Commit c91e7f69bce389236905c48ae3b69d4402882def
1 parent
9dccb888
changed popular items in pageController itemAction, and added links to addresses
Showing
4 changed files
with
60 additions
and
17 deletions
Show diff stats
src/app/frontend/controllers/PageController.php
@@ -850,14 +850,27 @@ class PageController extends \controllers\ControllerBase | @@ -850,14 +850,27 @@ class PageController extends \controllers\ControllerBase | ||
850 | } | 850 | } |
851 | 851 | ||
852 | // get popular items_groups | 852 | // get popular items_groups |
853 | +// | ||
854 | +// $popular_groups = $this->models->getItems()->getPopularItems($this->lang_id); | ||
855 | +// $popular_groups = $this->common->explodeAlias($popular_groups); | ||
856 | +// | ||
857 | +// | ||
858 | +// $recommended_items = $this->models->getItems()->getRecommendedGroups($this->lang_id, \config::get( 'limits/top_items' )); | ||
859 | +// $recommended_items = $this->common->explodeAlias($recommended_items); | ||
860 | +// $popular_groups_ = $this->common->getGroups1($this->lang_id, $recommended_items); | ||
861 | + | ||
862 | + $groups = $this->models->getItems()->getBuyWithItems( $this->lang_id, $item['0']['group_id'] ); | ||
863 | + foreach( $groups as &$p ) | ||
864 | + { | ||
865 | + $p['explode'] = explode( '/', $p['catalog_alias'] ); | ||
866 | + $p['type_alias'] = $p['explode']['1']; | ||
867 | + $p['subtype_alias'] = $p['explode']['2']; | ||
868 | + unset( $p['explode'] ); | ||
869 | + } | ||
853 | 870 | ||
854 | - $popular_groups = $this->models->getItems()->getPopularItems($this->lang_id); | ||
855 | - $popular_groups = $this->common->explodeAlias($popular_groups); | ||
856 | 871 | ||
872 | + $popular_groups_ = $this->common->getGroups1( $this->lang_id, $groups ); | ||
857 | 873 | ||
858 | - $recommended_items = $this->models->getItems()->getRecommendedGroups($this->lang_id, \config::get( 'limits/top_items' )); | ||
859 | - $recommended_items = $this->common->explodeAlias($recommended_items); | ||
860 | - $popular_groups_ = $this->common->getGroups1($this->lang_id, $recommended_items); | ||
861 | 874 | ||
862 | 875 | ||
863 | $seo = $this->seoUrl->getSeoData($this->models->getSeoInfo()->getAllSeo()); | 876 | $seo = $this->seoUrl->getSeoData($this->models->getSeoInfo()->getAllSeo()); |
src/app/frontend/views/menu/contacts.php
@@ -251,14 +251,14 @@ | @@ -251,14 +251,14 @@ | ||
251 | </tr--> | 251 | </tr--> |
252 | <tr> | 252 | <tr> |
253 | <td class="contacts_list_phone"><?= $t->_("kiev") ?></td> | 253 | <td class="contacts_list_phone"><?= $t->_("kiev") ?></td> |
254 | - <td><?= $t->_("new_address_second") ?></td> | 254 | + <td><a href="https://www.google.com/maps?cid=10560965128246975743&hl=ru" title="<?= $t->_("new_address_second") ?>"><?= $t->_("new_address_second") ?></a></td> |
255 | <td>8.30-17.30 (<?= $t->_("vt_nd") ?>)</td> | 255 | <td>8.30-17.30 (<?= $t->_("vt_nd") ?>)</td> |
256 | <td class="contacts_list_phone">050-313-22-00</td> | 256 | <td class="contacts_list_phone">050-313-22-00</td> |
257 | <!--<td class="contacts_list_phone"><a href="https://www.google.com.ua/maps/place/%D0%B2%D1%83%D0%BB.+%D0%92%D0%B5%D0%BB%D0%B8%D0%BA%D0%B0+%D0%9E%D0%BA%D1%80%D1%83%D0%B6%D0%BD%D0%B0,+%D0%9A%D0%B8%D1%97%D0%B2,+%D0%BC%D1%96%D1%81%D1%82%D0%BE+%D0%9A%D0%B8%D1%97%D0%B2/@50.4092713,30.3904529,17z/data=!3m1!4b1!4m2!3m1!1s0x40d4cbdcd3b45185:0x481b85b82221ba1a?hl=ru" title="<?= $t->_("rout_map") ?>" target="_blank" rel="no-follow"><?= $t->_("rout_map") ?></a></td>--> | 257 | <!--<td class="contacts_list_phone"><a href="https://www.google.com.ua/maps/place/%D0%B2%D1%83%D0%BB.+%D0%92%D0%B5%D0%BB%D0%B8%D0%BA%D0%B0+%D0%9E%D0%BA%D1%80%D1%83%D0%B6%D0%BD%D0%B0,+%D0%9A%D0%B8%D1%97%D0%B2,+%D0%BC%D1%96%D1%81%D1%82%D0%BE+%D0%9A%D0%B8%D1%97%D0%B2/@50.4092713,30.3904529,17z/data=!3m1!4b1!4m2!3m1!1s0x40d4cbdcd3b45185:0x481b85b82221ba1a?hl=ru" title="<?= $t->_("rout_map") ?>" target="_blank" rel="no-follow"><?= $t->_("rout_map") ?></a></td>--> |
258 | </tr> | 258 | </tr> |
259 | <tr> | 259 | <tr> |
260 | <td class="contacts_list_phone"><?= $t->_("kiev") ?></td> | 260 | <td class="contacts_list_phone"><?= $t->_("kiev") ?></td> |
261 | - <td><?= $t->_("new_address_third") ?></td> | 261 | + <td><a href="https://www.google.com/maps?cid=5949473995652042489&hl=ru" title="<?= $t->_("new_address_third") ?>"><?= $t->_("new_address_third") ?></a></td> |
262 | <td>9.00-19.00 (<?= $t->_("pn_sb") ?>)</td> | 262 | <td>9.00-19.00 (<?= $t->_("pn_sb") ?>)</td> |
263 | <td class="contacts_list_phone">050-413-61-68</td> | 263 | <td class="contacts_list_phone">050-413-61-68</td> |
264 | <!--<td class="contacts_list_phone"><a href="https://www.google.com.ua/maps/place/%D0%BF%D1%80%D0%BE%D1%81%D0%BF.+%D0%90%D0%BA%D0%B0%D0%B4%D0%B5%D0%BC%D1%96%D0%BA%D0%B0+%D0%93%D0%BB%D1%83%D1%88%D0%BA%D0%BE%D0%B2%D0%B0,+%D0%9A%D0%B8%D1%97%D0%B2,+%D0%BC%D1%96%D1%81%D1%82%D0%BE+%D0%9A%D0%B8%D1%97%D0%B2/@50.371692,30.4609831,17z/data=!3m1!4b1!4m2!3m1!1s0x40d4c850f75e048f:0xee142a65f4bd318a?hl=ru" title="<?= $t->_("rout_map") ?>" target="_blank" rel="no-follow"><?= $t->_("rout_map") ?></a></td>--> | 264 | <!--<td class="contacts_list_phone"><a href="https://www.google.com.ua/maps/place/%D0%BF%D1%80%D0%BE%D1%81%D0%BF.+%D0%90%D0%BA%D0%B0%D0%B4%D0%B5%D0%BC%D1%96%D0%BA%D0%B0+%D0%93%D0%BB%D1%83%D1%88%D0%BA%D0%BE%D0%B2%D0%B0,+%D0%9A%D0%B8%D1%97%D0%B2,+%D0%BC%D1%96%D1%81%D1%82%D0%BE+%D0%9A%D0%B8%D1%97%D0%B2/@50.371692,30.4609831,17z/data=!3m1!4b1!4m2!3m1!1s0x40d4c850f75e048f:0xee142a65f4bd318a?hl=ru" title="<?= $t->_("rout_map") ?>" target="_blank" rel="no-follow"><?= $t->_("rout_map") ?></a></td>--> |
@@ -270,34 +270,34 @@ | @@ -270,34 +270,34 @@ | ||
270 | </tr--> | 270 | </tr--> |
271 | <tr> | 271 | <tr> |
272 | <td class="contacts_list_phone"><?= $t->_("kiev") ?></td> | 272 | <td class="contacts_list_phone"><?= $t->_("kiev") ?></td> |
273 | - <td><?= $t->_("new_address_sixth") ?></td> | 273 | + <td><a href="https://www.google.com/maps?cid=7171470467069443373&hl=ru" title="<?= $t->_("new_address_sixth") ?>"><?= $t->_("new_address_sixth") ?></a></td> |
274 | <td>8.30-17.00 (<?= $t->_("pn_sb") ?>)</td> | 274 | <td>8.30-17.00 (<?= $t->_("pn_sb") ?>)</td> |
275 | <td class="contacts_list_phone">050-476-16-55</td> | 275 | <td class="contacts_list_phone">050-476-16-55</td> |
276 | <!--<td class="contacts_list_phone"><a href="https://www.google.com.ua/maps/place/%D0%A5%D0%B0%D1%80%D0%BA%D1%96%D0%B2%D1%81%D1%8C%D0%BA%D0%B5+%D1%88.,+166,+%D0%9A%D0%B8%D1%97%D0%B2,+%D0%BC%D1%96%D1%81%D1%82%D0%BE+%D0%9A%D0%B8%D1%97%D0%B2/@50.414657,30.660084,17z/data=!3m1!4b1!4m2!3m1!1s0x40d4c4e339783c01:0x9de857a6571ac29a?hl=ru" title="<?= $t->_("rout_map") ?>" target="_blank" rel="no-follow"><?= $t->_("rout_map") ?></a></td>--> | 276 | <!--<td class="contacts_list_phone"><a href="https://www.google.com.ua/maps/place/%D0%A5%D0%B0%D1%80%D0%BA%D1%96%D0%B2%D1%81%D1%8C%D0%BA%D0%B5+%D1%88.,+166,+%D0%9A%D0%B8%D1%97%D0%B2,+%D0%BC%D1%96%D1%81%D1%82%D0%BE+%D0%9A%D0%B8%D1%97%D0%B2/@50.414657,30.660084,17z/data=!3m1!4b1!4m2!3m1!1s0x40d4c4e339783c01:0x9de857a6571ac29a?hl=ru" title="<?= $t->_("rout_map") ?>" target="_blank" rel="no-follow"><?= $t->_("rout_map") ?></a></td>--> |
277 | </tr> | 277 | </tr> |
278 | <tr> | 278 | <tr> |
279 | <td class="contacts_list_phone"><?= $t->_("kiev") ?></td> | 279 | <td class="contacts_list_phone"><?= $t->_("kiev") ?></td> |
280 | - <td><?= $t->_("new_address_first") ?></td> | 280 | + <td><a href="https://www.google.com/maps?cid=18229979471982705936&hl=ru" title="<?= $t->_("new_address_first") ?>"><?= $t->_("new_address_first") ?></a></td> |
281 | <td noWrap>9.00-19.00 (<?= $t->_("pn_sb") ?>)</td> | 281 | <td noWrap>9.00-19.00 (<?= $t->_("pn_sb") ?>)</td> |
282 | <td class="contacts_list_phone">050-442-63-53</td> | 282 | <td class="contacts_list_phone">050-442-63-53</td> |
283 | </tr> | 283 | </tr> |
284 | <tr> | 284 | <tr> |
285 | <td class="contacts_list_phone"><?= $t->_("kiev") ?></td> | 285 | <td class="contacts_list_phone"><?= $t->_("kiev") ?></td> |
286 | - <td><?= $t->_("new_address_fourth") ?></td> | 286 | + <td><a href="https://www.google.com/maps?cid=18042029842893234019&hl=ru" title="<?= $t->_("new_address_fourth") ?>"><?= $t->_("new_address_fourth") ?></a></td> |
287 | <td>9.00-19.00 (<?= $t->_("pn_pt") ?>), 9.00-18.00 (<?= $t->_("sb_vs") ?>)</td> | 287 | <td>9.00-19.00 (<?= $t->_("pn_pt") ?>), 9.00-18.00 (<?= $t->_("sb_vs") ?>)</td> |
288 | <td class="contacts_list_phone">050-410-38-92</td> | 288 | <td class="contacts_list_phone">050-410-38-92</td> |
289 | <!--<td class="contacts_list_phone"><a href="https://www.google.com.ua/maps/place/%D0%A5%D0%B0%D1%80%D0%BA%D1%96%D0%B2%D1%81%D1%8C%D0%BA%D0%B5+%D1%88.,+166,+%D0%9A%D0%B8%D1%97%D0%B2,+%D0%BC%D1%96%D1%81%D1%82%D0%BE+%D0%9A%D0%B8%D1%97%D0%B2/@50.414657,30.660084,17z/data=!3m1!4b1!4m2!3m1!1s0x40d4c4e339783c01:0x9de857a6571ac29a?hl=ru" title="<?= $t->_("rout_map") ?>" target="_blank" rel="no-follow"><?= $t->_("rout_map") ?></a></td>--> | 289 | <!--<td class="contacts_list_phone"><a href="https://www.google.com.ua/maps/place/%D0%A5%D0%B0%D1%80%D0%BA%D1%96%D0%B2%D1%81%D1%8C%D0%BA%D0%B5+%D1%88.,+166,+%D0%9A%D0%B8%D1%97%D0%B2,+%D0%BC%D1%96%D1%81%D1%82%D0%BE+%D0%9A%D0%B8%D1%97%D0%B2/@50.414657,30.660084,17z/data=!3m1!4b1!4m2!3m1!1s0x40d4c4e339783c01:0x9de857a6571ac29a?hl=ru" title="<?= $t->_("rout_map") ?>" target="_blank" rel="no-follow"><?= $t->_("rout_map") ?></a></td>--> |
290 | </tr> | 290 | </tr> |
291 | <tr> | 291 | <tr> |
292 | <td class="contacts_list_phone"><?= $t->_("kiev") ?></td> | 292 | <td class="contacts_list_phone"><?= $t->_("kiev") ?></td> |
293 | - <td><?= $t->_("new_address_eighth") ?></td> | 293 | + <td><a href="https://www.google.com/maps?cid=9290546046647461249&hl=ru" title="<?= $t->_("new_address_eighth") ?>"><?= $t->_("new_address_eighth") ?></a></td> |
294 | <td>9.00-19.00 (<?= $t->_("pn_sb") ?>)</td> | 294 | <td>9.00-19.00 (<?= $t->_("pn_sb") ?>)</td> |
295 | <td class="contacts_list_phone">050-442-62-31</td> | 295 | <td class="contacts_list_phone">050-442-62-31</td> |
296 | <!--<td class="contacts_list_phone"><a href="https://www.google.com.ua/maps/place/%D0%A5%D0%B0%D1%80%D0%BA%D1%96%D0%B2%D1%81%D1%8C%D0%BA%D0%B5+%D1%88.,+166,+%D0%9A%D0%B8%D1%97%D0%B2,+%D0%BC%D1%96%D1%81%D1%82%D0%BE+%D0%9A%D0%B8%D1%97%D0%B2/@50.414657,30.660084,17z/data=!3m1!4b1!4m2!3m1!1s0x40d4c4e339783c01:0x9de857a6571ac29a?hl=ru" title="<?= $t->_("rout_map") ?>" target="_blank" rel="no-follow"><?= $t->_("rout_map") ?></a></td>--> | 296 | <!--<td class="contacts_list_phone"><a href="https://www.google.com.ua/maps/place/%D0%A5%D0%B0%D1%80%D0%BA%D1%96%D0%B2%D1%81%D1%8C%D0%BA%D0%B5+%D1%88.,+166,+%D0%9A%D0%B8%D1%97%D0%B2,+%D0%BC%D1%96%D1%81%D1%82%D0%BE+%D0%9A%D0%B8%D1%97%D0%B2/@50.414657,30.660084,17z/data=!3m1!4b1!4m2!3m1!1s0x40d4c4e339783c01:0x9de857a6571ac29a?hl=ru" title="<?= $t->_("rout_map") ?>" target="_blank" rel="no-follow"><?= $t->_("rout_map") ?></a></td>--> |
297 | </tr> | 297 | </tr> |
298 | <tr> | 298 | <tr> |
299 | <td class="contacts_list_phone"><?= $t->_("kiev") ?></td> | 299 | <td class="contacts_list_phone"><?= $t->_("kiev") ?></td> |
300 | - <td><?= $t->_("new_address_ten") ?></td> | 300 | + <td><a href="https://www.google.com/maps?cid=17095950403227136610&hl=ru" title="<?= $t->_("new_address_ten") ?>"><?= $t->_("new_address_ten") ?></a></td> |
301 | <td>8.00-19.00 (<?= $t->_("without_day_off") ?>)</td> | 301 | <td>8.00-19.00 (<?= $t->_("without_day_off") ?>)</td> |
302 | <td class="contacts_list_phone">050-312-68-43</td> | 302 | <td class="contacts_list_phone">050-312-68-43</td> |
303 | <!--<td class="contacts_list_phone"><a href="https://www.google.com.ua/maps/place/%D0%A5%D0%B0%D1%80%D0%BA%D1%96%D0%B2%D1%81%D1%8C%D0%BA%D0%B5+%D1%88.,+166,+%D0%9A%D0%B8%D1%97%D0%B2,+%D0%BC%D1%96%D1%81%D1%82%D0%BE+%D0%9A%D0%B8%D1%97%D0%B2/@50.414657,30.660084,17z/data=!3m1!4b1!4m2!3m1!1s0x40d4c4e339783c01:0x9de857a6571ac29a?hl=ru" title="<?= $t->_("rout_map") ?>" target="_blank" rel="no-follow"><?= $t->_("rout_map") ?></a></td>--> | 303 | <!--<td class="contacts_list_phone"><a href="https://www.google.com.ua/maps/place/%D0%A5%D0%B0%D1%80%D0%BA%D1%96%D0%B2%D1%81%D1%8C%D0%BA%D0%B5+%D1%88.,+166,+%D0%9A%D0%B8%D1%97%D0%B2,+%D0%BC%D1%96%D1%81%D1%82%D0%BE+%D0%9A%D0%B8%D1%97%D0%B2/@50.414657,30.660084,17z/data=!3m1!4b1!4m2!3m1!1s0x40d4c4e339783c01:0x9de857a6571ac29a?hl=ru" title="<?= $t->_("rout_map") ?>" target="_blank" rel="no-follow"><?= $t->_("rout_map") ?></a></td>--> |
src/app/frontend/views/page/item.php
@@ -318,15 +318,15 @@ | @@ -318,15 +318,15 @@ | ||
318 | <div class="inner"> | 318 | <div class="inner"> |
319 | <div class="tabs clearfix"> | 319 | <div class="tabs clearfix"> |
320 | <ul class="change_similar_items"> | 320 | <ul class="change_similar_items"> |
321 | - <li class="float active_tab first_tab"> | ||
322 | - <?= '<a href="#" title="'.$t->_("popular_items").'" data-change_similar_items="popular" data-catalog_id="'.$catalog_id.'" data-group_id="'.$item['group_id'].'">'.$t->_("popular_items").'</a>' ?> | ||
323 | - </li> | 321 | + <li class="float active_tab first_tab"> |
322 | + <?= '<a href="#" title="'.$t->_("related_items").'" data-change_similar_items="buy_with" data-catalog_id="'.$catalog_id.'" data-group_id="'.$item['group_id'].'">'.$t->_("related_items").'</a>' ?> | ||
323 | + </li> | ||
324 | <li class="float not_active"> | 324 | <li class="float not_active"> |
325 | <?= '<a href="#" title="'.$t->_("similar_items").'" data-change_similar_items="same" data-catalog_id="'.$catalog_id.'" data-group_id="'.$item['group_id'].'">'.$t->_("similar_items").'</a>' ?> | 325 | <?= '<a href="#" title="'.$t->_("similar_items").'" data-change_similar_items="same" data-catalog_id="'.$catalog_id.'" data-group_id="'.$item['group_id'].'">'.$t->_("similar_items").'</a>' ?> |
326 | </li> | 326 | </li> |
327 | <li class="float not_active"> | 327 | <li class="float not_active"> |
328 | - <?= '<a href="#" title="'.$t->_("related_items").'" data-change_similar_items="buy_with" data-catalog_id="'.$catalog_id.'" data-group_id="'.$item['group_id'].'">'.$t->_("related_items").'</a>' ?> | ||
329 | - </li> | 328 | + <?= '<a href="#" title="'.$t->_("popular_items").'" data-change_similar_items="popular" data-catalog_id="'.$catalog_id.'" data-group_id="'.$item['group_id'].'">'.$t->_("popular_items").'</a>' ?> |
329 | + </li> | ||
330 | <li class="float last_tab not_active"> | 330 | <li class="float last_tab not_active"> |
331 | <?= '<a href="#" title="'.$t->_("watched").'" data-change_similar_items="viewed" data-catalog_id="'.$catalog_id.'" data-group_id="'.$item['group_id'].'">'.$t->_("watched").'</a>' ?> | 331 | <?= '<a href="#" title="'.$t->_("watched").'" data-change_similar_items="viewed" data-catalog_id="'.$catalog_id.'" data-group_id="'.$item['group_id'].'">'.$t->_("watched").'</a>' ?> |
332 | </li> | 332 | </li> |
src/lib/models/items.php
@@ -3300,6 +3300,36 @@ class items extends \db | @@ -3300,6 +3300,36 @@ class items extends \db | ||
3300 | ) AS alias, | 3300 | ) AS alias, |
3301 | ( | 3301 | ( |
3302 | SELECT | 3302 | SELECT |
3303 | + count(*) | ||
3304 | + FROM | ||
3305 | + public.items | ||
3306 | + WHERE | ||
3307 | + group_id = public.items_group.group_id | ||
3308 | + AND | ||
3309 | + status = 1 | ||
3310 | + ) AS count_available, | ||
3311 | + ( | ||
3312 | + SELECT | ||
3313 | + type | ||
3314 | + FROM | ||
3315 | + public.items | ||
3316 | + WHERE | ||
3317 | + price2 IN | ||
3318 | + ( | ||
3319 | + SELECT | ||
3320 | + MIN(price2) | ||
3321 | + FROM | ||
3322 | + public.items | ||
3323 | + WHERE | ||
3324 | + group_id = public.items_group.group_id | ||
3325 | + ) | ||
3326 | + AND | ||
3327 | + group_id = public.items_group.group_id | ||
3328 | + LIMIT | ||
3329 | + 1 | ||
3330 | + ) as type_id, | ||
3331 | + ( | ||
3332 | + SELECT | ||
3303 | full_alias | 3333 | full_alias |
3304 | FROM | 3334 | FROM |
3305 | catalog_i18n | 3335 | catalog_i18n |