From 776dd7a1036a3fd052c139023d7e08c297acaf25 Mon Sep 17 00:00:00 2001
From: Alex <kennen.md@gmail.com>
Date: Wed, 14 Jun 2017 16:16:21 +0300
Subject: [PATCH] -Added status 'waiting'

---
 common/modules/product/views/variant/_form.php | 289 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------
 frontend/views/catalog/product.php             |   3 ++-
 2 files changed, 176 insertions(+), 116 deletions(-)

diff --git a/common/modules/product/views/variant/_form.php b/common/modules/product/views/variant/_form.php
index 1fcde25..88d8f98 100755
--- a/common/modules/product/views/variant/_form.php
+++ b/common/modules/product/views/variant/_form.php
@@ -1,18 +1,21 @@
 <?php
-
-use common\modules\product\models\Stock;
-use yii\helpers\Html;
-use yii\web\View;
-use yii\widgets\ActiveForm;
-use yii\helpers\ArrayHelper;
-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 = '
+    
+    use common\modules\product\models\ProductVariant;
+    use common\modules\product\models\Stock;
+    use yii\helpers\Html;
+    use yii\web\View;
+    use yii\widgets\ActiveForm;
+    use yii\helpers\ArrayHelper;
+    use wbraganca\dynamicform\DynamicFormWidget;
+    
+    /**
+     * @var View           $this
+     * @var ProductVariant $model
+     * @var ActiveForm     $form
+     * @var Stock          $stocks
+     */
+    
+    $js = '
 $(".dynamicform_wrapper").on("beforeInsert", function(e, item) {
     console.log("beforeInsert");
 });
@@ -36,114 +39,170 @@ $(".dynamicform_wrapper").on("limitReached", function(e, item) {
     alert("Limit reached");
 });
 ';
-
-$this->registerJs($js, View::POS_LOAD);
+    
+    $this->registerJs($js, View::POS_LOAD);
 ?>
 <div class="product-form">
-
-    <?php $form = ActiveForm::begin([
-        'id' => 'dynamic-form',
-        'options' => ['enctype' => 'multipart/form-data']
-    ]); ?>
-
-    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
-
-    <?= $form->field($model, 'product_id')->hiddenInput()->label(false); ?>
-
-    <?= $form->field($model, 'sku')->textarea(); ?>
-    <?= $form->field($model, 'price')->textarea(); ?>
-    <?= $form->field($model, 'price_old')->textarea(); ?>
-    <?= $form->field($model, 'image')->widget(\kartik\file\FileInput::classname(), [
-        'model' => $model,
-        'attribute' => 'image',
-        'options' => [
-            'accept' => 'image/*',
-            'multiple' => true
-        ],
-        'pluginOptions' => [
-            'allowedFileExtensions' => ['jpg','gif','png'],
-            'initialPreview' => $model->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'products') : '',
-            'overwriteInitial' => true,
-            'showRemove' => true,
-            'showUpload' => false,
-        ],
-    ]); ?>
-
-    <?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, "[{$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'),
+    
+    <?php $form = ActiveForm::begin(
         [
-            'prompt' => Yii::t('product', 'Unit'),
-        ])->label(Yii::t('product', 'Unit')) ?>
+            'id'      => 'dynamic-form',
+            'options' => [ 'enctype' => 'multipart/form-data' ],
+        ]
+    ); ?>
+    
+    <?= $form->field($model, 'name')
+             ->textInput([ 'maxlength' => true ]) ?>
+    
+    <?= $form->field($model, 'product_id')
+             ->hiddenInput()
+             ->label(false); ?>
+    
+    <?= $form->field($model, 'sku')
+             ->textarea(); ?>
+    
+    <?= $form->field($model, 'status')
+             ->dropDownList(
+                 [
+                     0 => 'В наличии / под заказ',
+                     1 => 'снят с производства',
+                     2 => 'в ожидании',
+                 ]
+             )->label('Статус') ?>
+    
+    <?= $form->field($model, 'price')
+             ->textarea(); ?>
+    <?= $form->field($model, 'price_old')
+             ->textarea(); ?>
+    <?= $form->field($model, 'image')
+             ->widget(
+                 \kartik\file\FileInput::classname(),
+                 [
+                     'model'         => $model,
+                     'attribute'     => 'image',
+                     'options'       => [
+                         'accept'   => 'image/*',
+                         'multiple' => true,
+                     ],
+                     'pluginOptions' => [
+                         'allowedFileExtensions' => [
+                             'jpg',
+                             'gif',
+                             'png',
+                         ],
+                         'initialPreview'        => $model->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage(
+                             $model->imageUrl,
+                             'products'
+                         ) : '',
+                         'overwriteInitial'      => true,
+                         'showRemove'            => true,
+                         'showUpload'            => false,
+                     ],
+                 ]
+             ); ?>
     
-    <?php if(isset($groups)) :?>
-    <?php  foreach($groups->all() as $group) :?>
-        <?= $form->field($model, 'options')->checkboxList(
-        ArrayHelper::map($group->options, 'tax_option_id', 'ValueRenderFlash'),
+    <?php DynamicFormWidget::begin(
         [
-            'multiple' => true,
-            'unselect' => null,
+            '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',
+            ],
         ]
-        )->label($group->name);?>
-    <?php endforeach?>
-    <?php endif?>
-
-    <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? Yii::t('product', 'Create') : Yii::t('product', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    ); ?>
+  
+  <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, "[{$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'
+                 ),
+                 [
+                     'prompt' => Yii::t('product', 'Unit'),
+                 ]
+             )
+             ->label(Yii::t('product', 'Unit')) ?>
+    
+    <?php if (isset($groups)) : ?>
+        <?php foreach ($groups->all() as $group) : ?>
+            <?= $form->field($model, 'options')
+                     ->checkboxList(
+                         ArrayHelper::map($group->options, 'tax_option_id', 'ValueRenderFlash'),
+                         [
+                             'multiple' => true,
+                             'unselect' => null,
+                         ]
+                     )
+                     ->label($group->name); ?>
+        <?php endforeach ?>
+    <?php endif ?>
+  
+  <div class="form-group">
+      <?= Html::submitButton(
+          $model->isNewRecord ? Yii::t('product', 'Create') : Yii::t('product', 'Update'),
+          [ 'class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary' ]
+      ) ?>
+  </div>
+    
     <?php ActiveForm::end(); ?>
 
 </div>
diff --git a/frontend/views/catalog/product.php b/frontend/views/catalog/product.php
index c452f03..48747fe 100755
--- a/frontend/views/catalog/product.php
+++ b/frontend/views/catalog/product.php
@@ -13,7 +13,6 @@
     use yii\bootstrap\ActiveForm;
     use yii\bootstrap\Html;
     use yii\helpers\Url;
-    use yii\helpers\VarDumper;
     use yii\web\View;
     use yii\widgets\MaskedInput;
     use frontend\assets\FlipclockAsset;
@@ -227,6 +226,8 @@
                         <td class="left_count available">
                             <?php if($product->variant->status == 1){?>
                                 снят с производства
+                            <?php } elseif($product->variant->status == 2) {?>
+                                в ожидании
                             <?php } elseif($product->variant->stock > 0) {?>
                                 в наличии
                             <?php } else {?>
--
libgit2 0.21.4