From 3a153125f28d34064fa320acd989b8a0ce638e96 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 19 Jan 2017 18:07:03 +0200 Subject: [PATCH] test --- src/app/frontend/controllers/PageController.php | 10 ++++++++++ src/app/frontend/views/partial/item_group.php | 2 +- src/lib/common.php | 1 - 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app/frontend/controllers/PageController.php b/src/app/frontend/controllers/PageController.php index c9a1813..c3e471b 100644 --- a/src/app/frontend/controllers/PageController.php +++ b/src/app/frontend/controllers/PageController.php @@ -1352,6 +1352,16 @@ $groups_ = $this->common->getGroups1( $this->lang_id, $groups ); + + //discount + $discount = $this->models->getDiscount()->getActiveData(); + $discount = $this->models->getDiscount()->explodeGroupIds($discount); + $discount = $discount[0]; + foreach ($groups_ as &$item) { + if ($discount['discount'] > 0 && $discount['discount'] <= 100 && in_array($item['id'], $discount['group_ids'])) { + $item['discounted_price'] = round($item['price']*(1-$discount['discount']/100), 1); + } + } } die( json_encode( $groups_ ) ); diff --git a/src/app/frontend/views/partial/item_group.php b/src/app/frontend/views/partial/item_group.php index 46c138f..c647c0c 100644 --- a/src/app/frontend/views/partial/item_group.php +++ b/src/app/frontend/views/partial/item_group.php @@ -69,7 +69,7 @@
/> -
diff --git a/src/lib/common.php b/src/lib/common.php index bf2365b..d41430e 100644 --- a/src/lib/common.php +++ b/src/lib/common.php @@ -779,7 +779,6 @@ namespace } - foreach( $groups as &$g ) { $g['items'] = $this->getDi()->get('models')->getItems()->getSizesByGroupId($lang_id, $g['group_id']); -- libgit2 0.21.4