Merge branch 'vip' into 'master'

Vip => master vip => master See merge request !6

Merge branch 'vip' into 'master'
Vip => master vip => master See merge request !6
Alex Savenko
2 parents 73a742aa dd724469
Showing 6 changed files with 56 additions and 8 deletions Show diff stats
src/app/frontend/controllers/MenuController.php
src/app/frontend/controllers/PageController.php
src/app/frontend/views/page/changeWithSize.php
src/app/frontend/views/page/item.php
src/app/frontend/views/partial/item_group.php
src/lib/common.php
@@ -411,6 +411,15 @@ class MenuController extends \controllers\ControllerBase
 			$special_user = $this->models->getSpecialUsers()->getOneData($special_users_id)[0];
 		}
+        //vip
+        $users_group_id = $this->session->get('users_group_id');
+        if (isset($users_group_id) && $users_group_id == 37) {
+            if ($this->common->applyDiscount(5, $cart_items['items'])) {
+                $this->common->countOrderSum($cart_items);
+                $cart_items['total_price'] = $cart_items['total_sum'];
+            }
+        }
+
         //discount
         $discount = $this->models->getDiscount()->getActiveData();
@@ -438,6 +438,7 @@
                         '2' => (isset( $seo['description'] ) && !empty( $seo['description'] ) ?  $seo['description'] : 'Заказать '.$catalog['catalog']['title'].' в Киеве по лучшей цене. Качество товара подтверждена профессионалами.').(isset( $page ) && !empty( $page ) && $page != '1' ? ' страница '.$page : '')
                     ];
+                //discount
                 $discount = $this->models->getDiscount()->getActiveData();
                 if (!empty($discount)) {
                     $discount = $discount[0];
@@ -445,6 +446,8 @@
                     $discount['group_ids'] = str_replace('}', '', $discount['group_ids']);
                     $discount['group_ids'] = explode(',', $discount['group_ids']);
                 }
+                //vip
+                $users_group_id = $this->session->get('users_group_id');
                 if($subtype==='semena_gazonnykh_trav_1c_21')
                     $this->view->setMainView('landing');
@@ -479,7 +482,8 @@
                         'catalog_sales'             => $catalog_sales,
                         'css'                       => $cssSale,
                         'js'                        => $jsSale,
-                        'discount'                  => $discount
+                        'discount'                  => $discount,
+                        'users_group_id'           => $users_group_id
                     ]);
                 }
                 else
@@ -708,6 +712,7 @@
                 }
             }
+            //discount
             $discount = $this->models->getDiscount()->getActiveData();
             if (!empty($discount)) {
                 $discount = $discount[0];
@@ -715,6 +720,8 @@
                 $discount['group_ids'] = str_replace('}', '', $discount['group_ids']);
                 $discount['group_ids'] = explode(',', $discount['group_ids']);
             }
+            //vip
+            $users_group_id = $this->session->get('users_group_id');
             $cssSale = [
                 'https://fonts.googleapis.com/css?family=Ubuntu:400,700,400italic',
@@ -758,7 +765,8 @@
                 'catalog_sales'             => $catalog_sales,
                 'css'                       => $cssSale,
                 'js'                        => $jsSale,
-                'discount'                  => $discount
+                'discount'                  => $discount,
+                'users_group_id'           => $users_group_id
             ]);
         }
@@ -924,6 +932,7 @@
                         '2' => isset($seo['description']) && !empty($seo['description']) ? $seo['description'] : 'Профессионалы рекомендуют ' . $catalog_name . ' ' . $item['0']['title'] . ' в интернет магазине семян Semena.in.ua.'
                     ];
+                //discount
                 $discount = $this->models->getDiscount()->getActiveData();
                 if (!empty($discount)) {
                     $discount = $discount[0];
@@ -931,6 +940,8 @@
                     $discount['group_ids'] = str_replace('}', '', $discount['group_ids']);
                     $discount['group_ids'] = explode(',', $discount['group_ids']);
                 }
+                //vip
+                $users_group_id = $this->session->get('users_group_id');
                 $this->view->setVars([
                     'change_lang_url'   => $lang_url,
@@ -953,7 +964,8 @@
                     'catalog_id'        => $catalog_id,
                     'type_alias'        => $type_alias,
                     'subtype_alias'     => $subtype_alias,
-                    'discount'          => $discount
+                    'discount'          => $discount,
+                    'users_group_id'   => $users_group_id
                 ]);
             }
             else
@@ -1110,6 +1122,7 @@
                 ]);
             }
+            //discount
             $discount = $this->models->getDiscount()->getActiveData();
             if (!empty($discount)) {
                 $discount = $discount[0];
@@ -1125,11 +1138,14 @@
             } else {
                 $discount = 0;
             }
+            //vip
+            $users_group_id = $this->session->get('users_group_id');
             $this->view->pick('page/changeWithSize');
             $this->view->setVars([
-                'item'      => $item['0'],
-                'discount'  => $discount
+                'item'              => $item['0'],
+                'discount'          => $discount,
+                'users_group_id'    => $users_group_id
             ]);
             $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
         }
 <?php
+
 if(isset($special_user)) {
     $data['price'] = number_format(isset($item['prices'][$special_user['status']])
         ? $item['prices'][$special_user['status']]
@@ -6,6 +7,13 @@ if(isset($special_user)) {
 } else {
     $data['price'] = $item['price2'];
 }
+
+//vip
+if (isset($users_group_id) && $users_group_id == 37) {
+    $data['price'] = round($data['price']*0.95, 1);
+}
+
+//discount
 $old_price = $data['price'];
 $data['price'] = $data['price']*(1-$discount/100);
 $data['price'] = number_format($data['price'], 2, '.', ' ');
@@ -203,20 +203,23 @@
                             <ul>
                                 <li>
                                     <?php
+                                    //vip
+                                    if (isset($users_group_id) && $users_group_id == 37) {
+                                        $item['price2'] = round($item['price2']*0.95, 1);
+                                    }
                                     // скидка
                                     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>';
+                                            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>';
                                     }
                                     ?>
-                                    <!--<span itemprop="price"><?//= number_format($item['price2'], 2, '.', ' '); ?></span> грн<span style="display:none;" itemprop="priceCurrency">UAH</span>-->
                                     <div style="display: none" itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
                                         <span itemprop="ratingValue">5</span>
                                         <span itemprop="reviewCount">31</span>
@@ -35,7 +35,7 @@
             <?= $t->_("price_from") ?>
             <?php
             //vip
-            if($users_group_id == '37') {
+            if(isset($users_group_id) &&  $users_group_id == '37') {
                 $i['price'] = round($i['price']*0.95, 1);
             }
             // скидка
@@ -1335,6 +1335,18 @@ namespace
         public function parseArray($str) {
             return explode(',', preg_replace('[{|}]', '' , $str));
         }
+
+        public function applyDiscount($discount_value, &$items) {
+            if (empty($discount_value) || $discount_value < 0 || $discount_value > 100) {
+                return false;
+            }
+            foreach($items as $k => $item) {
+                $items[$k]['price2'] = number_format($item['price2'] - ($item['price2'] * $discount_value / 100), 1, '.', '');
+                $items[$k]['total_price'] = number_format($items[$k]['price2'] * $item['count'], 1, '.', '');
+            }
+            return true;
+        }
+
     }
 }