injitools / cms-Inji

system/modules/Ecommerce/widgets/cart/cardSelect.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 $userCards = \Ecommerce\Card\Item::getList(['where' => ['user_id', \Users\User::$cur->id]]);
 foreach ($userCards as $userCard) {
     $checked = $cart->card_item_id == $userCard->id;
-    $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 . ' руб.']);
+    $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.' руб.']);
 }
 if (!$userCards) {
     echo '<p>У вас нет <b>дисконтной карты</b>, вы можете её оформить и сразу начать пльзоваться её приемуществами.</p>';

system/modules/Ecommerce/widgets/cart/delivery.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
           } else {

               $checked = '';

           }

-          echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';

+          echo '<li'.($checked ? ' class="active"' : '').'><a href = "#" onclick = "document.getElementById(\''.$hiddenId.'\').value=\''.$delivery->id.'\';inji.Ecommerce.Cart.calcSum();return false;">';

           echo $delivery->name;

           echo '</a></li>';

       }

@@ -27,10 +27,10 @@ 
     if ($cart->delivery) {

         echo "<h4>Информация о доставке</h4>";

         if ($cart->delivery->price_text || $cart->delivery->price) {

-            echo "<div>Стоимость доставки: <b>" . ($cart->delivery->price_text ? $cart->delivery->price_text : ( $cart->delivery->price . ' ' . ($cart->delivery->currency ? $cart->delivery->currency->acronym() : 'руб.') )) . '</b></div>';

+            echo "<div>Стоимость доставки: <b>".($cart->delivery->price_text ? $cart->delivery->price_text : ($cart->delivery->price.' '.($cart->delivery->currency ? $cart->delivery->currency->acronym() : 'руб.'))).'</b></div>';

         }

         if ((float) $cart->delivery->max_cart_price) {

-            echo '<div>При заказе товаров на сумму от ' . $cart->delivery->max_cart_price . ' руб - бесплатно</div>';

+            echo '<div>При заказе товаров на сумму от '.$cart->delivery->max_cart_price.' руб - бесплатно</div>';

         }

         echo $cart->delivery->info;

         if ($cart->delivery->fields) {

system/modules/Ecommerce/widgets/cart/payType.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
           } else {
               $checked = '';
           }
-          echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
+          echo '<li'.($checked ? ' class="active"' : '').'><a href = "#" onclick = "document.getElementById(\''.$hiddenId.'\').value=\''.$payType->id.'\';inji.Ecommerce.Cart.calcSum();return false;">';
           echo $payType->name;
           echo '</a></li>';
       }

system/modules/Ecommerce/widgets/cart/history.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
                       if (App::$cur->money) {
                           $currency = Money\Currency::get($currency_id);
                           if ($currency) {
-                              echo ' ' . $currency->acronym();
+                              echo ' '.$currency->acronym();
                           } else {
                               echo ' р.';
                           }
@@ -85,7 +85,7 @@ 
                       $newRedirect = $handlers[$cart->payType->handler]['handler']($cart);
                   }
                   if (!empty($newRedirect[0])) {
-                      echo '<a class="btn btn-warning btn-sm" href = "' . $newRedirect[0] . '">Оплатить</a>';
+                      echo '<a class="btn btn-warning btn-sm" href = "'.$newRedirect[0].'">Оплатить</a>';
                   } else {
                       echo 'Не оплачено';
                   }

system/modules/Ecommerce/objects/CloseCartBtn.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
             $cart->save();
         }
         $count = count($carts);
-        return 'Завершено <b>' . $count . '</b> ' . \Tools::getNumEnding($count, ['корзина', 'корзины', 'корзин']);
+        return 'Завершено <b>'.$count.'</b> '.\Tools::getNumEnding($count, ['корзина', 'корзины', 'корзин']);
     }
 
 }

system/modules/Ecommerce/snippets/payTypeHandler/onlinePay.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
                         'currency_id' => $currency_id,
                         'user_id' => \Users\User::$cur->id,
                         'sum' => $sum,
-                        'description' => 'Оплата заказа №' . $cart->id . ' в онлайн-магазине',
+                        'description' => 'Оплата заказа №'.$cart->id.' в онлайн-магазине',
                         'type' => 'pay',
                         'pay_status_id' => 1,
                         'callback_module' => 'Ecommerce',
@@ -32,7 +32,7 @@ 
                     $pay->save();
                 }
             }
-            return ['/money/merchants/pay/?data=' . $cart->id, 'Ваш заказ был создан. Вам необходимо оплатить счета, после чего с вами свяжется администратор для уточнения дополнительной информации', 'success'];
+            return ['/money/merchants/pay/?data='.$cart->id, 'Ваш заказ был создан. Вам необходимо оплатить счета, после чего с вами свяжется администратор для уточнения дополнительной информации', 'success'];
         }
     }
         ];

system/modules/Ecommerce/Ecommerce.php

Spacing +33 added lines, -33 removed lines

@@ -52,7 +52,7 @@ 
         $name = '';
         foreach ($fields as $field) {
             if ($field->save && !empty($data[$field->id])) {
-                $name .= htmlspecialchars($data[$field->id]) . ' ';
+                $name .= htmlspecialchars($data[$field->id]).' ';
             }
         }
         $name = trim($name);
@@ -109,7 +109,7 @@ 
         $name = '';
         foreach ($fields as $field) {
             if ($field->save && !empty($data[$field->id])) {
-                $name .= htmlspecialchars($data[$field->id]) . ' ';
+                $name .= htmlspecialchars($data[$field->id]).' ';
             }
         }
         $name = trim($name);
@@ -196,7 +196,7 @@ 
             foreach ($options['sort'] as $col => $direction) {
                 switch ($col) {
                     case 'price':
-                        $selectOptions['order'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
+                        $selectOptions['order'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
                         break;
                     case 'name':
                         $selectOptions['order'][] = ['name', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
@@ -217,10 +217,10 @@ 
         if (!empty($this->config['view_filter'])) {
             if (!empty($this->config['view_filter']['options'])) {
                 foreach ($this->config['view_filter']['options'] as $optionId => $optionValue) {
-                    $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
-                        'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-                        'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value = "' . (int) $optionValue . '"',
-                        'inner', 'option' . $optionId];
+                    $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index().' = '.'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item::index().' AND '.
+                        'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' = "'.(int) $optionId.'" AND '.
+                        'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().'value = "'.(int) $optionValue.'"',
+                        'inner', 'option'.$optionId];
                 }
             }
         }
@@ -230,18 +230,18 @@ 
                 switch ($col) {
                     case 'price':
                         if (!empty($filter['min'])) {
-                            $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['min'], '>='];
+                            $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', (float) $filter['min'], '>='];
                         }
                         if (!empty($filter['max'])) {
-                            $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['max'], '<='];
+                            $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', (float) $filter['max'], '<='];
                         }
                         break;
                     case 'options':
                         foreach ($filter as $optionId => $optionValue) {
-                            $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
-                                'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-                                'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value = "' . (int) $optionValue . '"',
-                                'inner', 'option' . $optionId];
+                            $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index().' = '.'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item::index().' AND '.
+                                'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' = "'.(int) $optionId.'" AND '.
+                                'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().'value = "'.(int) $optionValue.'"',
+                                'inner', 'option'.$optionId];
                         }
                         break;
                 }
@@ -256,13 +256,13 @@ 
                     continue;
                 }
                 $category = \Ecommerce\Category::get($categoryId);
-                $where[] = ['tree_path', $category->tree_path . (int) $categoryId . '/%', 'LIKE', $first ? 'AND' : 'OR'];
+                $where[] = ['tree_path', $category->tree_path.(int) $categoryId.'/%', 'LIKE', $first ? 'AND' : 'OR'];
                 $first = false;
             }
             $selectOptions['where'][] = $where;
         } elseif (!empty($options['parent'])) {
             $category = \Ecommerce\Category::get($options['parent']);
-            $selectOptions['where'][] = ['tree_path', $category->tree_path . (int) $options['parent'] . '/%', 'LIKE'];
+            $selectOptions['where'][] = ['tree_path', $category->tree_path.(int) $options['parent'].'/%', 'LIKE'];
         }
 
         //search
@@ -272,7 +272,7 @@ 
             foreach (explode(' ', $searchStr) as $part) {
                 $part = trim($part);
                 if ($part && strlen($part) > 2) {
-                    $searchArr[] = ['search_index', '%' . $part . '%', 'LIKE'];
+                    $searchArr[] = ['search_index', '%'.$part.'%', 'LIKE'];
                 }
             }
             if (!empty($searchArr)) {
@@ -282,18 +282,18 @@ 
         if (empty($this->config['view_empty_warehouse'])) {
             $selectOptions['where'][] = [
                 '(
-          (SELECT COALESCE(sum(`' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . 'count`),0) 
-            FROM ' . \App::$cur->db->table_prefix . \Ecommerce\Item\Offer\Warehouse::table() . ' iciw 
-            WHERE iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . '
+          (SELECT COALESCE(sum(`' . \Ecommerce\Item\Offer\Warehouse::colPrefix().'count`),0) 
+            FROM ' . \App::$cur->db->table_prefix.\Ecommerce\Item\Offer\Warehouse::table().' iciw 
+            WHERE iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Item\Offer::index().' = '.\Ecommerce\Item\Offer::index().'
             )
           -
-          (SELECT COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix() . 'count) ,0)
-            FROM ' . \App::$cur->db->table_prefix . \Ecommerce\Warehouse\Block::table() . ' iewb
-            inner JOIN ' . \App::$cur->db->table_prefix . \Ecommerce\Cart::table() . ' icc ON icc.' . \Ecommerce\Cart::index() . ' = iewb.' . \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() . \Ecommerce\Cart\Status::index() . '` in(0,1) and `' . \Ecommerce\Cart::colPrefix() . 'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
+          (SELECT COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix().'count) ,0)
+            FROM ' . \App::$cur->db->table_prefix.\Ecommerce\Warehouse\Block::table().' iewb
+            inner JOIN ' . \App::$cur->db->table_prefix.\Ecommerce\Cart::table().' icc ON icc.'.\Ecommerce\Cart::index().' = iewb.'.\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().\Ecommerce\Cart\Status::index().'` in(0,1) and `'.\Ecommerce\Cart::colPrefix().'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
             )
-            WHERE iewb.' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . ')
+            WHERE iewb.' . \Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Item\Offer::index().' = '.\Ecommerce\Item\Offer::index().')
           )',
                 0,
                 '>'
@@ -301,15 +301,15 @@ 
         }
 
 
-        $selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index() . ' = ' . Ecommerce\Item\Offer::colPrefix() . Ecommerce\Item::index(), 'inner'];
+        $selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index().' = '.Ecommerce\Item\Offer::colPrefix().Ecommerce\Item::index(), 'inner'];
         $selectOptions['join'][] = [Ecommerce\Item\Offer\Price::table(),
-            Ecommerce\Item\Offer::index() . ' = ' . Ecommerce\Item\Offer\Price::colPrefix() . Ecommerce\Item\Offer::index() . ' and ' . Ecommerce\Item\Offer\Price::colPrefix() . 'price>0', 'inner'];
+            Ecommerce\Item\Offer::index().' = '.Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer::index().' and '.Ecommerce\Item\Offer\Price::colPrefix().'price>0', 'inner'];
         $selectOptions['join'][] = [
-            Ecommerce\Item\Offer\Price\Type::table(), Ecommerce\Item\Offer\Price::colPrefix() . Ecommerce\Item\Offer\Price\Type::index() . ' = ' . Ecommerce\Item\Offer\Price\Type::index() .
-            ' and (' . Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles="" || ' . Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles LIKE "%|' . \Users\User::$cur->role_id . '|%")'
+            Ecommerce\Item\Offer\Price\Type::table(), Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer\Price\Type::index().' = '.Ecommerce\Item\Offer\Price\Type::index().
+            ' and ('.Ecommerce\Item\Offer\Price\Type::colPrefix().'roles="" || '.Ecommerce\Item\Offer\Price\Type::colPrefix().'roles LIKE "%|'.\Users\User::$cur->role_id.'|%")'
         ];
         $selectOptions['where'][] = [
-            [Ecommerce\Item\Offer\Price::colPrefix() . Ecommerce\Item\Offer\Price\Type::index(), 0],
+            [Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer\Price\Type::index(), 0],
             [Ecommerce\Item\Offer\Price\Type::index(), 0, '>', 'OR']
         ];
 
@@ -332,7 +332,7 @@ 
         $items = Ecommerce\Item::getList($selectOptions);
         $items = Ecommerce\Item\Param::getList([
                     'where' => ['item_id', array_keys($items), 'IN'],
-                    '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']],
+                    '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']],
                     'distinct' => \Ecommerce\Item\Option::index()
         ]);
         return $items;
@@ -365,7 +365,7 @@ 
         if (is_array($counts)) {
             $sum = 0;
             foreach ($counts as $count) {
-                $sum +=$count['count'];
+                $sum += $count['count'];
             }
             return $sum;
         }
@@ -401,7 +401,7 @@ 
 
         if (!empty($conf['files']['aditionTemplateFiels'])) {
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
-                $return[$file['file']] = '- ' . $file['name'];
+                $return[$file['file']] = '- '.$file['name'];
             }
         }
         return $return;

system/modules/Libs/Libs.php

Spacing +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
     public function loadLib($libName, $options = [])
     {
 
-        $className = 'Libs\\' . ucfirst($libName);
+        $className = 'Libs\\'.ucfirst($libName);
         if (class_exists($className)) {
             if (!empty($className::$composerPacks)) {
                 foreach ($className::$composerPacks as $packageName => $version) {
@@ -25,12 +25,12 @@ 
                     $this->loadLib($rLib);
                 }
             }
-            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'] )) {
+            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'])) {
                 foreach ($className::$files['css'] as $file) {
                     if (strpos($file, '/') === 0 || strpos($file, 'http') === 0) {
                         App::$cur->view->customAsset('css', $file, $libName);
                     } else {
-                        App::$cur->view->customAsset('css', '/static/libs/vendor/' . ucfirst($libName) . '/' . $file, $libName);
+                        App::$cur->view->customAsset('css', '/static/libs/vendor/'.ucfirst($libName).'/'.$file, $libName);
                     }
                 }
             }
@@ -39,7 +39,7 @@ 
                     if (strpos($file, '/') === 0 || strpos($file, 'http') === 0) {
                         App::$cur->view->customAsset('js', $file, $libName);
                     } else {
-                        App::$cur->view->customAsset('js', '/static/libs/vendor/' . ucfirst($libName) . '/' . $file, $libName);
+                        App::$cur->view->customAsset('js', '/static/libs/vendor/'.ucfirst($libName).'/'.$file, $libName);
                     }
                 }
             }
@@ -50,30 +50,30 @@ 
     {
         $libPath = preg_replace('!^libs/!', '', $file);
         $libName = substr($libPath, 0, strpos($libPath, '/'));
-        $className = 'Libs\\' . ucfirst($libName);
+        $className = 'Libs\\'.ucfirst($libName);
         if (class_exists($className)) {
             if (!empty($className::$programDirs)) {
                 $fileDir = substr($libPath, strlen($libName) + 1, strpos($libPath, '/', strlen($libName) + 1) - strlen($libName) - 1);
                 foreach ($className::$programDirs as $programDir) {
                     if ($programDir == $fileDir) {
-                        include $dir . $file;
+                        include $dir.$file;
                         exit();
                     }
                 }
             }
         }
-        return $dir . $file;
+        return $dir.$file;
     }
 
     public function getPath($args)
     {
         if (!empty($args[0])) {
-            $libName = 'Libs\\' . ucfirst($args[0]);
+            $libName = 'Libs\\'.ucfirst($args[0]);
             if (class_exists($libName)) {
                 $file = implode('/', array_slice($args, 1));
                 foreach ($libName::$staticDirs as $dir) {
                     if (strpos($file, $dir) === 0) {
-                        return \App::$primary->path . '/vendor/' . $file;
+                        return \App::$primary->path.'/vendor/'.$file;
                     }
                 }
             }

system/modules/View/appAdminControllers/content/index.php

Spacing +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
     foreach ($templates['app']['installed'] as $template => $name) {
         $table->addRow([
             $name,
-            (empty($templates['app']['current']) || $templates['app']['current'] != $template) ? '<a href = "/admin/view/setDefault/' . $template . '">Установить по умолчанию</a>' : 'Тема по умолчанию',
-            '<a href = "/admin/view/editTemplate/' . $template . '">Редактировать</a>'
+            (empty($templates['app']['current']) || $templates['app']['current'] != $template) ? '<a href = "/admin/view/setDefault/'.$template.'">Установить по умолчанию</a>' : 'Тема по умолчанию',
+            '<a href = "/admin/view/editTemplate/'.$template.'">Редактировать</a>'
         ]);
     }
 $table->draw();
\ No newline at end of file