From 86301a927906a2d7829be20693eb956def65f901 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Fri, 17 Jun 2016 19:00:51 +0300
Subject: [PATCH] 14.06.16

---
 common/modules/product/models/Import.php       | 3 ++-
 common/modules/product/models/ProductStock.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/modules/product/models/Import.php b/common/modules/product/models/Import.php
index ded42d6..ec01d86 100755
--- a/common/modules/product/models/Import.php
+++ b/common/modules/product/models/Import.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;
diff --git a/common/modules/product/models/ProductStock.php b/common/modules/product/models/ProductStock.php
index 57b1952..9e0ec1c 100755
--- a/common/modules/product/models/ProductStock.php
+++ b/common/modules/product/models/ProductStock.php
@@ -79,6 +79,6 @@ class ProductStock extends \yii\db\ActiveRecord
 
     public static function primaryKey()
     {
-        return ["product_id"];
+        return ["stock_id","product_variant_id"];
     }
 }
--
libgit2 0.21.4