-

Karnovsky A
1 parent db5497ee
Showing 6 changed files with 14 additions and 16 deletions Show diff stats
common/modules/product/models/Product.php
common/modules/product/models/ProductImageQuery.php
common/modules/product/widgets/views/product_smart.php
console/controllers/ImportController.php
frontend/views/catalog/product.php
frontend/views/catalog/products.php
@@ -71,7 +71,7 @@ class Product extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['categories'], 'required'],
+//            [['categories'], 'required'],
             [['brand_id'], 'integer'],
             [['name'], 'string', 'max' => 150],
             [['alias'], 'string', 'max' => 250],
@@ -136,7 +136,7 @@ class Product extends \yii\db\ActiveRecord
      */
     public function getImages()
     {
-        return $this->hasMany(ProductImage::className(), ['product_id' => 'product_id'])->filterWhere(['is', 'product_variant_id', NULL]);
+        return $this->hasMany(ProductImage::className(), ['product_id' => 'product_id']);
     }
     /**
@@ -20,6 +20,7 @@ class ProductImageQuery extends \yii\db\ActiveQuery
      */
     public function all($db = null)
     {
+        $this->where(['product_variant_id' => NULL]);
         return parent::all($db);
     }
@@ -7,7 +7,8 @@ use yii\helpers\Url;
         <div class="pixbox">
             <a href="<?= Url::to([
                 'catalog/product',
-                'product' => $product])
+                'product' => $product,
+                '#' => 'm' .$product->variant->product_variant_id])
             ?>">
                 <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'list')?>
             </a>
@@ -49,7 +50,8 @@ use yii\helpers\Url;
     </div>
     <a href="<?= Url::to([
         'catalog/product',
-        'product' => $product])
+        'product' => $product,
+        '#' => 'm' .$product->variant->product_variant_id])
     ?>" class="link_buy">Купить</a>
     <div class="mycarousel">
@@ -137,15 +137,13 @@ class ImportController extends Controller {
             $is_new_product = empty($_product->product_id);
             // ==== Set category ====
-            if ( ($category = CategoryName::find()->filterWhere(['ilike', 'value', trim($catalog_name)])->one()) !== null ) {
-                $_product->categories = [$category->category_id];
-            } else {
+            if ( ($category = CategoryName::find()->filterWhere(['ilike', 'value', trim($catalog_name)])->one()) === null ) {
                 // Create category
                 $category = new Category();
                 $category->name = trim($catalog_name);
                 $category->save();
-                $_product->categories = [$category->category_id];
             }
+            $_product->categories = [$category->category_id];
             // ===== Set brand ====
             if ( $brand_name ) {
@@ -167,8 +165,9 @@ class ImportController extends Controller {
             $_product->akciya = $product_akciya;
             $_product->is_new = $product_new;
-
-            $_product->save();
+            if (!$_product->save()) {
+                var_dump($category->category_id, $_product->categories);exit;
+            }
             // @todo Set image
@@ -2,7 +2,7 @@
 use yii\widgets\Breadcrumbs;
 use yii\web\View;
 use yii\helpers\Url;
-
+$this->params['seo']['title'] = $product->fullname ;
 $this->title = $product->fullname;
 //$this->title = (! empty($product->meta_title)) ? $product->meta_title : $product->fullname;
 //$this->registerMetaTag (['name' => 'description', 'content' => ((! empty($product->meta_description)) ? $product->meta_description : $product->fullname)]);
@@ -15,11 +15,7 @@ foreach($category-&gt;getParents()-&gt;all() as $parent) {
 }
 $this->params['breadcrumbs'][] = $category->categoryName->value;
-$this->params['seo']['seo_text'] = 'TEST SEO TEXT';
-$this->params['seo']['h1'] = 'TEST H1';
-$this->params['seo']['description'] = 'TEST DESCRIPTION';
-$this->params['seo']['fields']['name'] = 'TEST NAME FROM FIELD';
-$this->params['seo']['key']= 'product_list';
+$this->params['seo']['title'] = $category->name;
 $this->registerCssFile (Yii::getAlias('@web/css/ion.rangeSlider.css'));
 $this->registerCssFile (Yii::getAlias('@web/css/ion.rangeSlider.skinHTML5.css'));