big commti

Administrator
1 parent 5d65011e
Showing 3 changed files with 11 additions and 5 deletions Show diff stats
common/modules/product/models/Import.php
common/modules/product/models/Product.php
common/modules/product/models/ProductVariant.php
@@ -76,9 +76,11 @@ class Import extends Model {
         $is_utf = (preg_match('//u', file_get_contents(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFilePrices'), null, null, null, 1000000)));
+        if($from == 0){
+            ProductStock::updateAll(['quantity' => 0 ]);
+            ProductVariant::updateAll(['status' => 1 ]);
+        }
-        Stock::updateAll(['stock' => 0 ]);
-        ProductVariant::updateAll(['status' => 0 ]);
         while (empty($limit) || $j++ < $limit)
@@ -180,7 +182,7 @@ class Import extends Model {
             }
             $productVariant->stock = $quantity;
-
+            $productVariant->status = 0;
             $productVariant->save();
             $this->output[] = '<font style="color:blue">Товар '. $product_title .' успешно сохранен</font>';
@@ -179,7 +179,9 @@ class Product extends \yii\db\ActiveRecord
      */
     public function getEnabledVariant()
     {
-        return $this->hasOne(ProductVariant::className(), ['product_id' => 'product_id'])->andOnCondition(['!=', ProductVariant::tableName() .'.stock', 0]);
+        return $this->hasOne(ProductVariant::className(), ['product_id' => 'product_id'])
+            ->andOnCondition(['!=', ProductVariant::tableName() .'.stock', 0])
+            ->andOnCondition(['!=', ProductVariant::tableName() .'.status', 1]);
     }
     public function getVariantPrice() {
@@ -20,6 +20,7 @@ use yii\helpers\ArrayHelper;
  * @property double $price
  * @property double $price_old
  * @property double $stock
+ * @property integer $status
  * @property integer $product_unit_id
  * @property integer $product_variant_type_id
  * @property ProductImage $image
@@ -59,7 +60,7 @@ class ProductVariant extends \yii\db\ActiveRecord
     {
         return [
             [['product_id', 'product_unit_id'], 'required'],
-            [['product_id', 'product_unit_id', 'product_variant_type_id'], 'integer'],
+            [['product_id', 'product_unit_id', 'product_variant_type_id','status'], 'integer'],
             [['price', 'price_old', 'stock'], 'number'],
             [['name', 'sku'], 'string', 'max' => 255],
             [['remote_id'], 'string', 'max' => 20],
@@ -88,6 +89,7 @@ class ProductVariant extends \yii\db\ActiveRecord
             'stock_caption' => Yii::t('product', 'Stock'),
             'image' => Yii::t('product', 'Image'),
             'images' => Yii::t('product', 'Images'),
+            'status' => Yii::t('product', 'Снят с производства'),
         ];
     }