Commit 91b45094e016c1c4da6c6c5472188c51ff6307f8
1 parent
a2616d5f
29.06.16
Showing
3 changed files
with
33 additions
and
29 deletions
Show diff stats
frontend/controllers/BasketController.php
@@ -6,6 +6,7 @@ namespace frontend\controllers; | @@ -6,6 +6,7 @@ namespace frontend\controllers; | ||
6 | use common\models\Customer; | 6 | use common\models\Customer; |
7 | use common\models\OrdersProducts; | 7 | use common\models\OrdersProducts; |
8 | use Yii; | 8 | use Yii; |
9 | +use yii\helpers\ArrayHelper; | ||
9 | use yii\web\Controller; | 10 | use yii\web\Controller; |
10 | use common\modules\product\models\ProductVariant; | 11 | use common\modules\product\models\ProductVariant; |
11 | use common\models\Orders; | 12 | use common\models\Orders; |
@@ -123,31 +124,9 @@ class BasketController extends Controller | @@ -123,31 +124,9 @@ class BasketController extends Controller | ||
123 | $text = "# zakaz: ". $order->id .". V blijayshee vremya menedjer svyajetsya s Vami. (044) 303 90 15"; | 124 | $text = "# zakaz: ". $order->id .". V blijayshee vremya menedjer svyajetsya s Vami. (044) 303 90 15"; |
124 | Yii::$app->sms->send($order->phone, $text); | 125 | Yii::$app->sms->send($order->phone, $text); |
125 | 126 | ||
126 | - $js = ''; | ||
127 | - if(isset($productV) && isset($order)){ | ||
128 | - $orderData = " | ||
129 | - ga('require', 'ecommerce'); | ||
130 | - ga('ecommerce:addTransaction', { | ||
131 | - 'id': $order->id, // где ID - транзакции, обязательно | ||
132 | - });"; | ||
133 | - | ||
134 | - foreach($productV as $row){ | ||
135 | - $orderData .= " | ||
136 | - ga('ecommerce:addItem', { | ||
137 | - 'id': {$order->id}, // ID - транзакции, обязательно | ||
138 | - 'name': \"{$row['product_name']} {$row['name']}\", // Имя товара | ||
139 | - 'price': {$row['price']}, // Цена товара | ||
140 | - 'quantity': {$row['count']} // Количество | ||
141 | - });"; | 127 | + Yii::$app->session['order_data']= ['order' => $order,'variants'=>$productV]; |
142 | 128 | ||
143 | - } | ||
144 | - $orderData .= "ga('ecommerce:send');"; | ||
145 | - $js = $orderData; | ||
146 | - | ||
147 | - } | ||
148 | - | ||
149 | - return $this->render('success',[ | ||
150 | - 'js' => $js | 129 | + return $this->redirect(['basket/success', |
151 | ]); | 130 | ]); |
152 | } | 131 | } |
153 | } | 132 | } |
@@ -210,7 +189,14 @@ class BasketController extends Controller | @@ -210,7 +189,14 @@ class BasketController extends Controller | ||
210 | 189 | ||
211 | 190 | ||
212 | public function actionSuccess(){ | 191 | public function actionSuccess(){ |
213 | - return $this->render('success'); | 192 | + |
193 | + $orderData = Yii::$app->session->get('order_data'); | ||
194 | + unset($_SESSION['order_data']); | ||
195 | + return $this->render('success',[ | ||
196 | + | ||
197 | + 'order' => $orderData['order'], | ||
198 | + 'variants' => $orderData['variants'], | ||
199 | + ]); | ||
214 | } | 200 | } |
215 | 201 | ||
216 | 202 |
frontend/views/basket/success.php
@@ -9,9 +9,27 @@ $this->title = 'Корзина'; | @@ -9,9 +9,27 @@ $this->title = 'Корзина'; | ||
9 | $this->registerMetaTag(['name' => 'description', 'content' => 'Корзина']); | 9 | $this->registerMetaTag(['name' => 'description', 'content' => 'Корзина']); |
10 | $this->registerMetaTag(['name' => 'keywords', 'content' => 'Корзина']); | 10 | $this->registerMetaTag(['name' => 'keywords', 'content' => 'Корзина']); |
11 | 11 | ||
12 | - $this->registerJs ($js, View::POS_END); | ||
13 | - | ||
14 | - | 12 | +if(isset($variants) && isset($order)){ |
13 | + $orderData = " | ||
14 | + ga('require', 'ecommerce'); | ||
15 | + ga('ecommerce:addTransaction', { | ||
16 | + 'id': {$order->id}, // где ID - транзакции, обязательно | ||
17 | + });"; | ||
18 | + | ||
19 | + foreach($variants as $row){ | ||
20 | + $orderData .= " | ||
21 | + ga('ecommerce:addItem', { | ||
22 | + 'id': {$order->id}, // ID - транзакции, обязательно | ||
23 | + 'name': \"{$row['product_name']} {$row['name']}\", // Имя товара | ||
24 | + 'price': {$row['price']}, // Цена товара | ||
25 | + 'quantity': {$row['count']} // Количество | ||
26 | + });"; | ||
27 | + | ||
28 | + } | ||
29 | + $orderData .= "ga('ecommerce:send');"; | ||
30 | + $this->registerJs ($orderData, View::POS_END); | ||
31 | + | ||
32 | +} | ||
15 | 33 | ||
16 | 34 | ||
17 | ?> | 35 | ?> |
frontend/views/site/error.php
@@ -84,7 +84,7 @@ $this->title = 'Ошибка '.$code; | @@ -84,7 +84,7 @@ $this->title = 'Ошибка '.$code; | ||
84 | </style> | 84 | </style> |
85 | 85 | ||
86 | <div class="site-error"> | 86 | <div class="site-error"> |
87 | - <div class="img-404"><img src="img/404.png" alt=""></div> | 87 | + <div class="img-404"><img src="/images/404.png" alt=""></div> |
88 | <div class="text-404-wr"> | 88 | <div class="text-404-wr"> |
89 | <p>Добро пожаловать на страницу 404!<br /> | 89 | <p>Добро пожаловать на страницу 404!<br /> |
90 | Вы находитесь здесь, потому что ввели адрес страницы,<br /> | 90 | Вы находитесь здесь, потому что ввели адрес страницы,<br /> |