From 0526f97aeecb074fdf8eaa08b135a7249d1be9ac Mon Sep 17 00:00:00 2001
From: Alex <program.artweb@gmail.com>
Date: Thu, 22 Dec 2016 17:26:37 +0200
Subject: [PATCH] price display basket

---
 src/app/frontend/controllers/MenuController.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/app/frontend/controllers/MenuController.php b/src/app/frontend/controllers/MenuController.php
index f618fd0..0f1053e 100644
--- a/src/app/frontend/controllers/MenuController.php
+++ b/src/app/frontend/controllers/MenuController.php
@@ -189,11 +189,21 @@ class MenuController extends \controllers\ControllerBase
 				$sms_text = "Vash zakaz prinyat. #:".$proposal_number['proposal_number']." V blijayshee vremya menedjer svyajetsya s Vami (044) 581-67-15";
 				$this->sms->sendSMS($order['phone'], $sms_text);
 
+                //promocode
 				if(!empty($promo_code)) {
 					if($this->common->applyPromoCode($promo_code[0], $order['items']))
 						$this->common->countOrderSum($order);
 				}
 
+                //discount
+                $discount = $this->getDi()->get('models')->getDiscount()->getActiveData();
+                if (!empty($discount)) {
+                    $discount = $discount[0];
+                }
+                if ($this->common->applyPromoCode($discount, $order['items'])) {
+                    $this->common->countOrderSum($order);
+                }
+
 				// novaposhta
 				if (!empty($proposal_number['novaposhta_tnn']))
 				{
@@ -272,7 +282,6 @@ class MenuController extends \controllers\ControllerBase
 		]);
 	}
 
-	
 	public function orderCompletedAction() {
 		$completed = $this->languages->getTranslation()->_("successfully_realized_order");
 		
@@ -330,7 +339,6 @@ class MenuController extends \controllers\ControllerBase
 		]);
 	}
 
-
     public function getCitiesAction( )
     {
         header('Content-Type: application/json; charset=utf8');
@@ -358,7 +366,6 @@ class MenuController extends \controllers\ControllerBase
         die( json_encode( $selected_cities ) );
     }
 
-
     public function getOfficesAction( )
     {
         header('Content-Type: application/json; charset=utf8');
@@ -379,7 +386,6 @@ class MenuController extends \controllers\ControllerBase
         die( json_encode( $offices ) );
     }
 
-
 	public function addProductBasketAction(){
 		$item_id        = $_GET['productID'];
 		$count_items    = $_GET['productCount'];
@@ -446,7 +452,6 @@ class MenuController extends \controllers\ControllerBase
 		echo json_encode($cart_items);
 	}
 
-
 	public function addToBasketAction()
     {
         $count = 0;
--
libgit2 0.21.4