Commit 81ac851125e51112a7bb64a3420bc6d59ed8ea20
Merge branch 'discount' of gitlab.artweb.com.ua:Alex/semena
Showing
1 changed file
with
5 additions
and
1 deletions
Show diff stats
src/app/frontend/controllers/MenuController.php
@@ -420,7 +420,7 @@ class MenuController extends \controllers\ControllerBase | @@ -420,7 +420,7 @@ class MenuController extends \controllers\ControllerBase | ||
420 | 420 | ||
421 | foreach($cart_items['items'] as $k => $item) { | 421 | foreach($cart_items['items'] as $k => $item) { |
422 | 422 | ||
423 | - $cart_items['items'][$k]['price'] = round($cart_items['items'][$k]['price']*(1-$discount['discount']/100), 1); | 423 | + |
424 | 424 | ||
425 | $cart_items['items'][$k]['group_sizes'] = $this->models->getItems()->getSizesByGroupId( $this->lang_id, $item['group_id'] ); | 425 | $cart_items['items'][$k]['group_sizes'] = $this->models->getItems()->getSizesByGroupId( $this->lang_id, $item['group_id'] ); |
426 | $cart_items['items'][$k]['prices'] = $this->common->getPricesArray($item); | 426 | $cart_items['items'][$k]['prices'] = $this->common->getPricesArray($item); |
@@ -433,6 +433,8 @@ class MenuController extends \controllers\ControllerBase | @@ -433,6 +433,8 @@ class MenuController extends \controllers\ControllerBase | ||
433 | ? $cart_items['items'][$k]['prices'][$special_user['status']] | 433 | ? $cart_items['items'][$k]['prices'][$special_user['status']] |
434 | : $item['price2'], 2, '.', '' | 434 | : $item['price2'], 2, '.', '' |
435 | ); | 435 | ); |
436 | + //discount | ||
437 | + $cart_items['items'][$k]['price'] = round($cart_items['items'][$k]['price']*(1-$discount['discount']/100), 1); | ||
436 | 438 | ||
437 | $cart_items['items'][$k]['total_price'] = $cart_items['items'][$k]['price'] * $item['count']; | 439 | $cart_items['items'][$k]['total_price'] = $cart_items['items'][$k]['price'] * $item['count']; |
438 | 440 | ||
@@ -442,6 +444,8 @@ class MenuController extends \controllers\ControllerBase | @@ -442,6 +444,8 @@ class MenuController extends \controllers\ControllerBase | ||
442 | 444 | ||
443 | } else { | 445 | } else { |
444 | $cart_items['items'][$k]['price'] = $item['price2']; | 446 | $cart_items['items'][$k]['price'] = $item['price2']; |
447 | + //discount | ||
448 | + $cart_items['items'][$k]['price'] = round($cart_items['items'][$k]['price']*(1-$discount['discount']/100), 1); | ||
445 | } | 449 | } |
446 | } | 450 | } |
447 | 451 |