@@ -61,21 +61,21 @@ |
||
| 61 | 61 | if ($first) { |
| 62 | 62 | $first = false; |
| 63 | 63 | } else { |
| 64 | - $string.= '<br />'; |
|
| 64 | + $string .= '<br />'; |
|
| 65 | 65 | } |
| 66 | - $string.= '<span style="white-space:nowrap;">'; |
|
| 67 | - $string.= number_format($sum, 2, '.', ' '); |
|
| 66 | + $string .= '<span style="white-space:nowrap;">'; |
|
| 67 | + $string .= number_format($sum, 2, '.', ' '); |
|
| 68 | 68 | if (\App::$cur->money) { |
| 69 | 69 | $currency = \Money\Currency::get($currency_id); |
| 70 | 70 | if ($currency) { |
| 71 | - $string.= ' ' . $currency->acronym(); |
|
| 71 | + $string .= ' ' . $currency->acronym(); |
|
| 72 | 72 | } else { |
| 73 | - $string.= ' руб.'; |
|
| 73 | + $string .= ' руб.'; |
|
| 74 | 74 | } |
| 75 | 75 | } else { |
| 76 | - $string.= ' руб.'; |
|
| 76 | + $string .= ' руб.'; |
|
| 77 | 77 | } |
| 78 | - $string.= '</span>'; |
|
| 78 | + $string .= '</span>'; |
|
| 79 | 79 | } |
| 80 | 80 | return $string; |
| 81 | 81 | } |
@@ -282,7 +282,7 @@ |
||
| 282 | 282 | $groups[$stage->group] = $stage; |
| 283 | 283 | } |
| 284 | 284 | } |
| 285 | - $discounts = Cart\Discount::getList(['where'=>['cart_id',$this->id]]); |
|
| 285 | + $discounts = Cart\Discount::getList(['where'=>['cart_id', $this->id]]); |
|
| 286 | 286 | foreach ($discounts as $discount) { |
| 287 | 287 | if (!isset($groups[$discount->group]) && $discount->auto) { |
| 288 | 288 | $discount->delete(); |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | 'manager' => [ |
| 44 | 44 | 'map' => [ |
| 45 | 45 | ['name', 'code'], |
| 46 | - ['delivery', 'electronic','discount'] |
|
| 46 | + ['delivery', 'electronic', 'discount'] |
|
| 47 | 47 | ] |
| 48 | 48 | ] |
| 49 | 49 | ]; |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | if ($cart->delivery) {
|
| 28 | 28 | echo "<h4>Информация о доставке</h4>"; |
| 29 | 29 | if ($cart->delivery->price_text || $cart->delivery->price) {
|
| 30 | - echo "<div>Стоимость доставки: <b>" . ($cart->delivery->price_text ? $cart->delivery->price_text : ( $cart->delivery->price . ' ' . ($cart->delivery->currency ? $cart->delivery->currency->acronym() : 'руб.') )) . '</b></div>'; |
|
| 30 | + echo "<div>Стоимость доставки: <b>" . ($cart->delivery->price_text ? $cart->delivery->price_text : ($cart->delivery->price . ' ' . ($cart->delivery->currency ? $cart->delivery->currency->acronym() : 'руб.'))) . '</b></div>'; |
|
| 31 | 31 | } |
| 32 | 32 | if ((float) $cart->delivery->max_cart_price) {
|
| 33 | 33 | echo '<div>При заказе товаров на сумму от ' . $cart->delivery->max_cart_price . ' руб - бесплатно</div>'; |