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

Alex Savenko
2 parents 5e0d8659 9ebe6e90
Showing 2 changed files with 15 additions and 3 deletions Show diff stats
src/app/frontend/controllers/PageController.php
src/app/frontend/views/page/subtype.php
@@ -704,6 +704,14 @@
                     $catalog_sales[] = $active_sales[$k];
                 }
             }
+
+            $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']);
+            }
             $cssSale = [
                 'https://fonts.googleapis.com/css?family=Ubuntu:400,700,400italic',
@@ -745,8 +753,9 @@
                 'meta_link_next'            => $meta_link_next[1],
                 'meta_link_prev'            => $meta_link_prev[1],
                 'catalog_sales'             => $catalog_sales,
-                'css' => $cssSale,
-                'js' => $jsSale
+                'css'                       => $cssSale,
+                'js'                        => $jsSale,
+                'discount'                  => $discount
             ]);
         }
@@ -197,7 +197,10 @@
         $minPrice = 0;
     ?>
     <?php foreach ($groups as $k => $i): ?>
-        <?php $this->partial('partial/item_group', ['k' => $k, 'i' => $i, 'limit' => 3, 'discount' => $discount]) ?>
+        <?php
+            if (empty($discount)) $discount = 0;
+            $this->partial('partial/item_group', ['k' => $k, 'i' => $i, 'limit' => 3, 'discount' => $discount])
+        ?>
         <?php
         if ($i['price'] > $maxPrice) {
             $maxPrice = $i['price'];