Completed
Push — master ( 8a2ff5...fefe7e )
by Alexey
05:32
created
system/modules/Ecommerce/appControllers/CartController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -268,7 +268,7 @@
 block discarded – undo
268 268
             $result->send();
269 269
         }
270 270
 
271
-        $item->sales ++;
271
+        $item->sales++;
272 272
         $item->save();
273 273
 
274 274
         if (empty($_GET['count']))
Please login to merge, or discard this patch.
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -270,10 +270,11 @@
 block discarded – undo
270 270
         $item->sales ++;
271 271
         $item->save();
272 272
 
273
-        if (empty($_GET['count']))
274
-            $count = 1;
275
-        else
276
-            $count = (float) $_GET['count'];
273
+        if (empty($_GET['count'])) {
274
+                    $count = 1;
275
+        } else {
276
+                    $count = (float) $_GET['count'];
277
+        }
277 278
 
278 279
         $cart = $this->ecommerce->getCurCart();
279 280
 
Please login to merge, or discard this patch.
system/modules/Ecommerce/appControllers/content/Cart/index.php 3 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -49,12 +49,12 @@  discard block
 block discarded – undo
49 49
                 <?php $this->widget('Ecommerce\cart/fields', ['form' => $form, 'cart' => $cart]); ?>
50 50
               </fieldset>
51 51
               <?php
52
-              $packchecked = '';
53
-              $packItem = false;
54
-              $packSum = 0;
55
-              if ($packItem) {
56
-                  $packchecked = ((!empty($_POST) && empty($_POST['packs']))) ? '' : 'checked';
57
-                  ?>
52
+                $packchecked = '';
53
+                $packItem = false;
54
+                $packSum = 0;
55
+                if ($packItem) {
56
+                    $packchecked = ((!empty($_POST) && empty($_POST['packs']))) ? '' : 'checked';
57
+                    ?>
58 58
                   <fieldset id="additional">
59 59
                     <h2 class="secondary-title">Дополнительно</h2>
60 60
                     <div class=" checkout-payment-form">
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
78 78
                     </div>
79 79
                   </fieldset>
80 80
                   <?php
81
-              }
82
-              ?>
81
+                }
82
+                ?>
83 83
             </div>                                    
84 84
           </div>
85 85
           <div class="col-sm-8">
@@ -338,8 +338,8 @@  discard block
 block discarded – undo
338 338
             <hr />
339 339
             <div class="order_page-finish">
340 340
               <?php
341
-              $form->input('textarea', 'comment', 'Вы можете добавить комментарий к своему заказу', ['value' => (!empty($_POST['comment'])) ? $_POST['comment'] : '']);
342
-              ?>
341
+                $form->input('textarea', 'comment', 'Вы можете добавить комментарий к своему заказу', ['value' => (!empty($_POST['comment'])) ? $_POST['comment'] : '']);
342
+                ?>
343 343
               <div class="order_page-orderBtn">
344 344
                 <button name ="action" value ="order" data-loading-text="Подождите.." class="btn btn-primary">Подтверждение заказа</button>
345 345
               </div>
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@
 block discarded – undo
97 97
                         }
98 98
                         $helpText = '';
99 99
                         if ((float) $delivery->max_cart_price) {
100
-                            $helpText.= 'При заказе товаров на сумму от ' . $delivery->max_cart_price . ' руб - бесплатно';
100
+                            $helpText .= 'При заказе товаров на сумму от ' . $delivery->max_cart_price . ' руб - бесплатно';
101 101
                         }
102 102
                         if ($delivery->info) {
103 103
                             if ($helpText) {
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,9 +2,9 @@
 block discarded – undo
2 2
   <div class="cart-order_page">
3 3
     <h2>Быстрое оформление заказа</h2>
4 4
     <?php
5
-    if (!$cart || !$cart->cartItems)
6
-        echo "<h1>Ваша корзина пуста</h1>";
7
-    else {
5
+    if (!$cart || !$cart->cartItems) {
6
+            echo "<h1>Ваша корзина пуста</h1>";
7
+    } else {
8 8
         $sums = [];
9 9
         $cartDelivery = $cart->delivery;
10 10
         $deliveryPrice = 0;
Please login to merge, or discard this patch.
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/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.