Commit 05f79cc4eaa858853d578f9be016d6b42cfb6c99
Merge branch 'discount' of gitlab.artweb.com.ua:Alex/semena
Showing
1 changed file
with
13 additions
and
13 deletions
Show diff stats
src/app/frontend/controllers/MenuController.php
| @@ -180,20 +180,11 @@ class MenuController extends \controllers\ControllerBase | @@ -180,20 +180,11 @@ class MenuController extends \controllers\ControllerBase | ||
| 180 | $order['passwd_'] = $passwd_; | 180 | $order['passwd_'] = $passwd_; |
| 181 | $order['passwd'] = $this->common->hashPasswd( $passwd_ ); | 181 | $order['passwd'] = $this->common->hashPasswd( $passwd_ ); |
| 182 | 182 | ||
| 183 | - // save order | ||
| 184 | - $proposal_number = $this->models->getOrders()->addOrder($order); | ||
| 185 | - $order['proposal_number'] = $proposal_number['proposal_number']; | ||
| 186 | - $order['confirmed'] = $proposal_number['confirmed']; | ||
| 187 | - $order['customer_new'] = $proposal_number['new']; | ||
| 188 | - | ||
| 189 | - $sms_text = "Vash zakaz prinyat. #:".$proposal_number['proposal_number']." V blijayshee vremya menedjer svyajetsya s Vami (044) 581-67-15"; | ||
| 190 | - $this->sms->sendSMS($order['phone'], $sms_text); | ||
| 191 | - | ||
| 192 | //promocode | 183 | //promocode |
| 193 | - if(!empty($promo_code)) { | ||
| 194 | - if($this->common->applyPromoCode($promo_code[0], $order['items'])) | ||
| 195 | - $this->common->countOrderSum($order); | ||
| 196 | - } | 184 | + if(!empty($promo_code)) { |
| 185 | + if($this->common->applyPromoCode($promo_code[0], $order['items'])) | ||
| 186 | + $this->common->countOrderSum($order); | ||
| 187 | + } | ||
| 197 | 188 | ||
| 198 | //discount | 189 | //discount |
| 199 | $discount = $this->getDi()->get('models')->getDiscount()->getActiveData(); | 190 | $discount = $this->getDi()->get('models')->getDiscount()->getActiveData(); |
| @@ -204,6 +195,15 @@ class MenuController extends \controllers\ControllerBase | @@ -204,6 +195,15 @@ class MenuController extends \controllers\ControllerBase | ||
| 204 | $this->common->countOrderSum($order); | 195 | $this->common->countOrderSum($order); |
| 205 | } | 196 | } |
| 206 | 197 | ||
| 198 | + // save order | ||
| 199 | + $proposal_number = $this->models->getOrders()->addOrder($order); | ||
| 200 | + $order['proposal_number'] = $proposal_number['proposal_number']; | ||
| 201 | + $order['confirmed'] = $proposal_number['confirmed']; | ||
| 202 | + $order['customer_new'] = $proposal_number['new']; | ||
| 203 | + | ||
| 204 | + $sms_text = "Vash zakaz prinyat. #:".$proposal_number['proposal_number']." V blijayshee vremya menedjer svyajetsya s Vami (044) 581-67-15"; | ||
| 205 | + $this->sms->sendSMS($order['phone'], $sms_text); | ||
| 206 | + | ||
| 207 | // novaposhta | 207 | // novaposhta |
| 208 | if (!empty($proposal_number['novaposhta_tnn'])) | 208 | if (!empty($proposal_number['novaposhta_tnn'])) |
| 209 | { | 209 | { |