Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents 44747138 9e6e9086
Showing 2 changed files with 46 additions and 17 deletions Show diff stats
controllers/OrderController.php
views/order/_form.php
@@ -176,6 +176,7 @@
                 if (!empty( $model )) {
                     $model->count += $count;
+                    $model->removed = false;
                 } else {
                     $model = new OrderProduct();
@@ -186,6 +187,7 @@
                     $model->sku = $productVariant->sku;
                     $model->price = $productVariant->price;
                     $model->count = $count;
+                    $model->removed = false;
                 }
                 \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
@@ -320,9 +322,9 @@
                 return $out;
             }
-            
+
             $model = $this->findModel($id);
-            
+
             /**
              * @var User $user
              */
@@ -332,7 +334,7 @@
                     throw new ForbiddenHttpException();
                 }
             }
-            
+
             $dataProvider = new ActiveDataProvider(
                 [
                     'query' => $model->getProducts()
@@ -345,11 +347,32 @@
             if (empty( $model->manager_id )) {
                 $model->manager_id = \Yii::$app->user->id;
             }
-            
+
             $headers = \Yii::$app->response->headers;
             $headers->set('Access-Control-Allow-Origin', '*');
             if ($model->load(Yii::$app->request->post()) && $model->save()) {
+
+                if ($model->published != true) {
+                    $model->published = true;
+                    $model->save();
+                    /**
+                     * @var SmsSender $sender
+                     */
+
+                    $sender = \Yii::$app->sender;
+                    $sender->send(
+                        $model->phone,
+                        $this->renderPartial(
+                            '@common/mail/smsorder',
+                            [
+                                'order_id' => $model->id,
+                            ]
+                        )
+                    );
+                }
+
+
                 $this->unblockOrder($model->id);
                 return $this->render(
                     'update',
@@ -416,6 +439,7 @@
         {
             $model = OrderProduct::findOne($id);
             $model->removed = true;
+            $model->count = 0;
             $model->save();
             $order = Order::findOne($order_id);
             $order->totalRecount();
@@ -445,7 +469,7 @@
             if ($model->edit_id == \Yii::$app->user->id) {
                 $this->unblockOrder(\Yii::$app->request->post('id'));
             }
-            
+
             if (!$model->published) {
                 $model->deleteUnpublished();
             }
@@ -508,7 +532,7 @@
             $model->save();
         }
-        public function actionPublishOrder($id)
+        public function actionPublishOrder($id,$phone)
         {
             $model = Order::findOne($id);
             if ($model->published == true) {
@@ -520,14 +544,17 @@
              * @var SmsSender $sender
              */
             $sender = \Yii::$app->sender;
-            $sender->send(
-                $model->phone,
-                $this->renderPartial(
-                    '@common/mail/smsorder',
-                    [
-                        'order_id' => $model->id,
-                    ]
-                )
-            );
+            if(!empty($phone)){
+                $sender->send(
+                    $phone,
+                    $this->renderPartial(
+                        '@common/mail/smsorder',
+                        [
+                            'order_id' => $model->id,
+                        ]
+                    )
+                );
+            }
+
         }
     }
@@ -122,14 +122,16 @@ JS;
     $js = <<< JS
 $(document).on('click', '#page-submit', function() {
+  var phone =  $('#order-phone').val(); 
   $.ajax({
     url: "/admin/ecommerce/order/publish-order",
     type: "GET",
     data: {
-        id: {$model->id}
+        id: {$model->id},
+        phone: phone
     },
     success: function (data) {
-    
+
     },
     error: function () {
     }