injitools / cms-Inji

system/modules/Ecommerce/widgets/cart/row.php

Indentation +6 added lines, -6 removed lines

@@ -14,12 +14,12 @@
     </td>
     <td class="text-left">
       <?php
-      if (!empty($cartItem->item->options['7fc7a4d1-b26a-11e4-9490-80c16e818121']) && $cartItem->item->options['7fc7a4d1-b26a-11e4-9490-80c16e818121']->cip_value) {
-          echo '<div style="min-width:200px;">';
-          $price = $cartItem->price->price;
-          $max = $cartItem->price->offer->warehouseCount((!empty($_SESSION['cart']['cart_id']) ? $_SESSION['cart']['cart_id'] : 0)) * 1000;
-          $step = preg_replace('![^0-9]!', '', $cartItem->item->options['7fc7a4d1-b26a-11e4-9490-80c16e818121']->cip_value);
-          ?>
+        if (!empty($cartItem->item->options['7fc7a4d1-b26a-11e4-9490-80c16e818121']) && $cartItem->item->options['7fc7a4d1-b26a-11e4-9490-80c16e818121']->cip_value) {
+            echo '<div style="min-width:200px;">';
+            $price = $cartItem->price->price;
+            $max = $cartItem->price->offer->warehouseCount((!empty($_SESSION['cart']['cart_id']) ? $_SESSION['cart']['cart_id'] : 0)) * 1000;
+            $step = preg_replace('![^0-9]!', '', $cartItem->item->options['7fc7a4d1-b26a-11e4-9490-80c16e818121']->cip_value);
+            ?>
             Примерный вес
             <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; ?>" />
             <?php

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
             <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; ?>" />
             <?php
             echo '</div>';
-        } else {
+        }
+        else {
             ?>
             <div class="input-group">
                 <span class="input-group-btn">

system/modules/Ecommerce/widgets/cart/delivery.php

Indentation +18 added lines, -18 removed lines

@@ -2,24 +2,24 @@
     <div class="col-md-4">
         <ul class="nav nav-pills nav-stacked">
           <?php
-          $hiddenId = Tools::randomString();
-          foreach ($deliverys as $delivery) {
-              if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || ($cart->delivery && $delivery->id == $cart->delivery->id)) {
-                  $checked = 'checked';
-              } else {
-                  $checked = '';
-              }
-              echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
-              echo $delivery->name;
-              echo '</a></li>';
-          }
-          $form->input('hidden', "delivery", '', [
-              'value' => $cart->delivery_id,
-              'attributes' => [
-                  'id' => $hiddenId
-              ],
-          ]);
-          ?>
+            $hiddenId = Tools::randomString();
+            foreach ($deliverys as $delivery) {
+                if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || ($cart->delivery && $delivery->id == $cart->delivery->id)) {
+                    $checked = 'checked';
+                } else {
+                    $checked = '';
+                }
+                echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
+                echo $delivery->name;
+                echo '</a></li>';
+            }
+            $form->input('hidden', "delivery", '', [
+                'value' => $cart->delivery_id,
+                'attributes' => [
+                    'id' => $hiddenId
+                ],
+            ]);
+            ?>
         </ul>
     </div>
     <div class="col-md-8">

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
         if ($cart->delivery) {
             echo "<h4>Информация о доставке</h4>";
             if ($cart->delivery->price_text || $cart->delivery->price) {
-                echo "<div>Стоимость доставки: <b>" . ($cart->delivery->price_text ? $cart->delivery->price_text : ( $cart->delivery->price . ' ' . ($cart->delivery->currency ? $cart->delivery->currency->acronym() : 'руб.') )) . '</b></div>';
+                echo "<div>Стоимость доставки: <b>" . ($cart->delivery->price_text ? $cart->delivery->price_text : ($cart->delivery->price . ' ' . ($cart->delivery->currency ? $cart->delivery->currency->acronym() : 'руб.'))) . '</b></div>';
             }
             if ((float) $cart->delivery->max_cart_price) {
                 echo '<div>При заказе товаров на сумму от ' . $cart->delivery->max_cart_price . ' руб - бесплатно</div>';

Braces +6 added lines, -3 removed lines

@@ -6,7 +6,8 @@ 
           foreach ($deliverys as $delivery) {
               if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || ($cart->delivery && $delivery->id == $cart->delivery->id)) {
                   $checked = 'checked';
-              } else {
+              }
+              else {
                   $checked = '';
               }
               echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
@@ -43,7 +44,8 @@ 
                             $options['value'] = $key;
                             $form->input($field->type, "deliveryFields[{$field->id}]", $value, $options);
                         }
-                    } else {
+                    }
+                    else {
                         if ($field->type == 'select') {
                             $options['values'] = $field->fieldItems(['forSelect' => true]);
                         }
@@ -51,7 +53,8 @@ 
                     }
                 }
             }
-        } else {
+        }
+        else {
             echo "<h4>Выберите способ доставки</h4>";
         }
         ?>

system/modules/Ecommerce/models/Cart/Item.php

Braces +8 added lines, -4 removed lines

@@ -17,14 +17,16 @@ 
         if (!$this->id) {
             $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]);
             $event->save();
-        } else {
+        }
+        else {
             $cur = Item::get($this->id);
             if ($cur->item_id != $this->item_id) {
                 $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]);
                 $event->save();
                 $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]);
                 $event->save();
-            } else {
+            }
+            else {
                 if ($cur->item_offer_price_id != $this->item_offer_price_id) {
                     $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]);
                     $event->save();
@@ -56,14 +58,16 @@ 
             if ($block) {
                 $block->count = $this->count;
                 $block->save();
-            } else {
+            }
+            else {
                 $block = new \Ecommerce\Warehouse\Block();
                 $block->item_offer_id = $this->price->item_offer_id;
                 $block->cart_id = $this->cart_id;
                 $block->count = $this->count;
                 $block->save();
             }
-        } elseif ($block) {
+        }
+        elseif ($block) {
             $block->delete();
         }
         $this->cart->checkStage();

system/modules/Ecommerce/models/Cart.php

Braces +4 added lines, -2 removed lines

@@ -313,7 +313,8 @@ 
             $deliveryPrice = new \Money\Sums([$this->delivery->currency_id => $this->delivery->max_cart_price]);
             if ($this->delivery->max_cart_price && $sums->greater($deliveryPrice) || $sums->equal($deliveryPrice)) {
                 $sum->sums = [$this->delivery->currency_id => 0];
-            } else if ($this->delivery->prices) {
+            }
+            else if ($this->delivery->prices) {
                 foreach ($this->delivery->prices(['order' => ['cart_price', 'asc']]) as $delPrice) {
                     $deliveryPrice = new \Money\Sums([$delPrice->currency_id => $delPrice->cart_price]);
                     if ($sums->greater($deliveryPrice) || $sums->equal($deliveryPrice)) {
@@ -323,7 +324,8 @@ 
                 if (!$sum->sums) {
                     $sum->sums = [$this->delivery->currency_id => $this->delivery->price];
                 }
-            } else {
+            }
+            else {
                 $sum->sums = [$this->delivery->currency_id => $this->delivery->price];
             }
         }

system/modules/Ecommerce/models/Item.php

Braces +6 added lines, -3 removed lines

@@ -234,7 +234,8 @@ 
                     if ($option->item_option_searchable && $option->value) {
                         if ($option->item_option_type != 'select') {
                             $this->search_index .= $option->value . ' ';
-                        } elseif (!empty($option->option->items[$option->value])) {
+                        }
+                        elseif (!empty($option->option->items[$option->value])) {
                             $option->option->items[$option->value]->value . ' ';
                         }
                     }
@@ -247,7 +248,8 @@ 
                             if ($option->item_offer_option_searchable && $option->value) {
                                 if ($option->item_offer_option_type != 'select') {
                                     $this->search_index .= $option->value . ' ';
-                                } elseif (!empty($option->option->items[$option->value])) {
+                                }
+                                elseif (!empty($option->option->items[$option->value])) {
                                     $option->option->items[$option->value]->value . ' ';
                                 }
                             }
@@ -305,7 +307,8 @@ 
         foreach ($offers[0]->prices as $price) {
             if (!$price->type) {
                 $curPrice = $price;
-            } elseif (
+            }
+            elseif (
                     (!$price->type->roles && !$curPrice) ||
                     ($price->type->roles && !$curPrice && strpos($price->type->roles, "|" . \Users\User::$cur->role_id . "|") !== false)
             ) {

system/modules/Ecommerce/models/Item/Offer/Param.php

Braces +2 added lines, -1 removed lines

@@ -94,7 +94,8 @@
     public function value($default = '') {
         if ($this->option->type != 'select') {
             return $this->value;
-        } elseif ($this->optionItem) {
+        }
+        elseif ($this->optionItem) {
             return $this->optionItem->value;
         }
         return $default;

system/modules/Ecommerce/models/Item/Param.php

Braces +2 added lines, -1 removed lines

@@ -94,7 +94,8 @@
     public function value($default = '') {
         if ($this->option->type != 'select') {
             return $this->value;
-        } elseif ($this->optionItem) {
+        }
+        elseif ($this->optionItem) {
             return $this->optionItem->value;
         }
         return $default;

system/modules/Ecommerce/models/Category.php

Braces +8 added lines, -4 removed lines

@@ -132,9 +132,11 @@ 
     public function resolveTemplate() {
         if ($this->template !== 'inherit') {
             return $this->template;
-        } elseif ($this->template == 'inherit' && $this->category) {
+        }
+        elseif ($this->template == 'inherit' && $this->category) {
             return $this->category->resolveTemplate(true);
-        } else {
+        }
+        else {
             return (!empty(\App::$cur->ecommerce->config['defaultCategoryTemplate']) ? \App::$cur->ecommerce->config['defaultCategoryTemplate'] : 'current');
         }
     }
@@ -142,9 +144,11 @@ 
     public function resolveViewer() {
         if ($this->viewer !== 'inherit') {
             return $this->viewer;
-        } elseif ($this->viewer == 'inherit' && $this->category) {
+        }
+        elseif ($this->viewer == 'inherit' && $this->category) {
             return $this->category->resolveViewer(true);
-        } else {
+        }
+        else {
             return (!empty(\App::$cur->ecommerce->config['defaultCategoryView']) ? \App::$cur->ecommerce->config['defaultCategoryView'] : 'itemList');
         }
     }

system/modules/Ecommerce/appControllers/content/Cart/success.php

Indentation +12 added lines, -12 removed lines

@@ -1,20 +1,20 @@
 <div class="ecommerce">
     <div class="content">
       <?php
-      $cart = Ecommerce\Cart::getList([
-                  'where' => [
-                      ['user_id', Users\User::$cur->id],
-                  ],
-                  'order' => ['complete_data', 'desc'],
-                  'limit' => 1
-      ]);
-      $cart_id = isset(array_values($cart)[0]) ? array_values($cart)[0]->id : '';
-      $prefix = isset(App::$cur->ecommerce->config['orderPrefix']) ? $config = App::$cur->ecommerce->config['orderPrefix'] : '';
-      $text = "<p>История заказа находится в <a href='/users/cabinet'>Личном кабинете</a>. Для просмотра истории, перейдите по ссылке <a href=\"/users/cabinet/ecommerceOrdersHistory\">История заказов</a>.</p>
+        $cart = Ecommerce\Cart::getList([
+                    'where' => [
+                        ['user_id', Users\User::$cur->id],
+                    ],
+                    'order' => ['complete_data', 'desc'],
+                    'limit' => 1
+        ]);
+        $cart_id = isset(array_values($cart)[0]) ? array_values($cart)[0]->id : '';
+        $prefix = isset(App::$cur->ecommerce->config['orderPrefix']) ? $config = App::$cur->ecommerce->config['orderPrefix'] : '';
+        $text = "<p>История заказа находится в <a href='/users/cabinet'>Личном кабинете</a>. Для просмотра истории, перейдите по ссылке <a href=\"/users/cabinet/ecommerceOrdersHistory\">История заказов</a>.</p>
              <p>Если у Вас возникли вопросы, пожалуйста <a href='/materials/contacts'>свяжитесь с нами</a>.</p>";
 
-      if (isset(array_values($cart)[0])) {
-          ?>
+        if (isset(array_values($cart)[0])) {
+            ?>
             <h1 class="heading-title">Ваш заказ номер <?= $prefix; ?><?= $cart_id; ?> принят!</h1>
             <p>Ваш заказ принят!</p>
             <?= $text ?>

Braces +2 added lines, -1 removed lines

@@ -20,7 +20,8 @@
             <?= $text ?>
             <p>Спасибо за покупки в нашем интернет-магазине!</p>
             <?php
-        } else {
+        }
+        else {
             ?>
             <h1 class="heading-title">У вас нет недавних заказов</h1>
             <p>У вас нет недавних заказов</p>