---

Karnovsky A
1 parent d0a3671d
Showing 8 changed files with 22 additions and 8 deletions Show diff stats
common/components/artboximage/ArtboxImage.php
common/modules/product/models/Brand.php
common/modules/product/models/Product.php
console/controllers/ImportController.php
frontend/web/images/lightbox/close.png
frontend/web/images/lightbox/loading.gif
frontend/web/images/lightbox/next.png
frontend/web/images/lightbox/prev.png
@@ -52,7 +52,8 @@ class ArtboxImage extends Component {
                 'initialPreview' => $model->{$modelField} ? Html::img($model->{$modelField}) : '',
                 'overwriteInitial' => !$multiple,
                 'showRemove' => true,
-                'showUpload' => false,
+                'showUpload' => true,
+                'showCaption' => false,
                 'uploadUrl' => $this->uploadUrl,
                 'uploadExtraData' => [
                     'fileField' => $modelField,
@@ -60,7 +61,9 @@ class ArtboxImage extends Component {
                 ],
             ],
             'pluginEvents' => [
-                "change" => "function() { console.log('change'); }",
+                "change" => "function() {
+                alert('_change');
+                }",
                 "open" => "function() { console.log('open'); }",
                 "save" => "function() { console.log('save'); }",
                 "upload" => "function() { console.log('upload'); }",
@@ -43,6 +43,13 @@ class Brand extends \yii\db\ActiveRecord
                     'slugKeyName' => 'alias',
                     'translit' => true
                 ],
+                'image' => [
+                    'class' => UploadBehavior::className(),
+                    'attribute' => 'file',
+                    'scenarios' => ['insert', 'update'],
+                    'path' => '@webroot/upload/docs/{category.id}',
+                    'url' => '@web/upload/docs/{category.id}',
+                ],
             ],
         ];
     }
@@ -71,7 +71,7 @@ class Product extends \yii\db\ActiveRecord
             [['name'], 'string', 'max' => 150],
             [['alias'], 'string', 'max' => 250],
             [['categories', 'variants', 'options', 'imagesUpload'], 'safe'],
-            [['imagesUpload'], 'file', 'skipOnEmpty' => false, 'extensions' => 'png, jpg, gif', 'maxFiles' => 50],
+//            [['imagesUpload'], 'file', 'skipOnEmpty' => false, 'extensions' => 'png, jpg, gif', 'maxFiles' => 50],
             [['description', 'video'], 'safe'],
             [['is_top', 'is_new'], 'boolean'],
 //            [['product_id'], 'exist', 'skipOnError' => true, 'targetClass' => Product::className(), 'targetAttribute' => ['product_id' => 'product_id']],
@@ -28,17 +28,22 @@ class ImportController extends Controller {
         $new_products = $linked_products = 0;
         foreach(RemoteProducts::find()->all() as $product) {
             $product->Brand = trim($product->Brand);
-            if (!empty($product->product->product_id)) {
+            if (empty($product->remoteCategory) || empty($product->remoteCategory->category)) {
+                continue;
+            }
+            if (!empty($product->product->product_id))
+            {
                 $linked_products++;
  
                 $_productVariant = ProductVariant::findOne($product->product->product_variant_id);
+
                 $_product = Product::findOne($product->product->product_id);
  
                 $brand = Brand::find()->filterWhere(['ilike', 'remote_id', trim($product->Brand)])->one();
  
                 if (
                 $_product->name != $product->Name ||
-                $_product->categories[0]->category_id != [$product->remoteCategory->category->category_id] ||
+                $_product->categories[0]->category_id != $product->remoteCategory->category->category_id ||
                 ($product->Brand && $brand !== null && $_product->brand_id != $brand->brand_id)
                 ) {
                     $_product->name = $product->Name;
@@ -71,7 +76,8 @@ class ImportController extends Controller {
                     }
                     $_productVariant->save();
                 }
-            } elseif (!empty($product->remoteCategory) && !empty($product->remoteCategory->category) && !empty($product->remoteCategory->category->category_id)) {
+            }
+            elseif (!empty($product->remoteCategory->category->category_id)) {
                 $new_products++;
  
                 $_product = new Product();
@@ -90,7 +96,6 @@ class ImportController extends Controller {
                         $_product->brand_id = $brand->brand_id;
                     }
                 }
-
                 $_productVariant->price = floatval($product->Price);
                 $_productVariant->price_old = floatval($product->Price_old);
                 $_productVariant->sku = empty($product->Article) ? uniqid('gds_') : $product->Article;
@@ -102,7 +107,6 @@ class ImportController extends Controller {
                     print $this->stdout("Saved error for the {$_product->name} {$_product->product_id}?\n");
                     return Controller::EXIT_CODE_ERROR;
                 }
-
                 $_productVariant->product_id = $_product->product_id;
                 if (!$_productVariant->save()) {
                     print $this->stdout("Saved error for variant of the {$_product->name} {$_product->product_id}?\n");