From c91e7f69bce389236905c48ae3b69d4402882def Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Fri, 12 Aug 2016 12:27:41 +0300
Subject: [PATCH] changed popular items in pageController itemAction, and added links to addresses

---
 src/app/frontend/controllers/PageController.php | 23 ++++++++++++++++++-----
 src/app/frontend/views/menu/contacts.php        | 14 +++++++-------
 src/app/frontend/views/page/item.php            | 10 +++++-----
 src/lib/models/items.php                        | 30 ++++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/src/app/frontend/controllers/PageController.php b/src/app/frontend/controllers/PageController.php
index b43199f..452a748 100644
--- a/src/app/frontend/controllers/PageController.php
+++ b/src/app/frontend/controllers/PageController.php
@@ -850,14 +850,27 @@ class PageController extends \controllers\ControllerBase
             }
 
             // get popular items_groups
+//
+//            $popular_groups = $this->models->getItems()->getPopularItems($this->lang_id);
+//            $popular_groups = $this->common->explodeAlias($popular_groups);
+//
+//
+//            $recommended_items = $this->models->getItems()->getRecommendedGroups($this->lang_id, \config::get( 'limits/top_items' ));
+//            $recommended_items = $this->common->explodeAlias($recommended_items);
+//            $popular_groups_ = $this->common->getGroups1($this->lang_id, $recommended_items);
+
+            $groups = $this->models->getItems()->getBuyWithItems( $this->lang_id, $item['0']['group_id'] );
+            foreach( $groups as &$p )
+            {
+                $p['explode']       = explode( '/', $p['catalog_alias'] );
+                $p['type_alias']    = $p['explode']['1'];
+                $p['subtype_alias'] = $p['explode']['2'];
+                unset( $p['explode'] );
+            }
 
-            $popular_groups = $this->models->getItems()->getPopularItems($this->lang_id);
-            $popular_groups = $this->common->explodeAlias($popular_groups);
 
+            $popular_groups_         = $this->common->getGroups1( $this->lang_id, $groups );
 
-            $recommended_items = $this->models->getItems()->getRecommendedGroups($this->lang_id, \config::get( 'limits/top_items' ));
-            $recommended_items = $this->common->explodeAlias($recommended_items);
-            $popular_groups_ = $this->common->getGroups1($this->lang_id, $recommended_items);
 
 
             $seo = $this->seoUrl->getSeoData($this->models->getSeoInfo()->getAllSeo());
diff --git a/src/app/frontend/views/menu/contacts.php b/src/app/frontend/views/menu/contacts.php
index 7c4de3e..6b0474c 100644
--- a/src/app/frontend/views/menu/contacts.php
+++ b/src/app/frontend/views/menu/contacts.php
@@ -251,14 +251,14 @@
         </tr-->
         <tr>
             <td class="contacts_list_phone"><?= $t->_("kiev") ?></td>
-            <td><?= $t->_("new_address_second") ?></td>
+            <td><a href="https://www.google.com/maps?cid=10560965128246975743&hl=ru" title="<?= $t->_("new_address_second") ?>"><?= $t->_("new_address_second") ?></a></td>
             <td>8.30-17.30 (<?= $t->_("vt_nd") ?>)</td>
             <td class="contacts_list_phone">050-313-22-00</td>
             <!--<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>-->
         </tr>
         <tr>
             <td class="contacts_list_phone"><?= $t->_("kiev") ?></td>
-            <td><?= $t->_("new_address_third") ?></td>
+            <td><a href="https://www.google.com/maps?cid=5949473995652042489&hl=ru" title="<?= $t->_("new_address_third") ?>"><?= $t->_("new_address_third") ?></a></td>
             <td>9.00-19.00 (<?= $t->_("pn_sb") ?>)</td>
             <td class="contacts_list_phone">050-413-61-68</td>
             <!--<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 @@
         </tr-->
         <tr>
             <td class="contacts_list_phone"><?= $t->_("kiev") ?></td>
-            <td><?= $t->_("new_address_sixth") ?></td>
+            <td><a href="https://www.google.com/maps?cid=7171470467069443373&hl=ru" title="<?= $t->_("new_address_sixth") ?>"><?= $t->_("new_address_sixth") ?></a></td>
             <td>8.30-17.00 (<?= $t->_("pn_sb") ?>)</td>
             <td class="contacts_list_phone">050-476-16-55</td>
             <!--<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>-->
         </tr>
         <tr>
             <td class="contacts_list_phone"><?= $t->_("kiev") ?></td>
-            <td><?= $t->_("new_address_first") ?></td>
+            <td><a href="https://www.google.com/maps?cid=18229979471982705936&hl=ru" title="<?= $t->_("new_address_first") ?>"><?= $t->_("new_address_first") ?></a></td>
 			<td noWrap>9.00-19.00 (<?= $t->_("pn_sb") ?>)</td>
             <td class="contacts_list_phone">050-442-63-53</td>
         </tr>
         <tr>
             <td class="contacts_list_phone"><?= $t->_("kiev") ?></td>
-            <td><?= $t->_("new_address_fourth") ?></td>
+            <td><a href="https://www.google.com/maps?cid=18042029842893234019&hl=ru" title="<?= $t->_("new_address_fourth") ?>"><?= $t->_("new_address_fourth") ?></a></td>
 			<td>9.00-19.00 (<?= $t->_("pn_pt") ?>), 9.00-18.00 (<?= $t->_("sb_vs") ?>)</td>
             <td class="contacts_list_phone">050-410-38-92</td>
             <!--<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>-->
         </tr>
         <tr>
             <td class="contacts_list_phone"><?= $t->_("kiev") ?></td>
-            <td><?= $t->_("new_address_eighth") ?></td>
+            <td><a href="https://www.google.com/maps?cid=9290546046647461249&hl=ru" title="<?= $t->_("new_address_eighth") ?>"><?= $t->_("new_address_eighth") ?></a></td>
 			<td>9.00-19.00 (<?= $t->_("pn_sb") ?>)</td>
             <td class="contacts_list_phone">050-442-62-31</td>
             <!--<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>-->
         </tr>
         <tr>
             <td class="contacts_list_phone"><?= $t->_("kiev") ?></td>
-            <td><?= $t->_("new_address_ten") ?></td>
+            <td><a href="https://www.google.com/maps?cid=17095950403227136610&hl=ru" title="<?= $t->_("new_address_ten") ?>"><?= $t->_("new_address_ten") ?></a></td>
             <td>8.00-19.00 (<?= $t->_("without_day_off") ?>)</td>
             <td class="contacts_list_phone">050-312-68-43</td>
             <!--<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>-->
diff --git a/src/app/frontend/views/page/item.php b/src/app/frontend/views/page/item.php
index 6322d34..234e1c2 100644
--- a/src/app/frontend/views/page/item.php
+++ b/src/app/frontend/views/page/item.php
@@ -318,15 +318,15 @@
         <div class="inner">
             <div class="tabs clearfix">
                 <ul class="change_similar_items">
-                    <li class="float active_tab first_tab">
-                        <?= '<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>' ?>
-                     </li>
+                    <li class="float  active_tab first_tab">
+                        <?= '<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>' ?>
+                    </li>
                     <li class="float not_active">
                         <?= '<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>' ?>
                     </li>
                     <li class="float not_active">
-                        <?= '<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>' ?>
-                    </li>
+                        <?= '<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>' ?>
+                     </li>
                     <li class="float last_tab not_active">
                         <?= '<a href="#" title="'.$t->_("watched").'" data-change_similar_items="viewed"       data-catalog_id="'.$catalog_id.'" data-group_id="'.$item['group_id'].'">'.$t->_("watched").'</a>' ?>
                     </li>
diff --git a/src/lib/models/items.php b/src/lib/models/items.php
index 328ee4f..ce104d7 100644
--- a/src/lib/models/items.php
+++ b/src/lib/models/items.php
@@ -3300,6 +3300,36 @@ class items extends \db
                         ) AS alias,
                         (
                             SELECT
+                                count(*)
+                            FROM
+                                public.items
+                            WHERE
+                                group_id = public.items_group.group_id
+                                AND
+                                status = 1
+                        ) AS count_available,
+                       (
+                        SELECT
+                                type
+                            FROM
+                                public.items
+                            WHERE
+                                price2 IN
+                                (
+                                    SELECT
+                                        MIN(price2)
+                                    FROM
+                                        public.items
+                                    WHERE
+                                        group_id = public.items_group.group_id
+                                )
+                                AND
+                                group_id = public.items_group.group_id
+                            LIMIT
+                                1
+                        ) as type_id,
+                        (
+                            SELECT
                                 full_alias
                             FROM
                                 catalog_i18n
--
libgit2 0.21.4