Completed
Push — master ( 18aa30...8e3681 )
by Alexey
04:31
created
system/modules/Money/appControllers/content/pay.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -10,12 +10,12 @@  discard block
 block discarded – undo
10 10
         <th></th>
11 11
       </tr>
12 12
       <?php
13
-      foreach ($merchants as $merchant) {
14
-          $allowCurrencies = $merchant->allowCurrencies($pay);
15
-          if (!$allowCurrencies) {
16
-              continue;
17
-          }
18
-          ?>
13
+        foreach ($merchants as $merchant) {
14
+            $allowCurrencies = $merchant->allowCurrencies($pay);
15
+            if (!$allowCurrencies) {
16
+                continue;
17
+            }
18
+            ?>
19 19
           <tr>
20 20
             <td>
21 21
               <img src="<?= Statics::file($merchant->image ? $merchant->image->path : '/static/system/images/no-image.png', '150x150'); ?>" class="img-responsive" />
@@ -23,23 +23,23 @@  discard block
 block discarded – undo
23 23
             </td>
24 24
             <td>
25 25
               <?php
26
-              foreach ($allowCurrencies as $allowCurrency) {
27
-                  $className = 'Money\MerchantHelper\\' . $merchant->object_name;
28
-                  $sum = $className::getFinalSum($pay, $allowCurrency);
29
-                  ?>
26
+                foreach ($allowCurrencies as $allowCurrency) {
27
+                    $className = 'Money\MerchantHelper\\' . $merchant->object_name;
28
+                    $sum = $className::getFinalSum($pay, $allowCurrency);
29
+                    ?>
30 30
                   <b><?= $allowCurrency['currency']->name(); ?></b>
31 31
                   <a class="btn btn-primary" href ="/money/merchants/go/<?= $pay->id; ?>/<?= $merchant->id; ?>/<?= $allowCurrency['currency']->id; ?>">Оплатить <?= $sum; ?> <?= $allowCurrency['currency']->acronym(); ?></a>
32 32
                   <?php
33
-              }
34
-              ?>
33
+                }
34
+                ?>
35 35
             </td>
36 36
             <td width="100%">
37 37
               <?= $merchant->previewImage ? '<img src="' . $merchant->previewImage->path . '" class="img-responsive" />' : ''; ?>
38 38
             </td>
39 39
           </tr>
40 40
           <?php
41
-      }
42
-      ?>
41
+        }
42
+        ?>
43 43
     </table>
44 44
   </div>
45 45
 </div>
46 46
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Materials/appControllers/content/category.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,10 +2,10 @@  discard block
 block discarded – undo
2 2
   <div class="row">
3 3
     <div class="col-md-3">
4 4
       <?php
5
-      \Ui\Tree::ul($category->getRoot(), 0, function($category) {
6
-          echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
7
-      });
8
-      ?>
5
+        \Ui\Tree::ul($category->getRoot(), 0, function($category) {
6
+            echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
7
+        });
8
+        ?>
9 9
     </div>
10 10
     <div class="col-md-9">
11 11
       <div class="content">
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
34 34
             ?>
35 35
           </div>
36 36
           <?php
37
-          $pages->draw();
38
-          ?>
37
+            $pages->draw();
38
+            ?>
39 39
         </div>
40 40
       </div>
41 41
     </div>
Please login to merge, or discard this patch.
system/modules/Materials/appControllers/content/materialWithCategorys.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -2,11 +2,11 @@
 block discarded – undo
2 2
   <div class="row">
3 3
     <div class="col-md-3">
4 4
       <?php
5
-      $category = $material->category;
6
-      \Ui\Tree::ul($category->getRoot(), 0, function($category) {
7
-          echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
8
-      });
9
-      ?>
5
+        $category = $material->category;
6
+        \Ui\Tree::ul($category->getRoot(), 0, function($category) {
7
+            echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
8
+        });
9
+        ?>
10 10
     </div>
11 11
     <div class="col-md-9">
12 12
       <div class="content">
Please login to merge, or discard this patch.
system/modules/Ecommerce/appControllers/content/Cart/index.php 1 patch
Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -3,13 +3,13 @@  discard block
 block discarded – undo
3 3
     <div class="cart-order_page">
4 4
       <h2>Быстрое оформление заказа</h2>
5 5
       <?php
6
-      if (!$cart || !$cart->cartItems)
7
-          echo "<h1>Ваша корзина пуста</h1>";
8
-      else {
9
-          $form = new Ui\Form;
10
-          $form->action = "/ecommerce/cart";
11
-          $form->begin();
12
-          ?>
6
+        if (!$cart || !$cart->cartItems)
7
+            echo "<h1>Ваша корзина пуста</h1>";
8
+        else {
9
+            $form = new Ui\Form;
10
+            $form->action = "/ecommerce/cart";
11
+            $form->begin();
12
+            ?>
13 13
           <div class="row">
14 14
             <div class="col-sm-4">
15 15
               <div class="order_page-info">
@@ -86,14 +86,14 @@  discard block
 block discarded – undo
86 86
                     </thead>
87 87
                     <tbody>
88 88
                       <?php
89
-                      if (class_exists('Money\Currency')) {
90
-                          $defaultCurrency = Money\Currency::get(\App::$cur->ecommerce->config['defaultCurrency']);
91
-                      } else {
92
-                          $defaultCurrency = '';
93
-                      }
94
-                      foreach ($cart->cartItems as $cartItem) {
95
-                          $path = $cartItem->item->image ? $cartItem->item->image->path : '/static/system/images/no-image.png';
96
-                          ?>
89
+                        if (class_exists('Money\Currency')) {
90
+                            $defaultCurrency = Money\Currency::get(\App::$cur->ecommerce->config['defaultCurrency']);
91
+                        } else {
92
+                            $defaultCurrency = '';
93
+                        }
94
+                        foreach ($cart->cartItems as $cartItem) {
95
+                            $path = $cartItem->item->image ? $cartItem->item->image->path : '/static/system/images/no-image.png';
96
+                            ?>
97 97
                           <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; ?>'>
98 98
                             <td class="text-center image">                            
99 99
                               <a href="/ecommerce/view/<?php echo $cartItem->item->id; ?>">
@@ -119,41 +119,41 @@  discard block
 block discarded – undo
119 119
                             </td>
120 120
                           </tr>
121 121
                           <?php
122
-                      }
123
-                      ?>
122
+                        }
123
+                        ?>
124 124
                     </tbody>
125 125
                     <tfoot>
126 126
                       <?php
127
-                      $colspan = $cart->hasDiscount() ? 5 : 4;
128
-                      ?>
127
+                        $colspan = $cart->hasDiscount() ? 5 : 4;
128
+                        ?>
129 129
                       <tr class="order_page-sum">
130 130
                         <td colspan="<?= $colspan; ?>" class="text-right">Сумма:</td>
131 131
                         <td colspan="2" class="text-right"><?= $cart->itemsSum(); ?></td>
132 132
                       </tr>
133 133
                       <?php
134
-                      if ($cart->hasDiscount()) {
135
-                          ?>
134
+                        if ($cart->hasDiscount()) {
135
+                            ?>
136 136
                           <tr class="order_page-discountSum">
137 137
                             <td colspan="<?= $colspan; ?>" class="text-right">Скидка:</td>
138 138
                             <td colspan="2" class="text-right"><?= $cart->discountSum(); ?></td>
139 139
                           </tr>
140 140
                           <?php
141
-                      }
142
-                      if ($cart->delivery) {
143
-                          ?>
141
+                        }
142
+                        if ($cart->delivery) {
143
+                            ?>
144 144
                           <tr class="order_page-deliverySum">
145 145
                             <td colspan="<?= $colspan; ?>" class="text-right"><?= $cart->delivery->name; ?>:</td>
146 146
                             <td colspan="2" class="text-right"><?php
147
-                              if ($cart->delivery && $cart->delivery->price_text) {
148
-                                  echo $cart->delivery->price_text;
149
-                              } else {
150
-                                  echo $cart->deliverySum();
151
-                              }
152
-                              ?></td>
147
+                                if ($cart->delivery && $cart->delivery->price_text) {
148
+                                    echo $cart->delivery->price_text;
149
+                                } else {
150
+                                    echo $cart->deliverySum();
151
+                                }
152
+                                ?></td>
153 153
                           </tr>
154 154
                           <?php
155
-                      }
156
-                      ?>
155
+                        }
156
+                        ?>
157 157
                       <tr class="order_page-total">
158 158
                         <td colspan="<?= $colspan; ?>" class="text-right">Итого:</td>
159 159
                         <td colspan="2" class="text-right"><?= $cart->finalSum(); ?></td>
@@ -165,8 +165,8 @@  discard block
 block discarded – undo
165 165
                 <div class="clearfix"></div>
166 166
                 <div class="order_page-finish">
167 167
                   <?php
168
-                  $form->input('textarea', 'comment', 'Вы можете добавить комментарий к своему заказу', ['value' => (!empty($_POST['comment'])) ? $_POST['comment'] : '']);
169
-                  ?>
168
+                    $form->input('textarea', 'comment', 'Вы можете добавить комментарий к своему заказу', ['value' => (!empty($_POST['comment'])) ? $_POST['comment'] : '']);
169
+                    ?>
170 170
                   <div class="order_page-orderBtn">
171 171
                     <button name ="action" value ="order" data-loading-text="Подождите.." class="btn btn-primary">Подтверждение заказа</button>
172 172
                   </div>
@@ -175,9 +175,9 @@  discard block
 block discarded – undo
175 175
             </div>
176 176
           </div>
177 177
           <?php
178
-          $form->end(false);
179
-      }
180
-      ?>
178
+            $form->end(false);
179
+        }
180
+        ?>
181 181
     </div>
182 182
   </div>
183 183
 </div>
184 184
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Ecommerce/widgets/cart/payType.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -2,24 +2,24 @@
 block discarded – undo
2 2
   <div class="col-md-4">
3 3
     <ul class="nav nav-pills nav-stacked">
4 4
       <?php
5
-      $hiddenId = Tools::randomString();
6
-      foreach ($payTypes as $payType) {
7
-          if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || ($cart->payType && $payType->id == $cart->payType->id)) {
8
-              $checked = 'checked';
9
-          } else {
10
-              $checked = '';
11
-          }
12
-          echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
13
-          echo $payType->name;
14
-          echo '</a></li>';
15
-      }
16
-      $form->input('hidden', "payType", '', [
17
-          'value' => $cart->paytype_id,
18
-          'attributes' => [
19
-              'id' => $hiddenId
20
-          ],
21
-      ]);
22
-      ?>
5
+        $hiddenId = Tools::randomString();
6
+        foreach ($payTypes as $payType) {
7
+            if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || ($cart->payType && $payType->id == $cart->payType->id)) {
8
+                $checked = 'checked';
9
+            } else {
10
+                $checked = '';
11
+            }
12
+            echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
13
+            echo $payType->name;
14
+            echo '</a></li>';
15
+        }
16
+        $form->input('hidden', "payType", '', [
17
+            'value' => $cart->paytype_id,
18
+            'attributes' => [
19
+                'id' => $hiddenId
20
+            ],
21
+        ]);
22
+        ?>
23 23
     </ul>
24 24
   </div>
25 25
   <div class="col-md-8">
Please login to merge, or discard this patch.
system/modules/Users/appControllers/content/login.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -5,15 +5,15 @@
 block discarded – undo
5 5
         <h3>Вход</h3>
6 6
         <div class="form-group">
7 7
           <?php
8
-          $socials = Users\Social::getList(['where' => ['active', 1]]);
9
-          if ($socials) {
10
-              echo 'Войти через: ';
11
-              foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
12
-                  $text = $social->image ? '<img src ="' . Statics::file($social->image->path, '25x25', 'q') . '">' : $social->name();
13
-                  echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
14
-              }
15
-          }
16
-          ?>
8
+            $socials = Users\Social::getList(['where' => ['active', 1]]);
9
+            if ($socials) {
10
+                echo 'Войти через: ';
11
+                foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
12
+                    $text = $social->image ? '<img src ="' . Statics::file($social->image->path, '25x25', 'q') . '">' : $social->name();
13
+                    echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
14
+                }
15
+            }
16
+            ?>
17 17
         </div>
18 18
         <form action = '' method = 'POST' >
19 19
           <div class ='row'>
Please login to merge, or discard this patch.
system/modules/Ui/widgets/ActiveForm/ActiveForm.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -9,33 +9,33 @@
 block discarded – undo
9 9
 ?>
10 10
 <div id ='<?= $id; ?>' class="uiActiveForm" data-modelname="<?= $activeForm->modelName; ?>" data-formname="<?= $activeForm->formName; ?>" data-inputs='<?= json_encode($formInputs); ?>'>
11 11
   <?php
12
-  $form->action = $activeForm->action;
13
-  $form->begin($activeForm->header, ['onsubmit' => $ajax ? 'inji.Ui.forms.submitAjax(this);return false;' : ''], ['activeForm' => $activeForm]);
12
+    $form->action = $activeForm->action;
13
+    $form->begin($activeForm->header, ['onsubmit' => $ajax ? 'inji.Ui.forms.submitAjax(this);return false;' : ''], ['activeForm' => $activeForm]);
14 14
 
15
-  if (empty($activeForm->form['noMapCell'])) {
16
-      foreach ($activeForm->form['map'] as $row) {
17
-          $colSize = 12 / count($row);
18
-          echo "<div class ='row'>";
19
-          foreach ($row as $col) {
20
-              echo "<div class = 'col-sm-{$colSize}'>";
21
-              if ($col) {
22
-                  $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
23
-              }
24
-              echo '</div>';
25
-          }
26
-          echo '</div>';
27
-      }
28
-  } else {
29
-      foreach ($activeForm->form['map'] as $row) {
30
-          foreach ($row as $col) {
31
-              if ($col) {
32
-                  $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
33
-              }
34
-          }
35
-      }
36
-  }
37
-  $form->end($activeForm->model ? ($activeForm->model->pk() ? 'Сохранить' : 'Создать') : 'Отправить', [], ['activeForm' => $activeForm]);
38
-  ?>
15
+    if (empty($activeForm->form['noMapCell'])) {
16
+        foreach ($activeForm->form['map'] as $row) {
17
+            $colSize = 12 / count($row);
18
+            echo "<div class ='row'>";
19
+            foreach ($row as $col) {
20
+                echo "<div class = 'col-sm-{$colSize}'>";
21
+                if ($col) {
22
+                    $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
23
+                }
24
+                echo '</div>';
25
+            }
26
+            echo '</div>';
27
+        }
28
+    } else {
29
+        foreach ($activeForm->form['map'] as $row) {
30
+            foreach ($row as $col) {
31
+                if ($col) {
32
+                    $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
33
+                }
34
+            }
35
+        }
36
+    }
37
+    $form->end($activeForm->model ? ($activeForm->model->pk() ? 'Сохранить' : 'Создать') : 'Отправить', [], ['activeForm' => $activeForm]);
38
+    ?>
39 39
 </div>
40 40
 <script>
41 41
     inji.onLoad(function () {
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Form/begin.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
     }
9 9
     ?>>
10 10
       <?php
11
-  }
12
-  ?>
11
+    }
12
+    ?>
13 13
   <?= !empty($header) ? "<h1>{$header}</h1>" : ''; ?>
14 14
     
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Form/end.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,10 +5,10 @@
 block discarded – undo
5 5
         <div class="form-group">
6 6
           <button class ='btn btn-primary' 
7 7
                   <?php
8
-                  foreach ($attributs as $attribute => $value) {
9
-                      echo " {$attribute} = '{$value}' ";
10
-                  }
11
-                  ?>
8
+                    foreach ($attributs as $attribute => $value) {
9
+                        echo " {$attribute} = '{$value}' ";
10
+                    }
11
+                    ?>
12 12
                   ><?= $btnText; ?></button>
13 13
         </div>
14 14
         <?php
Please login to merge, or discard this patch.