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 @@
| _("kiev") ?> |
- _("new_address_second") ?> |
+ ">_("new_address_second") ?> |
8.30-17.30 (_("vt_nd") ?>) |
050-313-22-00 |
| _("kiev") ?> |
- _("new_address_third") ?> |
+ ">_("new_address_third") ?> |
9.00-19.00 (_("pn_sb") ?>) |
050-413-61-68 |
@@ -270,34 +270,34 @@
| _("kiev") ?> |
- _("new_address_sixth") ?> |
+ ">_("new_address_sixth") ?> |
8.30-17.00 (_("pn_sb") ?>) |
050-476-16-55 |
| _("kiev") ?> |
- _("new_address_first") ?> |
+ ">_("new_address_first") ?> |
9.00-19.00 (_("pn_sb") ?>) |
050-442-63-53 |
| _("kiev") ?> |
- _("new_address_fourth") ?> |
+ ">_("new_address_fourth") ?> |
9.00-19.00 (_("pn_pt") ?>), 9.00-18.00 (_("sb_vs") ?>) |
050-410-38-92 |
| _("kiev") ?> |
- _("new_address_eighth") ?> |
+ ">_("new_address_eighth") ?> |
9.00-19.00 (_("pn_sb") ?>) |
050-442-62-31 |
| _("kiev") ?> |
- _("new_address_ten") ?> |
+ ">_("new_address_ten") ?> |
8.00-19.00 (_("without_day_off") ?>) |
050-312-68-43 |
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 @@
- -
- _("popular_items").'" data-change_similar_items="popular" data-catalog_id="'.$catalog_id.'" data-group_id="'.$item['group_id'].'">'.$t->_("popular_items").'' ?>
-
+ -
+ _("related_items").'" data-change_similar_items="buy_with" data-catalog_id="'.$catalog_id.'" data-group_id="'.$item['group_id'].'">'.$t->_("related_items").'' ?>
+
-
_("similar_items").'" data-change_similar_items="same" data-catalog_id="'.$catalog_id.'" data-group_id="'.$item['group_id'].'">'.$t->_("similar_items").'' ?>
-
- _("related_items").'" data-change_similar_items="buy_with" data-catalog_id="'.$catalog_id.'" data-group_id="'.$item['group_id'].'">'.$t->_("related_items").'' ?>
-
+ _("popular_items").'" data-change_similar_items="popular" data-catalog_id="'.$catalog_id.'" data-group_id="'.$item['group_id'].'">'.$t->_("popular_items").'' ?>
+
-
_("watched").'" data-change_similar_items="viewed" data-catalog_id="'.$catalog_id.'" data-group_id="'.$item['group_id'].'">'.$t->_("watched").'' ?>
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