-Order module almost ready (need to add roles)

Alexey Boroda
1 parent 0893579c
Showing 7 changed files with 225 additions and 63 deletions Show diff stats
controllers/OrderController.php
models/Order.php
views/order/_form.php
views/order/create.php
views/order/index.php
views/order/update.php
views/order/view.php
@@ -2,6 +2,7 @@
     namespace artweb\artbox\ecommerce\controllers;
+    use artweb\artbox\components\SmsSender;
     use artweb\artbox\ecommerce\models\OrderSearch;
     use phpDocumentor\Reflection\Types\Null_;
     use Yii;
@@ -98,6 +99,21 @@
             $model->save();
         }
+        public function actionView($id)
+        {
+            $model = $this->findModel($id);
+            $dataProvider = new ActiveDataProvider([
+                'query' => $model->getProducts(),
+                                                   ]);
+            return $this->render(
+                'view',
+                [
+                    'model'    => $model,
+                    'products' => $dataProvider,
+                ]
+            );
+        }
+        
         public function actionPayUpdate()
         {
             $model = Order::findOne($_POST[ 'order_id' ]);
@@ -300,14 +316,13 @@
                 ],
             ];
             if (!is_null($q)) {
-                $result = ProductVariant::find()
-//                                        ->select(
-//                                            [
-//                                                'id',
-//                                                'sku',
-//                                                'product_lang.title AS name'
-//                                            ]
-//                                        )
+                $result = ProductVariant::find()//                                        ->select(
+                    //                                            [
+                    //                                                'id',
+                    //                                                'sku',
+                    //                                                'product_lang.title AS name'
+                    //                                            ]
+                    //                                        )
                                         ->joinWith('product.lang')
                                         ->where(
                                             [
@@ -325,6 +340,15 @@
             return $out;
         }
+        public function actionSendSms()
+        {
+            $phone = \Yii::$app->request->post('phone');
+            $content = \Yii::$app->request->post('content');
+            $sender = \Yii::$app->sender;
+            $result = $sender->send($phone, $content);
+            return $phone . $content . $result;
+        }
+        
         //        public function actionDeleteProduct($id, $order_id)
         //        {
         //            $model = OrderProduct::findOne($id);
@@ -61,6 +61,26 @@
             ],
         ];
+        const REASONS = [
+            1  => 'Нет товара',
+            2  => 'Нет оплаты',
+            3  => 'Передумал',
+            4  => ' - Купил в другом месте',
+            5  => ' - Не подошли условия доставки',
+            6  => ' - Не подошел срок доставки',
+            7  => ' - Нет денег',
+            8  => ' - Купит позже',
+            9  => 'Купил в другом месте',
+            10 => 'Подьедет в маг.',
+            11 => 'Дубль заказа.',
+            12 => 'Другое',
+            13 => 'Брак',
+            14 => 'Отказался от Самовывоза',
+            15 => 'Не приехал за Самовывозом',
+            16 => 'Отменил заказ',
+            17 => 'Не берет трубку',
+        ];
+        
         public static function tableName()
         {
             return 'order';
@@ -9,7 +9,6 @@
     use kartik\widgets\DatePicker;
     use kartik\widgets\Select2;
     use kartik\widgets\SwitchInput;
-    use yii\bootstrap\Dropdown;
     use yii\data\ActiveDataProvider;
     use yii\helpers\Html;
     use yii\bootstrap\ActiveForm;
@@ -58,9 +57,31 @@ JS;
     $js = <<< JS
 $(document).on('change', '#sms-template-selector', function(event) {
     var text = $('#select2-sms-template-selector-container').attr('title');
-    var val = $('option:contains(' + text + ')')
-    console.log(text);
-    console.log(val);
+    var val = $('option:contains(' + text + ')').attr('value');
+    $('#sms-text-area').val(val);
+});
+
+$(document).on('click', '#send-sms-action', function(event) {
+    console.log('click');
+    var content = $('#sms-text-area').val()
+    var phone = $('input#order-phone').val();    
+    $.ajax({
+        url: "/admin/ecommerce/order/send-sms",
+        method: "POST",
+        data: { 
+            phone: phone,
+            content: content
+         },
+        success: function(data) {
+          console.log(data);
+          var newButton = document.createElement('button');
+          newButton.classList.add('btn', 'btn-default');
+          newButton.innerText = 'Отправлено';
+          var current = document.getElementById("send-sms-action");
+          var parentDiv = current.parentNode;
+          parentDiv.replaceChild(newButton, current);
+        }
+    });
 });
 JS;
@@ -72,8 +93,8 @@ JS;
     <div class="form-group">
         <div class="row">
             <?= Html::submitButton(
-                $model->isNewRecord ? \Yii::t('app', 'Create') : \Yii::t('app', 'Update'),
-                [ 'class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary' ]
+                $model->isNewRecord ? \Yii::t('app', 'Создать') : \Yii::t('app', 'Обновить'),
+                [ 'class' => $model->isNewRecord ? 'btn btn-success btn-lg' : 'btn btn-primary btn-lg' ]
             ) ?>
             <?= Html::a(
                 \Yii::t('app', 'Печать'),
@@ -84,11 +105,12 @@ JS;
                     ]
                 ),
                 [
-                    'class'  => $model->isNewRecord ? 'btn btn-info disabled' : 'btn btn-info',
+                    'class'  => $model->isNewRecord ? 'btn btn-info disabled btn-lg' : 'btn btn-info btn-lg',
                     'target' => '_blank',
                 ]
             ) ?>
         </div>
+        <br>
         <div class="row">
             <div class="col-sm-6">
@@ -115,10 +137,7 @@ JS;
                 <?= $form->field($model, 'reason')
                          ->dropDownList(
-                             [
-                                 1 => 'То',
-                                 2 => 'Сё',
-                             ],
+                             Order::REASONS,
                              [ 'prompt' => 'Выберите причину' ]
                          ) ?>
@@ -263,9 +282,6 @@ JS;
                                         'max' => 20,
                                     ],
                                 ],
-                                'pluginEvents' => [
-                                    'editableSuccess' => 'function(event) { $.pjax.reload({container:"#order-products-grid"}); }',
-                                ],
                             ],
                             'format'          => [
                                 'text',
@@ -284,37 +300,25 @@ JS;
                                         'max' => 20,
                                     ],
                                 ],
-                                'pluginEvents' => [
-                                    'editableSuccess' => 'function(event) { $.pjax.reload({container:"#order-products-grid"}); }',
-                                ],
                             ],
                             'format'          => [
                                 'text',
                             ],
                             'pageSummary'     => false,
                         ],
-//                        [
-//                            'class'           => 'kartik\grid\EditableColumn',
-//                            'attribute'       => 'count',
-//                            'editableOptions' => [
-//                                'header'       => \Yii::t('app', 'Количество'),
-//                                'inputType'    => kartik\editable\Editable::INPUT_SPIN,
-//                                'options'      => [
-//                                    'pluginOptions' => [
-//                                        'min' => 0,
-//                                        'max' => 5000,
-//                                    ],
-//                                ],
-//                                'pluginEvents' => [
-//                                    'editableSuccess' => 'function(event) { $.pjax.reload({container:"#order-products-grid"}); }',
-//                                ],
-//                            ],
-//                            'format'          => [
-//                                'decimal',
-//                                0,
-//                            ],
-//                            'pageSummary'     => false,
-//                        ],
+                        [
+                            'class'           => 'kartik\grid\EditableColumn',
+                            'attribute'       => 'return',
+                            'editableOptions' => [
+                                'header'       => \Yii::t('app', 'Возврат'),
+                                'inputType'    => kartik\editable\Editable::INPUT_CHECKBOX,
+                                'options'      => [],
+                            ],
+                            'format'          => [
+                                'boolean',
+                            ],
+                            'pageSummary'     => false,
+                        ],
                         [
                             'class'    => 'yii\grid\ActionColumn',
                             'template' => '{delete}',
@@ -383,10 +387,18 @@ JS;
             ?>
         </div>
         <div class="col-md-2">
-            <?php echo $newProductForm->field($newOrderProduct, 'count')
-                                      ->input('number'); ?>
+            <?php echo $newProductForm->field(
+                $newOrderProduct,
+                'count'
+            )
+                                      ->input(
+                                          'number',
+                                          [
+                                              'disabled' => $model->isNewRecord ? true : false,
+                                          ]
+                                      ); ?>
         </div>
-        <div class="col-md-2">
+        <div class="col-md-2" style="margin-top: 23px">
             <?php echo Html::submitButton(
                 'Add',
                 [
@@ -406,15 +418,13 @@ JS;
 </div>
 <br>
 <br>
-<br>
-<br>
-<br>
 <div class="container">
+    <h2><?php echo \Yii::t('app', 'Отправить смс'); ?></h2>
     <div class="row">
         <?php
             echo Select2::widget(
                 [
-                    'id' => 'sms-template-selector',
+                    'id'            => 'sms-template-selector',
                     'name'          => 'select-sms-template',
                     'data'          => ArrayHelper::map(
                         SmsTemplate::find()
@@ -431,15 +441,36 @@ JS;
             );
         ?>
-        
+        <br>
         <?php
             echo Html::textarea(
                 'sms-text',
                 '',
                 [
-                    'rows' => 5,
+                    'rows'  => 3,
+                    'id'    => 'sms-text-area',
+                    'class' => 'form-control',
                 ]
             );
         ?>
+        <br>
+        <?php
+            if ($model->isNewRecord) {
+                echo Html::button(
+                    \Yii::t('app', 'Отправить'),
+                    [
+                        'class' => 'btn btn-warning disabled',
+                    ]
+                );
+            } else {
+                echo Html::button(
+                    \Yii::t('app', 'Отправить'),
+                    [
+                        'class' => 'btn btn-warning',
+                        'id'    => 'send-sms-action',
+                    ]
+                );
+            }
+        ?>
     </div>
 </div>
@@ -11,14 +11,16 @@
     $this->title = 'Добавить товар в заказ';
     $this->params[ 'breadcrumbs' ][] = [
-        'label' => 'Pages',
+        'label' => \Yii::t('app', 'Заказы'),
         'url'   => [ 'index' ],
     ];
     $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
 <div class="order-create">
-    <h1><?= Html::encode($this->title) ?></h1>
+    <div class="container">
+        <h1><?= Html::encode($this->title) ?></h1>
+    </div>
     <?= $this->render(
         '_form',
@@ -33,7 +33,7 @@ $(&#39;[name=&quot;OrderSearch[phone]&quot;]&#39;).mask(&#39;+38(000)000-00-00&#39;, {
 JS;
     $this->registerJs($js, View::POS_READY);
-    
+
 ?>
 <h1>Заказы</h1>
 <p>
@@ -107,9 +107,9 @@ JS;
 ?>
 <?php
-        $query = new JsExpression(
-            'function(params) { return {q:params.term}; }'
-        );
+    $query = new JsExpression(
+        'function(params) { return {q:params.term}; }'
+    );
     echo $searchForm->field($searchModel, 'sku')
                     ->widget(
                         Select2::className(),
@@ -11,10 +11,14 @@
     use yii\web\View;
     $this->title = 'Заказ #' . $model->id;
+    $this->params[ 'breadcrumbs' ][] = [
+        'url'   => yii\helpers\Url::to([ '/ecommerce/order/index' ]),
+        'label' => \Yii::t('app', 'Заказы'),
+    ];
     $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
 <div class="order-update">
-    <h1><?php echo Html::encode($this->title) ?></h1>
+    <div class="container"><h1><?php echo Html::encode($this->title) ?></h1></div>
     <?= $this->render(
         '_form',
+<?php
+    
+    use artweb\artbox\ecommerce\models\Order;
+    use kartik\grid\GridView;
+    use yii\helpers\Html;
+    use yii\web\View;
+    use yii\widgets\DetailView;
+    
+    /**
+     * @var View  $this
+     * @var Order $model
+     */
+    
+    $this->title = 'Заказ #' . $model->id;
+    $this->params[ 'breadcrumbs' ][] = [
+        'label' => \Yii::t('app', 'Заказы'),
+        'url'   => [ 'index' ],
+    ];
+    $this->params[ 'breadcrumbs' ][] = $this->title;
+?>
+<div class="order-view">
+    
+    <h1><?= Html::encode($this->title) ?></h1>
+    
+    <p>
+        <?= Html::a(
+            'Update',
+            [
+                'update',
+                'id' => $model->id,
+            ],
+            [ 'class' => 'btn btn-primary' ]
+        ) ?>
+    
+    </p>
+    
+    <?= DetailView::widget(
+        [
+            'model'      => $model,
+            'attributes' => [
+                'id',
+                'deadline',
+                'pay',
+                'reason',
+                'label',
+                'name',
+                'phone',
+                'email',
+                'comment',
+                'delivery',
+                'declaration',
+                'stock',
+                'payment',
+                'insurance',
+                'city',
+                'adress',
+                'body',
+                'check',
+                'sms',
+            ],
+        ]
+    ) ?>
+    
+    <?php
+        echo GridView::widget(
+            [
+                'dataProvider' => $products,
+                'columns' => [
+                    'id',
+                    'product_name',
+                    'name',
+                    'sku',
+                    'price',
+                    'count',
+                    'sum_cost',
+                ],
+            ]
+        );
+    ?>
+
+</div>