29.06.16

Administrator
1 parent 96f5a822
Showing 18 changed files with 140 additions and 50 deletions Show diff stats
common/modules/product/controllers/ManageController.php
common/modules/product/controllers/VariantController.php
common/modules/product/models/ProductStock.php
common/modules/product/models/ProductVariant.php
common/modules/product/models/ProductVariantListSearch.php
common/modules/product/models/ProductVariantOption.php
common/modules/product/models/Stock.php
common/modules/product/views/variant/_form.php
common/modules/product/views/variant/_search.php
common/modules/product/views/variant/create.php
common/modules/product/views/variant/index.php
common/modules/product/views/variant/update.php
common/modules/product/views/variant/view.php
composer.json
frontend/components/SeoComponent.php
frontend/controllers/SiteController.php
frontend/web/img/404.png
frontend/web/sitemap.xml
@@ -133,7 +133,7 @@ class ManageController extends Controller
                 return $this->redirect(['view', 'id' => $model->product_id]);
             }
         } else {
-            $groups = $model->category->getTaxGroups();
+            $groups = $model->category-> getTaxGroupsByLevel(0);
             return $this->render('update', [
                 'model' => $model,
@@ -4,8 +4,10 @@ namespace common\modules\product\controllers;
 use common\modules\product\models\Product;
 use common\modules\product\models\ProductImage;
+use common\modules\product\models\ProductStock;
 use common\modules\product\models\ProductVariant;
 use common\modules\product\models\ProductVariantListSearch;
+use common\modules\product\models\Stock;
 use Yii;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
@@ -94,8 +96,12 @@ class VariantController extends Controller
                 return $this->redirect(['index', 'product_id' => $product_id]);
             }
         } else {
+            $groups = $model->category->getTaxGroupsByLevel(1);
+
             return $this->render('create', [
                 'model' => $model,
+                'groups' => $groups,
+                'stocks' => [new ProductStock()],
             ]);
         }
     }
@@ -112,14 +118,9 @@ class VariantController extends Controller
         $model = $this->findModel($id);
         if ($model->load(Yii::$app->request->post())) {
-
-
-
-
-
-
             if ($model->save()) {
+
                 if ( ($image = UploadedFile::getInstance($model, 'image')) ) {
                     $imageModel = ProductImage::find()->where(['product_variant_id' => $model->product_variant_id])->one();
@@ -146,6 +147,31 @@ class VariantController extends Controller
                     $image->saveAs(Yii::getAlias('@storage/products/' . $image->name));
                 }
+
+                $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();
+                    if(!$stock instanceof Stock){
+                        $stock = new Stock();
+                        $stock->name = $Stocks[$index]['name'];
+                        $stock->save();
+                    }
+                    $psModel = ProductStock::find()->where(['product_variant_id'=>$model->product_variant_id, 'stock_id' =>$stock->stock_id ]);
+                    if(!$psModel instanceof ProductStock){
+                        $psModel = new ProductStock;
+                        $psModel->load(['ProductStock'=>$ProductStock]);
+                        $psModel->stock_id = $stock->stock_id;
+                        $psModel->save();
+                    } else {
+                        $psModel->load(['ProductStock'=>$ProductStock]);
+                        $psModel->save();
+                    }
+
+                }
+
+
             }
             return $this->redirect(['index', 'product_id'=>$product_id]);
@@ -172,6 +198,7 @@ class VariantController extends Controller
             return $this->render('update', [
                 'model' => $model,
                 'groups' => $groups,
+                'stocks' => (!empty($model->variantStocks)) ? $model->variantStocks : [new ProductStock],
             ]);
         }
     }
@@ -47,7 +47,7 @@ class ProductStock extends \yii\db\ActiveRecord
         return [
             'product_id' => 'Product ID',
             'stock_id' => 'Stock ID',
-            'quantity' => 'Quantity',
+            'quantity' => 'Количество',
             'product_variant_id' => 'Product Variant ID',
         ];
     }
@@ -37,7 +37,7 @@ class ProductVariant extends \yii\db\ActiveRecord
     public $translit;
     public $translit_rubric;
     private $data;
-    public $stocks;
+
     /** @var array $_images */
     public $imagesUpload = [];
@@ -142,6 +142,18 @@ class ProductVariant extends \yii\db\ActiveRecord
         return is_null($this->stock) ? '∞' : ($this->stock > 0 ? Yii::t('product', 'Enable') : Yii::t('product', 'Disable')); // intval($this->stock);
     }
+    public function getVariantStocks(){
+
+        return $this->hasMany(ProductStock::className(),['product_variant_id'=> 'product_variant_id'])->joinWith('stock');
+    }
+
+    public function getStocks(){
+
+        return $this->hasMany(Stock::className(),['stock_id'=>'stock_id'])
+            ->viaTable(ProductStock::tableName(),['product_variant_id'=> 'product_variant_id']);
+    }
+
+
     public function getFilters(){
         return $this->hasMany(TaxOption::className(), ['tax_option_id' => 'option_id'])
@@ -29,6 +29,7 @@ class Stock extends \yii\db\ActiveRecord
     {
         return [
             [['name'], 'string', 'max' => 150],
+            [['name'], 'required'],
         ];
     }
 <?php
+use common\modules\product\models\Stock;
 use yii\helpers\Html;
+use yii\web\View;
 use yii\widgets\ActiveForm;
 use yii\helpers\ArrayHelper;
-use common\components\artboxtree\ArtboxTreeHelper;
-use common\modules\product\helpers\ProductHelper;
-use kartik\file\FileInput;
-use unclead\widgets\MultipleInput;
-use unclead\widgets\MultipleInputColumn;
-use kartik\select2\Select2;
-
+use wbraganca\dynamicform\DynamicFormWidget;
 /* @var $this yii\web\View */
 /* @var $model common\modules\product\models\Product */
 /* @var $form yii\widgets\ActiveForm */
-?>
+/* @var $stocks common\modules\product\models\Stock */
+
+
+$js = '
+$(".dynamicform_wrapper").on("beforeInsert", function(e, item) {
+    console.log("beforeInsert");
+});
+
+$(".dynamicform_wrapper").on("afterInsert", function(e, item) {
+    console.log("afterInsert");
+});
+
+$(".dynamicform_wrapper").on("beforeDelete", function(e, item) {
+    if (! confirm("Are you sure you want to delete this item?")) {
+        return false;
+    }
+    return true;
+});
+$(".dynamicform_wrapper").on("afterDelete", function(e) {
+    console.log("Deleted item!");
+});
+
+$(".dynamicform_wrapper").on("limitReached", function(e, item) {
+    alert("Limit reached");
+});
+';
+
+$this->registerJs($js, View::POS_END);
+?>
 <div class="product-form">
     <?php $form = ActiveForm::begin([
+        'id' => 'dynamic-form',
         'options' => ['enctype' => 'multipart/form-data']
     ]); ?>
@@ -44,38 +69,58 @@ use kartik\select2\Select2;
         ],
     ]); ?>
-    <?= $form->field($model, 'variants')->widget(MultipleInput::className(), [
-        'columns' => [
-            [
-                'name'  => '',
-                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
-                'title' => Yii::t('product', 'Name'),
-            ],
-            [
-                'name'  => 'sku',
-                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
-                'title' => Yii::t('product', 'SKU'),
-            ],
-            [
-                'name'  => 'price',
-                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
-                'title' => Yii::t('product', 'Price'),
-            ],
-            [
-                'name'  => 'price_old',
-                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
-                'title' => Yii::t('product', 'Old Price'),
-            ],
-            [
-                'name'  => 'product_unit_id',
-                'type'  => MultipleInputColumn::TYPE_DROPDOWN,
-                'title' => Yii::t('product', 'Unit'),
-                'items' => ArrayHelper::map(\common\modules\product\models\ProductUnit::find()->all(), 'product_unit_id', 'name'),
-            ],
-
+    <?php DynamicFormWidget::begin([
+        'widgetContainer' => 'dynamicform_wrapper', // required: only alphanumeric characters plus "_" [A-Za-z0-9_]
+        'widgetBody' => '.container-items', // required: css class selector
+        'widgetItem' => '.item', // required: css class
+        'limit' => 10, // the maximum times, an element can be added (default 999)
+        'min' => 0, // 0 or 1 (default 1)
+        'insertButton' => '.add-item', // css class
+        'deleteButton' => '.remove-item', // css class
+        'model' => $stocks[0],
+        'formId' => 'dynamic-form',
+        'formFields' => [
+            'quantity',
+            'name',
         ],
-    ]);
-    ?>
+    ]); ?>
+
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h4>
+                <i class="glyphicon glyphicon-envelope"></i> Склады
+                <button type="button" class="add-item btn btn-success btn-sm pull-right"><i class="glyphicon glyphicon-plus"></i> Add</button>
+            </h4>
+        </div>
+        <div class="panel-body">
+            <div class="container-items"><!-- widgetBody -->
+                <?php foreach ($stocks as $i => $stock): ?>
+                    <div class="item panel panel-default"><!-- widgetItem -->
+                        <div class="panel-body">
+                            <?php
+                            // necessary for update action.
+                            if (! $stock->isNewRecord) {
+                                echo Html::activeHiddenInput($stock, "[{$i}]stock_id");
+                            }
+                            ?>
+                            <div class="row">
+                                <div class="col-sm-5">
+                                    <?= $form->field($stock, "[{$i}]quantity")->textInput(['maxlength' => true]) ?>
+                                </div>
+                                <div class="col-sm-5">
+                                    <?= $form->field($stock->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>
+                                </div>
+                            </div><!-- .row -->
+                        </div>
+                    </div>
+                <?php endforeach; ?>
+            </div>
+        </div>
+    </div><!-- .panel -->
+    <?php DynamicFormWidget::end(); ?>
     <?= $form->field($model, 'product_unit_id')->dropDownList(
         ArrayHelper::map(\common\modules\product\models\ProductUnit::find()->all(), 'product_unit_id', 'name'),
@@ -16,6 +16,8 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?= $this->render('_form', [
         'model' => $model,
+        'groups' => $groups,
+        'stocks' => $stocks,
     ]) ?>
 </div>
@@ -21,6 +21,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = Yii::t(&#39;product&#39;, &#39;Update&#39;);
     <?= $this->render('_form', [
         'model' => $model,
         'groups' => $groups,
+        'stocks' => $stocks,
     ]) ?>
 </div>
@@ -13,6 +13,7 @@
         "source": "https://github.com/yiisoft/yii2"
     },
     "minimum-stability": "dev",
+
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.6",
@@ -42,7 +43,8 @@
         "iutbay/yii2-imagecache": "*",
         "yurkinx/yii2-image": "dev-master",
         "cics/yii2-video-embed-widget": "dev-master",
-        "sersid/yii2-owl-carousel-asset": "*"
+        "sersid/yii2-owl-carousel-asset": "*",
+        "wbraganca/yii2-dynamicform": "dev-master"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
@@ -167,7 +167,7 @@ class SiteController extends Controller
                 print "<categoryId>" . htmlspecialchars($product->category->category_id) . "</categoryId>";
                 print "<vendor>" . $product->brand->name . "</vendor>";
                 print "<code>" . htmlspecialchars($variant->sku) . "</code>";
-                print "<name>" . htmlspecialchars($product->name) . " </name>";
+                print "<name>" . htmlspecialchars($product->name)." " .htmlspecialchars($variant->name). " </name>";
                 print "<description>" . htmlspecialchars($product->description) . "</description>";
                 print "<url>http://rukzachok.com.ua{$product->url}#{$variant->product_variant_id}</url>";
                 print "<image>http://rukzachok.com.ua{$variant->imageUrl}</image>";