Completed
Push — master ( cd826b...6cd982 )
by Alexey
06:32 queued 01:53
created
system/modules/Ecommerce/appAdminControllers/EcommerceController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,8 +74,8 @@
 block discarded – undo
74 74
                 unset($items[$key]);
75 75
                 unset($item);
76 76
             }
77
-            echo 'Происходит процесс индексации: проиндексировано ' . $i * $count;
78
-            Tools::redirect('/admin/ecommerce/reSearchIndex/' . $i);
77
+            echo 'Происходит процесс индексации: проиндексировано '.$i * $count;
78
+            Tools::redirect('/admin/ecommerce/reSearchIndex/'.$i);
79 79
         }
80 80
     }
81 81
 
Please login to merge, or discard this patch.
system/modules/Ecommerce/appControllers/CartController.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
                         $warecount = $cartitem->price->offer->warehouseCount($cart->id);
63 63
                         if ($cartitem->count > $warecount) {
64 64
                             $error = true;
65
-                            Msg::add('Вы заказали <b>' . $cartitem->item->name . '</b> больше чем есть на складе. на складе: <b>' . $warecount . '</b>', 'danger');
65
+                            Msg::add('Вы заказали <b>'.$cartitem->item->name.'</b> больше чем есть на складе. на складе: <b>'.$warecount.'</b>', 'danger');
66 66
                         }
67 67
                     }
68 68
                 }
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
                     foreach ($deliverys[$cart->delivery_id]->fields as $field) {
75 75
                         if (empty($_POST['deliveryFields'][$field->id]) && $field->required) {
76 76
                             $error = 1;
77
-                            Msg::add('Вы не указали: ' . $field->name);
77
+                            Msg::add('Вы не указали: '.$field->name);
78 78
                         }
79 79
                     }
80 80
                 }
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
                 foreach (\Ecommerce\UserAdds\Field::getList() as $field) {
91 91
                     if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
92 92
                         $error = 1;
93
-                        Msg::add('Вы не указали: ' . $field->name);
93
+                        Msg::add('Вы не указали: '.$field->name);
94 94
                     }
95 95
                 }
96 96
                 if (!empty($_POST['discounts']['card_item_id'])) {
@@ -127,13 +127,13 @@  discard block
 block discarded – undo
127 127
                     }
128 128
                     $cart = \Ecommerce\Cart::get($cart->id);
129 129
                     if (!empty(\App::$cur->ecommerce->config['notify_mail'])) {
130
-                        $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/admin/ecommerce/Cart">Админ панель</a>';
131
-                        $title = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
132
-                        \Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
130
+                        $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/admin/ecommerce/Cart">Админ панель</a>';
131
+                        $title = 'Новый заказ в интернет магазине на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
132
+                        \Tools::sendMail('noreply@'.INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
133 133
                     }
134 134
                     if ($this->notifications) {
135 135
                         $notification = new Notifications\Notification();
136
-                        $notification->name = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
136
+                        $notification->name = 'Новый заказ в интернет магазине на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
137 137
                         $notification->text = 'Перейдите в админ панель чтобы просмотреть новый заказ';
138 138
                         $notification->chanel_id = $this->notifications->getChanel('Ecommerce-orders')->id;
139 139
                         $notification->save();
@@ -179,10 +179,10 @@  discard block
 block discarded – undo
179 179
             'href' => '/ecommerce/cart'
180 180
         ];
181 181
         $bread[] = [
182
-            'text' => 'Заказ: №' . $cart->id,
183
-            'href' => '/ecommerce/cart/orderDetail/' . $cart->id
182
+            'text' => 'Заказ: №'.$cart->id,
183
+            'href' => '/ecommerce/cart/orderDetail/'.$cart->id
184 184
         ];
185
-        $this->view->setTitle('Заказ №' . $cart->id);
185
+        $this->view->setTitle('Заказ №'.$cart->id);
186 186
         $this->view->page(['data' => compact('cart', 'bread')]);
187 187
     }
188 188
 
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
             $result->send();
276 276
         }
277 277
 
278
-        $item->sales ++;
278
+        $item->sales++;
279 279
         $item->save();
280 280
 
281 281
         if (empty($_GET['count']))
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
 
289 289
         if (empty($this->module->config['sell_over_warehouse']) && $price->offer->warehouseCount() < $count) {
290 290
             $result->success = false;
291
-            $result->content = 'На складе недостаточно товара! Доступно: ' . $price->offer->warehouseCount();
291
+            $result->content = 'На складе недостаточно товара! Доступно: '.$price->offer->warehouseCount();
292 292
             $result->send();
293 293
         }
294 294
 
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
             $cart->addItem($price->id, $count);
306 306
         }
307 307
         $cart->calc();
308
-        $result->successMsg = '<a href="/ecommerce/view/' . $item->id . '">' . $item->name() . ($price->offer->name() ? ' (' . $price->offer->name() . ')' : '') . '</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
308
+        $result->successMsg = '<a href="/ecommerce/view/'.$item->id.'">'.$item->name().($price->offer->name() ? ' ('.$price->offer->name().')' : '').'</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
309 309
         $result->send();
310 310
     }
311 311
 
Please login to merge, or discard this patch.
system/modules/Ecommerce/appControllers/content/Cart/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
                               </a>
102 102
                             </td>
103 103
                             <td class="text-left name">
104
-                              <a href="/ecommerce/view/<?= $cartItem->item->id; ?>"><?= $cartItem->item->name() . ($cartItem->price->offer->name && $cartItem->price->offer->name != $cartItem->item->name() ? ' (' . $cartItem->price->offer->name . ')' : ''); ?></a>
104
+                              <a href="/ecommerce/view/<?= $cartItem->item->id; ?>"><?= $cartItem->item->name().($cartItem->price->offer->name && $cartItem->price->offer->name != $cartItem->item->name() ? ' ('.$cartItem->price->offer->name.')' : ''); ?></a>
105 105
                             </td>
106 106
                             <td class="text-left quantity">
107 107
                               <?php $this->widget('Ecommerce\cart/ranger', compact('form', 'cart', 'cartItem')); ?>
Please login to merge, or discard this patch.
system/modules/Ecommerce/widgets/admin/contacts.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,11 +16,11 @@
 block discarded – undo
16 16
                         "mode": "",
17 17
                         "all": false,
18 18
                         "relation": "infos"}
19
-              )'><?= $count . ' ' . Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов']); ?></a>
19
+              )'><?= $count.' '.Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов']); ?></a>
20 20
     <?php
21 21
 } else {
22 22
     foreach ($item->infos as $info) {
23
-        echo $info->value . ' ';
23
+        echo $info->value.' ';
24 24
     }
25 25
 }
26 26
 ?>
27 27
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Ecommerce/widgets/cart/cardSelect.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 $userCards = \Ecommerce\Card\Item::getList(['where' => ['user_id', \Users\User::$cur->id]]);
4 4
 foreach ($userCards as $userCard) {
5 5
     $checked = $cart->card_item_id == $userCard->id;
6
-    $form->input('radio', "discounts[card_item_id]", $userCard->card->name, ['value' => $userCard->id, 'checked' => $checked, 'helpText' => $userCard->level->name . ' (' . $userCard->level->discount->name . ')<br />Сумма накоплений: ' . $userCard->sum . ' руб.']);
6
+    $form->input('radio', "discounts[card_item_id]", $userCard->card->name, ['value' => $userCard->id, 'checked' => $checked, 'helpText' => $userCard->level->name.' ('.$userCard->level->discount->name.')<br />Сумма накоплений: '.$userCard->sum.' руб.']);
7 7
 }
8 8
 if (!$userCards) {
9 9
     echo '<p>У вас нет <b>дисконтной карты</b>, вы можете её оформить и сразу начать пльзоваться её приемуществами.</p>';
Please login to merge, or discard this patch.
system/modules/Ecommerce/widgets/cart/delivery.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
           } else {
10 10
               $checked = '';
11 11
           }
12
-          echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
12
+          echo '<li'.($checked ? ' class="active"' : '').'><a href = "#" onclick = "document.getElementById(\''.$hiddenId.'\').value=\''.$delivery->id.'\';inji.Ecommerce.Cart.calcSum();return false;">';
13 13
           echo $delivery->name;
14 14
           echo '</a></li>';
15 15
       }
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
27 27
     if ($cart->delivery) {
28 28
         echo "<h4>Информация о доставке</h4>";
29 29
         if ($cart->delivery->price_text || $cart->delivery->price) {
30
-            echo "<div>Стоимость доставки: <b>" . ($cart->delivery->price_text ? $cart->delivery->price_text : ( $cart->delivery->price . ' ' . ($cart->delivery->currency ? $cart->delivery->currency->acronym() : 'руб.') )) . '</b></div>';
30
+            echo "<div>Стоимость доставки: <b>".($cart->delivery->price_text ? $cart->delivery->price_text : ($cart->delivery->price.' '.($cart->delivery->currency ? $cart->delivery->currency->acronym() : 'руб.'))).'</b></div>';
31 31
         }
32 32
         if ((float) $cart->delivery->max_cart_price) {
33
-            echo '<div>При заказе товаров на сумму от ' . $cart->delivery->max_cart_price . ' руб - бесплатно</div>';
33
+            echo '<div>При заказе товаров на сумму от '.$cart->delivery->max_cart_price.' руб - бесплатно</div>';
34 34
         }
35 35
         echo $cart->delivery->info;
36 36
         if ($cart->delivery->fields) {
Please login to merge, or discard this patch.
system/modules/Ecommerce/widgets/cart/payType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
           } else {
10 10
               $checked = '';
11 11
           }
12
-          echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
12
+          echo '<li'.($checked ? ' class="active"' : '').'><a href = "#" onclick = "document.getElementById(\''.$hiddenId.'\').value=\''.$payType->id.'\';inji.Ecommerce.Cart.calcSum();return false;">';
13 13
           echo $payType->name;
14 14
           echo '</a></li>';
15 15
       }
Please login to merge, or discard this patch.
system/modules/Ecommerce/widgets/cart/history.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
                       if (App::$cur->money) {
62 62
                           $currency = Money\Currency::get($currency_id);
63 63
                           if ($currency) {
64
-                              echo '&nbsp;' . $currency->acronym();
64
+                              echo '&nbsp;'.$currency->acronym();
65 65
                           } else {
66 66
                               echo '&nbsp;р.';
67 67
                           }
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
                       $newRedirect = $handlers[$cart->payType->handler]['handler']($cart);
86 86
                   }
87 87
                   if (!empty($newRedirect[0])) {
88
-                      echo '<a class="btn btn-warning btn-sm" href = "' . $newRedirect[0] . '">Оплатить</a>';
88
+                      echo '<a class="btn btn-warning btn-sm" href = "'.$newRedirect[0].'">Оплатить</a>';
89 89
                   } else {
90 90
                       echo 'Не оплачено';
91 91
                   }
Please login to merge, or discard this patch.
system/modules/Ecommerce/objects/CloseCartBtn.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
             $cart->save();
50 50
         }
51 51
         $count = count($carts);
52
-        return 'Завершено <b>' . $count . '</b> ' . \Tools::getNumEnding($count, ['корзина', 'корзины', 'корзин']);
52
+        return 'Завершено <b>'.$count.'</b> '.\Tools::getNumEnding($count, ['корзина', 'корзины', 'корзин']);
53 53
     }
54 54
 
55 55
 }
Please login to merge, or discard this patch.