diff --git a/src/app/frontend/controllers/PageController.php b/src/app/frontend/controllers/PageController.php index 56466d9..8fc50d0 100644 --- a/src/app/frontend/controllers/PageController.php +++ b/src/app/frontend/controllers/PageController.php @@ -143,12 +143,8 @@ //discount $discount = $this->models->getDiscount()->getActiveData(); - if (!empty($discount)) { - $discount = $discount[0]; - $discount['group_ids'] = str_replace('{', '', $discount['group_ids']); - $discount['group_ids'] = str_replace('}', '', $discount['group_ids']); - $discount['group_ids'] = explode(',', $discount['group_ids']); - } + $discount = $this->models->getDiscount()->explodeGroupIds($discount); + $discount = $discount[0]; //vip $users_group_id = $this->session->get('users_group_id'); @@ -445,12 +441,8 @@ //discount $discount = $this->models->getDiscount()->getActiveData(); - if (!empty($discount)) { - $discount = $discount[0]; - $discount['group_ids'] = str_replace('{', '', $discount['group_ids']); - $discount['group_ids'] = str_replace('}', '', $discount['group_ids']); - $discount['group_ids'] = explode(',', $discount['group_ids']); - } + $discount = $this->models->getDiscount()->explodeGroupIds($discount); + $discount = $discount[0]; //vip $users_group_id = $this->session->get('users_group_id'); @@ -719,12 +711,8 @@ //discount $discount = $this->models->getDiscount()->getActiveData(); - if (!empty($discount)) { - $discount = $discount[0]; - $discount['group_ids'] = str_replace('{', '', $discount['group_ids']); - $discount['group_ids'] = str_replace('}', '', $discount['group_ids']); - $discount['group_ids'] = explode(',', $discount['group_ids']); - } + $discount = $this->models->getDiscount()->explodeGroupIds($discount); + $discount = $discount[0]; //vip $users_group_id = $this->session->get('users_group_id'); @@ -939,12 +927,8 @@ //discount $discount = $this->models->getDiscount()->getActiveData(); - if (!empty($discount)) { - $discount = $discount[0]; - $discount['group_ids'] = str_replace('{', '', $discount['group_ids']); - $discount['group_ids'] = str_replace('}', '', $discount['group_ids']); - $discount['group_ids'] = explode(',', $discount['group_ids']); - } + $discount = $this->models->getDiscount()->explodeGroupIds($discount); + $discount = $discount[0]; //vip $users_group_id = $this->session->get('users_group_id'); @@ -1130,10 +1114,8 @@ //discount $discount = $this->models->getDiscount()->getActiveData(); if (!empty($discount)) { + $discount = $this->models->getDiscount()->explodeGroupIds($discount); $discount = $discount[0]; - $discount['group_ids'] = str_replace('{', '', $discount['group_ids']); - $discount['group_ids'] = str_replace('}', '', $discount['group_ids']); - $discount['group_ids'] = explode(',', $discount['group_ids']); if ($discount['discount'] > 0 && $discount['discount'] <= 100 && in_array($item_id, $discount['group_ids'])) { $discount = $discount['discount']; } @@ -1443,12 +1425,6 @@ $discount = $this->models->getDiscount()->getActiveData(); $discount = $this->models->getDiscount()->explodeGroupIds($discount); $discount = $discount[0]; -// if (!empty($discount)) { -// $discount = $discount[0]; -// $discount['group_ids'] = str_replace('{', '', $discount['group_ids']); -// $discount['group_ids'] = str_replace('}', '', $discount['group_ids']); -// $discount['group_ids'] = explode(',', $discount['group_ids']); -// } $this->view->setVars([ 'groups' => $items, diff --git a/src/app/frontend/views/page/search.php b/src/app/frontend/views/page/search.php index 8f1a9ef..fc49b4c 100644 --- a/src/app/frontend/views/page/search.php +++ b/src/app/frontend/views/page/search.php @@ -58,7 +58,7 @@
$i ): - $this->partial('partial/item_group', ['k' => $k, 'i' => $i, 'limit' => 3, 'discount' => $discount]); + $this->partial('partial/item_group', ['k' => $k, 'i' => $i, 'limit' => 3]); endforeach; ?>
diff --git a/src/app/frontend/views/partial/item_group.php b/src/app/frontend/views/partial/item_group.php index bbb2860..c647c0c 100644 --- a/src/app/frontend/views/partial/item_group.php +++ b/src/app/frontend/views/partial/item_group.php @@ -1,21 +1,26 @@
- - - Новинки -
' - : - ''). - ( isset( $i['is_top'] ) && !empty( $i['is_top'] ) - ? - '
- Топ продаж -
' - : - '') ?> - */?> + + + + Новинки + ' + : + ''). + ( isset( $i['is_top'] ) && !empty( $i['is_top'] ) + ? + '
+ Топ продаж +
' + : + '') ?> + + */ + ?> +
" alt="" width="126" height="200" />
+

+
+
_("price_from") ?> 0 && $discount['discount'] <= 100 && in_array($i['id'], $discount['group_ids'])) { - echo ''.$i['price'].' грн
'; - echo ''.round($i['price']*(1-$discount['discount']/100), 1).' грн'; + //vip + if(isset($users_group_id) && $users_group_id == '37') { + $i['price'] = round($i['price']*0.95, 1); + } + //discount + if (!empty($discount)) { + if ($discount['discount'] > 0 && $discount['discount'] <= 100 && in_array($i['id'], $discount['group_ids'])) { + echo ''.$i['price'].' грн
'; + echo ''.round($i['price']*(1-$discount['discount']/100), 1).' грн'; + } + else { + echo ''.$i['price'].' грн'; + } } else { echo ''.$i['price'].' грн'; } - } - else { - echo ''.$i['price'].' грн'; - } ?>
+
_("details") ?> _("buy") ?>
+
/>
+
+ \ No newline at end of file -- libgit2 0.21.4