injitools / cms-Inji

system/modules/Ecommerce/models/Cart/Item.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
                     $event->save();
                 }
                 if ($cur->count != $this->count) {
-                    $event = new Event(['cart_id' => $this->cart->cart_id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 4, 'info' => $this->item_offer_price_id . "|" . ($this->count - $cur->count)]);
+                    $event = new Event(['cart_id' => $this->cart->cart_id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 4, 'info' => $this->item_offer_price_id."|".($this->count - $cur->count)]);
                     $event->save();
                 }
             }

system/modules/Ecommerce/models/Cart.php

Spacing +2 added lines, -2 removed lines

@@ -216,7 +216,7 @@ 
 
     public static function itemName($item)
     {
-        return $item->pk() . '. ' . $item->name();
+        return $item->pk().'. '.$item->name();
     }
 
     public static $forms = [
@@ -281,7 +281,7 @@ 
                 $groups[$stage->group] = $stage;
             }
         }
-        $discounts = Cart\Discount::getList(['where'=>['cart_id',$this->id]]);
+        $discounts = Cart\Discount::getList(['where'=>['cart_id', $this->id]]);
         foreach ($discounts as $discount) {
             if (!isset($groups[$discount->group]) && $discount->auto) {
                 $discount->delete();

system/modules/Ecommerce/models/Item/Offer.php

Spacing +10 added lines, -10 removed lines

@@ -78,12 +78,12 @@ 
     {
         $warehouse = Offer\Warehouse::get([['count', '0', '>'], ['item_offer_id', $this->id]]);
         if ($warehouse) {
-            $warehouse->count +=(float) $count;
+            $warehouse->count += (float) $count;
             $warehouse->save();
         } else {
             $warehouse = Offer\Warehouse::get([['item_offer_id', $this->id]]);
             if ($warehouse) {
-                $warehouse->count +=(float) $count;
+                $warehouse->count += (float) $count;
                 $warehouse->save();
             }
         }
@@ -91,19 +91,19 @@ 
 
     public function warehouseCount($cart_id = 0)
     {
-        \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Item\Offer::index(), $this->id);
-        \App::$cur->db->cols = 'COALESCE(sum(' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . 'count),0) as `sum` ';
+        \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Item\Offer::index(), $this->id);
+        \App::$cur->db->cols = 'COALESCE(sum('.\Ecommerce\Item\Offer\Warehouse::colPrefix().'count),0) as `sum` ';
         $warehouse = \App::$cur->db->select(\Ecommerce\Item\Offer\Warehouse::table())->fetch();
 
-        \App::$cur->db->cols = 'COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix() . 'count) ,0) as `sum` ';
-        \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Item\Offer::index(), $this->id);
+        \App::$cur->db->cols = 'COALESCE(sum('.\Ecommerce\Warehouse\Block::colPrefix().'count) ,0) as `sum` ';
+        \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Item\Offer::index(), $this->id);
         if ($cart_id) {
-            \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Cart::index(), (int) $cart_id, '!=');
+            \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Cart::index(), (int) $cart_id, '!=');
         }
         $on = '
-            ' . \Ecommerce\Cart::index() . ' = ' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Cart::index() . ' AND (
-            (`' . \Ecommerce\Cart::colPrefix() . 'warehouse_block` = 1 and `' . \Ecommerce\Cart::colPrefix() . 'cart_status_id` in(2,3,6)) || 
-            (`' . \Ecommerce\Cart::colPrefix() . 'cart_status_id` in(0,1) and `' . \Ecommerce\Cart::colPrefix() . 'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
+            ' . \Ecommerce\Cart::index().' = '.\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Cart::index().' AND (
+            (`' . \Ecommerce\Cart::colPrefix().'warehouse_block` = 1 and `'.\Ecommerce\Cart::colPrefix().'cart_status_id` in(2,3,6)) || 
+            (`' . \Ecommerce\Cart::colPrefix().'cart_status_id` in(0,1) and `'.\Ecommerce\Cart::colPrefix().'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
             )
         ';
         \App::$cur->db->join(\Ecommerce\Cart::table(), $on, 'inner');

system/modules/Ecommerce/appAdminControllers/content/configure.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
   foreach ($managers as $manager) {
       $dataManager = new Ui\DataManager($manager);
       $dataManagers[$manager] = $dataManager;
-      $code = 'tab_' . str_replace('\\', '_', $manager);
+      $code = 'tab_'.str_replace('\\', '_', $manager);
       echo "<li role='presentation'><a href='#{$code}' aria-controls='{$code}' role='tab' data-toggle='tab'>{$dataManager->name}</a></li>";
   }
   ?>
@@ -54,7 +54,7 @@ 
   </div>
   <?php
   foreach ($dataManagers as $manager => $dataManager) {
-      $code = 'tab_' . str_replace('\\', '_', $manager);
+      $code = 'tab_'.str_replace('\\', '_', $manager);
       ?>
       <div role="tabpanel" class="tab-pane fade" id="<?= $code; ?>">
         <?php

system/modules/Ecommerce/appAdminControllers/EcommerceController.php

Spacing +2 added lines, -2 removed lines

@@ -74,8 +74,8 @@
                 unset($items[$key]);
                 unset($item);
             }
-            echo 'Происходит процесс индексации: проиндексировано ' . $i * $count;
-            Tools::redirect('/admin/ecommerce/reSearchIndex/' . $i);
+            echo 'Происходит процесс индексации: проиндексировано '.$i * $count;
+            Tools::redirect('/admin/ecommerce/reSearchIndex/'.$i);
         }
     }
 

system/modules/Ecommerce/appControllers/CartController.php

Spacing +13 added lines, -13 removed lines

@@ -62,7 +62,7 @@ 
                         $warecount = $cartitem->price->offer->warehouseCount($cart->id);
                         if ($cartitem->count > $warecount) {
                             $error = true;
-                            Msg::add('Вы заказали <b>' . $cartitem->item->name . '</b> больше чем есть на складе. на складе: <b>' . $warecount . '</b>', 'danger');
+                            Msg::add('Вы заказали <b>'.$cartitem->item->name.'</b> больше чем есть на складе. на складе: <b>'.$warecount.'</b>', 'danger');
                         }
                     }
                 }
@@ -74,7 +74,7 @@ 
                     foreach ($deliverys[$cart->delivery_id]->fields as $field) {
                         if (empty($_POST['deliveryFields'][$field->id]) && $field->required) {
                             $error = 1;
-                            Msg::add('Вы не указали: ' . $field->name);
+                            Msg::add('Вы не указали: '.$field->name);
                         }
                     }
                 }
@@ -90,7 +90,7 @@ 
                 foreach (\Ecommerce\UserAdds\Field::getList() as $field) {
                     if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
                         $error = 1;
-                        Msg::add('Вы не указали: ' . $field->name);
+                        Msg::add('Вы не указали: '.$field->name);
                     }
                 }
                 if (!empty($_POST['discounts']['card_item_id'])) {
@@ -127,13 +127,13 @@ 
                     }
                     $cart = \Ecommerce\Cart::get($cart->id);
                     if (!empty(\App::$cur->ecommerce->config['notify_mail'])) {
-                        $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/admin/ecommerce/Cart">Админ панель</a>';
-                        $title = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
-                        \Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
+                        $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/admin/ecommerce/Cart">Админ панель</a>';
+                        $title = 'Новый заказ в интернет магазине на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
+                        \Tools::sendMail('noreply@'.INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
                     }
                     if ($this->notifications) {
                         $notification = new Notifications\Notification();
-                        $notification->name = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
+                        $notification->name = 'Новый заказ в интернет магазине на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
                         $notification->text = 'Перейдите в админ панель чтобы просмотреть новый заказ';
                         $notification->chanel_id = $this->notifications->getChanel('Ecommerce-orders')->id;
                         $notification->save();
@@ -179,10 +179,10 @@ 
             'href' => '/ecommerce/cart'
         ];
         $bread[] = [
-            'text' => 'Заказ: №' . $cart->id,
-            'href' => '/ecommerce/cart/orderDetail/' . $cart->id
+            'text' => 'Заказ: №'.$cart->id,
+            'href' => '/ecommerce/cart/orderDetail/'.$cart->id
         ];
-        $this->view->setTitle('Заказ №' . $cart->id);
+        $this->view->setTitle('Заказ №'.$cart->id);
         $this->view->page(['data' => compact('cart', 'bread')]);
     }
 
@@ -275,7 +275,7 @@ 
             $result->send();
         }
 
-        $item->sales ++;
+        $item->sales++;
         $item->save();
 
         if (empty($_GET['count']))
@@ -288,7 +288,7 @@ 
 
         if (empty($this->module->config['sell_over_warehouse']) && $price->offer->warehouseCount() < $count) {
             $result->success = false;
-            $result->content = 'На складе недостаточно товара! Доступно: ' . $price->offer->warehouseCount();
+            $result->content = 'На складе недостаточно товара! Доступно: '.$price->offer->warehouseCount();
             $result->send();
         }
 
@@ -305,7 +305,7 @@ 
             $cart->addItem($price->id, $count);
         }
         $cart->calc();
-        $result->successMsg = '<a href="/ecommerce/view/' . $item->id . '">' . $item->name() . ($price->offer->name() ? ' (' . $price->offer->name() . ')' : '') . '</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
+        $result->successMsg = '<a href="/ecommerce/view/'.$item->id.'">'.$item->name().($price->offer->name() ? ' ('.$price->offer->name().')' : '').'</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
         $result->send();
     }
 

system/modules/Ecommerce/appControllers/content/Cart/orderDetail.php

Spacing +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
       <td class="text-left" style="width: 50%;">              
         <?php
         foreach ($orderDeatilCols as $col => $label) {
-            echo "<b>{$label}</b> " . $cart->$col . "<br>";
+            echo "<b>{$label}</b> ".$cart->$col."<br>";
         }
         ?>
       </td>
@@ -39,7 +39,7 @@ 
         <?php
         if ($cart->infos) {
             foreach ($cart->infos as $info) {
-                echo "<b>{$info->field->name()}</b> " . $info->value . "<br>";
+                echo "<b>{$info->field->name()}</b> ".$info->value."<br>";
             }
         }
         ?>
@@ -123,7 +123,7 @@ 
               if (App::$cur->money) {
                   $currency = Money\Currency::get($currency_id);
                   if ($currency) {
-                      echo '&nbsp;' . $currency->acronym();
+                      echo '&nbsp;'.$currency->acronym();
                   } else {
                       echo '&nbsp;руб.';
                   }
@@ -166,7 +166,7 @@ 
               if (App::$cur->money) {
                   $currency = Money\Currency::get($currency_id);
                   if ($currency) {
-                      echo '&nbsp;' . $currency->acronym();
+                      echo '&nbsp;'.$currency->acronym();
                   } else {
                       echo '&nbsp;руб.';
                   }
@@ -205,7 +205,7 @@ 
                 case'2':
                     $price = Ecommerce\Item\Offer\Price::get($status->info);
                     if ($price) {
-                        echo "<a href = '/ecommerce/view/{$item->id}'>" . $price->offer->item->name() . "</a>";
+                        echo "<a href = '/ecommerce/view/{$item->id}'>".$price->offer->item->name()."</a>";
                     } else {
                         echo 'Товар удален';
                     }
@@ -214,7 +214,7 @@ 
                     $info = explode('|', $status->info);
                     $price = Ecommerce\Item\Offer\Price::get($info[0]);
                     if ($price) {
-                        echo "<a href = '/ecommerce/view/{$item->id}'>" . $price->offer->item->name() . "</a> " . ($info[1] > 0 ? '+' . $info[1] : $info[1]);
+                        echo "<a href = '/ecommerce/view/{$item->id}'>".$price->offer->item->name()."</a> ".($info[1] > 0 ? '+'.$info[1] : $info[1]);
                     } else {
                         echo 'Товар удален';
                     }

system/modules/Ecommerce/appControllers/content/Cart/index.php

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
                               </a>
                             </td>
                             <td class="text-left name">
-                              <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>
+                              <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>
                             </td>
                             <td class="text-left quantity">
                               <?php $this->widget('Ecommerce\cart/ranger', compact('form', 'cart', 'cartItem')); ?>

system/modules/Ecommerce/widgets/filters.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
           switch ($option->type) {
               case 'radio':
                   foreach ($option->items as $item) {
-                      $this->widget('Ui\Form/' . $option->type, [
+                      $this->widget('Ui\Form/'.$option->type, [
                           'label' => $item->name,
                           'name' => "filters[options][{$option->id}]",
                           !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : false,
@@ -45,7 +45,7 @@ 
                   }
                   break;
               default:
-                  $this->widget('Ui\Form/' . $option->type, [
+                  $this->widget('Ui\Form/'.$option->type, [
                       'label' => $option->name,
                       'name' => "filters[options][{$option->id}]",
                       'options' => [