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

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <div class="filters">
     <form>
       <?php
-      $min = App::$cur->ecommerce->getItems(['sort' => ['price' => 'asc'], 'count' => 1, 'key' => false]);
-      $max = App::$cur->ecommerce->getItems(['sort' => ['price' => 'desc'], 'count' => 1, 'key' => false]);
-      if ($min && $min[0]->getPrice() && $max && $max[0]->getPrice()) {
-          ?>
+        $min = App::$cur->ecommerce->getItems(['sort' => ['price' => 'asc'], 'count' => 1, 'key' => false]);
+        $max = App::$cur->ecommerce->getItems(['sort' => ['price' => 'desc'], 'count' => 1, 'key' => false]);
+        if ($min && $min[0]->getPrice() && $max && $max[0]->getPrice()) {
+            ?>
             <h4>Фильтр по цене</h4>
             <div class="form-group">      
                 <div class="row">

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

Braces +16 added lines, -8 removed lines

@@ -26,7 +26,8 @@ 
                   $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 {
+                  }
+                  else {
                       $sums[$currency_id] += $cartItem->final_price * $cartItem->count;
                   }
               }
@@ -34,7 +35,8 @@ 
                   $currency_id = $cart->delivery->currency_id;
                   if (empty($sums[$currency_id])) {
                       $sums[$currency_id] = $cart->delivery->price;
-                  } else {
+                  }
+                  else {
                       $sums[$currency_id] += $cart->delivery->price;
                   }
               }
@@ -42,7 +44,8 @@ 
                   $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 {
+                  }
+                  else {
                       $sums[$currency_id] += $extra->price * $extra->count;
                   }
               }
@@ -62,10 +65,12 @@ 
                                   $currency = Money\Currency::get($currency_id);
                                   if ($currency) {
                                       echo ' ' . $currency->acronym();
-                                  } else {
+                                  }
+                                  else {
                                       echo ' р.';
                                   }
-                              } else {
+                              }
+                              else {
                                   echo ' р.';
                               }
                               echo '<br />';
@@ -76,9 +81,11 @@ 
                     <td><?php
                       if ($cart->payed) {
                           echo 'Оплачено';
-                      } elseif (!App::$cur->money) {
+                      }
+                      elseif (!App::$cur->money) {
                           echo 'Не оплачено';
-                      } else {
+                      }
+                      else {
                           $handlers = App::$cur->ecommerce->getSnippets('payTypeHandler');
                           $redirect = ['/ecommerce/cart/success'];
                           if ($cart->payType && !empty($handlers[$cart->payType->handler]['handler'])) {
@@ -86,7 +93,8 @@ 
                           }
                           if (!empty($newRedirect[0])) {
                               echo '<a class="btn btn-warning btn-sm" href = "' . $newRedirect[0] . '">Оплатить</a>';
-                          } else {
+                          }
+                          else {
                               echo 'Не оплачено';
                           }
                       }

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

Braces +4 added lines, -2 removed lines

@@ -6,7 +6,8 @@ 
           foreach ($payTypes as $payType) {
               if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || ($cart->payType && $payType->id == $cart->payType->id)) {
                   $checked = 'checked';
-              } else {
+              }
+              else {
                   $checked = '';
               }
               echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
@@ -27,7 +28,8 @@ 
         if ($cart->payType) {
             echo "<h4>Информация об оплате</h4>";
             echo $cart->payType->info;
-        } else {
+        }
+        else {
             echo "<h4>Выберите способ оплаты</h4>";
         }
         ?> 

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

Braces +4 added lines, -2 removed lines

@@ -3,7 +3,8 @@ 
 $price = $cartItem->item->getPrice();
 if (empty(App::$cur->ecommerce->config['sell_over_warehouse'])) {
     $max = $price->offer->warehouseCount((!empty($_SESSION['cart']['cart_id']) ? $_SESSION['cart']['cart_id'] : 0));
-} else {
+}
+else {
     $max = 100;
 }
 if (!empty($options[16]) && $options[16]->value) {
@@ -15,7 +16,8 @@ 
     <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; ?>" />
     <?php
     echo '</div>';
-} else {
+}
+else {
     ?>
     <div class="input-group number-spinner" >
         <span class="input-group-btn">

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 @@
         $code .= '$' . $this->name . ' = ';
         if (is_array($this->value)) {
             $code .= \CodeGenerator::genArray($this->value);
-        } else {
+        }
+        else {
             $code .= '"' . str_replace('"', '\"', $this->value) . '";';
         }
         return $code;