injitools / cms-Inji

system/modules/Files/install_script.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function($step = NULL, $params = []) {
+return function($step = null, $params = []) {
     $options = ['max_height' => 1200, 'max_width' => 1200];
     $types = [
         [

system/modules/Ecommerce/appAdminControllers/content/configure.php

Indentation +17 added lines, -17 removed lines

@@ -15,23 +15,23 @@
 <div class="tab-content">
     <div role="tabpanel" class="tab-pane fade in active" id="home">
       <?php
-      $form = new Ui\Form();
-      $form->begin();
-      $form->input('checkbox', 'config[view_empty_warehouse]', 'Показывать отсутствующие товары', ['value' => App::$cur->ecommerce->config['view_empty_warehouse']]);
-      $form->input('checkbox', 'config[view_empty_image]', 'Показывать товары без изображения', ['value' => App::$cur->ecommerce->config['view_empty_image']]);
-      $form->input('checkbox', 'config[sell_empty_warehouse]', 'Продавать отсутствующие товары', ['value' => App::$cur->ecommerce->config['sell_empty_warehouse']]);
-      $form->input('checkbox', 'config[sell_over_warehouse]', 'Продавать сверх остатоков на складе', ['value' => App::$cur->ecommerce->config['sell_over_warehouse']]);
-      $form->input('checkbox', 'config[show_zero_price]', 'Показывать товары с нулевой ценой', ['value' => App::$cur->ecommerce->config['show_zero_price']]);
-      $form->input('checkbox', 'config[show_without_price]', 'Показывать товары без цен', ['value' => App::$cur->ecommerce->config['show_without_price']]);
-      $form->input('select', 'config[defaultCategoryView]', 'Стандартный вид категории', ['value' => App::$cur->ecommerce->config['defaultCategoryView'], 'values' => App::$cur->ecommerce->viewsCategoryList()]);
-      if (App::$cur->money) {
-          $form->input('select', 'config[defaultCurrency]', 'Валюта по умолчанию', ['value' => App::$cur->ecommerce->config['defaultCurrency'], 'values' => ['' => 'Выберите'] + \Money\Currency::getList()]);
-      }
-      $form->input('text', 'config[orderPrefix]', 'Префикс для номеров заказов', ['value' => App::$cur->ecommerce->config['orderPrefix']]);
-      $form->input('text', 'config[notify_mail]', 'E-mail оповещений о новых заказах', ['value' => App::$cur->ecommerce->config['notify_mail']]);
-      $form->input('hidden', 'config[save]', '', ['value' => 1]);
-      $form->end('Сохранить');
-      ?>
+        $form = new Ui\Form();
+        $form->begin();
+        $form->input('checkbox', 'config[view_empty_warehouse]', 'Показывать отсутствующие товары', ['value' => App::$cur->ecommerce->config['view_empty_warehouse']]);
+        $form->input('checkbox', 'config[view_empty_image]', 'Показывать товары без изображения', ['value' => App::$cur->ecommerce->config['view_empty_image']]);
+        $form->input('checkbox', 'config[sell_empty_warehouse]', 'Продавать отсутствующие товары', ['value' => App::$cur->ecommerce->config['sell_empty_warehouse']]);
+        $form->input('checkbox', 'config[sell_over_warehouse]', 'Продавать сверх остатоков на складе', ['value' => App::$cur->ecommerce->config['sell_over_warehouse']]);
+        $form->input('checkbox', 'config[show_zero_price]', 'Показывать товары с нулевой ценой', ['value' => App::$cur->ecommerce->config['show_zero_price']]);
+        $form->input('checkbox', 'config[show_without_price]', 'Показывать товары без цен', ['value' => App::$cur->ecommerce->config['show_without_price']]);
+        $form->input('select', 'config[defaultCategoryView]', 'Стандартный вид категории', ['value' => App::$cur->ecommerce->config['defaultCategoryView'], 'values' => App::$cur->ecommerce->viewsCategoryList()]);
+        if (App::$cur->money) {
+            $form->input('select', 'config[defaultCurrency]', 'Валюта по умолчанию', ['value' => App::$cur->ecommerce->config['defaultCurrency'], 'values' => ['' => 'Выберите'] + \Money\Currency::getList()]);
+        }
+        $form->input('text', 'config[orderPrefix]', 'Префикс для номеров заказов', ['value' => App::$cur->ecommerce->config['orderPrefix']]);
+        $form->input('text', 'config[notify_mail]', 'E-mail оповещений о новых заказах', ['value' => App::$cur->ecommerce->config['notify_mail']]);
+        $form->input('hidden', 'config[save]', '', ['value' => 1]);
+        $form->end('Сохранить');
+        ?>
         <h3>Обслужвание</h3>
         <a href="/admin/ecommerce/reSearchIndex" class="btn btn-primary">Обновить поисковые индексы</a>
         <h3>Уведомления в браузере</h3>

system/modules/Ecommerce/widgets/items/icons.php

Indentation +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <div class="items-icons">	
     <div class="row">	
       <?php
-      $i = 0;
-      foreach ($items as $item) {
-          ?>
+        $i = 0;
+        foreach ($items as $item) {
+            ?>
             <div class="col-xs-6 col-sm-4">		
                 <?php $this->widget('Ecommerce\items/item-icon', ['item' => $item]); ?>
             </div>

Spacing +2 added lines, -2 removed lines

@@ -9,10 +9,10 @@
             </div>
             <?php
             ++$i;
-            if (!( $i % 3)) {
+            if (!($i % 3)) {
                 echo '<div class="clearfix hidden-xs"></div>';
             }
-            if (!( $i % 2)) {
+            if (!($i % 2)) {
                 echo '<div class="clearfix visible-xs"></div>';
             }
         }

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

Indentation +66 added lines, -66 removed lines

@@ -20,81 +20,81 @@
         </thead>
         <tbody>
           <?php
-          foreach ($carts as $cart) {
-              $sums = [];
-              foreach ($cart->cartItems as $cartItem) {
-                  $currency_id = $cartItem->price && $cartItem->price->currency ? $cartItem->price->currency->id : (!empty(\App::$cur->ecommerce->config['defaultCurrency']) ? \App::$cur->ecommerce->config['defaultCurrency'] : 0);
-                  if (empty($sums[$currency_id])) {
-                      $sums[$currency_id] = $cartItem->final_price * $cartItem->count;
-                  } else {
-                      $sums[$currency_id] += $cartItem->final_price * $cartItem->count;
-                  }
-              }
-              if ($cart->delivery && $cart->delivery->price) {
-                  $currency_id = $cart->delivery->currency_id;
-                  if (empty($sums[$currency_id])) {
-                      $sums[$currency_id] = $cart->delivery->price;
-                  } else {
-                      $sums[$currency_id] += $cart->delivery->price;
-                  }
-              }
-              foreach ($cart->extras as $extra) {
-                  $currency_id = $extra->currency ? $extra->currency->id : \App::$cur->ecommerce->config['defaultCurrency'];
-                  if (empty($sums[$currency_id])) {
-                      $sums[$currency_id] = $extra->price * $extra->count;
-                  } else {
-                      $sums[$currency_id] += $extra->price * $extra->count;
-                  }
-              }
-              ?>
+            foreach ($carts as $cart) {
+                $sums = [];
+                foreach ($cart->cartItems as $cartItem) {
+                    $currency_id = $cartItem->price && $cartItem->price->currency ? $cartItem->price->currency->id : (!empty(\App::$cur->ecommerce->config['defaultCurrency']) ? \App::$cur->ecommerce->config['defaultCurrency'] : 0);
+                    if (empty($sums[$currency_id])) {
+                        $sums[$currency_id] = $cartItem->final_price * $cartItem->count;
+                    } else {
+                        $sums[$currency_id] += $cartItem->final_price * $cartItem->count;
+                    }
+                }
+                if ($cart->delivery && $cart->delivery->price) {
+                    $currency_id = $cart->delivery->currency_id;
+                    if (empty($sums[$currency_id])) {
+                        $sums[$currency_id] = $cart->delivery->price;
+                    } else {
+                        $sums[$currency_id] += $cart->delivery->price;
+                    }
+                }
+                foreach ($cart->extras as $extra) {
+                    $currency_id = $extra->currency ? $extra->currency->id : \App::$cur->ecommerce->config['defaultCurrency'];
+                    if (empty($sums[$currency_id])) {
+                        $sums[$currency_id] = $extra->price * $extra->count;
+                    } else {
+                        $sums[$currency_id] += $extra->price * $extra->count;
+                    }
+                }
+                ?>
                 <tr>
                     <td class="text-right"><?= $prefix ?><?= $cart->id; ?></td>
                     <td class="text-left"><?= $cart->status ? $cart->status->name : 'Наполняется'; ?></td>
                     <td class="text-right"><?= count($cart->cartItems); ?></td>
                     <td class="text-right"><?php
-                      if ($sums) {
-                          foreach ($sums as $currency_id => $sum) {
-                              if (!$sum) {
-                                  continue;
-                              }
-                              echo number_format($sum, 2, '.', ' ');
-                              if (App::$cur->money) {
-                                  $currency = Money\Currency::get($currency_id);
-                                  if ($currency) {
-                                      echo '&nbsp;' . $currency->acronym();
-                                  } else {
-                                      echo '&nbsp;р.';
-                                  }
-                              } else {
-                                  echo '&nbsp;р.';
-                              }
-                              echo '<br />';
-                          }
-                      }
-                      ?></td>
+                        if ($sums) {
+                            foreach ($sums as $currency_id => $sum) {
+                                if (!$sum) {
+                                    continue;
+                                }
+                                echo number_format($sum, 2, '.', ' ');
+                                if (App::$cur->money) {
+                                    $currency = Money\Currency::get($currency_id);
+                                    if ($currency) {
+                                        echo '&nbsp;' . $currency->acronym();
+                                    } else {
+                                        echo '&nbsp;р.';
+                                    }
+                                } else {
+                                    echo '&nbsp;р.';
+                                }
+                                echo '<br />';
+                            }
+                        }
+                        ?></td>
                     <td class="text-left"><?= $cart->complete_data; ?></td>
                     <td><?php
-                      if ($cart->payed) {
-                          echo 'Оплачено';
-                      } elseif (!App::$cur->money) {
-                          echo 'Не оплачено';
-                      } else {
-                          $handlers = App::$cur->ecommerce->getSnippets('payTypeHandler');
-                          $redirect = ['/ecommerce/cart/success'];
-                          if ($cart->payType && !empty($handlers[$cart->payType->handler]['handler'])) {
-                              $newRedirect = $handlers[$cart->payType->handler]['handler']($cart);
-                          }
-                          if (!empty($newRedirect[0])) {
-                              echo '<a class="btn btn-warning btn-sm" href = "' . $newRedirect[0] . '">Оплатить</a>';
-                          } else {
-                              echo 'Не оплачено';
-                          }
-                      }
-                      ?></td>
+                        if ($cart->payed) {
+                            echo 'Оплачено';
+                        } elseif (!App::$cur->money) {
+                            echo 'Не оплачено';
+                        } else {
+                            $handlers = App::$cur->ecommerce->getSnippets('payTypeHandler');
+                            $redirect = ['/ecommerce/cart/success'];
+                            if ($cart->payType && !empty($handlers[$cart->payType->handler]['handler'])) {
+                                $newRedirect = $handlers[$cart->payType->handler]['handler']($cart);
+                            }
+                            if (!empty($newRedirect[0])) {
+                                echo '<a class="btn btn-warning btn-sm" href = "' . $newRedirect[0] . '">Оплатить</a>';
+                            } else {
+                                echo 'Не оплачено';
+                            }
+                        }
+                        ?></td>
                     <td class="text-right">
                       <?php
-                      if ($cart->cart_status_id < 2) {
-                          ?>
+                        if ($cart->cart_status_id < 2) {
+                            ?>
                             <a title="Продолжить покупки" href="/ecommerce/cart/continue/<?= $cart->id; ?>" data-toggle="tooltip" title="" class="btn btn-success btn-sm"><i class="glyphicon glyphicon-chevron-right"></i></a>
                             <a title="Удалить заказ" onclick="return confirm('Вы уверены?')" href="/ecommerce/cart/delete/<?= $cart->id; ?>" data-toggle="tooltip" title="" class="btn btn-danger btn-sm"><i class="glyphicon glyphicon-trash"></i></a>
                             <?php

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/fields.php

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <fieldset>
   <?php
-  if (\Users\User::$cur->id) {
-      $userAdds = Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id]]);
-      $values = [];
-      foreach ($userAdds as $userAdd) {
-          $values[$userAdd->id] = $userAdd->values(['array' => true]);
-      }
-      if ($userAdds) {
-          $form->input('select', 'userAddsId', 'Ваши контакты', ['values' => ['' => 'Выберите'] + Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id], 'forSelect' => true])]);
-          echo '<hr />';
-      }
-      ?>
+    if (\Users\User::$cur->id) {
+        $userAdds = Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id]]);
+        $values = [];
+        foreach ($userAdds as $userAdd) {
+            $values[$userAdd->id] = $userAdd->values(['array' => true]);
+        }
+        if ($userAdds) {
+            $form->input('select', 'userAddsId', 'Ваши контакты', ['values' => ['' => 'Выберите'] + Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id], 'forSelect' => true])]);
+            echo '<hr />';
+        }
+        ?>
         <script>
             var userAddsValues = <?= json_encode($values); ?>;
             inji.onLoad(function () {

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

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

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