Completed
Push — master ( b5b491...b93a9c )
by Alexey
05:05
created
system/Inji/Html.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
         $html = "<{$tag}";
25 25
         if ($attributes && is_array($attributes)) {
26 26
             foreach ($attributes as $key => $value) {
27
-                $html .=" {$key} = '";
27
+                $html .= " {$key} = '";
28 28
                 if (!is_array($value)) {
29 29
                     $html .= addcslashes($value, "'");
30 30
                 } else {
Please login to merge, or discard this patch.
system/Inji/Msg.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
             if (!empty($_SESSION['_INJI_MSG'])) {
23 23
                 foreach ($_SESSION['_INJI_MSG'] as $key => $msg) {
24 24
                     if ($msg['text'] == $text) {
25
-                        $msg['count'] ++;
25
+                        $msg['count']++;
26 26
                         return true;
27 27
                     }
28 28
                 }
Please login to merge, or discard this patch.
system/modules/Callbacks/appControllers/content/index.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <div class = 'callbacks'>
2 2
   <h1>Отзывы</h1>
3 3
   <?php
4
-  $callbacks = Callbacks\Callback::getList(['where' => ['view', '1'], 'order' => ['weight', 'asc']]);
5
-  foreach ($callbacks as $callback) {
6
-      echo "<h3>{$callback->name}<div class = 'time'>{$callback->date_create}</div></h3>";
7
-      echo "<p>" . nl2br($callback->text) . "</p>";
8
-  }
9
-  ?>
4
+    $callbacks = Callbacks\Callback::getList(['where' => ['view', '1'], 'order' => ['weight', 'asc']]);
5
+    foreach ($callbacks as $callback) {
6
+        echo "<h3>{$callback->name}<div class = 'time'>{$callback->date_create}</div></h3>";
7
+        echo "<p>" . nl2br($callback->text) . "</p>";
8
+    }
9
+    ?>
10 10
 </div>
11 11
 <h3>Можете и вы в свободной форме оставить свой отзыв</h3>
12 12
 <?php
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@
 block discarded – undo
4 4
   $callbacks = Callbacks\Callback::getList(['where' => ['view', '1'], 'order' => ['weight', 'asc']]);
5 5
   foreach ($callbacks as $callback) {
6 6
       echo "<h3>{$callback->name}<div class = 'time'>{$callback->date_create}</div></h3>";
7
-      echo "<p>" . nl2br($callback->text) . "</p>";
7
+      echo "<p>".nl2br($callback->text)."</p>";
8 8
   }
9 9
   ?>
10 10
 </div>
Please login to merge, or discard this patch.
system/modules/Dashboard/appAdminControllers/content/siteConfig.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,9 +17,9 @@
 block discarded – undo
17 17
     <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) echo \App::$primary->config['site']['description']; ?>' />
18 18
   </div>
19 19
   <?php
20
-  $form = new Ui\Form();
21
-  $form->input('image', 'site_logo', 'Лого сайта', ['value' => !empty(\App::$primary->config['site']['site_logo']) ? \App::$primary->config['site']['site_logo'] : '']);
22
-  ?>
20
+    $form = new Ui\Form();
21
+    $form->input('image', 'site_logo', 'Лого сайта', ['value' => !empty(\App::$primary->config['site']['site_logo']) ? \App::$primary->config['site']['site_logo'] : '']);
22
+    ?>
23 23
   <h2>Дополнительные мета теги</h2>
24 24
   <div class ="form-group">
25 25
     <button type = 'button' class = 'btn btn-primary ' onclick = 'addMeta()'>Добавить <i class = 'glyphicon glyphicon-plus'></i></button>
Please login to merge, or discard this patch.
system/modules/Ecommerce/appAdminControllers/content/configure.php 2 patches
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -3,14 +3,14 @@  discard block
 block discarded – undo
3 3
 <ul class="nav nav-tabs" role="tablist">
4 4
   <li role="presentation" class="active"><a href="#home" aria-controls="home" role="tab" data-toggle="tab">Настройки</a></li>
5 5
   <?php
6
-  $dataManagers = [];
7
-  foreach ($managers as $manager) {
8
-      $dataManager = new Ui\DataManager($manager);
9
-      $dataManagers[$manager] = $dataManager;
10
-      $code = 'tab_' . str_replace('\\', '_', $manager);
11
-      echo "<li role='presentation'><a href='#{$code}' aria-controls='{$code}' role='tab' data-toggle='tab'>{$dataManager->name}</a></li>";
12
-  }
13
-  ?>
6
+    $dataManagers = [];
7
+    foreach ($managers as $manager) {
8
+        $dataManager = new Ui\DataManager($manager);
9
+        $dataManagers[$manager] = $dataManager;
10
+        $code = 'tab_' . str_replace('\\', '_', $manager);
11
+        echo "<li role='presentation'><a href='#{$code}' aria-controls='{$code}' role='tab' data-toggle='tab'>{$dataManager->name}</a></li>";
12
+    }
13
+    ?>
14 14
 </ul>
15 15
 <div class="tab-content">
16 16
   <div role="tabpanel" class="tab-pane fade in active" id="home">
@@ -52,17 +52,17 @@  discard block
 block discarded – undo
52 52
     </script>
53 53
   </div>
54 54
   <?php
55
-  foreach ($dataManagers as $manager => $dataManager) {
56
-      $code = 'tab_' . str_replace('\\', '_', $manager);
57
-      ?>
55
+    foreach ($dataManagers as $manager => $dataManager) {
56
+        $code = 'tab_' . str_replace('\\', '_', $manager);
57
+        ?>
58 58
       <div role="tabpanel" class="tab-pane fade" id="<?= $code; ?>">
59 59
         <?php
60 60
         $dataManager->draw();
61 61
         ?>
62 62
       </div>
63 63
       <?php
64
-  }
65
-  ?>
64
+    }
65
+    ?>
66 66
 </div>
67 67
 
68 68
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
   foreach ($managers as $manager) {
8 8
       $dataManager = new Ui\DataManager($manager);
9 9
       $dataManagers[$manager] = $dataManager;
10
-      $code = 'tab_' . str_replace('\\', '_', $manager);
10
+      $code = 'tab_'.str_replace('\\', '_', $manager);
11 11
       echo "<li role='presentation'><a href='#{$code}' aria-controls='{$code}' role='tab' data-toggle='tab'>{$dataManager->name}</a></li>";
12 12
   }
13 13
   ?>
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
   </div>
55 55
   <?php
56 56
   foreach ($dataManagers as $manager => $dataManager) {
57
-      $code = 'tab_' . str_replace('\\', '_', $manager);
57
+      $code = 'tab_'.str_replace('\\', '_', $manager);
58 58
       ?>
59 59
       <div role="tabpanel" class="tab-pane fade" id="<?= $code; ?>">
60 60
         <?php
Please login to merge, or discard this patch.
system/modules/Ecommerce/appControllers/content/Cart/orderDetail.php 2 patches
Indentation   +87 added lines, -87 removed lines patch added patch discarded remove patch
@@ -6,11 +6,11 @@  discard block
 block discarded – undo
6 6
     </tr>
7 7
   </thead>
8 8
   <?php
9
-  $orderDeatilCols = [
10
-      'id' => '№ Заказа',
11
-      'complete_data' => 'Дата заказа'
12
-  ];
13
-  ?>
9
+    $orderDeatilCols = [
10
+        'id' => '№ Заказа',
11
+        'complete_data' => 'Дата заказа'
12
+    ];
13
+    ?>
14 14
   <tbody>
15 15
     <tr>
16 16
       <td class="text-left" style="width: 50%;">              
@@ -63,91 +63,91 @@  discard block
 block discarded – undo
63 63
     </thead>
64 64
     <tbody>
65 65
       <?php
66
-      $sums = [];
67
-      foreach ($cart->cartItems as $cartItem) {
68
-          $item = $cartItem->item;
69
-          $itemName = $item->name();
70
-          if (!isset($sums[$cartItem->price->currency_id])) {
71
-              $sums[$cartItem->price->currency_id] = $cartItem->price->price;
72
-          } else {
73
-              $sums[$cartItem->price->currency_id] += $cartItem->price->price;
74
-          }
75
-          ?>
66
+        $sums = [];
67
+        foreach ($cart->cartItems as $cartItem) {
68
+            $item = $cartItem->item;
69
+            $itemName = $item->name();
70
+            if (!isset($sums[$cartItem->price->currency_id])) {
71
+                $sums[$cartItem->price->currency_id] = $cartItem->price->price;
72
+            } else {
73
+                $sums[$cartItem->price->currency_id] += $cartItem->price->price;
74
+            }
75
+            ?>
76 76
           <tr>
77 77
             <td class="text-left"><?= $itemName; ?></td>
78 78
             <td class="text-right"><?= $cartItem->count; ?></td>
79 79
             <td class="text-right"><?= $cartItem->price->price; ?> 
80 80
               <?php
81
-              if (App::$cur->money) {
82
-                  $currency = Money\Currency::get($cartItem->price->currency_id);
83
-                  if ($currency) {
84
-                      echo $currency->acronym();
85
-                  } else {
86
-                      echo 'руб.';
87
-                  }
88
-              } else {
89
-                  echo 'руб.';
90
-              }
91
-              ?></td>
81
+                if (App::$cur->money) {
82
+                    $currency = Money\Currency::get($cartItem->price->currency_id);
83
+                    if ($currency) {
84
+                        echo $currency->acronym();
85
+                    } else {
86
+                        echo 'руб.';
87
+                    }
88
+                } else {
89
+                    echo 'руб.';
90
+                }
91
+                ?></td>
92 92
             <td class="text-right"><?= ($cartItem->price->price * $cartItem->count); ?>
93 93
               <?php
94
-              if (App::$cur->money) {
95
-                  $currency = Money\Currency::get($cartItem->price->currency_id);
96
-                  if ($currency) {
97
-                      echo $currency->acronym();
98
-                  } else {
99
-                      echo 'руб.';
100
-                  }
101
-              } else {
102
-                  echo 'руб.';
103
-              }
104
-              ?></td>
94
+                if (App::$cur->money) {
95
+                    $currency = Money\Currency::get($cartItem->price->currency_id);
96
+                    if ($currency) {
97
+                        echo $currency->acronym();
98
+                    } else {
99
+                        echo 'руб.';
100
+                    }
101
+                } else {
102
+                    echo 'руб.';
103
+                }
104
+                ?></td>
105 105
             <td class="text-right" style="white-space: nowrap;">
106 106
               <a onclick = 'inji.Ecommerce.Cart.addItem(<?= $item->getPrice()->id; ?>, 1);
107 107
                         return false;' data-original-title="Добавить в корзину" href="#" data-toggle="tooltip" title="" class="btn btn-primary"><i class="glyphicon glyphicon-shopping-cart"></i></a>
108 108
           </tr>
109 109
           <?php
110
-      }
111
-      ?>
110
+        }
111
+        ?>
112 112
     </tbody>
113 113
     <tfoot>
114 114
       <tr>
115 115
         <td colspan="2"></td>
116 116
         <td class="text-right"><b>Сумма</b></td>
117 117
         <td class="text-right"><?php
118
-          foreach ($sums as $currency_id => $sum) {
119
-              if (!$sum) {
120
-                  continue;
121
-              }
122
-              echo number_format($sum, 2, '.', ' ');
123
-              if (App::$cur->money) {
124
-                  $currency = Money\Currency::get($currency_id);
125
-                  if ($currency) {
126
-                      echo '&nbsp;' . $currency->acronym();
127
-                  } else {
128
-                      echo '&nbsp;руб.';
129
-                  }
130
-              } else {
131
-                  echo '&nbsp;руб.';
132
-              }
133
-              echo '<br />';
134
-          }
135
-          ?></td>
118
+            foreach ($sums as $currency_id => $sum) {
119
+                if (!$sum) {
120
+                    continue;
121
+                }
122
+                echo number_format($sum, 2, '.', ' ');
123
+                if (App::$cur->money) {
124
+                    $currency = Money\Currency::get($currency_id);
125
+                    if ($currency) {
126
+                        echo '&nbsp;' . $currency->acronym();
127
+                    } else {
128
+                        echo '&nbsp;руб.';
129
+                    }
130
+                } else {
131
+                    echo '&nbsp;руб.';
132
+                }
133
+                echo '<br />';
134
+            }
135
+            ?></td>
136 136
         <td></td>
137 137
       </tr>
138 138
       <?php
139
-      $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0;
140
-      $deliveryPrice = $cart->delivery->price;
141
-      if (!isset($sums[$deliveryCurrency])) {
142
-          $sums[$deliveryCurrency] = $deliveryPrice;
143
-      } else {
144
-          $sums[$deliveryCurrency] += $deliveryPrice;
145
-      }
146
-      $delCurrency = false;
147
-      if (App::$cur->money) {
148
-          $delCurrency = Money\Currency::get($deliveryPrice);
149
-      }
150
-      ?>
139
+        $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0;
140
+        $deliveryPrice = $cart->delivery->price;
141
+        if (!isset($sums[$deliveryCurrency])) {
142
+            $sums[$deliveryCurrency] = $deliveryPrice;
143
+        } else {
144
+            $sums[$deliveryCurrency] += $deliveryPrice;
145
+        }
146
+        $delCurrency = false;
147
+        if (App::$cur->money) {
148
+            $delCurrency = Money\Currency::get($deliveryPrice);
149
+        }
150
+        ?>
151 151
       <tr>
152 152
         <td colspan="2"></td>
153 153
         <td class="text-right"><b><?= $cart->delivery ? $cart->delivery->name : 'Доставка'; ?></b></td>
@@ -158,24 +158,24 @@  discard block
 block discarded – undo
158 158
         <td colspan="2"></td>
159 159
         <td class="text-right"><b>Итого</b></td>
160 160
         <td class="text-right"><?php
161
-          foreach ($sums as $currency_id => $sum) {
162
-              if (!$sum) {
163
-                  continue;
164
-              }
165
-              echo number_format($sum, 2, '.', ' ');
166
-              if (App::$cur->money) {
167
-                  $currency = Money\Currency::get($currency_id);
168
-                  if ($currency) {
169
-                      echo '&nbsp;' . $currency->acronym();
170
-                  } else {
171
-                      echo '&nbsp;руб.';
172
-                  }
173
-              } else {
174
-                  echo '&nbsp;руб.';
175
-              }
176
-              echo '<br />';
177
-          }
178
-          ?></td>
161
+            foreach ($sums as $currency_id => $sum) {
162
+                if (!$sum) {
163
+                    continue;
164
+                }
165
+                echo number_format($sum, 2, '.', ' ');
166
+                if (App::$cur->money) {
167
+                    $currency = Money\Currency::get($currency_id);
168
+                    if ($currency) {
169
+                        echo '&nbsp;' . $currency->acronym();
170
+                    } else {
171
+                        echo '&nbsp;руб.';
172
+                    }
173
+                } else {
174
+                    echo '&nbsp;руб.';
175
+                }
176
+                echo '<br />';
177
+            }
178
+            ?></td>
179 179
         <td></td>
180 180
       </tr>
181 181
     </tfoot>
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
       <td class="text-left" style="width: 50%;">              
17 17
         <?php
18 18
         foreach ($orderDeatilCols as $col => $label) {
19
-            echo "<b>{$label}</b> " . $cart->$col . "<br>";
19
+            echo "<b>{$label}</b> ".$cart->$col."<br>";
20 20
         }
21 21
         ?>
22 22
       </td>
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
         <?php
40 40
         if ($cart->infos) {
41 41
             foreach ($cart->infos as $info) {
42
-                echo "<b>{$info->field->name()}</b> " . $info->value . "<br>";
42
+                echo "<b>{$info->field->name()}</b> ".$info->value."<br>";
43 43
             }
44 44
         }
45 45
         ?>
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
               if (App::$cur->money) {
124 124
                   $currency = Money\Currency::get($currency_id);
125 125
                   if ($currency) {
126
-                      echo '&nbsp;' . $currency->acronym();
126
+                      echo '&nbsp;'.$currency->acronym();
127 127
                   } else {
128 128
                       echo '&nbsp;руб.';
129 129
                   }
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
               if (App::$cur->money) {
167 167
                   $currency = Money\Currency::get($currency_id);
168 168
                   if ($currency) {
169
-                      echo '&nbsp;' . $currency->acronym();
169
+                      echo '&nbsp;'.$currency->acronym();
170 170
                   } else {
171 171
                       echo '&nbsp;руб.';
172 172
                   }
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
                 case'2':
206 206
                     $price = Ecommerce\Item\Offer\Price::get($status->info);
207 207
                     if ($price) {
208
-                        echo "<a href = '/ecommerce/view/{$item->id}'>" . $price->offer->item->name() . "</a>";
208
+                        echo "<a href = '/ecommerce/view/{$item->id}'>".$price->offer->item->name()."</a>";
209 209
                     } else {
210 210
                         echo 'Товар удален';
211 211
                     }
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
                     $info = explode('|', $status->info);
215 215
                     $price = Ecommerce\Item\Offer\Price::get($info[0]);
216 216
                     if ($price) {
217
-                        echo "<a href = '/ecommerce/view/{$item->id}'>" . $price->offer->item->name() . "</a> " . ($info[1] > 0 ? '+' . $info[1] : $info[1]);
217
+                        echo "<a href = '/ecommerce/view/{$item->id}'>".$price->offer->item->name()."</a> ".($info[1] > 0 ? '+'.$info[1] : $info[1]);
218 218
                     } else {
219 219
                         echo 'Товар удален';
220 220
                     }
Please login to merge, or discard this patch.
system/modules/Ecommerce/appControllers/content/buyCard.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -50,12 +50,12 @@
 block discarded – undo
50 50
                       <td>
51 51
                         <ul>
52 52
                           <?php
53
-                          foreach ($card->levels as $level) {
54
-                              ?>
53
+                            foreach ($card->levels as $level) {
54
+                                ?>
55 55
                               <li><?= $level->name; ?> - <?= $level->discount->name; ?></li>
56 56
                               <?php
57
-                          }
58
-                          ?>
57
+                            }
58
+                            ?>
59 59
                         </ul>
60 60
                       </td>
61 61
                       <td>
Please login to merge, or discard this patch.
system/modules/Ecommerce/models/Delivery.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
     static $forms = [
47 47
         'manager' => [
48 48
             'map' => [
49
-                ['name',],
49
+                ['name', ],
50 50
                 ['price', 'currency_id'],
51 51
                 ['max_cart_price', 'icon_file_id'],
52 52
                 ['info']
Please login to merge, or discard this patch.
system/modules/Ecommerce/models/Item/Offer/Price.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
     static $forms = [
40 40
         'manager' => [
41 41
             'map' => [
42
-                ['price', 'currency_id',],
42
+                ['price', 'currency_id', ],
43 43
                 ['item_offer_price_type_id', 'item_offer_id']
44 44
             ]
45 45
     ]];
Please login to merge, or discard this patch.