From 1de7deef8a5ed736b15b9a6a04f9cdfdc79d4241 Mon Sep 17 00:00:00 2001
From: Alex <program.artweb@gmail.com>
Date: Thu, 29 Dec 2016 18:22:57 +0200
Subject: [PATCH] common

---
 src/app/frontend/controllers/PageController.php |  3 +--
 src/app/frontend/views/page/item.php            |  2 +-
 src/app/frontend/views/partial/item_group.php   | 28 ++++++++++++++--------------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/app/frontend/controllers/PageController.php b/src/app/frontend/controllers/PageController.php
index 57aa376..8d9f866 100644
--- a/src/app/frontend/controllers/PageController.php
+++ b/src/app/frontend/controllers/PageController.php
@@ -479,8 +479,7 @@
                         'catalog_sales'             => $catalog_sales,
                         'css'                       => $cssSale,
                         'js'                        => $jsSale,
-                        'discount'                  => $discount,
-                        'users_group_id'           => $users_group_id
+                        'discount'                  => $discount
                     ]);
                 }
                 else
diff --git a/src/app/frontend/views/page/item.php b/src/app/frontend/views/page/item.php
index 13e4769..c6f34fa 100644
--- a/src/app/frontend/views/page/item.php
+++ b/src/app/frontend/views/page/item.php
@@ -204,7 +204,7 @@
                                 <li>
                                     <?php
                                     //vip
-                                    if (isset($users_group_id) && $users_group_id == 37) {
+                                    if (isset($users_group_id) && $users_group_id == 38) {
                                         $item['price2'] = round($item['price2']*0.95, 1);
                                     }
                                     // скидка
diff --git a/src/app/frontend/views/partial/item_group.php b/src/app/frontend/views/partial/item_group.php
index 18f1ca3..322f9ff 100644
--- a/src/app/frontend/views/partial/item_group.php
+++ b/src/app/frontend/views/partial/item_group.php
@@ -34,20 +34,20 @@
         <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/>';
-                    echo '<span>'.round($i['price']*(1-$discount['discount']/100), 1).'</span> грн';
-                }
-                else {
-                    echo '<span>'.$i['price'].'</span> грн';
-                }
-            }
-            else {
-                echo '<span>'.$i['price'].'</span> грн';
-            }
-            ?>
+//            // скидка
+//            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/>';
+//                    echo '<span>'.round($i['price']*(1-$discount['discount']/100), 1).'</span> грн';
+//                }
+//                else {
+//                    echo '<span>'.$i['price'].'</span> грн';
+//                }
+//            }
+//            else {
+//                echo '<span>'.$i['price'].'</span> грн';
+//            }
+//            ?>
             <span><?= round($i['price'], 2) ?></span> грн
         </div>
         <div class="one_item_buttons">
--
libgit2 0.21.4