injitools / cms-Inji

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

Braces +3 added lines, -3 removed lines

@@ -3,9 +3,9 @@
     <div class="cart-order_page">
       <h2>Быстрое оформление заказа</h2>
       <?php
-      if (!$cart || !$cart->cartItems)
-          echo "<h1>Ваша корзина пуста</h1>";
-      else {
+      if (!$cart || !$cart->cartItems) {
+                echo "<h1>Ваша корзина пуста</h1>";
+      } else {
           $sums = [];
           $cartDelivery = $cart->delivery;
           $deliveryPrice = 0;

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

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
                               </a>
                             </td>
                             <td class="text-left name">
-                              <a href="/ecommerce/view/<?= $cartItem->item->id; ?>"><?= $cartItem->item->name() . ($cartItem->price->offer->name && $cartItem->price->offer->name != $cartItem->item->name() ? ' (' . $cartItem->price->offer->name . ')' : ''); ?></a>
+                              <a href="/ecommerce/view/<?= $cartItem->item->id; ?>"><?= $cartItem->item->name().($cartItem->price->offer->name && $cartItem->price->offer->name != $cartItem->item->name() ? ' ('.$cartItem->price->offer->name.')' : ''); ?></a>
                             </td>
                             <td class="text-left quantity">
                               <?php $this->widget('Ecommerce\cart/ranger', compact('form', 'cart', 'cartItem')); ?>

system/modules/Materials/appControllers/content/category.php

Indentation +6 added lines, -6 removed lines

@@ -2,10 +2,10 @@ 
   <div class="row">
     <div class="col-md-3">
       <?php
-      \Ui\Tree::ul($category->getRoot(), 0, function($category) {
-          echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
-      });
-      ?>
+        \Ui\Tree::ul($category->getRoot(), 0, function($category) {
+            echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
+        });
+        ?>
     </div>
     <div class="col-md-9">
       <div class="content">
@@ -34,8 +34,8 @@ 
             ?>
           </div>
           <?php
-          $pages->draw();
-          ?>
+            $pages->draw();
+            ?>
         </div>
       </div>
     </div>

system/modules/Materials/appControllers/content/materialWithCategorys.php

Indentation +5 added lines, -5 removed lines

@@ -2,11 +2,11 @@
   <div class="row">
     <div class="col-md-3">
       <?php
-      $category = $material->category;
-      \Ui\Tree::ul($category->getRoot(), 0, function($category) {
-          echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
-      });
-      ?>
+        $category = $material->category;
+        \Ui\Tree::ul($category->getRoot(), 0, function($category) {
+            echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
+        });
+        ?>
     </div>
     <div class="col-md-9">
       <div class="content">

system/modules/Menu/widgets/menu.php

Braces +10 added lines, -8 removed lines

@@ -9,18 +9,20 @@
 $menu = \Menu\Menu::get($code, 'code');
 if ($menu) {
     foreach ($menu->items(['where' => ['parent_id', 0], 'order' => ['weight', 'asc']]) as $item) {
-        if (urldecode($_SERVER['REQUEST_URI']) == $item->href)
-            $active = ' class = "active" ';
-        else
-            $active = '';
+        if (urldecode($_SERVER['REQUEST_URI']) == $item->href) {
+                    $active = ' class = "active" ';
+        } else {
+                    $active = '';
+        }
         echo "<li {$active}><a href = '{$item->href}'>{$item->name}</a>";
         if ($item->childs(['order' => ['weight', 'asc']])) {
             echo "<ul>";
             foreach ($item->childs as $item) {
-                if (urldecode($_SERVER['REQUEST_URI']) == $item->href)
-                    $active = ' class = "active" ';
-                else
-                    $active = '';
+                if (urldecode($_SERVER['REQUEST_URI']) == $item->href) {
+                                    $active = ' class = "active" ';
+                } else {
+                                    $active = '';
+                }
                 echo "<li {$active}><a href = '{$item->href}'>{$item->name}</a>";
             }
             echo "</ul>";

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">

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
           } else {
               $checked = '';
           }
-          echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
+          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>';
       }

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">

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>";

     }

     ?>

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
           } else {

               $checked = '';

           }

-          echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';

+          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>';

       }

@@ -27,10 +27,10 @@ 
     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>';

+            echo '<div>При заказе товаров на сумму от '.$cart->delivery->max_cart_price.' руб - бесплатно</div>';

         }

         echo $cart->delivery->info;

         if ($cart->delivery->fields) {

system/modules/Ecommerce/widgets/filters.php

Indentation +25 added lines, -25 removed lines

@@ -19,22 +19,22 @@ 
         <div class="filter">  
           <label><?= $option->name; ?></label>
           <?php
-          switch ($option->type) {
-              case 'radio':
+            switch ($option->type) {
+                case 'radio':
                   foreach ($option->items as $item) {
-                      $this->widget('Ui\Form/' . $option->type, [
-                          'label' => $item->name,
-                          'name' => "filters[options][{$option->id}]",
-                          !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : false,
-                          'options' => [
-                              'value' => $item->id,
-                          ]
-                      ]);
-                  }
-                  break;
-              case 'select':
+                        $this->widget('Ui\Form/' . $option->type, [
+                            'label' => $item->name,
+                            'name' => "filters[options][{$option->id}]",
+                            !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : false,
+                            'options' => [
+                                'value' => $item->id,
+                            ]
+                        ]);
+                    }
+                    break;
+                case 'select':
                   foreach ($option->items as $item) {
-                      ?>
+                        ?>
                       <div class="radio">
                         <label>
                           <input type="radio" name = 'filters[options][<?= $option->id; ?>]' value ="<?= $item->id; ?>" <?= !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : ''; ?>>
@@ -42,18 +42,18 @@ 
                         </label>
                       </div>
                       <?php
-                  }
-                  break;
-              default:
+                    }
+                    break;
+                default:
                   $this->widget('Ui\Form/' . $option->type, [
-                      'label' => $option->name,
-                      'name' => "filters[options][{$option->id}]",
-                      'options' => [
-                          'value' => !empty($_GET['filters']['options'][$option->id]) ? $_GET['filters']['options'][$option->id] : '',
-                      ]
-                  ]);
-          }
-          ?>
+                        'label' => $option->name,
+                        'name' => "filters[options][{$option->id}]",
+                        'options' => [
+                            'value' => !empty($_GET['filters']['options'][$option->id]) ? $_GET['filters']['options'][$option->id] : '',
+                        ]
+                    ]);
+            }
+            ?>
         </div>
         <?php
     }

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
           switch ($option->type) {
               case 'radio':
                   foreach ($option->items as $item) {
-                      $this->widget('Ui\Form/' . $option->type, [
+                      $this->widget('Ui\Form/'.$option->type, [
                           'label' => $item->name,
                           'name' => "filters[options][{$option->id}]",
                           !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : false,
@@ -45,7 +45,7 @@ 
                   }
                   break;
               default:
-                  $this->widget('Ui\Form/' . $option->type, [
+                  $this->widget('Ui\Form/'.$option->type, [
                       'label' => $option->name,
                       'name' => "filters[options][{$option->id}]",
                       'options' => [

system/modules/Users/appControllers/content/login.php

Indentation +9 added lines, -9 removed lines

@@ -5,15 +5,15 @@
         <h3>Вход</h3>
         <div class="form-group">
           <?php
-          $socials = Users\Social::getList(['where' => ['active', 1]]);
-          if ($socials) {
-              echo 'Войти через: ';
-              foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
-                  $text = $social->image ? '<img src ="' . Statics::file($social->image->path, '25x25', 'q') . '">' : $social->name();
-                  echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
-              }
-          }
-          ?>
+            $socials = Users\Social::getList(['where' => ['active', 1]]);
+            if ($socials) {
+                echo 'Войти через: ';
+                foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
+                    $text = $social->image ? '<img src ="' . Statics::file($social->image->path, '25x25', 'q') . '">' : $social->name();
+                    echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
+                }
+            }
+            ?>
         </div>
         <form action = '' method = 'POST' >
           <div class ='row'>

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
           if ($socials) {
               echo 'Войти через: ';
               foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
-                  $text = $social->image ? '<img src ="' . Statics::file($social->image->path, '25x25', 'q') . '">' : $social->name();
+                  $text = $social->image ? '<img src ="'.Statics::file($social->image->path, '25x25', 'q').'">' : $social->name();
                   echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
               }
           }