Merge branch 'discount' of gitlab.artweb.com.ua:Alex/semena

Alex Savenko
2 parents b5e115e7 903c98f7
Showing 3 changed files with 6 additions and 1 deletions Show diff stats
src/app/frontend/controllers/MenuController.php
src/app/frontend/views/page/item.php
src/app/frontend/views/partial/item_group.php
@@ -447,7 +447,7 @@ class MenuController extends \controllers\ControllerBase
                 //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);
-                //$cart_items['total_price'] = round($cart_items['total_price']*(1-$discount['discount']/100), 1);
+                $cart_items['total_price'] = round($cart_items['total_price']*(1-$discount['discount']/100), 1);
 			}
 		}
  
@@ -203,10 +203,14 @@
                             <ul>
                                 <li>
                                     <?php
+                                    // скидка
                                     if (!empty($discount)) {
                                         if (isset($discount) && $discount['discount'] > 0 && $discount['discount'] <= 100 && in_array($item['id'], $discount['group_ids'])) {
                                             echo '<span itemprop="price">'.number_format($item['price2']*(1-$discount['discount']/100), 2, '.', ' ').'</span> грн<span style="display:none;" itemprop="priceCurrency">UAH</span>';
                                         }
+                                        else {
+                                            echo '<span itemprop="price">'.number_format($item['price2'], 2, '.', ' ').'</span> грн<span style="display:none;" itemprop="priceCurrency">UAH</span>';
+                                        }
                                     }
                                     else {
                                         echo '<span itemprop="price">'.number_format($item['price2'], 2, '.', ' ').'</span> грн<span style="display:none;" itemprop="priceCurrency">UAH</span>';
@@ -34,6 +34,7 @@
         <div class="one_item_price">
             <?= $t->_("price_from") ?>
             <?php
+            // скидка
             if (!empty($discount)) {
                 if ($discount['discount'] > 0 && $discount['discount'] <= 100 && in_array($i['id'], $discount['group_ids'])) {
                     echo '<span style="text-decoration: line-through;"><span>'.$i['price'].'</span></span> грн<br/>';