14.06.16

Administrator
1 parent 19a7a33f
Showing 2 changed files with 3 additions and 2 deletions Show diff stats
common/modules/product/models/Import.php
common/modules/product/models/ProductStock.php
@@ -125,6 +125,7 @@ class Import extends Model {
             // ===== Set stock ====
             if ( $city_name ) {
                 if ( ($stock = Stock::find()->filterWhere(['name' => trim($city_name)])->one()) === null ) {
+
                     // Create stock
                     $stock = new Stock();
                     $stock->name = trim($city_name);
@@ -139,8 +140,8 @@ class Import extends Model {
                     $productStock->product_id = $productVariant->product_id;
                 }
                 $productStock->quantity = $count;
-                $productStock->save();
  
+                $productStock->save();
                 $productStocks = ProductStock::find()->where(['product_variant_id' => $productVariant->product_variant_id])->andWhere(['<>', 'stock_id', $stock->stock_id])->all();
  
                 $quantity = array_sum(ArrayHelper::getColumn($productStocks, 'quantity')) + $count;
@@ -79,6 +79,6 @@ class ProductStock extends \yii\db\ActiveRecord
  
     public static function primaryKey()
     {
-        return ["product_id"];
+        return ["stock_id","product_variant_id"];
     }
 }