@@ -3,7 +3,8 @@ discard block |
||
| 3 | 3 | $price = $cartItem->item->getPrice(); |
| 4 | 4 | if (empty(App::$cur->ecommerce->config['sell_over_warehouse'])) { |
| 5 | 5 | $max = $price->offer->warehouseCount((!empty($_SESSION['cart']['cart_id']) ? $_SESSION['cart']['cart_id'] : 0)); |
| 6 | -} else { |
|
| 6 | +} |
|
| 7 | +else { |
|
| 7 | 8 | $max = 100; |
| 8 | 9 | } |
| 9 | 10 | if (!empty($options[16]) && $options[16]->value) { |
@@ -15,7 +16,8 @@ discard block |
||
| 15 | 16 | <input type = "text" data-miltiple="1000" class ="combineRanger item-counter" data-step ="<?= $step; ?>" data-max="<?= $max; ?>" data-price ="<?= $price->price; ?>" name="cartItems[<?php echo $cartItem->id; ?>]" value ="<?= $cartItem->count; ?>" /> |
| 16 | 17 | <?php |
| 17 | 18 | echo '</div>'; |
| 18 | -} else { |
|
| 19 | +} |
|
| 20 | +else { |
|
| 19 | 21 | ?> |
| 20 | 22 | <div class="input-group number-spinner" > |
| 21 | 23 | <span class="input-group-btn"> |
@@ -24,7 +24,8 @@ |
||
| 24 | 24 | <input name="items[<?php echo $cartItem->id; ?>]" type = "text" class ="combineRanger item-counter cart-couner rangerCount" data-step ="<?= $step; ?>" data-max="<?= $max; ?>" data-price ="<?= $price; ?>" value="<?php echo (float) $cartItem->count * 1000; ?>" /> |
| 25 | 25 | <?php |
| 26 | 26 | echo '</div>'; |
| 27 | - } else { |
|
| 27 | + } |
|
| 28 | + else { |
|
| 28 | 29 | ?> |
| 29 | 30 | <div class="input-group"> |
| 30 | 31 | <span class="input-group-btn"> |
@@ -6,7 +6,8 @@ discard block |
||
| 6 | 6 | foreach ($deliverys as $delivery) { |
| 7 | 7 | if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || ($cart->delivery && $delivery->id == $cart->delivery->id)) { |
| 8 | 8 | $checked = 'checked'; |
| 9 | - } else { |
|
| 9 | + } |
|
| 10 | + else { |
|
| 10 | 11 | $checked = ''; |
| 11 | 12 | } |
| 12 | 13 | echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">'; |
@@ -43,7 +44,8 @@ discard block |
||
| 43 | 44 | $options['value'] = $key; |
| 44 | 45 | $form->input($field->type, "deliveryFields[{$field->id}]", $value, $options); |
| 45 | 46 | } |
| 46 | - } else { |
|
| 47 | + } |
|
| 48 | + else { |
|
| 47 | 49 | if ($field->type == 'select') { |
| 48 | 50 | $options['values'] = $field->fieldItems(['forSelect' => true]); |
| 49 | 51 | } |
@@ -51,7 +53,8 @@ discard block |
||
| 51 | 53 | } |
| 52 | 54 | } |
| 53 | 55 | } |
| 54 | - } else { |
|
| 56 | + } |
|
| 57 | + else { |
|
| 55 | 58 | echo "<h4>Выберите способ доставки</h4>"; |
| 56 | 59 | } |
| 57 | 60 | ?> |
@@ -86,7 +86,8 @@ discard block |
||
| 86 | 86 | $user->{$path[0]}->{$path[1]} = $info->value; |
| 87 | 87 | $relations[$path[0]] = $path[0]; |
| 88 | 88 | } |
| 89 | - } else { |
|
| 89 | + } |
|
| 90 | + else { |
|
| 90 | 91 | if (!$user->{$field->userfield}) { |
| 91 | 92 | $user->{$field->userfield} = $info->value; |
| 92 | 93 | } |
@@ -142,7 +143,8 @@ discard block |
||
| 142 | 143 | $user->{$path[0]}->{$path[1]} = $info->value; |
| 143 | 144 | $relations[$path[0]] = $path[0]; |
| 144 | 145 | } |
| 145 | - } else { |
|
| 146 | + } |
|
| 147 | + else { |
|
| 146 | 148 | if (!$user->{$field->userfield}) { |
| 147 | 149 | $user->{$field->userfield} = $info->value; |
| 148 | 150 | } |
@@ -262,7 +264,8 @@ discard block |
||
| 262 | 264 | $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val); |
| 263 | 265 | } |
| 264 | 266 | $qstr = 'IN (' . implode(',', $optionValueArr) . ')'; |
| 265 | - } else { |
|
| 267 | + } |
|
| 268 | + else { |
|
| 266 | 269 | $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue); |
| 267 | 270 | } |
| 268 | 271 | $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' . |
@@ -281,7 +284,8 @@ discard block |
||
| 281 | 284 | $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val); |
| 282 | 285 | } |
| 283 | 286 | $qstr = 'IN (' . implode(',', $optionValueArr) . ')'; |
| 284 | - } else { |
|
| 287 | + } |
|
| 288 | + else { |
|
| 285 | 289 | $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue); |
| 286 | 290 | } |
| 287 | 291 | $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index() . ' = ' . 'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer::index() . ' AND ' . |
@@ -306,7 +310,8 @@ discard block |
||
| 306 | 310 | $first = false; |
| 307 | 311 | } |
| 308 | 312 | $selectOptions['where'][] = $where; |
| 309 | - } elseif (!empty($options['parent'])) { |
|
| 313 | + } |
|
| 314 | + elseif (!empty($options['parent'])) { |
|
| 310 | 315 | $category = \Ecommerce\Category::get($options['parent']); |
| 311 | 316 | $selectOptions['where'][] = ['tree_path', $category->tree_path . (int) $options['parent'] . '/%', 'LIKE']; |
| 312 | 317 | } |
@@ -492,7 +497,8 @@ discard block |
||
| 492 | 497 | foreach ($cartItem->price->offer->bonuses as $bonus) { |
| 493 | 498 | if ($bonus->limited && $bonus->left <= 0) { |
| 494 | 499 | continue; |
| 495 | - } elseif ($bonus->limited && $bonus->left > 0) { |
|
| 500 | + } |
|
| 501 | + elseif ($bonus->limited && $bonus->left > 0) { |
|
| 496 | 502 | $bonus->left -= 1; |
| 497 | 503 | $bonus->save(); |
| 498 | 504 | } |
@@ -17,14 +17,16 @@ discard block |
||
| 17 | 17 | if (!$this->id) { |
| 18 | 18 | $event = new Event(['cart_id' => $this->cart_id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 1, 'info' => $this->item_offer_price_id]); |
| 19 | 19 | $event->save(); |
| 20 | - } else { |
|
| 20 | + } |
|
| 21 | + else { |
|
| 21 | 22 | $cur = Item::get($this->id); |
| 22 | 23 | if ($cur->item_id != $this->item_id) { |
| 23 | 24 | $event = new Event(['cart_id' => $this->cart->cart_id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 2, 'info' => $cur->item_offer_price_id]); |
| 24 | 25 | $event->save(); |
| 25 | 26 | $event = new Event(['cart_id' => $this->cart->cart_id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 1, 'info' => $this->item_offer_price_id]); |
| 26 | 27 | $event->save(); |
| 27 | - } else { |
|
| 28 | + } |
|
| 29 | + else { |
|
| 28 | 30 | if ($cur->item_offer_price_id != $this->item_offer_price_id) { |
| 29 | 31 | $event = new Event(['cart_id' => $this->cart->cart_id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 3, 'info' => $this->item_offer_price_id]); |
| 30 | 32 | $event->save(); |
@@ -56,14 +58,16 @@ discard block |
||
| 56 | 58 | if ($block) { |
| 57 | 59 | $block->count = $this->count; |
| 58 | 60 | $block->save(); |
| 59 | - } else { |
|
| 61 | + } |
|
| 62 | + else { |
|
| 60 | 63 | $block = new \Ecommerce\Warehouse\Block(); |
| 61 | 64 | $block->item_offer_id = $this->price->item_offer_id; |
| 62 | 65 | $block->cart_id = $this->cart_id; |
| 63 | 66 | $block->count = $this->count; |
| 64 | 67 | $block->save(); |
| 65 | 68 | } |
| 66 | - } elseif ($block) { |
|
| 69 | + } |
|
| 70 | + elseif ($block) { |
|
| 67 | 71 | $block->delete(); |
| 68 | 72 | } |
| 69 | 73 | $this->cart->checkStage(); |
@@ -313,7 +313,8 @@ discard block |
||
| 313 | 313 | $deliveryPrice = new \Money\Sums([$this->delivery->currency_id => $this->delivery->max_cart_price]); |
| 314 | 314 | if ($this->delivery->max_cart_price && $sums->greater($deliveryPrice) || $sums->equal($deliveryPrice)) { |
| 315 | 315 | $sum->sums = [$this->delivery->currency_id => 0]; |
| 316 | - } else if ($this->delivery->prices) { |
|
| 316 | + } |
|
| 317 | + else if ($this->delivery->prices) { |
|
| 317 | 318 | foreach ($this->delivery->prices(['order' => ['cart_price', 'asc']]) as $delPrice) { |
| 318 | 319 | $deliveryPrice = new \Money\Sums([$delPrice->currency_id => $delPrice->cart_price]); |
| 319 | 320 | if ($sums->greater($deliveryPrice) || $sums->equal($deliveryPrice)) { |
@@ -323,7 +324,8 @@ discard block |
||
| 323 | 324 | if (!$sum->sums) { |
| 324 | 325 | $sum->sums = [$this->delivery->currency_id => $this->delivery->price]; |
| 325 | 326 | } |
| 326 | - } else { |
|
| 327 | + } |
|
| 328 | + else { |
|
| 327 | 329 | $sum->sums = [$this->delivery->currency_id => $this->delivery->price]; |
| 328 | 330 | } |
| 329 | 331 | } |
@@ -234,7 +234,8 @@ discard block |
||
| 234 | 234 | if ($option->item_option_searchable && $option->value) { |
| 235 | 235 | if ($option->item_option_type != 'select') { |
| 236 | 236 | $this->search_index .= $option->value . ' '; |
| 237 | - } elseif (!empty($option->option->items[$option->value])) { |
|
| 237 | + } |
|
| 238 | + elseif (!empty($option->option->items[$option->value])) { |
|
| 238 | 239 | $option->option->items[$option->value]->value . ' '; |
| 239 | 240 | } |
| 240 | 241 | } |
@@ -247,7 +248,8 @@ discard block |
||
| 247 | 248 | if ($option->item_offer_option_searchable && $option->value) { |
| 248 | 249 | if ($option->item_offer_option_type != 'select') { |
| 249 | 250 | $this->search_index .= $option->value . ' '; |
| 250 | - } elseif (!empty($option->option->items[$option->value])) { |
|
| 251 | + } |
|
| 252 | + elseif (!empty($option->option->items[$option->value])) { |
|
| 251 | 253 | $option->option->items[$option->value]->value . ' '; |
| 252 | 254 | } |
| 253 | 255 | } |
@@ -305,7 +307,8 @@ discard block |
||
| 305 | 307 | foreach ($offers[0]->prices as $price) { |
| 306 | 308 | if (!$price->type) { |
| 307 | 309 | $curPrice = $price; |
| 308 | - } elseif ( |
|
| 310 | + } |
|
| 311 | + elseif ( |
|
| 309 | 312 | (!$price->type->roles && !$curPrice) || |
| 310 | 313 | ($price->type->roles && !$curPrice && strpos($price->type->roles, "|" . \Users\User::$cur->role_id . "|") !== false) |
| 311 | 314 | ) { |
@@ -94,7 +94,8 @@ |
||
| 94 | 94 | public function value($default = '') { |
| 95 | 95 | if ($this->option->type != 'select') { |
| 96 | 96 | return $this->value; |
| 97 | - } elseif ($this->optionItem) { |
|
| 97 | + } |
|
| 98 | + elseif ($this->optionItem) { |
|
| 98 | 99 | return $this->optionItem->value; |
| 99 | 100 | } |
| 100 | 101 | return $default; |
@@ -89,7 +89,8 @@ |
||
| 89 | 89 | if ($warehouse) { |
| 90 | 90 | $warehouse->count +=(float) $count; |
| 91 | 91 | $warehouse->save(); |
| 92 | - } else { |
|
| 92 | + } |
|
| 93 | + else { |
|
| 93 | 94 | $warehouse = Offer\Warehouse::get([['item_offer_id', $this->id]]); |
| 94 | 95 | if ($warehouse) { |
| 95 | 96 | $warehouse->count +=(float) $count; |