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

Alex Savenko
2 parents 525b93c3 02c45234
Showing 3 changed files with 18 additions and 3 deletions Show diff stats
src/app/frontend/controllers/PageController.php
src/app/frontend/views/page/changeWithSize.php
src/app/frontend/views/page/item.php
@@ -1092,10 +1092,25 @@
                     'special_user'      => $special_user
                 ]);
             }
+
+            $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']);
+                if ($discount['discount'] > 0 && $discount['discount'] <= 100 && in_array($item_id, $discount['group_ids'])) {
+                    $discount = $discount['discount'];
+                }
+                else {
+                    $discount = 0;
+                }
+            }
             $this->view->pick('page/changeWithSize');
             $this->view->setVars([
-                'item' => $item['0']
+                'item'      => $item['0'],
+                'discount'  => $discount
             ]);
             $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
         }
@@ -8,7 +8,7 @@ if(isset($special_user)) {
 }
 $data['html'] = '<div class="clearfix buy_compare">
                     <div class="one_item_price float">'. $t->_("price") .
-    ' <span>' . $data['price'] . '</span> грн';
+    ' <span>' . number_format($data['price']*(1-$discount['discount']/100), 2, '.', ' ') . '</span> грн';
 $data['html'] .= '</ul></div><div data-group_id="' . $item['group_id'] .'" class="one_item_buttons float">';
@@ -453,6 +453,7 @@
         $customer_id    = $this->session->get('id');
     ?>
     $( document ).ready(function() {
+
         $('body').on('click','.one_item_buttons a', function(){
             <?php if( !empty( $customer_id ) ) : ?>
@@ -490,7 +491,6 @@
         });
-
     });