-

Karnovsky A
1 parent 564ca613
Showing 12 changed files with 141 additions and 66 deletions Show diff stats
common/modules/product/models/Product.php
common/modules/product/models/ProductSearch.php
common/modules/product/models/ProductVariant.php
common/modules/product/views/manage/index.php
common/modules/product/widgets/views/product_smart.php
common/modules/product/widgets/views/products_block.php
common/translation/ru/product.php
composer_2.phar
frontend/models/ProductFrontendSearch.php
frontend/views/catalog/product.php
frontend/views/catalog/product_item.php
frontend/views/catalog/products.php
@@ -127,8 +127,8 @@ class Product extends \yii\db\ActiveRecord
      */
     public function getImageUrl()
     {
-        // return a default image placeholder if your source image is not found
-        return !empty($this->image) ? $this->image->imageUrl : '/images/no_photo.png';
+        $image = empty($this->variant) ? null : $this->variant->image;
+        return !empty($image) ? $image->imageUrl : '/images/no_photo.png';
     }
  
     /**
@@ -136,7 +136,7 @@ class Product extends \yii\db\ActiveRecord
      */
     public function getImages()
     {
-        return $this->hasMany(ProductImage::className(), ['product_id' => 'product_id']);
+        return $this->hasMany(ProductImage::className(), ['product_id' => 'product_id'])->filterWhere(['is', 'product_variant_id', NULL]);
     }
  
     /**
@@ -144,7 +144,7 @@ class Product extends \yii\db\ActiveRecord
      */
     public function getVariant()
     {
-        return $this->hasOne(ProductVariant::className(), ['product_id' => 'product_id']);
+        return $this->hasOne(ProductVariant::className(), ['product_id' => 'product_id'])->orderBy('product_variant.product_variant_id', SORT_ASC);
     }
  
     public function getVariantPrice() {
@@ -215,27 +215,29 @@ class Product extends \yii\db\ActiveRecord
 //
 //        }
  
-        $todel = [];
-        foreach ($this->variants ? : [] as $_variant) {
-            $todel[$_variant->product_variant_id] = $_variant->product_variant_id;
-        }
-        foreach ($this->_variants as $_variant) {
-            if (!is_array($_variant)) {
-                return;
+        if (!empty($this->_variants)) {
+            $todel = [];
+            foreach ($this->variants ?: [] as $_variant) {
+                $todel[$_variant->product_variant_id] = $_variant->product_variant_id;
             }
-            if (!empty($_variant['product_variant_id'])) {
-                unset($todel[$_variant['product_variant_id']]);
-                $model = ProductVariant::findOne($_variant['product_variant_id']);
-            } else {
-                $model = new ProductVariant();
+            foreach ($this->_variants as $_variant) {
+                if (!is_array($_variant)) {
+                    return;
+                }
+                if (!empty($_variant['product_variant_id'])) {
+                    unset($todel[$_variant['product_variant_id']]);
+                    $model = ProductVariant::findOne($_variant['product_variant_id']);
+                } else {
+                    $model = new ProductVariant();
+                }
+                $_variant['product_id'] = $this->product_id;
+                $model->load(['ProductVariant' => $_variant]);
+                $model->product_id = $this->product_id;
+                $model->save();
+            }
+            if (!empty($todel)) {
+                ProductVariant::deleteAll(['product_variant_id' => $todel]);
             }
-            $_variant['product_id'] = $this->product_id;
-            $model->load(['ProductVariant' => $_variant]);
-            $model->product_id = $this->product_id;
-            $model->save();
-        }
-        if (!empty($todel)) {
-            ProductVariant::deleteAll(['product_variant_id' => $todel]);
         }
     }
  
@@ -14,6 +14,8 @@ use yii\web\NotFoundHttpException;
 class ProductSearch extends Product
 {
     public $brand_name;
+    public $brand_id;
+    public $category_id;
     public $category_name;
     public $variant_sku;
  
@@ -23,7 +25,7 @@ class ProductSearch extends Product
     public function rules()
     {
         return [
-            [['name', 'brand_name', 'category_name', 'variant_sku'], 'safe'],
+            [['name', 'brand_name', 'brand_id', 'category_id', 'category_name', 'variant_sku'], 'safe'],
             [['tax_brand_id', 'product_id'], 'integer'],
             [['is_top', 'is_new', 'akciya'], 'boolean'],
         ];
@@ -49,17 +51,16 @@ class ProductSearch extends Product
     {
         $query = Product::find();
  
-        // add conditions that should always apply here
+        $query->joinWith(['brand', 'brand.brandNames', 'categories', 'categories.categoryNames', 'variant']);
+
+        $query->groupBy(['product.product_id']);
+        $query->orderBy('product.product_id', 'DESC');
  
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
         ]);
  
-        $this->load($params);
-
-        if (!$this->validate()) {
-            // uncomment the following line if you do not want to return any records when validation fails
-            // $query->where('0=1');
+        if ( !($this->load($params) && $this->validate()) ) {
             return $dataProvider;
         }
  
@@ -77,8 +78,6 @@ class ProductSearch extends Product
             ]
         ]);
  
-        $query->joinWith(['brand', 'brand.brandNames', 'categories', 'categories.categoryNames', 'variant']);
-
         if (isset($this->is_top)) {
             $query->andFilterWhere([
                 'is_top' => (bool)$this->is_top,
@@ -95,18 +94,16 @@ class ProductSearch extends Product
             ]);
         }
         $query->andFilterWhere([
-            'tax_brand_id' => $this->tax_brand_id,
-            'product_id' => $this->product_id,
+            'product.brand_id' => $this->brand_id,
+            'product.product_id' => $this->product_id,
+            'product_category.category_id' => $this->category_id
         ]);
  
-        $query->andFilterWhere(['ilike', 'name', $this->name]);
+        $query->andFilterWhere(['ilike', 'product.name', $this->name]);
         $query->andFilterWhere(['ilike', 'brand_name.value', $this->brand_name]);
         $query->andFilterWhere(['ilike', 'category_name.value', $this->category_name]);
         $query->andFilterWhere(['ilike', 'product_variant.sku', $this->variant_sku]);
  
-        $query->groupBy(['product.product_id']);
-        $query->orderBy('product.product_id', 'DESC');
-
         return $dataProvider;
     }
  
@@ -111,7 +111,7 @@ class ProductVariant extends \yii\db\ActiveRecord
     }
  
     public function getStock_caption() {
-        return is_null($this->stock) ? '∞' : intval($this->stock);
+        return is_null($this->stock) ? '∞' : ($this->stock > 0 ? Yii::t('product', 'Enable') : Yii::t('product', 'Disable')); // intval($this->stock);
     }
  
     /**
@@ -2,6 +2,11 @@
  
 use yii\helpers\Html;
 use yii\grid\GridView;
+use yii\helpers\ArrayHelper;
+use kartik\select2\Select2;
+use common\components\artboxtree\ArtboxTreeHelper;
+use common\modules\product\helpers\ProductHelper;
+
 /* @var $this yii\web\View */
 /* @var $searchModel common\modules\product\models\ProductSearch */
 /* @var $dataProvider yii\data\ActiveDataProvider */
@@ -28,11 +33,45 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
                 'label' => Yii::t('product', 'Brand'),
                 'attribute' => 'brand_name',
                 'value' => 'brand.name',
+                'format' => 'raw',
+                'filter' => Select2::widget([
+                    'model' => $searchModel,
+                    'attribute' => 'brand_id',
+                    'data' => ArrayHelper::map(ProductHelper::getBrands()->all(), 'brand_id', 'name'),
+                    'language' => 'ru',
+                    'options' => [
+                        'placeholder' => Yii::t('product', 'Select brand'),
+                        'multiple' => false,
+                    ],
+                    'pluginOptions' => [
+                        'allowClear' => true
+                    ],
+                ])
             ],
             [
                 'label' => Yii::t('product', 'Category'),
                 'attribute' => 'category_name',
-                'value' => 'category.name',
+                'value' => function($model) {
+                    $categories = [];
+                    foreach ($model->categories as $category) {
+                        $categories[] = $category->name;
+                    }
+                    return implode(", ", $categories);
+                },
+                'format' => 'raw',
+                'filter' => Select2::widget([
+                    'model' => $searchModel,
+                    'attribute' => 'category_id',
+                    'data' => ArtboxTreeHelper::treeMap(ProductHelper::getCategories(), 'category_id', 'name'),
+                    'language' => 'ru',
+                    'options' => [
+                        'placeholder' => Yii::t('product', 'Select category'),
+                        'multiple' => false,
+                    ],
+                    'pluginOptions' => [
+                        'allowClear' => true
+                    ],
+                ])
             ],
             [
                 'label' => Yii::t('product', 'SKU'),
@@ -40,9 +79,12 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
                 'value' => 'variant.sku',
             ],
             'variant.price',
-            'variant.stock_caption',
-
-
+            'variant.price_old',
+            [
+                'label' => Yii::t('product', 'Stock'),
+                'attribute' => 'variant_stock',
+                'value' => 'variant.stock_caption',
+            ],
             [
                 'class' => 'yii\grid\ActionColumn',
                 'template' => '{view} |{is_top} {is_new} {akciya}  | {update} {delete}',
@@ -12,6 +12,19 @@ use yii\helpers\Url;
                 <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'list')?>
             </a>
         </div>
+        <?php if(!empty($product->is_top) || !empty($product->is_new) || !empty($product->akciya)) :?>
+            <ul class="product-special">
+                <?php if(!empty($product->is_top)) :?>
+                    <li class="top">top&nbsp;</li>
+                <?php endif?>
+                <?php if(!empty($product->is_new)) :?>
+                    <li class="new">new&nbsp;</li>
+                <?php endif?>
+                <?php if(!empty($product->akciya)) :?>
+                    <li class="promo">promo&nbsp;</li>
+                <?php endif?>
+            </ul>
+        <?php endif?>
         <a href="<?= Url::to([
             'catalog/product',
             'product' => $product])
 <?php
     use yii\web\View;
 ?>
+<?php if(!empty($products)) :?>
 <div class="_prd_spec-wr">
-    <div class="special-products products<?=
-
-    (!empty($class) ? ' '. $class : '')?>">
+    <div class="special-products products<?= (!empty($class) ? ' '. $class : '')?>">
         <h3><?= $title?></h3>
         <div class="owl-carousel">
             <?php foreach($products as $product) :?>
@@ -14,7 +13,7 @@
         <div class="both"></div>
     </div>
 </div>
-
 <?php $js = '$(".owl-carousel").owlCarousel()';
 $this->registerJs($js, View::POS_READY);
-?>
 \ No newline at end of file
+?>
+<?php endif?>
@@ -13,4 +13,17 @@ return [
     'Top products' => 'Популярные',
     'Brands' => 'Бренды',
     'Brand' => 'Бренд',
+    'Categories' => 'Категории',
+    'Category' => 'Категория',
+    'Select brand' => 'Выберите бренд',
+    'Select category' => 'Выберите категорию',
+    'SKU' => 'Артикул',
+    'Stock' => 'Остаток',
+    'Price' => 'Цена',
+    'Price Old' => 'Старая Цена',
+    'Products' => 'Товары',
+    'Product' => 'Товар',
+    'Create Product' => 'Создать Товар',
+    'Enable' => 'Доступно',
+    'Disable' => 'Отсутсвует',
 ];
 \ No newline at end of file
@@ -51,18 +51,18 @@ class ProductFrontendSearch extends Product {
         } else {
             $query = Product::find();
         }
-        $query->joinWith('variant');
-        $query->joinWith('brand');
-        $query->joinWith('image');
-        $query->joinWith('categories');
-        if (empty($_GET['sort']) || ($_GET['sort'] != 'price' && $_GET['sort'] != '-price')) {
-            $query->groupBy('product.product_id');
-        }
+        $query->with(['variant', 'variant.image', 'brand', 'brand.brandName', 'category', 'category.categoryName']);
+
+        $query->groupBy('product.product_id');
+
+//        if (empty($_GET['sort']) || ($_GET['sort'] != 'price' && $_GET['sort'] != '-price')) {
+//            $query->groupBy('product.product_id');
+//        }
  
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
             'pagination' => [
-                'pageSize' => 15,
+                'pageSize' => 16,
             ],
             'sort' => [
                 'attributes' => [
@@ -160,7 +160,7 @@ $this-&gt;registerJs (&quot;
             <?php if(!empty($product->video)) :?>
                 <li><a href="#">Видео</a>
                     <div class="info product-thumb-video">
-                        <?= \cics\widgets\VideoEmbed::widget(['responsive' => false, 'url' => $product->video]); ?>
+                        <?= strpos($product->video, '<iframe') !== FALSE || strpos($product->video, '<object') !== FALSE ? $product->video : \cics\widgets\VideoEmbed::widget(['responsive' => false, 'url' => $product->video]); ?>
                     </div>
                 </li>
             <?php endif?>
@@ -182,6 +182,11 @@ $this-&gt;registerJs (&quot;
         </ul>
     </div>
     <div class="both"></div>
+
+    <?= \common\modules\product\widgets\specialProducts::widget(['type' => 'promo'])?>
+    <?= \common\modules\product\widgets\specialProducts::widget(['type' => 'new'])?>
+    <?= \common\modules\product\widgets\specialProducts::widget(['type' => 'top'])?>
+    <?= \common\modules\product\widgets\lastProducts::widget()?>
 </div>
 <?php
 $this->registerJs ("
@@ -6,19 +6,19 @@ use yii\helpers\Url;
     <div class="boxitem">
         <div class="pixbox">
             <a href="<?= Url::to(['catalog/product', 'product' => $product,'#' => 'm' .$product->variant->product_variant_id]) ?>">
-                <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->variant->image->imageUrl, 'list')?>
+                <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->variant->imageUrl, 'list')?>
             </a>
         </div>
         <?php if(!empty($product->is_top) || !empty($product->is_new) || !empty($product->akciya)) :?>
             <ul class="product-special">
                 <?php if(!empty($product->is_top)) :?>
-                    <li class="top">top&nbsp;</li>
+                    <li class="top">top</li>
                 <?php endif?>
                 <?php if(!empty($product->is_new)) :?>
-                    <li class="new">new&nbsp;</li>
+                    <li class="new">new</li>
                 <?php endif?>
                 <?php if(!empty($product->akciya)) :?>
-                    <li class="promo">promo&nbsp;</li>
+                    <li class="promo">promo</li>
                 <?php endif?>
             </ul>
         <?php endif?>
@@ -54,11 +54,13 @@ use yii\helpers\Url;
  
     <div class="mycarousel">
         <ul class="jcarousel jcarousel-skin-tango">
-            <?php foreach (array_reverse($product->variants) as $variant) : ?>
-                <?php if (!is_null($variant->stock) && empty($variant->stock)) continue;?>
+            <?php foreach ($product->variants as $variant) : ?>
                 <?php if (!empty($variant->image)) :?>
                 <li>
-                    <a href="<?= Url::to(['catalog/product', 'product' => $product, '#' => 'm' . $variant->product_variant_id]) ?>">
+                    <a href="<?= Url::to([
+                        'catalog/product',
+                        'product' => $product,
+                        '#' => 'm' . $variant->product_variant_id]) ?>">
                         <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant')?>
                     </a>
                 </li>
@@ -164,7 +164,6 @@ $this-&gt;registerJsFile (Yii::getAlias(&#39;@web/js/ion.rangeSlider.js&#39;));
                 <?= \yii\widgets\LinkSorter::widget([
                     'sort' => $productProvider->sort,
                     'attributes' => [
-                        'name',
                         'price',
                     ]
                 ]);
@@ -174,7 +173,7 @@ $this-&gt;registerJsFile (Yii::getAlias(&#39;@web/js/ion.rangeSlider.js&#39;));
         <div class="products pn">
             <ul>
                 <?php foreach($productProvider->models as $product) :?>
-                    <?php require(__DIR__ .'/product_item.php')?>
+                    <?= $this->render('/catalog/product_item.php', ['product' => $product])?>
                 <?php endforeach?>
             </ul>
             <div class="both"></div>
@@ -191,5 +190,8 @@ $this-&gt;registerJsFile (Yii::getAlias(&#39;@web/js/ion.rangeSlider.js&#39;));
     </div>
     <div class="both"></div>
  
+    <?= \common\modules\product\widgets\specialProducts::widget(['type' => 'promo'])?>
+    <?= \common\modules\product\widgets\specialProducts::widget(['type' => 'new'])?>
+    <?= \common\modules\product\widgets\specialProducts::widget(['type' => 'top'])?>
     <?= \common\modules\product\widgets\lastProducts::widget()?>
 </div>
 \ No newline at end of file