Completed
Push — master ( f17270...776132 )
by Alexey
07:15
created
system/modules/Money/widgets/cabinet/wallets.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <h3>Мои кошельки</h3>
2 2
 <div class="row">
3 3
   <?php
4
-  $blocked = App::$cur->money->getUserBlocks();
5
-  $wallets = App::$cur->money->getUserWallets();
6
-  $rates = Money\Currency\ExchangeRate::getList();
7
-  foreach ($wallets as $wallet) {
8
-      ?>
4
+    $blocked = App::$cur->money->getUserBlocks();
5
+    $wallets = App::$cur->money->getUserWallets();
6
+    $rates = Money\Currency\ExchangeRate::getList();
7
+    foreach ($wallets as $wallet) {
8
+        ?>
9 9
         <div class="col-sm-4">
10 10
             <h4><?= $wallet->currency->name(); ?></h4>
11 11
             <b><?= $wallet->showAmount(); ?></b> <?= $wallet->currency->acronym(); ?><br />
Please login to merge, or discard this patch.
system/modules/Money/widgets/cabinet/rewards.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
             <h3>Уровни начислений</h3>
13 13
             <ul>
14 14
               <?php
15
-              foreach ($reward->levels(['order' => ['level', 'asc']]) as $level) {
16
-                  ?>
15
+                foreach ($reward->levels(['order' => ['level', 'asc']]) as $level) {
16
+                    ?>
17 17
 
18 18
                     <li><?= !$level->level ? 'Личный' : $level->level; ?>. <?= $types[$level->type]['viewer']($level); ?></li>
19 19
                     <?php
@@ -34,14 +34,14 @@  discard block
 block discarded – undo
34 34
                 <h4 class="<?= $complete ? 'text-success' : 'text-danger'; ?>"><?= $condition->name(); ?></h4>
35 35
                 <ul>
36 36
                   <?php
37
-                  foreach ($condition->items as $item) {
38
-                      $itemComplete = $item->checkComplete();
39
-                      switch ($item->type) {
40
-                          case 'event':
37
+                    foreach ($condition->items as $item) {
38
+                        $itemComplete = $item->checkComplete();
39
+                        switch ($item->type) {
40
+                            case 'event':
41 41
                               $name = \Events\Event::get($item->value, 'event')->name();
42
-                              break;
43
-                      }
44
-                      ?>
42
+                                break;
43
+                        }
44
+                        ?>
45 45
                         <li> 
46 46
                             <b class="<?= $itemComplete ? 'text-success' : 'text-danger'; ?>"><?= $name; ?> <?= $item->recivedCount(); ?></b>/<?= $item->count; ?> <br />
47 47
                         </li>
Please login to merge, or discard this patch.
system/modules/Money/appControllers/content/pay.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,10 +23,10 @@
 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
Please login to merge, or discard this patch.
system/widgets/msgList.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -4,18 +4,18 @@
 block discarded – undo
4 4
     <div class="alert alert-<?= $msg['status']; ?> alert-dismissable">
5 5
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
6 6
         <strong><?php
7
-          switch ($msg['status']) {
8
-              case 'success':
7
+            switch ($msg['status']) {
8
+                case 'success':
9 9
                   echo 'Успех!';
10
-                  break;
11
-              case 'danger':
10
+                    break;
11
+                case 'danger':
12 12
               case 'warning':
13 13
                   echo 'Внимание!';
14
-                  break;
15
-              default:
14
+                    break;
15
+                default:
16 16
                   echo 'Информация.';
17
-          }
18
-          ?></strong> <?= $msg['text']; ?>
17
+            }
18
+            ?></strong> <?= $msg['text']; ?>
19 19
     </div>
20 20
     <?php
21 21
 }
Please login to merge, or discard this patch.
system/program/setup/modules/Main/appSetupControllers/content/index.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <div class="row">
2 2
     <div class="col-lg-12">
3 3
       <?php
4
-      $dataManager = new Ui\DataManager('Apps\App', 'setup');
5
-      $dataManager->draw();
6
-      ?>
4
+        $dataManager = new Ui\DataManager('Apps\App', 'setup');
5
+        $dataManager->draw();
6
+        ?>
7 7
     </div>
8 8
     <div class="col-lg-12">
9 9
         <?php
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Table/head.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@
 block discarded – undo
1 1
 <tfoot>
2 2
     <tr>
3 3
       <?php
4
-      foreach ($table->cols as $col) {
5
-          if (is_string($col)) {
6
-              echo "<th>{$col}</th>";
7
-          } else {
8
-              echo Html::el('th', !empty($col['attributes']) ? $col['attributes'] : [], $col['text']);
9
-          }
10
-      }
11
-      ?>
4
+        foreach ($table->cols as $col) {
5
+            if (is_string($col)) {
6
+                echo "<th>{$col}</th>";
7
+            } else {
8
+                echo Html::el('th', !empty($col['attributes']) ? $col['attributes'] : [], $col['text']);
9
+            }
10
+        }
11
+        ?>
12 12
     </tr>
13 13
 </tfoot>
14 14
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Ecommerce/widgets/filters.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1 1
 <div class="filters">
2 2
     <form>
3 3
       <?php
4
-      $min = App::$cur->ecommerce->getItems(['sort' => ['price' => 'asc'], 'count' => 1, 'key' => false]);
5
-      $max = App::$cur->ecommerce->getItems(['sort' => ['price' => 'desc'], 'count' => 1, 'key' => false]);
6
-      if ($min && $min[0]->getPrice() && $max && $max[0]->getPrice()) {
7
-          ?>
4
+        $min = App::$cur->ecommerce->getItems(['sort' => ['price' => 'asc'], 'count' => 1, 'key' => false]);
5
+        $max = App::$cur->ecommerce->getItems(['sort' => ['price' => 'desc'], 'count' => 1, 'key' => false]);
6
+        if ($min && $min[0]->getPrice() && $max && $max[0]->getPrice()) {
7
+            ?>
8 8
             <label>Фильтр по цене</label>
9 9
             <div class="form-group">      
10 10
                 <div class="row">
@@ -18,24 +18,24 @@  discard block
 block discarded – undo
18 18
             ?>
19 19
             <div class="filter">  
20 20
               <?php
21
-              switch ($option->type) {
22
-                  case 'radio':
21
+                switch ($option->type) {
22
+                    case 'radio':
23 23
                       echo "<label>{$option->name}</label>";
24
-                      foreach ($option->items as $item) {
25
-                          $this->widget('Ui\Form/' . $option->type, [
26
-                              'label' => $item->name,
27
-                              'name' => "filters[options][{$option->id}]",
28
-                              !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : false,
29
-                              'options' => [
30
-                                  'value' => $item->id,
31
-                              ]
32
-                          ]);
33
-                      }
34
-                      break;
35
-                  case 'select':
24
+                        foreach ($option->items as $item) {
25
+                            $this->widget('Ui\Form/' . $option->type, [
26
+                                'label' => $item->name,
27
+                                'name' => "filters[options][{$option->id}]",
28
+                                !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : false,
29
+                                'options' => [
30
+                                    'value' => $item->id,
31
+                                ]
32
+                            ]);
33
+                        }
34
+                        break;
35
+                    case 'select':
36 36
                       echo "<label>{$option->name}</label>";
37
-                      foreach ($option->items as $item) {
38
-                          ?>
37
+                        foreach ($option->items as $item) {
38
+                            ?>
39 39
                             <div class="radio">
40 40
                                 <label>
41 41
                                     <input type="checkbox" name = 'filters[options][<?= $option->id; ?>][]' value ="<?= $item->id; ?>" <?= !empty($_GET['filters']['options'][$option->id]) && in_array($item->id, $_GET['filters']['options'][$option->id]) ? 'checked' : ''; ?>>
Please login to merge, or discard this patch.