From 446925e6da5d31b98b3115adc0209f54ac338e53 Mon Sep 17 00:00:00 2001
From: Alex <program.artweb@gmail.com>
Date: Thu, 29 Dec 2016 18:01:24 +0200
Subject: [PATCH] common

---
 src/lib/common.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lib/common.php b/src/lib/common.php
index db8e95a..5a4e8f3 100644
--- a/src/lib/common.php
+++ b/src/lib/common.php
@@ -762,9 +762,9 @@ namespace
          */
         public function getGroups1( $lang_id, $groups)
         {
-            $groups_    = [];
-            $compare    = $this->getDi()->get('session')->get('compare', []);
-            $users_group_id = $this->getDi()->get('session')->get('users_group_id');
+            $groups_            = [];
+            $compare            = $this->getDi()->get('session')->get('compare', []);
+            $users_group_id     = $this->getDi()->get('session')->get('users_group_id');
 
             if( !empty( $groups ) )
             {
@@ -779,8 +779,6 @@ namespace
                         $items_[$i['id']] = $i;
                     }
 
-
-
                     foreach( $groups as &$g )
                     {
                         $g['items']                 = $this->getDi()->get('models')->getItems()->getSizesByGroupId($lang_id, $g['group_id']);
@@ -788,18 +786,20 @@ 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;
-                        //5% for vip users
-                        if (isset($users_group_id) && $users_group_id == 38)
-                            $g['price']             = $g['price']*0.95;
                         $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;
 
+                        //5% for vip users
+                        if (isset($users_group_id) && $users_group_id == 38)
+                            $g['price']             = $g['price']*0.95;
 
                         if( !empty( $g['options'] ) )
                         {
--
libgit2 0.21.4