diff --git a/src/app/frontend/controllers/MenuController.php b/src/app/frontend/controllers/MenuController.php index 9f8cca1..1f5f79e 100644 --- a/src/app/frontend/controllers/MenuController.php +++ b/src/app/frontend/controllers/MenuController.php @@ -393,33 +393,43 @@ class MenuController extends \controllers\ControllerBase } public function getCartItemsAction() { + $this->view->disable(); $in_cart = $this->session->get('in_cart', []); - - $cart_items = $this->common->getCartItems($in_cart, $this->lang_id); - - if($this->session->get('special_users_id') != null) { $special_users_id = $this->session->get('special_users_id'); $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]; - $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; + if ($this->common->applyPromoCode($discount, $cart_items['items'])) { + $this->common->countOrderSum($cart_items); + $cart_items['total_price'] = $cart_items['total_sum']; } - - $cart_items['total_price'] = round($cart_items['total_price']*(1-$discount['discount']/100), 1); + // foreach($cart_items['items'] as $k => $item) { -- libgit2 0.21.4