Merge remote-tracking branch 'origin/vip' into master+discount

# Conflicts: # src/app/frontend/controllers/PageController.php # src/app/frontend/views/page/changeWithSize.php # src/app/frontend/views/partial/item_group.php # src/lib/common.php

Merge remote-tracking branch 'origin/vip' into master+discount
# Conflicts: # src/app/frontend/controllers/PageController.php # src/app/frontend/views/page/changeWithSize.php # src/app/frontend/views/partial/item_group.php # src/lib/common.php
Alex Savenko
2 parents 398bfb42 3fa6ae3b
Showing 13 changed files with 186 additions and 51 deletions Show diff stats
src/app/backend/controllers/GroupsController.php
src/app/backend/views/groups/addEdit.php
src/app/backend/views/groups/index.php
src/app/frontend/controllers/MenuController.php
src/app/frontend/controllers/PageController.php
src/app/frontend/views/customer/cabinet.php
src/app/frontend/views/page/changeWithSize.php
src/app/frontend/views/page/compareItems.php
src/app/frontend/views/page/item.php
src/app/frontend/views/partial/dealer.php
src/app/frontend/views/partial/item_group.php
src/lib/common.php
src/lib/models/users_groups.php
@@ -59,7 +59,8 @@ class GroupsController extends \Phalcon\Mvc\Controller
         if( $this->request->isPost() )
         {
-            $data['name'] = $this->request->getPost('name', 'string', NULL );
+            $data['name']       = $this->request->getPost('name', 'string', NULL );
+            $data['discount']   = $this->request->getPost('discount', 'int', NULL );
@@ -97,6 +98,7 @@ class GroupsController extends \Phalcon\Mvc\Controller
         {
             $data['name']       = $this->request->getPost('name', 'string', NULL );
+            $data['discount']   = $this->request->getPost('discount', 'int', NULL );
             if( !empty( $data ) && !isset($this->models->getUsersGroup()->getOneDataByName($data['name'])['0']) )
@@ -21,6 +21,11 @@
                                     <div class="input"><input type="text" name="name" id="name" value='<?=  (isset( $page['0']['name'] ) && !empty( $page['0']['name'] ) ? $page['0']['name'] : '') ?>'></div>
                                 </div>
+                                <div class="clearfix input_wrapper">
+                                    <div class="label"><label for="discount">Скидка</label></div>
+                                    <div class="input"><input type="text" name="discount" id="discount" value='<?=  (isset( $page['0']['discount'] ) && !empty( $page['0']['discount'] ) ? $page['0']['discount'] : '') ?>'></div>
+                                </div>
+
                             </div>
@@ -25,8 +25,7 @@
                                 {
                                     $data_pages .=
                                         '<div class="one_page_edit header_gradient clearfix">'.
-                                        '<div class="one_page_edit_check float"></div>'.
-                                        '<div class="one_page_edit_name float">'.$p['name'].'</div>'.
+                                        '<div class="one_page_edit_name float"><a href="/users_group_update/'.$p['id'].'" title="">'.$p['name'].'</a></div>'.
                                         '<div class="one_page_delete_ico float_right"><a href="/users_group_delete/'.$p['id'].'" title="Удалить" onclick="return confirm(\'Вы действительно хотите удалить информацию?\')"></a></div>'.
                                         '</div>';
                                 }
@@ -58,6 +58,22 @@ class MenuController extends \controllers\ControllerBase
                 $this->common->countOrderSum($cart);
                 $cart['total_price'] = $cart['total_sum'];
             }
+            /************************/
+
+            //vip
+            $users_group_id = $this->session->get('users_group_id');
+            $users_group_discount = $this->getDi()->get('models')->getUsersGroup()->getOneData($users_group_id);
+            if (!empty($users_group_discount[0]['discount']) && $users_group_discount[0]['discount'] < 100 && $users_group_discount[0]['discount'] > 0) {
+                $users_group_discount = $users_group_discount[0]['discount'];
+            }
+            else {
+                $users_group_discount = 0;
+            }
+            if ($this->common->applyDiscount($users_group_discount, $cart['items'])) {
+                $this->common->countOrderSum($cart);
+                $cart['total_price'] = $cart['total_sum'];
+            }
+            /************************/
             $total_price    = $cart['total_price'];
 			$items          = $cart['items'];
@@ -196,6 +212,18 @@ class MenuController extends \controllers\ControllerBase
                 if ($this->common->applyPromoCode($discount, $order['items'])) {
                     $this->common->countOrderSum($order);
                 }
+                //vip
+                $users_group_id = $this->session->get('users_group_id');
+                $users_group_discount = $this->getDi()->get('models')->getUsersGroup()->getOneData($users_group_id);
+                if (!empty($users_group_discount[0]['discount']) && $users_group_discount[0]['discount'] < 100 && $users_group_discount[0]['discount'] > 0) {
+                    $users_group_discount = $users_group_discount[0]['discount'];
+                }
+                else {
+                    $users_group_discount = 0;
+                }
+                if ($this->common->applyDiscount($users_group_discount, $order['items'])) {
+                    $this->common->countOrderSum($order);
+                }
                 // save order
 				$proposal_number            = $this->models->getOrders()->addOrder($order);
@@ -418,15 +446,6 @@ 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();
         if (!empty($discount)) {
@@ -436,7 +455,21 @@ class MenuController extends \controllers\ControllerBase
             $this->common->countOrderSum($cart_items);
             $cart_items['total_price'] = $cart_items['total_sum'];
         }
+        /************************/
+        //vip
+        $users_group_id = $this->session->get('users_group_id');
+        $users_group_discount = $this->getDi()->get('models')->getUsersGroup()->getOneData($users_group_id);
+        if (!empty($users_group_discount[0]['discount']) && $users_group_discount[0]['discount'] < 100 && $users_group_discount[0]['discount'] > 0) {
+            $users_group_discount = $users_group_discount[0]['discount'];
+        }
+        else {
+            $users_group_discount = 0;
+        }
+        if ($this->common->applyDiscount($users_group_discount, $cart_items['items'])) {
+            $this->common->countOrderSum($cart_items);
+            $cart_items['total_price'] = $cart_items['total_sum'];
+        }
         /************************/
 		foreach($cart_items['items'] as $k => $item) {
@@ -931,7 +931,14 @@
                 $discount = empty($discount[0])? 0 : $discount[0];
                 //vip
                 $users_group_id = $this->session->get('users_group_id');
-                
+                $users_group_discount = $this->models->getUsersGroup()->getOneData($users_group_id);
+                if (!empty($users_group_discount[0]['discount']) && $users_group_discount[0]['discount'] < 100 && $users_group_discount[0]['discount'] > 0) {
+                    $users_group_discount = $users_group_discount[0]['discount'];
+                }
+                else {
+                    $users_group_discount = 0;
+                }
+
                 $this->view->setVars([
                     'change_lang_url'   => $lang_url,
                     'catalog'           => $catalog,
@@ -954,7 +961,8 @@
                     'type_alias'        => $type_alias,
                     'subtype_alias'     => $subtype_alias,
                     'discount'          => $discount,
-                    'users_group_id'   => $users_group_id
+                    'users_group_id'    => $users_group_id,
+                    'users_group_discount' => $users_group_discount
                 ]);
             }
             else
@@ -1127,12 +1135,20 @@
             }
             //vip
             $users_group_id = $this->session->get('users_group_id');
-            
+            $users_group_discount = $this->models->getUsersGroup()->getOneData($users_group_id);
+            if (!empty($users_group_discount[0]['discount']) && $users_group_discount[0]['discount'] < 100 && $users_group_discount[0]['discount'] > 0) {
+                $users_group_discount = $users_group_discount[0]['discount'];
+            }
+            else {
+                $users_group_discount = 0;
+            }
+
             $this->view->pick('page/changeWithSize');
             $this->view->setVars([
                 'item'              => $item['0'],
                 'discount'          => $discount,
-                'users_group_id'    => $users_group_id
+                'users_group_id'    => $users_group_id,
+                'users_group_discount' => $users_group_discount
             ]);
             $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
         }
@@ -1349,8 +1365,8 @@
                     $p['subtype_alias'] = $p['explode']['2'];
                     unset( $p['explode'] );
                 }
-                
-                
+
+
                 $groups_         = $this->common->getGroups1( $this->lang_id, $groups );
                 //discount
@@ -1382,7 +1398,28 @@
             $total_items    = $this->models->getItems()->getTotalItemsByTerm( $search ,$this->lang_id);
             $items          = [];
-            
+
+            //discount
+            $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']);
+            } else {
+                $discount = 0;
+            }
+            //vip
+            $users_group_id = $this->session->get('users_group_id');
+            $users_group_discount = $this->models->getUsersGroup()->getOneData($users_group_id);
+            if (!empty($users_group_discount[0]['discount']) && $users_group_discount[0]['discount'] < 100 && $users_group_discount[0]['discount'] > 0) {
+                $users_group_discount = $users_group_discount[0]['discount'];
+            }
+            else {
+                $users_group_discount = 0;
+            }
+
+
             if( !empty( $items_ ) )
             {
                 $items_ids  = $this->common->array_column( $items_, 'item_id' );
@@ -1392,8 +1429,9 @@
                     $i['cover']         = !empty( $i['group_cover'] ) ? $this->storage->getPhotoUrl( $i['group_cover'], 'avatar', '200x' ) : '/images/packet.jpg';
                     $i['alias']         = $this->url->get([ 'for' => 'item', 'type' => $i['type_alias'], 'subtype' => $i['subtype_alias'], 'group_alias' => $i['group_alias'], 'item_id' => $i['id'] ]);
                     $i['price']         = $i['price2'];
+                        $i['price'] = round($i['price']*(1-$users_group_discount/100), 1);
                     $i['type_id']       = $i['type'];
-                    //$i['id']            = $i['group_id'];
+                    $i['id']            = $i['group_id'];
                     $i['options_'] = $this->etc->hstore2arr($i['options']);
@@ -1404,7 +1442,7 @@
                     unset($i['options']);
                 }
             }
-            
+
             if( $total_items['0']['total'] > \config::get( 'limits/items') )
             {
                 $paginate = $this->common->paginate(
@@ -1434,7 +1472,7 @@
             $discount = $this->models->getDiscount()->getActiveData();
             $discount = $this->models->getDiscount()->explodeGroupIds($discount);
             $discount = empty($discount[0])? 0 : $discount[0];
-            
+
             $this->view->setVars([
                 'groups'            => $items,
                 'page'              => $page,
@@ -1532,9 +1570,37 @@
                     }
                 }
             }
+
+            //discount
+            $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;
+                }
+            } else {
+                $discount = 0;
+            }
+            //vip
+            $users_group_id = $this->session->get('users_group_id');
+            $users_group_discount = $this->models->getUsersGroup()->getOneData($users_group_id);
+            if (!empty($users_group_discount[0]['discount']) && $users_group_discount[0]['discount'] < 100 && $users_group_discount[0]['discount'] > 0) {
+                $users_group_discount = $users_group_discount[0]['discount'];
+            }
+            else {
+                $users_group_discount = 0;
+            }
+
             $num = count($items);
             for($i=0; $i<$num; $i++){
                 $items[$i]['full_alias'] = $this->models->getCatalog()->getFullAlias($this->lang_id, $items[$i]['catalog'])[0]['full_alias'];
+                $items[$i]['price2'] = round($items[$i]['price2']*(1-$users_group_discount/100), 1);
             }
             foreach( $properties as $p )
@@ -1577,7 +1643,8 @@
                 'items'                 => $items,
                 'count'                 => max($count),
                 'no_robots'             => 1,
-                'prod_text'             => $prod_text
+                'prod_text'             => $prod_text,
+                'discount'              => $discount
             ]);
         }
@@ -19,7 +19,7 @@
                 <div id="sidebar" class="float">
                     <div class="subcategory_sidebar_title">
                         <h3><?= $t->_("personal_account") ?></h3>
-                        <?php if($customer['users_group_id'] == 37) echo '<img class="vip_icon" src="/images/icon_vip_01.png" alt="vip" />'; ?>
+                        <?php if($customer['users_group_id'] == 38) echo '<img class="vip_icon" src="/images/icon_vip_01.png" alt="vip" />'; ?>
                         <a href="<?= $this->seoUrl->setUrl($this->url->get([ 'for' => 'cabinet' ])) ?>" title="<?= $t->_("profile") ?>" class="active"><?= $t->_("profile") ?></a>
                         <a href="<?= $this->seoUrl->setUrl($this->url->get([ 'for' => 'cabinet_email_settings' ])) ?>" title="<?= $t->_("email_settings") ?>"><?= $t->_("email_settings") ?></a>
                             <?php
 <?php
 if(isset($special_user)) {
-    $data['price'] = number_format(isset($item['prices'][$special_user['status']])
+    $data['price'] = round(isset($item['prices'][$special_user['status']])
         ? $item['prices'][$special_user['status']]
-        : $item['price2'], 2, '.', '');
+        : $item['price2'], 1);
 } else {
     $data['price'] = $item['price2'];
 }
 //vip
-if (isset($users_group_id) && $users_group_id == 37) {
-    $data['price'] = round($data['price']*0.95, 1);
+if (isset($users_group_id) && isset($users_group_discount)) {
+    $data['price'] = round($data['price']*(1-$users_group_discount/100), 1);
 }
 //discount
 $old_price = $data['price'];
 $data['price'] = $data['price']*(1-$discount/100);
-$data['price'] = number_format($data['price'], 1, '.', ' ');
+$data['price'] = round($data['price'], 1);
 if ($discount == 0) {
     $data['html'] =
         '<div class="clearfix buy_compare">
@@ -39,7 +39,7 @@
                                             '<div class="compare_item_image"><a href="'.$this->seoUrl->setUrl($i['alias']).'" title="'.$i['title'].'"><img src="'.$i['cover'].'" alt="'.$i['title'].'" height="100" /></a></div>'.
                                             '<div class="compare_item_title"><a href="'.$this->seoUrl->setUrl($i['alias']).'" title="'.$i['title'].'">'.$i['title'].'</a></div>'.
                                             '<div class="align_bottom">'.
-                                                '<div class="compare_item_price">'.$t->_("price_from").' <span>'.$i['price2'].'</span> грн</div>'.
+                                                '<div class="compare_item_price">'.$t->_("price_from").' <span>'.round($i['price2'], 1).'</span> грн</div>'.
                                                 '<div class="one_item_buttons">
                                                 <a href="'.$this->seoUrl->setUrl($i['alias']) .'" title="" class="btn grey">'.$t->_("details").'</a>
                                                 <a data-group_id="'.$i['group_id'].'" href="#" title="" class="btn green buy">'.$t->_("buy").'</a>
@@ -204,20 +204,20 @@
                                 <li>
                                     <?php
                                     //vip
-                                    if (isset($users_group_id) && $users_group_id == 37) {
-                                        $item['price2'] = round($item['price2']*0.95, 1);
+                                    if (isset($users_group_id) && isset($users_group_discount)) {
+                                        $item['price2'] = round($item['price2']*(1-$users_group_discount/100), 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>';
+                                            echo '<span itemprop="price">'.round($item['price2']*(1-$discount['discount']/100), 1).'</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">'.round($item['price2'], 1).'</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">'.round($item['price2'], 1).'</span> грн<span style="display:none;" itemprop="priceCurrency">UAH</span>';
                                     }
                                     ?>
                                     <div style="display: none" itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
@@ -171,7 +171,7 @@
                 <a href="#"><i class="fa fa-circle text-success"></i> Online</a>
             </div>
             <?php  //vip icon
-                 if (isset($customer['users_group_id']) && $customer['users_group_id'] == 37)
+                 if (isset($customer['users_group_id']) && $customer['users_group_id'] == 38)
                     echo '<div class="dealer_vip_icon"><img src="/images/icon_vip_01.png" alt="vip"/></div>';
             ?>
         </div>
@@ -60,6 +60,7 @@
                     echo '<span>'.$i['price'].'</span> грн';
                 }
             ?>
+            <span><?= $i['price'] ?></span> грн
         </div>
         <div class="one_item_buttons">
@@ -762,8 +762,16 @@ namespace
          */
         public function getGroups1( $lang_id, $groups)
         {
-            $groups_    = [];
-            $compare    = $this->getDi()->get('session')->get('compare', []);
+            $groups_            = [];
+            $compare            = $this->getDi()->get('session')->get('compare', []);
+            $users_group_id     = $this->getDi()->get('session')->get('users_group_id');
+            $users_group_discount = $this->getDi()->get('models')->getUsersGroup()->getOneData($users_group_id);
+            if (!empty($users_group_discount[0]['discount']) && $users_group_discount[0]['discount'] < 100 && $users_group_discount[0]['discount'] > 0) {
+                $users_group_discount = $users_group_discount[0]['discount'];
+            }
+            else {
+                $users_group_discount = 0;
+            }
             if( !empty( $groups ) )
             {
@@ -778,7 +786,6 @@ namespace
                         $items_[$i['id']] = $i;
                     }
-
                     foreach( $groups as &$g )
                     {
                         $g['items']                 = $this->getDi()->get('models')->getItems()->getSizesByGroupId($lang_id, $g['group_id']);
@@ -786,15 +793,19 @@ namespace
                         for($i = 0; $i < count($g['items']); $i++) {
                             $g['items'][$i]['prices'] = $this->getPricesArray($g['items'][$i]);
                         }
+
                         $g['price']                 = !empty( $items_[$g['id']]['price2'] ) ? $items_[$g['id']]['price2'] : 0;
                         $g['title']                 = !empty( $items_[$g['id']]['title'] ) ? $items_[$g['id']]['title'] : '';
                         $g['description']           = !empty( $items_[$g['id']]['description'] ) ? $this->shortenString($items_[$g['id']]['description'], 200) : '';
                         $g['content_description']   = !empty( $items_[$g['id']]['content_description'] ) ? $items_[$g['id']]['content_description'] : '';
                         $g['cover']                 = !empty( $g['cover'] ) ? $this->getDi()->get('storage')->getPhotoUrl( $g['cover'], 'avatar', '200x' ) : '/images/packet.jpg';
                         $g['alias']                 = $this->getDi()->get('url')->get([ 'for' => 'item', 'type' => $g['type_alias'], 'subtype' => $g['subtype_alias'], 'group_alias' => $g['alias'], 'item_id' => $g['id'] ]);
+
                         if(isset($g['type_id']) && isset($g['catalog']))
-                            $g['checked']               = !empty($compare[$g['type_id']][$g['catalog']]) && in_array($g['id'], $compare[$g['type_id']][$g['catalog']]) ? 1 : 0;
+                            $g['checked']           = !empty($compare[$g['type_id']][$g['catalog']]) && in_array($g['id'], $compare[$g['type_id']][$g['catalog']]) ? 1 : 0;
+                        if (isset($users_group_id))
+                            $g['price']             = round($g['price']*(1-$users_group_discount/100), 1);
                         if( !empty( $g['options'] ) )
                         {
@@ -1217,12 +1228,24 @@ namespace
         }
         public function getPricesArray($item) {
-            $prices = [];
-            $price_first = 2;
-            $price_last = 6;
-
+            $prices             = [];
+            $price_first        = 2;
+            $price_last         = 6;
+            $users_group_id     = $this->getDi()->get('session')->get('users_group_id');
+            $users_group_discount = $this->getDi()->get('models')->getUsersGroup()->getOneData($users_group_id);
+            if (!empty($users_group_discount[0]['discount']) && $users_group_discount[0]['discount'] < 100 && $users_group_discount[0]['discount'] > 0) {
+                $users_group_discount = $users_group_discount[0]['discount'];
+            }
+            else {
+                $users_group_discount = 0;
+            }
             for ($i = $price_first; $i < $price_last + 1; $i++) {
-                $prices[] = $item['price' . $i];
+
+                if (isset($users_group_id)) {
+                    $prices[] = round($item['price' . $i]*(1-$users_group_discount/100), 1);
+                } else {
+                    $prices[] = $item['price' . $i];
+                }
             }
             return $prices;
         }
@@ -102,17 +102,20 @@ class users_groups extends \db
                 INSERT INTO
                     public.users_groups
                         (
-                            name
+                            name,
+                            discount
                         )
                         VALUES
                         (
-                            :name
+                            :name,
+                            :discount
                         )
                         RETURNING id
             ',
             [
-                'name'             => $data['name']
+                'name'             => $data['name'],
+                'discount'         => $data['discount']
             ],
             -1
         );
@@ -129,13 +132,15 @@ class users_groups extends \db
                 UPDATE
                     public.users_groups
                 SET
-                            name = :name
+                            name = :name,
+                            discount = :discount
                 WHERE
                     id              = :id
             ',
             [
-                'name'             => $data['name'],
-                "id" => $id
+                'name'          => $data['name'],
+                'discount'      => $data['discount'],
+                "id"            => $id
             ]
         );
     }