Completed
Push — master ( ee3756...724dac )
by Alexey
04:58
created
system/modules/Ui/objects/Tree.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -23,17 +23,17 @@
 block discarded – undo
23 23
         ?>
24 24
         <ul class="treeview" data-col='tree_path'>
25 25
           <?php
26
-          if (is_string($objectRoot)) {
27
-              $items = $objectRoot::getList(['where' => ['parent_id', 0]]);
28
-          } else {
29
-              $class = get_class($objectRoot);
30
-              $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()]]);
31
-          }
32
-          $count += count($items);
33
-          foreach ($items as $objectChild) {
34
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
35
-          }
36
-          ?>
26
+            if (is_string($objectRoot)) {
27
+                $items = $objectRoot::getList(['where' => ['parent_id', 0]]);
28
+            } else {
29
+                $class = get_class($objectRoot);
30
+                $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()]]);
31
+            }
32
+            $count += count($items);
33
+            foreach ($items as $objectChild) {
34
+                $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
35
+            }
36
+            ?>
37 37
         </ul>
38 38
         <?php
39 39
         return $count;
Please login to merge, or discard this patch.
system/modules/Ecommerce/widgets/cart/fields.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@  discard block
 block discarded – undo
1 1
 <fieldset>
2 2
   <?php
3
-  if (\Users\User::$cur->id) {
4
-      $userAdds = Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id]]);
5
-      $values = [];
6
-      foreach ($userAdds as $userAdd) {
7
-          $values[$userAdd->id] = $userAdd->values(['array' => true]);
8
-      }
9
-      if ($userAdds) {
10
-          $form->input('select', 'userAddsId', 'Ваши контакты', ['values' => ['' => 'Выберите'] + Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id], 'forSelect' => true])]);
11
-          echo '<hr />';
12
-      }
13
-      ?>
3
+    if (\Users\User::$cur->id) {
4
+        $userAdds = Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id]]);
5
+        $values = [];
6
+        foreach ($userAdds as $userAdd) {
7
+            $values[$userAdd->id] = $userAdd->values(['array' => true]);
8
+        }
9
+        if ($userAdds) {
10
+            $form->input('select', 'userAddsId', 'Ваши контакты', ['values' => ['' => 'Выберите'] + Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id], 'forSelect' => true])]);
11
+            echo '<hr />';
12
+        }
13
+        ?>
14 14
       <script>
15 15
           var userAddsValues = <?= json_encode($values); ?>;
16 16
           inji.onLoad(function () {
@@ -24,9 +24,9 @@  discard block
 block discarded – undo
24 24
           })
25 25
       </script>
26 26
       <?php
27
-  }
28
-  foreach (Ecommerce\UserAdds\Field::getList(['order' => ['weight', 'asc']]) as $field) {
29
-      $form->input($field->type, "userAdds[fields][{$field->id}]", $field->name, ['required' => $field->required]);
30
-  }
31
-  ?>
27
+    }
28
+    foreach (Ecommerce\UserAdds\Field::getList(['order' => ['weight', 'asc']]) as $field) {
29
+        $form->input($field->type, "userAdds[fields][{$field->id}]", $field->name, ['required' => $field->required]);
30
+    }
31
+    ?>
32 32
 </fieldset>
33 33
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Files/Files.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Files module
4
- *
5
- * @author Alexey Krupskiy <[email protected]>
6
- * @link http://inji.ru/
7
- * @copyright 2015 Alexey Krupskiy
8
- * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
9
- */
3
+     * Files module
4
+     *
5
+     * @author Alexey Krupskiy <[email protected]>
6
+     * @link http://inji.ru/
7
+     * @copyright 2015 Alexey Krupskiy
8
+     * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
9
+     */
10 10
 class Files extends Module
11 11
 {
12 12
     /**
Please login to merge, or discard this patch.
system/modules/Ecommerce/appControllers/content/view.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -17,20 +17,20 @@
 block discarded – undo
17 17
             <h1><?= $item->name(); ?></h1>
18 18
             <ul class="item-options">
19 19
               <?php
20
-              foreach ($item->options as $param) {
21
-                  if (!$param->item_option_view || !$param->value)
22
-                      continue;
23
-                  if ($param->item_option_type == 'select') {
24
-                      if (empty($param->option->items[$param->value]))
25
-                          continue;
26
-                      $value = $param->option->items[$param->value]->value;
27
-                  } else {
28
-                      $value = $param->value;
29
-                  }
30
-                  $paramName = $param->item_option_name;
31
-                  echo "<li>{$paramName}: {$value} {$param->item_option_postfix}</li>";
32
-              }
33
-              ?>
20
+                foreach ($item->options as $param) {
21
+                    if (!$param->item_option_view || !$param->value)
22
+                        continue;
23
+                    if ($param->item_option_type == 'select') {
24
+                        if (empty($param->option->items[$param->value]))
25
+                            continue;
26
+                        $value = $param->option->items[$param->value]->value;
27
+                    } else {
28
+                        $value = $param->value;
29
+                    }
30
+                    $paramName = $param->item_option_name;
31
+                    echo "<li>{$paramName}: {$value} {$param->item_option_postfix}</li>";
32
+                }
33
+                ?>
34 34
             </ul>
35 35
             <div class="item-actions">
36 36
               <div class="item-price">
Please login to merge, or discard this patch.
system/modules/Ecommerce/widgets/items/table.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -2,17 +2,17 @@
 block discarded – undo
2 2
   <div class="table-responsive">
3 3
     <table class="table table-bordered table-condensed table-striped table-hover">
4 4
       <?php
5
-      $i = 0;
6
-      foreach ($items as $item) {
7
-          ?>
5
+        $i = 0;
6
+        foreach ($items as $item) {
7
+            ?>
8 8
           <tr>	
9 9
             <?php $this->widget('Ecommerce\items/item-tablerow', ['item' => $item]); ?>
10 10
           </tr>
11 11
           <?php
12
-          if (!( ++$i % 3)) {
13
-              echo '</div><div class="row">';
14
-          }
15
-      }
16
-      ?>
12
+            if (!( ++$i % 3)) {
13
+                echo '</div><div class="row">';
14
+            }
15
+        }
16
+        ?>
17 17
     </table></div>
18 18
 </div>
19 19
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Ecommerce/widgets/categorys.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -1,21 +1,21 @@
 block discarded – undo
1 1
 <div class="ecommerce-sidebar-categorys">
2 2
   <?php
3
-  if (empty($category)) {
4
-      $category = [];
5
-  }
6
-  $tree = new Ui\Tree();
7
-  $tree->ul('\Ecommerce\Category', 0, function($categoryItem) use($category) {
8
-      if ($category && $category->id == $categoryItem->id) {
9
-          $class = 'active';
10
-      } else {
11
-          $class = '';
12
-      }
13
-      return [
14
-          'attributes' => [
15
-              'class' => $class,
16
-          ],
17
-          'text' => "<a {$class} href = '/ecommerce/itemList/{$categoryItem->id}'>{$categoryItem->name}</a>"
18
-      ];
19
-  });
20
-  ?>
3
+    if (empty($category)) {
4
+        $category = [];
5
+    }
6
+    $tree = new Ui\Tree();
7
+    $tree->ul('\Ecommerce\Category', 0, function($categoryItem) use($category) {
8
+        if ($category && $category->id == $categoryItem->id) {
9
+            $class = 'active';
10
+        } else {
11
+            $class = '';
12
+        }
13
+        return [
14
+            'attributes' => [
15
+                'class' => $class,
16
+            ],
17
+            'text' => "<a {$class} href = '/ecommerce/itemList/{$categoryItem->id}'>{$categoryItem->name}</a>"
18
+        ];
19
+    });
20
+    ?>
21 21
 </div>
22 22
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Ecommerce/appControllers/content/index.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -13,23 +13,23 @@
 block discarded – undo
13 13
         <div class="ecommerce-best">
14 14
           <h2 class='caption'><span>Рекомендумые товары</span></h2>
15 15
           <?php
16
-          $bestItems = App::$cur->ecommerce->getItems(['where' => [['best', '1']], 'sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 3]);
17
-          if (count($bestItems) < 3) {
18
-              $bestItems = array_merge($bestItems, App::$cur->ecommerce->getItems(['sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 3]));
19
-              $bestItems = array_slice($bestItems, 0, 3);
20
-          }
21
-          $this->widget('Ecommerce\items/icons', ['items' => $bestItems]);
22
-          $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]);
23
-          ?>
16
+            $bestItems = App::$cur->ecommerce->getItems(['where' => [['best', '1']], 'sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 3]);
17
+            if (count($bestItems) < 3) {
18
+                $bestItems = array_merge($bestItems, App::$cur->ecommerce->getItems(['sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 3]));
19
+                $bestItems = array_slice($bestItems, 0, 3);
20
+            }
21
+            $this->widget('Ecommerce\items/icons', ['items' => $bestItems]);
22
+            $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]);
23
+            ?>
24 24
         </div>
25 25
       </div>
26 26
       <?php
27
-      $this->widget('Ecommerce\items/showOptions');
27
+        $this->widget('Ecommerce\items/showOptions');
28 28
 
29
-      $bestItems = App::$cur->ecommerce->getItems(['sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 6]);
30
-      $this->widget('Ecommerce\items/icons', ['items' => $bestItems]);
31
-      $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]);
32
-      ?>
29
+        $bestItems = App::$cur->ecommerce->getItems(['sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 6]);
30
+        $this->widget('Ecommerce\items/icons', ['items' => $bestItems]);
31
+        $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]);
32
+        ?>
33 33
       <a class="ecommerce-showmore" href="/ecommerce/itemList">Показать больше товаров</a>
34 34
     </div>
35 35
   </div>
Please login to merge, or discard this patch.
system/modules/Users/appControllers/content/registration.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,10 +10,10 @@  discard block
 block discarded – undo
10 10
             <div class="form-group">
11 11
               <label>Регистрация через соц.сети</label><br />
12 12
               <?php
13
-              foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
14
-                  echo "<a href = '/users/social/auth/{$social->code}'>{$social->name()}</a> ";
15
-              }
16
-              ?>
13
+                foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
14
+                    echo "<a href = '/users/social/auth/{$social->code}'>{$social->name()}</a> ";
15
+                }
16
+                ?>
17 17
             </div>
18 18
             <?php
19 19
         }
@@ -29,15 +29,15 @@  discard block
 block discarded – undo
29 29
               <?php $form->input('date', 'user_birthday', 'Дата рождения'); ?>
30 30
               <?php $form->input('text', 'user_city', 'Город'); ?>
31 31
               <?php
32
-              if (!empty(App::$cur->users->config['invites'])) {
33
-                  ?>
32
+                if (!empty(App::$cur->users->config['invites'])) {
33
+                    ?>
34 34
                   <div class ='form-group'>
35 35
                     <label><?= !empty(App::$cur->users->config['invitesName']) ? App::$cur->users->config['invitesName'] : 'Код приглашения'; ?></label>
36 36
                     <input type ='text' name ='invite_code' class ='form-control' value ="<?= (isset($_POST['invite_code']) ? $_POST['invite_code'] : ((!empty($_COOKIE['invite_code']) ? $_COOKIE['invite_code'] : ((!empty($_GET['invite_code']) ? $_GET['invite_code'] : ''))))); ?>" />
37 37
                   </div>   
38 38
                   <?php
39
-              }
40
-              ?>
39
+                }
40
+                ?>
41 41
             </div>
42 42
             <div class="col-sm-6">
43 43
               <div class ='form-group'>
Please login to merge, or discard this patch.
system/modules/Users/appControllers/content/cabinet.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -26,20 +26,20 @@
 block discarded – undo
26 26
         </div>
27 27
         <div class="col-sm-9">
28 28
           <?php
29
-          if (empty($activeSection) || empty($sections[$activeSection]['fullWidget'])) {
30
-              foreach ($sections as $section) {
31
-                  if (!empty($section['smallWidget'])) {
32
-                      $widgetName = is_array($section['smallWidget']) ? $section['smallWidget']['widget'] : $section['smallWidget'];
33
-                      $widgetSize = !empty($section['smallWidget']['size']) ? $section['smallWidget']['size'] : 1;
34
-                      ?>
29
+            if (empty($activeSection) || empty($sections[$activeSection]['fullWidget'])) {
30
+                foreach ($sections as $section) {
31
+                    if (!empty($section['smallWidget'])) {
32
+                        $widgetName = is_array($section['smallWidget']) ? $section['smallWidget']['widget'] : $section['smallWidget'];
33
+                        $widgetSize = !empty($section['smallWidget']['size']) ? $section['smallWidget']['size'] : 1;
34
+                        ?>
35 35
                       <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $this->widget($widgetName); ?></div>
36 36
                       <?php
37
-                  }
38
-              }
39
-          } else {
40
-              $this->widget($sections[$activeSection]['fullWidget']);
41
-          }
42
-          ?>
37
+                    }
38
+                }
39
+            } else {
40
+                $this->widget($sections[$activeSection]['fullWidget']);
41
+            }
42
+            ?>
43 43
         </div>
44 44
       </div>
45 45
     </div>
Please login to merge, or discard this patch.