From 2848e106eab16a873bf93200bc370ea911055937 Mon Sep 17 00:00:00 2001
From: Karnovsky A <Karnovsky.a@gmail.com>
Date: Mon, 30 May 2016 15:11:59 +0300
Subject: [PATCH] Fix last-products widget

---
 common/modules/product/helpers/ProductHelper.php        | 19 +++++++++++++++----
 common/modules/product/widgets/views/product_smart.php  | 33 ++++++++++++++-------------------
 common/modules/product/widgets/views/products_block.php |  2 +-
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/common/modules/product/helpers/ProductHelper.php b/common/modules/product/helpers/ProductHelper.php
index 2fc32e5..ee2858a 100755
--- a/common/modules/product/helpers/ProductHelper.php
+++ b/common/modules/product/helpers/ProductHelper.php
@@ -62,7 +62,10 @@ class ProductHelper extends Object {
     public static function addLastProsucts($product_id) {
         $last_products = self::getLastProducts();
         if (!in_array($product_id, $last_products)) {
-            $last_products[] = $product_id;
+            $last_products[] = intval($product_id);
+            if (count($last_products) > 16) {
+                array_shift($last_products);
+            }
             Yii::$app->session->set('last_products', $last_products);
         }
     }
@@ -70,10 +73,18 @@ class ProductHelper extends Object {
     public static function getLastProducts($as_object = false) {
         $last_products = Yii::$app->session->get('last_products', []);
         if ($as_object) {
-            $last_products = array_reverse(Product::find()->where([Product::tableName() .'.product_id' => $last_products])->all());
-//            $last_products = array_reverse(Product::find()->joinWith('variants')->where([Product::tableName() .'.product_id' => $last_products])->andWhere(['!=', ProductVariant::tableName() .'.stock', 0])->all());
+            $_products = [];
+            foreach(Product::find()->joinWith(['variant'])->where([Product::tableName() .'.product_id' => $last_products])->andWhere(['!=', ProductVariant::tableName() .'.stock', 0])->all() as $product) {
+                $_products[$product->product_id] = $product;
+            }
+            foreach($last_products as &$last_product) {
+                if (empty($_products[$last_product])) {
+                    unset($last_product);
+                }
+                $last_product = $_products[$last_product];
+            }
         }
-        return $last_products;
+        return array_reverse($last_products);
     }
 
     public static function getSpecialProducts($type, $count, $sort = null) {
diff --git a/common/modules/product/widgets/views/product_smart.php b/common/modules/product/widgets/views/product_smart.php
index 7cdff6e..1577322 100755
--- a/common/modules/product/widgets/views/product_smart.php
+++ b/common/modules/product/widgets/views/product_smart.php
@@ -8,10 +8,12 @@ use yii\helpers\Url;
             <a href="<?= Url::to([
                 'catalog/product',
                 'product' => $product,
-                '#' => 'm' .$product->variant->product_variant_id])
+                '#' => 'm' .$product->enabledVariant->product_variant_id])
             ?>">
-                <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'list')?>
+                <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->enabledVariant->imageUrl, 'list')?>
+            <?php if ($enabled !== false) :?>
             </a>
+            <?php endif?>
         </div>
         <?php if(!empty($product->is_top) || !empty($product->is_new) || !empty($product->akciya)) :?>
             <ul class="product-special">
@@ -32,31 +34,24 @@ use yii\helpers\Url;
         ?>" class="name"><?= $product->name ?>
         </a>
 
-        <?php
-
-        echo '<div class="cost-block">';
-        echo '<p class="cost">';
-        // есть скидка
-        if ($product->variant->price_old != 0 && $product->variant->price_old != $product->variant->price)
-        {
-            echo '<strike><span id=\'old_cost\'>'.$product->variant->price_old.'</span> грн.</strike>&nbsp;';
-        }
-
-        echo $product->variant->price.' <span>грн.</span></p>';
-
-        echo '</div>';
-
-        ?>
+        <div class="cost-block">
+            <p class="cost">
+            <?php if ($product->enabledVariant->price_old != 0 && $product->enabledVariant->price_old != $product->enabledVariant->price) :?>
+                <strike><span id="old_cost"><?= $product->enabledVariant->price_old ?></span> грн.</strike>&nbsp;
+            <?php endif?>
+            <?= $product->enabledVariant->price?> <span>грн.</span></p>
+        </div>
     </div>
+
     <a href="<?= Url::to([
         'catalog/product',
         'product' => $product,
-        '#' => 'm' .$product->variant->product_variant_id])
+        '#' => 'm' .$product->enabledVariant->product_variant_id])
     ?>" class="link_buy">Купить</a>
 
     <div class="mycarousel">
         <ul class="jcarousel jcarousel-skin-tango">
-            <?php foreach ($product->variants as $variant) : ?>
+            <?php foreach ($product->enabledVariants as $variant) : ?>
             <li>
                 <a href="<?= Url::to([
                     'catalog/product',
diff --git a/common/modules/product/widgets/views/products_block.php b/common/modules/product/widgets/views/products_block.php
index 93bb908..e22e4fe 100644
--- a/common/modules/product/widgets/views/products_block.php
+++ b/common/modules/product/widgets/views/products_block.php
@@ -7,7 +7,7 @@ use yii\web\View;
             <h3><?= $title?></h3>
             <div class="owl-carousel">
                 <?php foreach($products as $product) :?>
-                    <?= $this->render('product_smart', ['product' => $product]);?>
+                    <?= $this->render('product_smart', ['product' => $product, 'enabled' => !empty($product->enabledVariant)]);?>
                 <?php endforeach?>
             </div>
             <div class="both"></div>
--
libgit2 0.21.4