Merge remote-tracking branch 'origin/master'

Administrator
2 parents 9695c55c 6041d68e
Showing 6 changed files with 145 additions and 60 deletions Show diff stats
controllers/OrderController.php
models/Order.php
models/OrderSearch.php
views/order/_form.php
views/order/index.php
views/order/update.php
@@ -229,6 +229,9 @@
             }
             $model = new Order();
+            $model->phone = '+38(000)000-00-00';
+            $model->name = \Yii::t('app', 'Новый заказ');
+            $model->save();
             $dataProvider = new ActiveDataProvider(
                 [
@@ -324,7 +327,13 @@
             if ($model->load(Yii::$app->request->post()) && $model->save()) {
                 $this->unblockOrder($model->id);
-                return $this->redirect([ 'index' ]);
+                return $this->render(
+                    'update',
+                    [
+                        'model'        => $model,
+                        'dataProvider' => $dataProvider,
+                    ]
+                );
             } else {
                 return $this->render(
                     'update',
@@ -401,7 +410,10 @@
         public function actionExitOrder($id)
         {
-            $this->unblockOrder($id);
+            $model = $this->findModel($id);
+            if ($model->edit_id == \Yii::$app->user->id) {
+                $this->unblockOrder($id);
+            }
             return $this->redirect('index');
         }
@@ -412,6 +424,9 @@
                 $model = $this->findModel(\Yii::$app->request->post('id'));
+                $user = User::find()
+                            ->where([ 'id' => $model->edit_id ])
+                            ->one();
                 $model->edit_time = time();
                 $model->edit_id = \Yii::$app->user->id;
@@ -421,6 +436,7 @@
                 if ($model->save()) {
                     return [
                         'time' => $date,
+                        'user' => !empty( $user ) ? $user->username : '',
                     ];
                 } else {
                     return [
@@ -293,7 +293,7 @@
          */
         public function getManager()
         {
-            $this->hasOne(User::className(), [ 'id' => 'manager_id' ]);
+            return $this->hasOne(User::className(), [ 'id' => 'manager_id' ]);
         }
         public function isBlocked()
@@ -75,6 +75,7 @@
             $dataProvider = new ActiveDataProvider(
                 [
                     'query' => $query,
+                    'sort'  => [ 'defaultOrder' => [ 'id' => SORT_DESC ] ],
                 ]
             );
@@ -155,7 +156,7 @@
             $query->andFilterWhere(
                 [
                     'manager_id' => $this->manager_id,
-        
+                
                 ]
             );
             $query->andFilterWhere(
@@ -63,9 +63,14 @@ $(document).on(&#39;change&#39;, &#39;#sms-template-selector&#39;, function(event) {
 });
 $(document).on('click', '#send-sms-action', function(event) {
-    console.log('click');
-    var content = $('#sms-text-area').val()
-    var phone = $('input#order-phone').val();    
+    var variant = $('input[name=send-phone]:checked').val();
+    var content = $('#sms-text-area').val();
+    if (variant == 1) {
+        var phone = $('input#order-phone').val();    
+    } else if (variant == 2) {
+        var phone = $('input#order-phone2').val();    
+    }
+    console.log(phone);
     $.ajax({
         url: "/admin/ecommerce/order/send-sms",
         method: "POST",
@@ -87,9 +92,18 @@ $(document).on(&#39;click&#39;, &#39;#send-sms-action&#39;, function(event) {
 JS;
     $this->registerJs($js, View::POS_READY);
+    
+    $js = <<< JS
+$(document).on('click', '#page-submit', function() {
+  $('#main-form').trigger('submit');
+});
+JS;
+    
+    $this->registerJs($js, View::POS_READY);
+
 ?>
-<?php $form = ActiveForm::begin(); ?>
+<?php $form = ActiveForm::begin([ 'id' => 'main-form' ]); ?>
 <div class="container">
     <div class="form-group">
         <br>
@@ -215,24 +229,40 @@ JS;
                     );
                 ?>
                 <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 class="row">
+                    <div class="col-md-6">
+                        <?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 class="col-md-6">
+                        <?php
+                            echo Html::radioList(
+                                'send-phone',
+                                '1',
+                                [
+                                    '1' => 'Первый номер',
+                                    '2' => 'Второй номер',
+                                ]
+                            );
+                        ?>
+                    </div>
+                </div>
             </div>
             <div class="col-sm-6">
@@ -280,38 +310,6 @@ JS;
             </div>
         </div>
     </div>
-    <br>
-    <div class="row">
-        <?= Html::submitButton(
-            $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', 'Печать'),
-            yii\helpers\Url::to(
-                [
-                    'order/print',
-                    'order_id' => $model->id,
-                ]
-            ),
-            [
-                'class'  => $model->isNewRecord ? 'btn btn-info disabled btn-lg' : 'btn btn-info btn-lg',
-                'target' => '_blank',
-            ]
-        ) ?>
-        <?= Html::a(
-            \Yii::t('app', 'Выйти'),
-            yii\helpers\Url::to(
-                [
-                    'exit-order',
-                    'id' => $model->id,
-                ]
-            ),
-            [
-                'class' => $model->isNewRecord ? 'btn btn-info disabled btn-lg' : 'btn btn-info btn-lg',
-            ]
-        ) ?>
-    </div>
 </div>
 <?php ActiveForm::end(); ?>
@@ -377,8 +375,12 @@ JS;
                             'attribute'       => 'status',
                             'editableOptions' => [
                                 'header'    => \Yii::t('app', 'Статус'),
-                                'inputType' => kartik\editable\Editable::INPUT_TEXT,
+                                'inputType' => kartik\editable\Editable::INPUT_SELECT2,
                                 'options'   => [
+                                    'data'          => [
+                                        0 => 'adsas',
+                                        2 => 'dSSSSasda',
+                                    ],
                                     'pluginOptions' => [
                                         'min' => 0,
                                         'max' => 20,
@@ -516,6 +518,43 @@ JS;
                                   ->label(false) ?>
         <?php ActiveForm::end(); ?>
     </div>
+    
+    <br>
+    <div class="row">
+        <?= Html::button(
+            $model->isNewRecord ? \Yii::t('app', 'Создать') : \Yii::t('app', 'Сохранить'),
+            [
+                'class' => $model->isNewRecord ? 'btn btn-success btn-lg' : 'btn btn-primary btn-lg',
+                'id'    => 'page-submit',
+            ]
+        ) ?>
+        <?= Html::a(
+            \Yii::t('app', 'Печать'),
+            yii\helpers\Url::to(
+                [
+                    'order/print',
+                    'order_id' => $model->id,
+                ]
+            ),
+            [
+                'class'  => $model->isNewRecord ? 'btn btn-info disabled btn-lg' : 'btn btn-info btn-lg',
+                'target' => '_blank',
+            ]
+        ) ?>
+        <?= Html::a(
+            \Yii::t('app', 'Выйти'),
+            yii\helpers\Url::to(
+                [
+                    'exit-order',
+                    'id' => $model->id,
+                ]
+            ),
+            [
+                'class' => $model->isNewRecord ? 'btn btn-info disabled btn-lg' : 'btn btn-info btn-lg',
+            ]
+        ) ?>
+    </div>
+
 </div>
 <br>
 <br>
@@ -189,6 +189,14 @@ JS;
                         'attribute' => 'id',
                         'filter'    => $searchForm->field($searchModel, 'id')
                                                   ->textInput(),
+                        'content' => function($model) {
+                            $manager = $model->manager;
+                            if (empty($manager)) {
+                                return $model->id;
+                            } else {
+                                return $model->id . ' ' . $manager->username;
+                            }
+                        }
                     ],
                     [
                         'attribute' => 'created_at',
@@ -25,8 +25,12 @@ $.ajax({
     id: ' . $model->id . '
   },
   success: function(data) {
+  var message = data.time;
+  if (data.user != "") {
+    message += "  " + data.user;
+  }
   $.notify({
-	message: data.time 
+	message:  message
         },{
 	type: "info"
     });
@@ -35,6 +39,23 @@ $.ajax({
     $this->registerJs($js, View::POS_READY);
+    $js = '
+    window.onbeforeunload = function(e) {
+        $.ajax({
+            type: "GET",
+            url: "/admin/ecommerce/order/exit-order",
+            data: {
+                id: ' . $model->id . ',
+            },
+            success: function() {
+                console.log("Exit order");
+            }
+        });
+};
+';
+    
+    $this->registerJs($js, View::POS_READY);
+ 
 ?>
 <div class="order-update">
     <div class="container"><h1><?php echo Html::encode($this->title) ?></h1></div>