Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents deaedeb0 7c536875
Showing 2 changed files with 48 additions and 4 deletions Show diff stats
controllers/OrderController.php
models/Basket.php
@@ -237,7 +237,12 @@
             $model->published = false;
             $model->save();
-            return $this->redirect(['update', 'id' => $model->id]);
+            return $this->redirect(
+                [
+                    'update',
+                    'id' => $model->id,
+                ]
+            );
             $dataProvider = new ActiveDataProvider(
                 [
@@ -353,7 +358,7 @@
             }
         }
-        public function actionFindProduct($q = NULL, $id = NULL)
+        public function actionFindProduct($q = null, $id = null)
         {
             \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
             $out = [
@@ -409,7 +414,7 @@
         protected function findModel($id)
         {
-            if (( $model = Order::findOne($id) ) !== NULL) {
+            if (( $model = Order::findOne($id) ) !== null) {
                 return $model;
             } else {
                 throw new NotFoundHttpException('The requested page does not exist.');
@@ -472,9 +477,23 @@
             $model->save();
         }
-        public function actionPublishOrder($id) {
+        public function actionPublishOrder($id)
+        {
             $model = Order::findOne($id);
             $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,
+                    ]
+                )
+            );
         }
     }
@@ -3,6 +3,8 @@
     namespace artweb\artbox\ecommerce\models;
     use yii\base\Component;
+    use yii\helpers\Json;
+    use yii\web\Cookie;
     use yii\web\NotFoundHttpException;
     /**
@@ -30,6 +32,16 @@
             $this->session = \Yii::$app->session;
             if (!$this->session->has('basket')) {
                 $this->session->set('basket', []);
+            } elseif(!empty($this->session->get('basket'))) {
+                $cookies = \Yii::$app->response->cookies;
+                $cookies->add(
+                    new Cookie(
+                        [
+                            'name'  => 'basket',
+                            'value' => Json::encode($this->session->get('basket')),
+                        ]
+                    )
+                );
             }
             parent::__construct($config);
         }
@@ -131,6 +143,19 @@
         public function setData(array $data)
         {
             $this->session->set('basket', $data);
+            $cookies = \Yii::$app->response->cookies;
+            if(empty($data)) {
+                $cookies->remove('basket');
+            } else {
+                $cookies->add(
+                    new Cookie(
+                        [
+                            'name'  => 'basket',
+                            'value' => Json::encode($data),
+                        ]
+                    )
+                );
+            }
         }
         /**