Completed
Branch master (89fef1)
by Alexey
11:01
created
system/modules/Ecommerce/appControllers/content/Cart/orderDetail.php 1 patch
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.
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/appControllers/content/itemList.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -19,18 +19,18 @@
 block discarded – undo
19 19
       <div class="items-icons">	
20 20
         <div class="row">	
21 21
           <?php
22
-          $i = 0;
23
-          foreach ($items as $item) {
24
-              ?>
22
+            $i = 0;
23
+            foreach ($items as $item) {
24
+                ?>
25 25
               <div class="col-sm-4">		
26 26
                 <?php $this->widget('Ecommerce\items/item', ['item' => $item]); ?>
27 27
               </div>
28 28
               <?php
29
-              if (!( ++$i % 3)) {
30
-                  echo '</div><div class="row">';
31
-              }
32
-          }
33
-          ?>
29
+                if (!( ++$i % 3)) {
30
+                    echo '</div><div class="row">';
31
+                }
32
+            }
33
+            ?>
34 34
         </div>
35 35
       </div>
36 36
       <div class="text-center">
Please login to merge, or discard this patch.
system/modules/Ecommerce/install_script.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-return function ($step = NULL, $params = array()) {
3
+return function($step = NULL, $params = array()) {
4 4
 
5 5
     //Категории
6 6
     App::$cur->db->createTable('ecommerce_category', array(
Please login to merge, or discard this patch.
system/modules/Ecommerce/models/Cart.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -275,8 +275,9 @@
 block discarded – undo
275 275
                 break;
276 276
             }
277 277
         }
278
-        if (!$price)
279
-            return false;
278
+        if (!$price) {
279
+                    return false;
280
+        }
280 281
 
281 282
         if ($count <= 0) {
282 283
             $count = 1;
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.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,12 +72,12 @@
 block discarded – undo
72 72
     {
73 73
         $warehouse = Offer\Warehouse::get([['count', '0', '>'], ['item_offer_id', $this->id]]);
74 74
         if ($warehouse) {
75
-            $warehouse->count +=(float) $count;
75
+            $warehouse->count += (float) $count;
76 76
             $warehouse->save();
77 77
         } else {
78 78
             $warehouse = Offer\Warehouse::get([['item_offer_id', $this->id]]);
79 79
             if ($warehouse) {
80
-                $warehouse->count +=(float) $count;
80
+                $warehouse->count += (float) $count;
81 81
                 $warehouse->save();
82 82
             }
83 83
         }
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.
system/modules/Ecommerce/objects/Florange.php 1 patch
Braces   +12 added lines, -10 removed lines patch added patch discarded remove patch
@@ -40,8 +40,9 @@  discard block
 block discarded – undo
40 40
         $i = 0;
41 41
         foreach ($html->find('ul li ul li ul li a') as $element) {
42 42
             $item = Item::get(['ci_imported', 'http://florange.ru' . $element->href]);
43
-            if ($item)
44
-                continue;
43
+            if ($item) {
44
+                            continue;
45
+            }
45 46
 
46 47
             $elem = file_get_html('http://florange.ru' . $element->href);
47 48
 
@@ -57,10 +58,11 @@  discard block
 block discarded – undo
57 58
             foreach ($elem->find('.description p') as $p) {
58 59
                 if ($p->find('strong') && $p->find('strong', 0)->innertext != 'Выберите стиль:') {
59 60
                     //$item['head'][] = $p->find('strong', 0)->innertext;
60
-                } elseif ($p->find('strong') && $p->find('strong', 0)->innertext == 'Выберите стиль:')
61
-                    break;
62
-                else
63
-                    $prices[$i++]['ciprice_about'] = $p->innertext;
61
+                } elseif ($p->find('strong') && $p->find('strong', 0)->innertext == 'Выберите стиль:') {
62
+                                    break;
63
+                } else {
64
+                                    $prices[$i++]['ciprice_about'] = $p->innertext;
65
+                }
64 66
             }
65 67
             $i = 0;
66 68
             foreach ($elem->find('.description .tabcontent') as $t) {
@@ -101,12 +103,12 @@  discard block
 block discarded – undo
101 103
             $html = file_get_html('http://florange.ru/production/style/pushup/');
102 104
 
103 105
             foreach ($html->find('.leftside .nav>li>a') as $element) {
104
-                if (strpos($element->href, '/style/'))
105
-                    continue;
106
+                if (strpos($element->href, '/style/')) {
107
+                                    continue;
108
+                }
106 109
                 $catalogs[] = ['name' => $element->innertext, 'href' => 'http://florange.ru' . $element->href];
107 110
             }
108
-        }
109
-        else {
111
+        } else {
110 112
             $html = file_get_html('http://florange.ru/production/style/pushup/');
111 113
             $element = $html->find('.leftside .nav>li>a', $parent);
112 114
             $html = file_get_html('http://florange.ru' . $element->href);
Please login to merge, or discard this patch.