From 7b24e24ab99a8ed70bdd26927214675f3f12187c Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 21 Dec 2016 14:04:50 +0200 Subject: [PATCH] products pick --- src/app/frontend/controllers/PageController.php | 5 +---- src/app/frontend/views/partial/item_group.php | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/app/frontend/controllers/PageController.php b/src/app/frontend/controllers/PageController.php index 41ce96e..bd4d5c1 100644 --- a/src/app/frontend/controllers/PageController.php +++ b/src/app/frontend/controllers/PageController.php @@ -138,10 +138,7 @@ $discount = $this->models->getDiscount()->getActiveData(); if (!empty($discount)) { - $discount = $discount[0]['discount']; - } - else { - $discount = 0; + $discount = $discount[0]; } $css = [ diff --git a/src/app/frontend/views/partial/item_group.php b/src/app/frontend/views/partial/item_group.php index 441a481..de190e3 100644 --- a/src/app/frontend/views/partial/item_group.php +++ b/src/app/frontend/views/partial/item_group.php @@ -33,8 +33,7 @@
_("price_from") ?> - - 0 && $discount <= 100) { + 0 && $discount['discount'] <= 100 && in_array($i['group_id'], $discount['group_ids'])) { echo ''.$i['price'].' грн
'; echo ''.round($i['price']*(1-$discount/100), 1).' грн'; } -- libgit2 0.21.4