From 91b45094e016c1c4da6c6c5472188c51ff6307f8 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Tue, 5 Jul 2016 20:19:50 +0300
Subject: [PATCH] 29.06.16

---
 frontend/controllers/BasketController.php | 36 +++++++++++-------------------------
 frontend/views/basket/success.php         | 24 +++++++++++++++++++++---
 frontend/views/site/error.php             |  2 +-
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/frontend/controllers/BasketController.php b/frontend/controllers/BasketController.php
index 4aa2578..6296575 100755
--- a/frontend/controllers/BasketController.php
+++ b/frontend/controllers/BasketController.php
@@ -6,6 +6,7 @@ namespace frontend\controllers;
 use common\models\Customer;
 use common\models\OrdersProducts;
 use Yii;
+use yii\helpers\ArrayHelper;
 use yii\web\Controller;
 use common\modules\product\models\ProductVariant;
 use common\models\Orders;
@@ -123,31 +124,9 @@ class BasketController extends Controller
                         $text = "# zakaz: ". $order->id .". V blijayshee vremya menedjer svyajetsya s Vami. (044) 303 90 15";
                         Yii::$app->sms->send($order->phone, $text);
 
-                        $js = '';
-                        if(isset($productV) && isset($order)){
-                            $orderData = "
-                            ga('require', 'ecommerce');
-                            ga('ecommerce:addTransaction', {
-                            'id': $order->id,                     //  где ID - транзакции, обязательно
-                            });";
-
-                            foreach($productV as $row){
-                                $orderData .= "
-                                ga('ecommerce:addItem', {
-                                'id': {$order->id},                     // ID - транзакции, обязательно
-                                'name': \"{$row['product_name']} {$row['name']}\",    //  Имя товара
-                                'price': {$row['price']},                 // Цена товара
-                                'quantity': {$row['count']}                   // Количество
-                                });";
+                        Yii::$app->session['order_data']= ['order' => $order,'variants'=>$productV];
 
-                            }
-                            $orderData .= "ga('ecommerce:send');";
-                            $js = $orderData;
-
-                        }
-
-                        return $this->render('success',[
-                            'js' => $js
+                        return $this->redirect(['basket/success',
                         ]);
                     }
                 }            
@@ -210,7 +189,14 @@ class BasketController extends Controller
         
         
         public function actionSuccess(){
-            return $this->render('success');            
+
+            $orderData = Yii::$app->session->get('order_data');
+            unset($_SESSION['order_data']);
+            return $this->render('success',[
+
+                'order' => $orderData['order'],
+                'variants' => $orderData['variants'],
+            ]);
         }
         
         
diff --git a/frontend/views/basket/success.php b/frontend/views/basket/success.php
index e7ced97..0ec7e0f 100755
--- a/frontend/views/basket/success.php
+++ b/frontend/views/basket/success.php
@@ -9,9 +9,27 @@ $this->title = 'Корзина';
 $this->registerMetaTag(['name' => 'description', 'content' => 'Корзина']);
 $this->registerMetaTag(['name' => 'keywords', 'content' => 'Корзина']);
 
-    $this->registerJs ($js, View::POS_END);
-
-
+if(isset($variants) && isset($order)){
+    $orderData = "
+    ga('require', 'ecommerce');
+    ga('ecommerce:addTransaction', {
+    'id': {$order->id},                     //  где ID - транзакции, обязательно
+    });";
+
+    foreach($variants as $row){
+        $orderData .= "
+    ga('ecommerce:addItem', {
+    'id': {$order->id},                     // ID - транзакции, обязательно
+    'name': \"{$row['product_name']} {$row['name']}\",    //  Имя товара
+    'price': {$row['price']},                 // Цена товара
+    'quantity': {$row['count']}                   // Количество
+    });";
+
+    }
+    $orderData .= "ga('ecommerce:send');";
+    $this->registerJs ($orderData, View::POS_END);
+
+}
 
 
 ?>
diff --git a/frontend/views/site/error.php b/frontend/views/site/error.php
index b0bbf62..69c6a65 100755
--- a/frontend/views/site/error.php
+++ b/frontend/views/site/error.php
@@ -84,7 +84,7 @@ $this->title = 'Ошибка '.$code;
 </style>
 
 <div class="site-error">
-    <div class="img-404"><img src="img/404.png" alt=""></div>
+    <div class="img-404"><img src="/images/404.png" alt=""></div>
     <div class="text-404-wr">
         <p>Добро пожаловать на страницу 404!<br />
             Вы находитесь здесь, потому что ввели адрес страницы,<br />
--
libgit2 0.21.4