Completed
Push — master ( a8c78d...2ddeae )
by Alexey
05:27
created
system/modules/Ecommerce/widgets/cart/delivery.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 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 33
             echo '<div>При заказе товаров на сумму от ' . $cart->delivery->max_cart_price . ' руб - бесплатно</div>';
Please login to merge, or discard this patch.
system/modules/Migrations/objects/Parser/Object.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
                         } else {
65 65
                             $parserName = '\Migrations\Parser\Object\\' . ucfirst($param->type);
66 66
                         }
67
-                        if (!in_array($parserName, ['\Migrations\Parser\Object\ObjectLink','Exchange1c\Parser\Item\Images', '\Migrations\Parser\Object\Value', '\Migrations\Parser\Object\Relation', '\Migrations\Parser\Object\ParamsList'])) {
67
+                        if (!in_array($parserName, ['\Migrations\Parser\Object\ObjectLink', 'Exchange1c\Parser\Item\Images', '\Migrations\Parser\Object\Value', '\Migrations\Parser\Object\Relation', '\Migrations\Parser\Object\ParamsList'])) {
68 68
                             var_dump($parserName);
69 69
                             exit();
70 70
                         }
Please login to merge, or discard this patch.
system/modules/Migrations/objects/Parser/Object/Value.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@
 block discarded – undo
85 85
                 }
86 86
                 break;
87 87
             default:
88
-                if(is_array($value)){
88
+                if (is_array($value)) {
89 89
                     $value = implode(' ', $value);
90 90
                 }
91 91
                 $this->model->{$this->param->value} = $value;
Please login to merge, or discard this patch.
system/modules/Ecommerce/Ecommerce.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
         $items = Ecommerce\Item::getList($selectOptions);
333 333
         $items = Ecommerce\Item\Param::getList([
334 334
                     'where' => ['item_id', array_keys($items), 'IN'],
335
-                    'join' => [[Ecommerce\Item\Option::table(), Ecommerce\Item\Option::index() . ' = ' . \Ecommerce\Item\Param::colPrefix() .Ecommerce\Item\Option::index(). ' and ' . \Ecommerce\Item\Option::colPrefix() . 'searchable = 1', 'inner']],
335
+                    'join' => [[Ecommerce\Item\Option::table(), Ecommerce\Item\Option::index() . ' = ' . \Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' and ' . \Ecommerce\Item\Option::colPrefix() . 'searchable = 1', 'inner']],
336 336
                     'distinct' => \Ecommerce\Item\Option::index()
337 337
         ]);
338 338
         return $items;
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
         if (is_array($counts)) {
366 366
             $sum = 0;
367 367
             foreach ($counts as $count) {
368
-                $sum +=$count['count'];
368
+                $sum += $count['count'];
369 369
             }
370 370
             return $sum;
371 371
         }
Please login to merge, or discard this patch.