injitools / cms-Inji

system/Inji/Model.php

Braces +39 added lines, -30 removed lines

@@ -718,17 +718,21 @@ 
         if (!$query) {
             return [];
         }
-        if (!empty($options['where']))
-            $query->where($options['where']);
+        if (!empty($options['where'])) {
+                    $query->where($options['where']);
+        }
         if (!empty($options['group'])) {
             $query->group($options['group']);
         }
-        if (!empty($options['order']))
-            $query->order($options['order']);
-        if (!empty($options['join']))
-            $query->join($options['join']);
-        if (!empty($options['distinct']))
-            $query->distinct = $options['distinct'];
+        if (!empty($options['order'])) {
+                    $query->order($options['order']);
+        }
+        if (!empty($options['join'])) {
+                    $query->join($options['join']);
+        }
+        if (!empty($options['distinct'])) {
+                    $query->distinct = $options['distinct'];
+        }
 
         foreach (static::$relJoins as $join) {
             $query->join($join[0], $join[1]);
@@ -754,14 +758,14 @@ 
         }
         static::$needJoin = [];
 
-        if (!empty($options['limit']))
-            $limit = (int) $options['limit'];
-        else {
+        if (!empty($options['limit'])) {
+                    $limit = (int) $options['limit'];
+        } else {
             $limit = 0;
         }
-        if (!empty($options['start']))
-            $start = (int) $options['start'];
-        else {
+        if (!empty($options['start'])) {
+                    $start = (int) $options['start'];
+        } else {
             $start = 0;
         }
         if ($limit || $start) {
@@ -1020,21 +1024,23 @@ 
         if (!empty($options['where'])) {
             static::fixPrefix($options['where'], 'first');
         }
-        if (!empty($options['where']))
-            $query->where($options['where']);
-        if (!empty($options['join']))
-            $query->join($options['join']);
+        if (!empty($options['where'])) {
+                    $query->where($options['where']);
+        }
+        if (!empty($options['join'])) {
+                    $query->join($options['join']);
+        }
         if (!empty($options['order'])) {
             $query->order($options['order']);
         }
-        if (!empty($options['limit']))
-            $limit = (int) $options['limit'];
-        else {
+        if (!empty($options['limit'])) {
+                    $limit = (int) $options['limit'];
+        } else {
             $limit = 0;
         }
-        if (!empty($options['start']))
-            $start = (int) $options['start'];
-        else {
+        if (!empty($options['start'])) {
+                    $start = (int) $options['start'];
+        } else {
             $start = 0;
         }
         if ($limit || $start) {
@@ -1112,8 +1118,9 @@ 
 
         $values = [];
         foreach ($cols as $col => $param) {
-            if (isset($params[$col]))
-                $values[$col] = $params[$col];
+            if (isset($params[$col])) {
+                            $values[$col] = $params[$col];
+            }
         }
         if (empty($values)) {
             return false;
@@ -1296,8 +1303,9 @@ 
         $values = [];
 
         foreach ($this->cols() as $col => $param) {
-            if (isset($this->_params[$col]))
-                $values[$col] = $this->_params[$col];
+            if (isset($this->_params[$col])) {
+                            $values[$col] = $this->_params[$col];
+            }
         }
         if (empty($values) && empty($options['empty'])) {
             return false;
@@ -1457,8 +1465,9 @@ 
     {
 
         foreach (static::relations() as $relName => $rel) {
-            if ($rel['col'] == $col)
-                return $relName;
+            if ($rel['col'] == $col) {
+                            return $relName;
+            }
         }
         return NULL;
     }

system/modules/Money/objects/Sums.php

Spacing +7 added lines, -7 removed lines

@@ -61,21 +61,21 @@
             if ($first) {
                 $first = false;
             } else {
-                $string.= '<br />';
+                $string .= '<br />';
             }
-            $string.= '<span style="white-space:nowrap;">';
-            $string.= number_format($sum, 2, '.', ' ');
+            $string .= '<span style="white-space:nowrap;">';
+            $string .= number_format($sum, 2, '.', ' ');
             if (\App::$cur->money) {
                 $currency = \Money\Currency::get($currency_id);
                 if ($currency) {
-                    $string.= ' ' . $currency->acronym();
+                    $string .= ' ' . $currency->acronym();
                 } else {
-                    $string.= ' руб.';
+                    $string .= ' руб.';
                 }
             } else {
-                $string.= ' руб.';
+                $string .= ' руб.';
             }
-            $string.= '</span>';
+            $string .= '</span>';
         }
         return $string;
     }

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

Indentation +37 added lines, -37 removed lines

@@ -3,13 +3,13 @@ 
     <div class="cart-order_page">
       <h2>Быстрое оформление заказа</h2>
       <?php
-      if (!$cart || !$cart->cartItems)
-          echo "<h1>Ваша корзина пуста</h1>";
-      else {
-          $form = new Ui\Form;
-          $form->action = "/ecommerce/cart";
-          $form->begin();
-          ?>
+        if (!$cart || !$cart->cartItems)
+            echo "<h1>Ваша корзина пуста</h1>";
+        else {
+            $form = new Ui\Form;
+            $form->action = "/ecommerce/cart";
+            $form->begin();
+            ?>
           <div class="row">
             <div class="col-sm-4">
               <div class="order_page-info">
@@ -86,14 +86,14 @@ 
                     </thead>
                     <tbody>
                       <?php
-                      if (class_exists('Money\Currency')) {
-                          $defaultCurrency = Money\Currency::get(\App::$cur->ecommerce->config['defaultCurrency']);
-                      } else {
-                          $defaultCurrency = '';
-                      }
-                      foreach ($cart->cartItems as $cartItem) {
-                          $path = $cartItem->item->image ? $cartItem->item->image->path : '/static/system/images/no-image.png';
-                          ?>
+                        if (class_exists('Money\Currency')) {
+                            $defaultCurrency = Money\Currency::get(\App::$cur->ecommerce->config['defaultCurrency']);
+                        } else {
+                            $defaultCurrency = '';
+                        }
+                        foreach ($cart->cartItems as $cartItem) {
+                            $path = $cartItem->item->image ? $cartItem->item->image->path : '/static/system/images/no-image.png';
+                            ?>
                           <tr class="cart_item_id<?= $cartItem->id; ?> item" data-cart_item_id = '<?php echo $cartItem->id; ?>' data-priceam = '<?php echo $cartItem->price->price; ?>' data-item_offer_price_id = '<?php echo $cartItem->price->id; ?>'>
                             <td class="text-center image">                            
                               <a href="/ecommerce/view/<?php echo $cartItem->item->id; ?>">
@@ -119,41 +119,41 @@ 
                             </td>
                           </tr>
                           <?php
-                      }
-                      ?>
+                        }
+                        ?>
                     </tbody>
                     <tfoot>
                       <?php
-                      $colspan = $cart->hasDiscount() ? 5 : 4;
-                      ?>
+                        $colspan = $cart->hasDiscount() ? 5 : 4;
+                        ?>
                       <tr class="order_page-sum">
                         <td colspan="<?= $colspan; ?>" class="text-right">Сумма:</td>
                         <td colspan="2" class="text-right"><?= $cart->itemsSum(); ?></td>
                       </tr>
                       <?php
-                      if ($cart->hasDiscount()) {
-                          ?>
+                        if ($cart->hasDiscount()) {
+                            ?>
                           <tr class="order_page-discountSum">
                             <td colspan="<?= $colspan; ?>" class="text-right">Скидка:</td>
                             <td colspan="2" class="text-right"><?= $cart->discountSum(); ?></td>
                           </tr>
                           <?php
-                      }
-                      if ($cart->delivery) {
-                          ?>
+                        }
+                        if ($cart->delivery) {
+                            ?>
                           <tr class="order_page-deliverySum">
                             <td colspan="<?= $colspan; ?>" class="text-right"><?= $cart->delivery->name; ?>:</td>
                             <td colspan="2" class="text-right"><?php
-                              if ($cart->delivery && $cart->delivery->price_text) {
-                                  echo $cart->delivery->price_text;
-                              } else {
-                                  echo $cart->deliverySum();
-                              }
-                              ?></td>
+                                if ($cart->delivery && $cart->delivery->price_text) {
+                                    echo $cart->delivery->price_text;
+                                } else {
+                                    echo $cart->deliverySum();
+                                }
+                                ?></td>
                           </tr>
                           <?php
-                      }
-                      ?>
+                        }
+                        ?>
                       <tr class="order_page-total">
                         <td colspan="<?= $colspan; ?>" class="text-right">Итого:</td>
                         <td colspan="2" class="text-right"><?= $cart->finalSum(); ?></td>
@@ -165,8 +165,8 @@ 
                 <div class="clearfix"></div>
                 <div class="order_page-finish">
                   <?php
-                  $form->input('textarea', 'comment', 'Вы можете добавить комментарий к своему заказу', ['value' => (!empty($_POST['comment'])) ? $_POST['comment'] : '']);
-                  ?>
+                    $form->input('textarea', 'comment', 'Вы можете добавить комментарий к своему заказу', ['value' => (!empty($_POST['comment'])) ? $_POST['comment'] : '']);
+                    ?>
                   <div class="order_page-orderBtn">
                     <button name ="action" value ="order" data-loading-text="Подождите.." class="btn btn-primary">Подтверждение заказа</button>
                   </div>
@@ -175,9 +175,9 @@ 
             </div>
           </div>
           <?php
-          $form->end(false);
-      }
-      ?>
+            $form->end(false);
+        }
+        ?>
     </div>
   </div>
 </div>
\ No newline at end of file

system/modules/Ecommerce/models/Cart.php

Spacing +1 added lines, -1 removed lines

@@ -282,7 +282,7 @@
                 $groups[$stage->group] = $stage;
             }
         }
-        $discounts = Cart\Discount::getList(['where'=>['cart_id',$this->id]]);
+        $discounts = Cart\Discount::getList(['where'=>['cart_id', $this->id]]);
         foreach ($discounts as $discount) {
             if (!isset($groups[$discount->group]) && $discount->auto) {
                 $discount->delete();

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

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         'manager' => [
             'map' => [
                 ['name', 'code'],
-                ['delivery', 'electronic','discount']
+                ['delivery', 'electronic', 'discount']
             ]
         ]
     ];

system/modules/Ecommerce/widgets/cart/payType.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 ($payTypes as $payType) {
-          if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || ($cart->payType && $payType->id == $cart->payType->id)) {
-              $checked = 'checked';
-          } else {
-              $checked = '';
-          }
-          echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
-          echo $payType->name;
-          echo '</a></li>';
-      }
-      $form->input('hidden', "payType", '', [
-          'value' => $cart->paytype_id,
-          'attributes' => [
-              'id' => $hiddenId
-          ],
-      ]);
-      ?>
+        $hiddenId = Tools::randomString();
+        foreach ($payTypes as $payType) {
+            if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || ($cart->payType && $payType->id == $cart->payType->id)) {
+                $checked = 'checked';
+            } else {
+                $checked = '';
+            }
+            echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
+            echo $payType->name;
+            echo '</a></li>';
+        }
+        $form->input('hidden', "payType", '', [
+            'value' => $cart->paytype_id,
+            'attributes' => [
+                'id' => $hiddenId
+            ],
+        ]);
+        ?>
     </ul>
   </div>
   <div class="col-md-8">

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 +1 added lines, -2 removed lines

@@ -39,8 +39,7 @@
                 $form->input($field->type, "deliveryFields[{$field->id}]", $field->name, ['required' => $field->required]);

             }

         }

-    }

-    else {

+    } else {

         echo "<h4>Выберите способ доставки</h4>";

     }

     ?>