fix

Alex Savenko
1 parent f72e1ce5
Showing 3 changed files with 52 additions and 64 deletions Show diff stats
src/app/frontend/controllers/PageController.php
src/app/frontend/views/page/search.php
src/app/frontend/views/partial/item_group.php
@@ -143,12 +143,8 @@
             //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']);
-            }
+            $discount = $this->models->getDiscount()->explodeGroupIds($discount);
+            $discount = $discount[0];
             //vip
             $users_group_id = $this->session->get('users_group_id');
@@ -445,12 +441,8 @@
                 //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']);
-                }
+                $discount = $this->models->getDiscount()->explodeGroupIds($discount);
+                $discount = $discount[0];
                 //vip
                 $users_group_id = $this->session->get('users_group_id');
@@ -719,12 +711,8 @@
             //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']);
-            }
+            $discount = $this->models->getDiscount()->explodeGroupIds($discount);
+            $discount = $discount[0];
             //vip
             $users_group_id = $this->session->get('users_group_id');
@@ -939,12 +927,8 @@
                 //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']);
-                }
+                $discount = $this->models->getDiscount()->explodeGroupIds($discount);
+                $discount = $discount[0];
                 //vip
                 $users_group_id = $this->session->get('users_group_id');
@@ -1130,10 +1114,8 @@
             //discount
             $discount = $this->models->getDiscount()->getActiveData();
             if (!empty($discount)) {
+                $discount = $this->models->getDiscount()->explodeGroupIds($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'];
                 }
@@ -1443,12 +1425,6 @@
             $discount = $this->models->getDiscount()->getActiveData();
             $discount = $this->models->getDiscount()->explodeGroupIds($discount);
             $discount = $discount[0];
-//            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']);
-//            }
             $this->view->setVars([
                 'groups'            => $items,
@@ -58,7 +58,7 @@
         <?php if( !empty( $groups ) ): ?>
             <div class="items clearfix">
             <?php foreach( $groups as $k => $i ):
-                $this->partial('partial/item_group', ['k' => $k, 'i' => $i, 'limit' => 3, 'discount' => $discount]);
+                $this->partial('partial/item_group', ['k' => $k, 'i' => $i, 'limit' => 3]);
             endforeach; ?>
             </div>
         <?php endif; ?>
 <div class="one_item float <?= ( ($k+1) % $limit == 0 ? 'last' : '' ) ?>">
-    <?php /*
-    <div class="new_top">
-        <?= ( isset( $i['is_new'] ) && !empty( $i['is_new'] )
-        ?
-        '<div class="float">
-            <img src="/images/new.png" alt="Новинки" width="47" height="14" />
-        </div>'
-        :
-        '').
-        ( isset( $i['is_top'] ) && !empty( $i['is_top'] )
-        ?
-        '<div class="float">
-            <img src="/images/top.png" alt="Топ продаж" width="63" height="14" />
-        </div>'
-        :
-        '') ?>
-    </div>*/?>
+
+    <?php
+        /*
+            <div class="new_top">
+                <?= ( isset( $i['is_new'] ) && !empty( $i['is_new'] )
+                ?
+                '<div class="float">
+                    <img src="/images/new.png" alt="Новинки" width="47" height="14" />
+                </div>'
+                :
+                '').
+                ( isset( $i['is_top'] ) && !empty( $i['is_top'] )
+                ?
+                '<div class="float">
+                    <img src="/images/top.png" alt="Топ продаж" width="63" height="14" />
+                </div>'
+                :
+                '') ?>
+            </div>
+        */
+    ?>
+
     <div class="one_item_image">
         <a href="<?= $this->seoUrl->setUrl($i['alias']) ?>" title="<?= $i['title'] ?>" style="position:relative;">
             <?php if($i['count_available'] == 0){
@@ -25,41 +30,48 @@
             <img src="<?= $i['cover'] ?>" alt="<?= $i['title'] ?>" width="126" height="200" />
         </a>
     </div>
+
     <div class="one_item_title">
         <a href="<?= $this->seoUrl->setUrl($i['alias']) ?>" title="<?= $i['title'] ?>">
             <h3><?= \plugins::getShortText($i['title']) ?></h3>
         </a>
     </div>
+
     <div class="align_bottom">
+
         <div class="one_item_price">
             <?= $t->_("price_from") ?>
             <?php
-            //vip
-            if(isset($users_group_id) &&  $users_group_id == '37') {
-                $i['price'] = round($i['price']*0.95, 1);
-            }
-            //discount
-            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> грн';
+                //vip
+                if(isset($users_group_id) &&  $users_group_id == '37') {
+                    $i['price'] = round($i['price']*0.95, 1);
+                }
+                //discount
+                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> грн';
                 }
-            }
-            else {
-                echo '<span>'.$i['price'].'</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="javascript:;" title="" class="<?= $i['count_available'] != 0 ? 'btn green buy' : 'not_available grey'?>"><?= $t->_("buy") ?></a>
         </div>
+
         <div class="one_item_compare">
             <input type="checkbox" id="items_compare_item_<?= $i['id'] ?>" value="<?= $i['type_id'].'-'.$i['catalog'].'-'.$i['id'] ?>" <?= ( !empty($i['checked']) ? 'checked' : '' ) ?> />
             <label for="items_compare_item_<?= $i['id'] ?>"><span></span><?= $t->_("compared_to") ?></label>
         </div>
+
     </div>
+
 </div>
 \ No newline at end of file