Base-product#3 functional

Karnovsky A
1 parent b15c889e
Showing 17 changed files with 463 additions and 22 deletions Show diff stats
common/config/main.php
common/modules/product/controllers/ManageController.php
common/modules/product/models/Product.php
common/modules/product/models/ProductOption.php
common/modules/product/models/ProductSearch.php
common/modules/product/views/manage/_form.php
common/modules/product/views/manage/update.php
common/modules/rubrication/helpers/RubricationHelper.php
common/modules/rubrication/models/TaxGroup.php
console/migrations/m160304_065108_product.php
console/migrations/m160324_075409_product_option.php
frontend/controllers/CatalogController.php
frontend/views/catalog/product.php
frontend/views/catalog/product_item.php
frontend/views/catalog/products.php
frontend/web/images/no_photo.png
frontend/web/images/no_photo_big.png
@@ -100,6 +100,27 @@ return [
                         'model' => '\common\modules\product\models\ProductCategory',
                     ]
                 ],
+                'product_option' => [
+                    'name' => Yii::t('product', 'Properties'),
+                    'field' => 'options',
+                    'entity1' => [
+                        'model' => '\common\modules\product\models\Product',
+                        'label' => 'Product',
+                        'listField' => 'fullname',
+                        'key' => 'product_id',
+                        'linked_key' => 'product_id',
+                    ],
+                    'entity2' => [
+                        'model' => '\common\modules\rubrication\models\TaxOption',
+                        'label' => 'Option',
+                        'listField' => 'ValueeRenderFlash',
+                        'key' => 'tax_option_id',
+                        'linked_key' => 'option_id',
+                    ],
+                    'via' => [
+                        'model' => 'common\modules\product\models\ProductOption',
+                    ]
+                ],
                 'tax_group_to_category' => [
                     'name' => Yii::t('product', 'Характеристики по категориям'),
                     'field' => 'group_to_category',
@@ -33,6 +33,24 @@ class ManageController extends Controller
     }
     public function actionTest() {
+        return;
+        foreach(Product::find()->all() as $product) {
+            if (!$product->variant) {
+                $product->save();
+                $variantModel = new ProductVariant();
+                $variantModel->product_id = $product->product_id;
+                $variantModel->name = 'test-'. uniqid();
+                $variantModel->sku = $variantModel->name;
+                $variantModel->price = rand(5, 200000);
+                $variantModel->price_old = rand(0, 5) > 3 ? $variantModel->price* (1+rand(0, 10) / 10) : $variantModel->price;
+                $variantModel->product_unit_id = rand(1, 5);
+                $variantModel->stock = rand(0, 50);
+                $variantModel->save();
+            }
+        }
+
+        return;
+
         $categories = Category::find()->where(['depth' => 2])->all();
         $cats_ids = [];
         foreach($categories as $cat) {
@@ -122,8 +140,11 @@ class ManageController extends Controller
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->product_id]);
         } else {
+            $groups = $model->category->getTaxGroups();
+
             return $this->render('update', [
                 'model' => $model,
+                'groups' => $groups,
             ]);
         }
     }
@@ -2,6 +2,7 @@
 namespace common\modules\product\models;
+use common\behaviors\Slug;
 use common\modules\rubrication\models\TaxOption;
 use Yii;
 use common\modules\relation\relationBehavior;
@@ -23,6 +24,9 @@ class Product extends \yii\db\ActiveRecord
 {
     /** @var array $variants */
     public $_variants = [];
+
+    /** @var array $_images */
+    public $imagesUpload = [];
     /**
      * @inheritdoc
      */
@@ -32,9 +36,16 @@ class Product extends \yii\db\ActiveRecord
             [
                 'class' => relationBehavior::className(),
                 'relations' => [
-                    'product_categories' => 'entity1' // Product category
+                    'product_categories' => 'entity1', // Product category
+                    'product_option' => 'entity1' // Product category
                 ]
             ],
+            [
+                'class' => Slug::className(),
+                'in_attribute' => 'name',
+                'out_attribute' => 'alias',
+                'translit' => true
+            ]
         ];
     }
@@ -54,7 +65,10 @@ class Product extends \yii\db\ActiveRecord
         return [
             [['brand_id'], 'integer'],
             [['name'], 'string', 'max' => 150],
-            [['categories', 'variants'], 'safe'],
+            [['alias'], 'string', 'max' => 250],
+            [['categories', 'variants', 'options'], 'safe'],
+            [['imagesUpload'], 'file', 'skipOnEmpty' => false, 'extensions' => 'png, jpg, gif'],
+            [['description', 'video'], 'safe'],
 //            [['product_id'], 'exist', 'skipOnError' => true, 'targetClass' => Product::className(), 'targetAttribute' => ['product_id' => 'product_id']],
         ];
     }
@@ -70,6 +84,8 @@ class Product extends \yii\db\ActiveRecord
             'brand_id' => Yii::t('product', 'Brand'),
             'categories' => Yii::t('product', 'Categories'), // relation behavior field
             'category' => Yii::t('product', 'Category'), // relation behavior field
+            'image' => Yii::t('product', 'Image'),
+            'images' => Yii::t('product', 'Images'),
         ];
     }
@@ -97,6 +113,10 @@ class Product extends \yii\db\ActiveRecord
         return $this->hasMany(ProductImage::className(), ['product_id' => 'product_id']);
     }
+    public function setImages($images) {
+        $this->_images = $images;
+    }
+
     /**
      * @return \yii\db\ActiveQuery
      */
@@ -146,6 +166,10 @@ class Product extends \yii\db\ActiveRecord
         return $categories->one();
     }
+    public function getOptions() {
+        return $this->getRelations('product_option');
+    }
+
     /**
      * @inheritdoc
      * @return ProductQuery the active query used by this AR class.
@@ -159,11 +183,18 @@ class Product extends \yii\db\ActiveRecord
     {
         parent::afterSave($insert, $changedAttributes);
+        foreach($this->imagesUpload as $image) {
+            $image->saveAs('/images/items/' . $image->baseName .'_'. uniqid() . '.' . $image->extension);
+        }
+
         $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($_variant['product_variant_id'])) {
                 unset($todel[$_variant['product_variant_id']]);
                 $model = ProductVariant::findOne($_variant['product_variant_id']);
+<?php
+
+namespace common\modules\product\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "product_option".
+ *
+ * @property integer $product_id
+ * @property integer $option_id
+ *
+ * @property Product $product
+ * @property TaxOption $option
+ */
+class ProductOption extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'product_option';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['product_id', 'option_id'], 'required'],
+            [['product_id', 'option_id'], 'integer'],
+            [['product_id'], 'exist', 'skipOnError' => true, 'targetClass' => Product::className(), 'targetAttribute' => ['product_id' => 'product_id']],
+            [['option_id'], 'exist', 'skipOnError' => true, 'targetClass' => TaxOption::className(), 'targetAttribute' => ['option_id' => 'tax_option_id']],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'product_id' => Yii::t('product', 'Product ID'),
+            'option_id' => Yii::t('product', 'Option ID'),
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getProduct()
+    {
+        return $this->hasOne(Product::className(), ['product_id' => 'product_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getOption()
+    {
+        return $this->hasOne(TaxOption::className(), ['tax_option_id' => 'option_id']);
+    }
+}
@@ -6,6 +6,7 @@ use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use common\modules\product\models\Product;
+use yii\web\NotFoundHttpException;
 /**
  * ProductSearch represents the model behind the search form about `common\modules\product\models\Product`.
@@ -70,7 +71,7 @@ class ProductSearch extends Product
     public static function findByAlias($alias) {
         /** @var ProductQuery $query */
-        $query = Category::find();
+        $query = Product::find();
         $query->byAlias($alias);
         if (($model = $query->one()) !== null) {
             return $model;
@@ -20,6 +20,9 @@ use unclead\widgets\MultipleInputColumn;
     <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+    <?= $form->field($model, 'description')->widget(\mihaildev\ckeditor\CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ], ]); ?>
+    <?= $form->field($model, 'video')->textarea()->label('Video embeded'); ?>
+
     <?= $form->field($model, 'brand_id')->dropDownList(
         ArrayHelper::map(ProductHelper::getBrands()->all(), 'brand_id', 'name'),
         [
@@ -30,21 +33,18 @@ use unclead\widgets\MultipleInputColumn;
     <?= $form->field($model, 'categories')->dropDownList(
         ArtboxTreeHelper::treeMap(ProductHelper::getCategories(), 'category_id', 'name'),
         [
-//            'prompt' => Yii::t('product', 'Select category'),
             'multiple' => true
         ]
     ) ?>
-    <?php /*= $form->field($model, 'images[]')->widget(FileInput::classname(), [
+
+
+    <?php /*= $form->field($model, 'imagesUpload[]')->widget(FileInput::classname(), [
         'options' => [
             'accept' => 'image/*',
             'multiple' => true,
         ],
-        'pluginOptions' => [
-//            'uploadUrl' => \yii\helpers\Url::to(['/site/file-upload']),
-        ]
-    ]);
-    */?>
+    ]);*/?>
     <?= $form->field($model, 'variants')->widget(MultipleInput::className(), [
         'columns' => [
@@ -90,6 +90,16 @@ use unclead\widgets\MultipleInputColumn;
     ]);
     ?>
+    <?php  foreach($groups->all() as $group) :?>
+        <?= $form->field($model, 'options')->checkboxList(
+        ArrayHelper::map($group->options, 'tax_option_id', 'ValueRenderFlash'),
+        [
+            'multiple' => true,
+            'unselect' => null,
+        ]
+        )->label($group->name);?>
+    <?php endforeach?>
+
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? Yii::t('product', 'Create') : Yii::t('product', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
@@ -18,6 +18,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = Yii::t(&#39;product&#39;, &#39;Update&#39;);
     <?= $this->render('_form', [
         'model' => $model,
+        'groups' => $groups,
     ]) ?>
 </div>
@@ -40,4 +40,12 @@ class RubricationHelper {
         return $module->types;
     }
+
+    public function checkboxList($items, $options = [])
+    {
+        $this->adjustLabelFor($options);
+        $this->parts['{input}'] = Html::activeCheckboxList($this->model, $this->attribute, $items, $options);
+
+        return $this;
+    }
 }
 \ No newline at end of file
@@ -23,6 +23,7 @@ use Yii;
  */
 class TaxGroup extends \yii\db\ActiveRecord
 {
+    public $_options = [];
     /**
      * @inheritdoc
      */
@@ -69,7 +69,10 @@ class m160304_065108_product extends Migration
         $this->createTable('{{%product}}', [
             'product_id' => $this->primaryKey(),
             'name' => $this->string(255)->notNull(),
+            'alias' => $this->string(255),
             'brand_id' => $this->integer(),
+            'description' => $this->text(),
+            'video' => $this->text(),
         ], $tableOptions);
         $this->addForeignKey('fki_product_id', 'product_category', 'product_id', 'product', 'product_id', 'NO ACTION', 'NO ACTION');
+<?php
+
+use yii\db\Migration;
+
+class m160324_075409_product_option extends Migration
+{
+    public function up()
+    {
+        $tableOptions = null;
+        if ($this->db->driverName === 'mysql') {
+            // Only for MySQL
+            $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+
+            // @todo https://habrahabr.ru/post/138947/
+        } elseif ($this->db->driverName === 'pgsql') {
+            // Only for PostgreSQL
+            // @todo use intarray field for tax_options
+        }
+
+        $this->createTable('{{%product_option}}', [
+            'product_id' => $this->integer()->notNull(),
+            'option_id' => $this->integer()->notNull(),
+        ], $tableOptions);
+        $this->addPrimaryKey('product_option_pkey', 'product_option', ['product_id', 'option_id']);
+        $this->addForeignKey('product_option_product_fkey', 'product_option', 'product_id', 'product', 'product_id', 'NO ACTION', 'NO ACTION');
+        $this->addForeignKey('product_option_option_fkey', 'product_option', 'option_id', 'tax_option', 'tax_option_id', 'NO ACTION', 'NO ACTION');
+    }
+
+    public function down()
+    {
+        $this->dropTable('{{%product_option}}');
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
@@ -7,8 +7,11 @@ use common\modules\product\models\Category;
 use common\modules\product\models\CategorySearch;
 use common\modules\product\models\Product;
 use common\modules\product\models\ProductCategory;
+use common\modules\product\models\ProductOption;
 use common\modules\product\models\ProductSearch;
 use common\modules\product\models\ProductVariant;
+use common\modules\rubrication\models\TaxGroup;
+use common\modules\rubrication\models\TaxOption;
 use yii\data\ActiveDataProvider;
 use yii\data\Pagination;
 use yii\data\Sort;
@@ -56,10 +59,34 @@ class CatalogController extends \yii\web\Controller
                 ]);
             $all_count = $query->count();
+            $brandsQuery = Brand::find()
+                ->innerJoinWith('products')
+                ->innerJoin(ProductCategory::tableName(), ProductCategory::tableName() .'.product_id='. Product::tableName() .'.product_id')
+                ->where([
+                    ProductCategory::tableName() .'.category_id' => $category->category_id
+                ])
+                ->groupBy(Brand::tableName() .'.brand_id');
+            $brands = $brandsQuery->all();
+            $brands_count = $brandsQuery->count();
+
+            $optionsQuery = TaxOption::find()
+//                ->select([TaxOption::tableName() .'.tax_option_id', TaxOption::tableName() .'.alias'])
+                ->innerJoin(ProductOption::tableName(), ProductOption::tableName() .'.option_id='. TaxOption::tableName() .'.tax_option_id')
+                ->innerJoin(ProductCategory::tableName(), ProductCategory::tableName() .'.product_id='. ProductOption::tableName() .'.product_id')
+                ->where([
+                    ProductCategory::tableName() .'.category_id' => $category->category_id
+                ])
+                ->groupBy(TaxOption::tableName() .'.tax_option_id');
+            $all_options = [];
+            foreach($optionsQuery->all() as $_option) {
+                $all_options[] = $_option;
+            }
+
             $priceQuery = clone $query;
             $priceMin = $priceMinCurr = $priceQuery->min(ProductVariant::tableName() .'.price');
             $priceMax = $priceMaxCurr = $priceQuery->max(ProductVariant::tableName() .'.price');
+            // Prices
             if (($price_interval = \Yii::$app->request->get('price_interval')) != false) {
                 $price_interval = explode(';', $price_interval);
                 $price_interval = [
@@ -75,21 +102,40 @@ class CatalogController extends \yii\web\Controller
                     $priceMaxCurr = $price_interval[1];
                 }
             }
+
+            $groups = [];
+            foreach($category->getTaxGroups()->all() as $_group) {
+                $groups[$_group->tax_group_id] = $_group;
+            }
+            foreach ($all_options as $option) {
+                $groups[$option->tax_group_id]->_options[] = $option;
+            }
+            foreach($groups as $i => $group) {
+                if (empty($group->_options))
+                    unset($groups[$i]);
+            }
+
+            // Options
+            if (($options = \Yii::$app->request->get('option')) != false) {
+                $query->innerJoin(ProductOption::tableName(), ProductOption::tableName() .'.product_id='. Product::tableName() .'.product_id');
+                $query->innerJoin(TaxOption::tableName(), TaxOption::tableName() .'.tax_option_id='. ProductOption::tableName() .'.option_id');
+                foreach($options as $group_alias => $option_alias) {
+                    $group = TaxGroup::find()->where(['like', 'alias', $group_alias])->one();
+                    if (!$group) {
+                        continue;
+                    }
+                    $query->andWhere([TaxOption::tableName() .'.tax_group_id' => $group->tax_group_id, TaxOption::tableName() .'.alias' => $option_alias]);
+                }
+            }
+
             $count = $query->count();
+
             $pages = new Pagination(['totalCount' => $count, 'pageSize' => $per_page]);
             $query->offset($pages->offset)
                 ->orderBy($sort->orders)
                 ->limit($pages->limit);
             $products = $query->all();
-            $brandsQuery = Brand::find()->innerJoinWith('products')->innerJoin(ProductCategory::tableName(), ProductCategory::tableName() .'.product_id='. Product::tableName() .'.product_id')->where([
-                ProductCategory::tableName() .'.category_id' => $category->category_id
-            ])->groupBy(Brand::tableName() .'.brand_id');
-            $brands = $brandsQuery->all();
-            $brands_count = $brandsQuery->count();
-
-            $groups = $category->getTaxGroups()->all();
-
             return $this->render(
                 'products',
                 [
@@ -107,6 +153,7 @@ class CatalogController extends \yii\web\Controller
                     'brands' => $brands,
                     'brands_count' => $brands_count,
                     'groups' => $groups,
+                    'options' => $options,
                 ]
             );
         }
@@ -118,7 +165,22 @@ class CatalogController extends \yii\web\Controller
         if (empty($product->product_id)) {
             throw new HttpException(404 ,'Page not found');
         }
-        return $this->render('product');
+        $groups = [];
+        foreach($product->category->getTaxGroups()->all() as $_group) {
+            $groups[$_group->tax_group_id] = $_group;
+        }
+        foreach ($product->options as $option) {
+            $groups[$option->tax_group_id]->_options[] = $option;
+        }
+        foreach($groups as $i => $group) {
+            if (empty($group->_options))
+                unset($groups[$i]);
+        }
+
+        return $this->render('product', [
+            'product' => $product,
+            'properties' => $groups,
+        ]);
     }
     public function actionBrands()
+<?php
+/** @var $this \yii\web\View */
+/** @var $dataProvider \yii\data\ActiveDataProvider */
+
+$this->title = $product->name;
+foreach($product->category->getParents()->all() as $parent) {
+    $this->params['breadcrumbs'][] = ['label' => $parent->name, 'url' => ['catalog/category', 'alias' => $parent->alias]];
+}
+$this->params['breadcrumbs'][] = ['label' => $product->category->name, 'url' => ['catalog/category', 'alias' => $product->category->alias]];
+$this->params['breadcrumbs'][] = $product->name .' #'. $product->variant->sku;
+?>
+<h1 class="open_card_item_title"><?= $product->name .' '. $product->variant->name?></h1>
+
+<div class="item_3_blocks_wrap"> <!-- flex container -->
+    <div class="item_img_block"> <!-- блок с фотографиями -->
+        <div class="main_img">
+            <?php if (empty($product->image)) :?>
+            <img src="/images/no_photo_big.png" alt="<?= $product->name?>">
+            <?php else :?>
+                <img src="/images/<?= $product->image->image?>" alt="<?= $product->image->alt ? $product->image->alt : $product->name?>">
+            <?php endif?>
+            <!--<span class="new">НОВИНКА</span>
+            <span class="top">ТОП</span>-->
+        </div>
+        <?php if (!empty($product->images)) :?>
+        <div class="main_img_slide">
+            <?php foreach($product->images as $image) :?>
+            <div class="small_img_block active">
+                <img src="/images/<?= $image->image?>" alt="<?= $image->alt ? $image->alt : $product->name?>">
+            </div>
+            <?php endforeach?>
+
+            <img class="slider_arrow_right" src="/images/slider_right.png" alt="">
+            <img class="slider_arrow_left" src="/images/slider_left.png" alt="">
+        </div>
+        <?php endif?>
+
+    </div> <!-- конец блока с фотографиями -->
+
+
+    <div class="busket_block"> <!-- блок с счетчиком и кнопкой добавить в корзину -->
+        <div class="top_code">
+            <span class="code">Код: <?= $product->variant->sku?></span>
+            <span class="have"><img src="/images/ok_icon_green.png" alt=""><?= $product->stock !== 0 ? ' есть в наличии' : ' нет в наличии'?></span>
+        </div>
+
+        <div class="grey_bg">
+            <div class="counter">
+                <div class="price"><?= $product->variant->price?></div>
+                <div class="sign">грн.</div>
+                <div class="count_block">
+                    <div class="count_number">1</div>
+                    <div class="count_buttons">
+                        <div class="button_plus">+</div>
+                        <div class="button_minus">-</div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="in_cart_btn">
+                <a href="#">
+                    <button class="cart_btn" data-id="<?= $product->variant->product_variant_id?>"> в корзину <img src="/images/ico_basket_white.png" alt=""></button>
+                </a>
+            </div>
+
+            <!--<div class="to_compare_link">
+                <img src="/images/ico_scales.png" alt="">
+                <a href="#" class="add_to_compare">добавить к сравнению</a>
+            </div>-->
+        </div>
+        <div class="quick_order">
+            <form action="">
+                <span class="text">БЫСТРЫЙ ЗАКАЗ</span>
+                <input type="text" class="quick_order_phone" name="quick_order_phone" placeholder="(0XX) XXX-XX-XX">
+                <button type="submit">заказать</button>
+            </form>
+        </div>
+
+        <div class="delivery">
+            <p>
+                Доставка товара на следующий день после выставления счета. Мы доставим “День в <br> день” — уточните это у менеджера.
+            </p>
+            <a href="#">Подробно о доставке</a>
+        </div>
+
+    </div><!-- конец блока с счетчиком и кнопкой добавить в корзину -->
+
+    <div class="character_block"> <!-- блок с характеристиками -->
+        <?php if (!empty($properties)) :?>
+        <h3>Характеристики</h3>
+        <ul>
+            <?php foreach($properties as $group) :?>
+            <li>
+                <div class="each">
+                    <div class="title"><?= $group->name?></div>
+                    <div class="tech">
+                    <?php foreach($group->_options as $option) :?>&nbsp;<?= $option->ValueRenderHTML?><?php endforeach?>
+                    </div>
+                </div>
+            </li>
+            <?php endforeach?>
+        </ul>
+        <?php endif?>
+
+        <!--<div class="tech_links">
+            <a href="#">Описание</a>
+            <a href="#">Видео</a>
+            <a href="#">Отзывы(12)</a>
+        </div>-->
+
+    </div><!-- закрытие блока с характеристиками -->
+
+    <div class="tabs_block"> <!-- Табы с описанием видео и отзывами -->
+        <div class="ionTabs" id="tabs_1" data-name="Tabs_Group_name">
+            <ul class="ionTabs__head">
+                <?php if (!empty($properties)) :?>
+                <li class="ionTabs__tab" data-target="Tab_1_name">Характеристики</li>
+                <?php endif?>
+                <?php if (!empty($product->description)) :?>
+                <li class="ionTabs__tab" data-target="Tab_2_name">Описание</li>
+                <?php endif?>
+                <?php if (!empty($product->description)) :?>
+                <li class="ionTabs__tab" data-target="Tab_3_name">Видео</li>
+                <?php endif?>
+<!--                <li class="ionTabs__tab" data-target="Tab_4_name">Отзывы(12)</li>-->
+            </ul>
+            <div class="ionTabs__body">
+                <?php if (!empty($properties)) :?>
+                <div class="ionTabs__item" data-name="Tab_1_name">
+                        <ul>
+                            <?php foreach($properties as $group) :?>
+                                <li>
+                                    <div class="each">
+                                        <div class="title"><?= $group->name?></div>
+                                        <div class="tech">
+                                            <?php foreach($group->_options as $option) :?>&nbsp;<?= $option->ValueRenderHTML?><?php endforeach?>
+                                        </div>
+                                    </div>
+                                </li>
+                            <?php endforeach?>
+                        </ul>
+                </div>
+                <?php endif?>
+                <?php if (!empty($product->description)) :?>
+                <div class="ionTabs__item" data-name="Tab_2_name">
+                    <?= $product->description?>
+                </div>
+                <?php endif?>
+                <?php if (!empty($product->video)) :?>
+                <div class="ionTabs__item" data-name="Tab_3_name">
+                    <?= $product->video?>
+                </div>
+                <?php endif?>
+                <!--<div class="ionTabs__item" data-name="Tab_4_name">
+                    <span class="tabs_item_name">Отзывы</span>
+                </div>-->
+
+                <div class="ionTabs__preloader"></div>
+            </div>
+        </div>
+
+    </div> <!-- конец табов с описанием видео и отзывами -->
+
+</div> <!-- end flex container -->
@@ -4,12 +4,21 @@
 <div class="item" data-id="<?= $product->product_id?>">
     <!--<div class="new">АКЦИЯ</div>
     <div class="top">Toп</div>-->
-    <a href="#" class="item_link"><div class="pic"><img src="/images/items/01.jpg"></div>
+    <a href="<?= \yii\helpers\Url::to(['catalog/product', 'alias' => $product->alias])?>" class="item_link">
+        <div class="pic">
+        <?php if (empty($product->image)) :?>
+            <img src="/images/no_photo.png">
+        <?php else :?>
+            <img src="/images/<?= $product->image->image?>" alt="<?= $product->image->alt ? $product->image->alt : $product->name?>">
+        <?php endif?>
+        </div>
         <div class="title_item"><?= $product->name?></div></a>
     <div class="brand">Бренд: <span><?= $product->brand->name?></span></div>
     <div class="type"><?= implode(', ', $product->categoriesNames)?></div>
+    <?php if($product->variant) :?>
     <div class="price"><?= $product->variant->price?> <span>грн.</span></div>
     <button class="basket_add_but" data-id="<?= $product->variant->product_variant_id?>">в корзину</button>
+    <?php endif?>
     <a href="#" class="compare_add_but" data-id="<?= $product->product_id?>"><span>добавить к сравнению</span></a>
     <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
 </div>
 \ No newline at end of file
@@ -74,9 +74,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $category-&gt;name;
                         <li><?= $group->name?>
                             <div class="arrow"><img src="/images/head_down.png" alt=""></i></div>
                             <div class="price_filter">
-                                <?php foreach($group->options as $option) :?>
+                                <?php foreach($group->_options as $option) :?>
                                 <div class="checkbox">
-                                    <label><input type="checkbox" name="option[<?= $group->alias?>][]" value="<?= $option->alias?>" /></label>
+                                    <label><input type="checkbox" name="option[<?= $group->alias?>][]" value="<?= $option->alias?>"<?= (isset($options[$group->alias]) && in_array($option->alias, $options[$group->alias])) ? ' checked' : ''?> /></label>
                                     <a href="#"><?= $option->ValueRenderHTML?></a>
                                 </div>
                                 <?php endforeach?>