From 746d54c8715d6c53862bd80ac87d174101a24abd Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 22 Dec 2016 15:34:04 +0200 Subject: [PATCH] price display basket --- src/app/frontend/controllers/MenuController.php | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/src/app/frontend/controllers/MenuController.php b/src/app/frontend/controllers/MenuController.php index b0a3243..f618fd0 100644 --- a/src/app/frontend/controllers/MenuController.php +++ b/src/app/frontend/controllers/MenuController.php @@ -405,22 +405,8 @@ class MenuController extends \controllers\ControllerBase $special_user = $this->models->getSpecialUsers()->getOneData($special_users_id)[0]; } - // скидка -// $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']); -// } -// else { -// $discount['discount'] = 0; -// } -// -// $cart_items['total_price'] = round($cart_items['total_price']*(1-$discount['discount']/100), 1); - - //discount + $discount = $this->models->getDiscount()->getActiveData(); if (!empty($discount)) { $discount = $discount[0]; @@ -429,11 +415,10 @@ class MenuController extends \controllers\ControllerBase $this->common->countOrderSum($cart_items); $cart_items['total_price'] = $cart_items['total_sum']; } - // - - foreach($cart_items['items'] as $k => $item) { + /************************/ + foreach($cart_items['items'] as $k => $item) { $cart_items['items'][$k]['group_sizes'] = $this->models->getItems()->getSizesByGroupId( $this->lang_id, $item['group_id'] ); $cart_items['items'][$k]['prices'] = $this->common->getPricesArray($item); @@ -446,9 +431,6 @@ class MenuController extends \controllers\ControllerBase ? $cart_items['items'][$k]['prices'][$special_user['status']] : $item['price2'], 2, '.', '' ); - //discount - //$cart_items['items'][$k]['price'] = round($cart_items['items'][$k]['price']*(1-$discount['discount']/100), 1); - $cart_items['items'][$k]['total_price'] = $cart_items['items'][$k]['price'] * $item['count']; $cart_items['new_total_price'] += $cart_items['items'][$k]['total_price']; @@ -457,10 +439,8 @@ class MenuController extends \controllers\ControllerBase } else { $cart_items['items'][$k]['price'] = $item['price2']; - //discount - //$cart_items['items'][$k]['price'] = round($cart_items['items'][$k]['price']*(1-$discount['discount']/100), 1); - //$cart_items['items'][$k]['total_price'] = round($cart_items['items'][$k]['total_price']*(1-$discount['discount']/100), 1); - } + } + } echo json_encode($cart_items); -- libgit2 0.21.4