From 52e22ec26866a8c2460f1eaaccd243d7ae1259c7 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Mon, 16 Jan 2017 16:06:51 +0200
Subject: [PATCH] add similar products

---
 controllers/OrderController.php | 55 +++++++++++++++++++++++++++++++++++++++----------------
 views/order/_form.php           |  9 +++++----
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/controllers/OrderController.php b/controllers/OrderController.php
index febc160..63c83f1 100755
--- a/controllers/OrderController.php
+++ b/controllers/OrderController.php
@@ -320,9 +320,9 @@
                 
                 return $out;
             }
-            
+
             $model = $this->findModel($id);
-            
+
             /**
              * @var User $user
              */
@@ -332,7 +332,7 @@
                     throw new ForbiddenHttpException();
                 }
             }
-            
+
             $dataProvider = new ActiveDataProvider(
                 [
                     'query' => $model->getProducts()
@@ -345,11 +345,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',
@@ -445,7 +466,7 @@
             if ($model->edit_id == \Yii::$app->user->id) {
                 $this->unblockOrder(\Yii::$app->request->post('id'));
             }
-            
+
             if (!$model->published) {
                 $model->deleteUnpublished();
             }
@@ -508,7 +529,7 @@
             $model->save();
         }
         
-        public function actionPublishOrder($id)
+        public function actionPublishOrder($id,$phone)
         {
             $model = Order::findOne($id);
             if ($model->published == true) {
@@ -519,16 +540,18 @@
             /**
              * @var SmsSender $sender
              */
-            print_r($model->phone);
             $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,
+                        ]
+                    )
+                );
+            }
+
         }
     }
diff --git a/views/order/_form.php b/views/order/_form.php
index 7be1b05..375c8b8 100755
--- a/views/order/_form.php
+++ b/views/order/_form.php
@@ -122,20 +122,21 @@ 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) {
-        alert(data);
-      $('#main-form').trigger('submit');
+
     },
     error: function () {
     }
   });
-
+  $('#main-form').trigger('submit');
 });
 JS;
     
--
libgit2 0.21.4