29.06.16

Administrator
1 parent 41068668
Showing 3 changed files with 14 additions and 4 deletions Show diff stats
common/modules/product/controllers/VariantController.php
common/modules/product/models/ProductStock.php
common/modules/product/views/variant/_form.php
@@ -149,13 +149,12 @@ class VariantController extends Controller
                 $ProductStocks = Yii::$app->request->post('ProductStock');
-                $Stocks = Yii::$app->request->post('Stock');
                 foreach($ProductStocks as $index => $ProductStock){
-                    $stock = Stock::find()->where(['name'=>$Stocks[$index]['name']])->one();
+                    $stock = Stock::find()->where(['name'=>$ProductStock['name']])->one();
                     if(!$stock instanceof Stock){
                         $stock = new Stock();
-                        $stock->name = $Stocks[$index]['name'];
+                        $stock->name = $ProductStock['name'];
                         $stock->save();
                     }
                     $psModel = ProductStock::find()->where(['product_variant_id'=>$model->product_variant_id, 'stock_id' =>$stock->stock_id ]);
@@ -33,6 +33,7 @@ class ProductStock extends \yii\db\ActiveRecord
     {
         return [
             [['product_id', 'stock_id', 'quantity', 'product_variant_id'], 'integer'],
+            [['name'],'required'],
             [['product_id'], 'exist', 'skipOnError' => true, 'targetClass' => Product::className(), 'targetAttribute' => ['product_id' => 'product_id']],
             [['product_variant_id'], 'exist', 'skipOnError' => true, 'targetClass' => ProductVariant::className(), 'targetAttribute' => ['product_variant_id' => 'product_variant_id']],
             [['stock_id'], 'exist', 'skipOnError' => true, 'targetClass' => Stock::className(), 'targetAttribute' => ['stock_id' => 'stock_id']],
@@ -49,6 +50,7 @@ class ProductStock extends \yii\db\ActiveRecord
             'stock_id' => 'Stock ID',
             'quantity' => 'Количество',
             'product_variant_id' => 'Product Variant ID',
+            'name' => "Название"
         ];
     }
@@ -68,6 +70,15 @@ class ProductStock extends \yii\db\ActiveRecord
         return $this->hasOne(ProductVariant::className(), ['product_variant_id' => 'product_variant_id']);
     }
+
+    public function getName(){
+        return (!empty($this->stock))?  $this->stock->name : '';
+    }
+
+    public function setName($value){
+        $this->name = $value;
+    }
+
     /**
      * @return \yii\db\ActiveQuery
      */
@@ -108,7 +108,7 @@ $this-&gt;registerJs($js, View::POS_END);
                                     <?= $form->field($stock, "[{$i}]quantity")->textInput(['maxlength' => true]) ?>
                                 </div>
                                 <div class="col-sm-5">
-                                    <?= $form->field($stock->stock, "[{$i}]name")->textInput(['maxlength' => true]) ?>
+                                    <?= $form->field($stock, "[{$i}]name")->textInput(['maxlength' => true]) ?>
                                 </div>
                                 <div class="col-sm-2" style="margin-top: 30px">
                                         <button type="button"  class="remove-item btn btn-danger btn-xs"><i class="glyphicon glyphicon-minus"></i></button>