injitools / cms-Inji

system/modules/View/appAdminControllers/content/Template/chooseFile.php

Spacing +2 added lines, -2 removed lines

@@ -3,9 +3,9 @@
 <hr/>

 <?php

 foreach ($template->config['css'] as $file) {

-    if (file_exists($template->path . '/css/' . $file)) {

+    if (file_exists($template->path.'/css/'.$file)) {

         ?>

-        <a href ='/admin/view/template/editFile/<?= $template->name; ?>?path=<?= 'css/' . $file; ?>'><?= $file; ?></a>

+        <a href ='/admin/view/template/editFile/<?= $template->name; ?>?path=<?= 'css/'.$file; ?>'><?= $file; ?></a>

         <?php

     }

 }

system/modules/Sitemap/Sitemap.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
     {
         header("Content-Type: text/xml");
         header("Expires: Thu, 19 Feb 1998 13:24:18 GMT");
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
         header("Cache-Control: no-cache, must-revalidate");
         header("Cache-Control: post-check=0,pre-check=0");
         header("Cache-Control: max-age=0");
@@ -39,7 +39,7 @@ 
         $root->setAttribute("xmlns", "http://www.sitemaps.org/schemas/sitemap/0.9");
         $root = $xml->appendChild($root);
 
-        $addToXml = function ($xml, $parent, $nodeName, $text) {
+        $addToXml = function($xml, $parent, $nodeName, $text) {
             $node = $parent->appendChild($xml->createElement($nodeName));
             $node->appendChild($xml->createTextNode($text));
             return $node;

system/modules/Sitemap/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

system/modules/Materials/Materials.php

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
 
         if (!empty($conf['files']['aditionTemplateFiels'])) {
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
-                $return[$file['file']] = '- ' . $file['name'];
+                $return[$file['file']] = '- '.$file['name'];
             }
         }
         return $return;
@@ -77,7 +77,7 @@ 
 
         if (!empty($conf['files']['aditionTemplateFiels'])) {
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
-                $return[$file['file']] = '- ' . $file['name'];
+                $return[$file['file']] = '- '.$file['name'];
             }
         }
         return $return;
@@ -91,7 +91,7 @@ 
             $map[] = [
                 'name' => $mat->name,
                 'url' => [
-                    'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($mat->getHref())
+                    'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.INJI_DOMAIN_NAME.($mat->getHref())
                 ],
             ];
         }
@@ -104,7 +104,7 @@ 
                 $map[] = [
                     'name' => $mat->name,
                     'url' => [
-                        'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($mat->getHref())
+                        'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.INJI_DOMAIN_NAME.($mat->getHref())
                     ],
                 ];
             }

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

Indentation +87 added lines, -87 removed lines

@@ -8,11 +8,11 @@ 
         </tr>
       </thead>
       <?php
-      $orderDeatilCols = [
-          'id' => '№ Заказа',
-          'complete_data' => 'Дата заказа'
-      ];
-      ?>
+        $orderDeatilCols = [
+            'id' => '№ Заказа',
+            'complete_data' => 'Дата заказа'
+        ];
+        ?>
       <tbody>
         <tr>
           <td class="text-left" style="width: 50%;">              
@@ -65,91 +65,91 @@ 
         </thead>
         <tbody>
           <?php
-          $sums = [];
-          foreach ($cart->cartItems as $cartItem) {
-              $item = $cartItem->item;
-              $itemName = $item->name();
-              if (!isset($sums[$cartItem->price->currency_id])) {
-                  $sums[$cartItem->price->currency_id] = $cartItem->price->price;
-              } else {
-                  $sums[$cartItem->price->currency_id] += $cartItem->price->price;
-              }
-              ?>
+            $sums = [];
+            foreach ($cart->cartItems as $cartItem) {
+                $item = $cartItem->item;
+                $itemName = $item->name();
+                if (!isset($sums[$cartItem->price->currency_id])) {
+                    $sums[$cartItem->price->currency_id] = $cartItem->price->price;
+                } else {
+                    $sums[$cartItem->price->currency_id] += $cartItem->price->price;
+                }
+                ?>
               <tr>
                 <td class="text-left"><?= $itemName; ?></td>
                 <td class="text-right"><?= $cartItem->count; ?></td>
                 <td class="text-right"><?= $cartItem->price->price; ?> 
                   <?php
-                  if (App::$cur->money) {
-                      $currency = Money\Currency::get($cartItem->price->currency_id);
-                      if ($currency) {
-                          echo $currency->acronym();
-                      } else {
-                          echo 'руб.';
-                      }
-                  } else {
-                      echo 'руб.';
-                  }
-                  ?></td>
+                    if (App::$cur->money) {
+                        $currency = Money\Currency::get($cartItem->price->currency_id);
+                        if ($currency) {
+                            echo $currency->acronym();
+                        } else {
+                            echo 'руб.';
+                        }
+                    } else {
+                        echo 'руб.';
+                    }
+                    ?></td>
                 <td class="text-right"><?= ($cartItem->price->price * $cartItem->count); ?>
                   <?php
-                  if (App::$cur->money) {
-                      $currency = Money\Currency::get($cartItem->price->currency_id);
-                      if ($currency) {
-                          echo $currency->acronym();
-                      } else {
-                          echo 'руб.';
-                      }
-                  } else {
-                      echo 'руб.';
-                  }
-                  ?></td>
+                    if (App::$cur->money) {
+                        $currency = Money\Currency::get($cartItem->price->currency_id);
+                        if ($currency) {
+                            echo $currency->acronym();
+                        } else {
+                            echo 'руб.';
+                        }
+                    } else {
+                        echo 'руб.';
+                    }
+                    ?></td>
                 <td class="text-right" style="white-space: nowrap;">
                   <a onclick = 'inji.Ecommerce.Cart.addItem(<?= $item->getPrice()->id; ?>, 1);
                           return false;' data-original-title="Добавить в корзину" href="#" data-toggle="tooltip" title="" class="btn btn-primary"><i class="glyphicon glyphicon-shopping-cart"></i></a>
               </tr>
               <?php
-          }
-          ?>
+            }
+            ?>
         </tbody>
         <tfoot>
           <tr>
             <td colspan="2"></td>
             <td class="text-right"><b>Сумма</b></td>
             <td class="text-right"><?php
-              foreach ($sums as $currency_id => $sum) {
-                  if (!$sum) {
-                      continue;
-                  }
-                  echo number_format($sum, 2, '.', ' ');
-                  if (App::$cur->money) {
-                      $currency = Money\Currency::get($currency_id);
-                      if ($currency) {
-                          echo '&nbsp;' . $currency->acronym();
-                      } else {
-                          echo '&nbsp;руб.';
-                      }
-                  } else {
-                      echo '&nbsp;руб.';
-                  }
-                  echo '<br />';
-              }
-              ?></td>
+                foreach ($sums as $currency_id => $sum) {
+                    if (!$sum) {
+                        continue;
+                    }
+                    echo number_format($sum, 2, '.', ' ');
+                    if (App::$cur->money) {
+                        $currency = Money\Currency::get($currency_id);
+                        if ($currency) {
+                            echo '&nbsp;' . $currency->acronym();
+                        } else {
+                            echo '&nbsp;руб.';
+                        }
+                    } else {
+                        echo '&nbsp;руб.';
+                    }
+                    echo '<br />';
+                }
+                ?></td>
             <td></td>
           </tr>
           <?php
-          $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0;
-          $deliveryPrice = $cart->delivery->price;
-          if (!isset($sums[$deliveryCurrency])) {
-              $sums[$deliveryCurrency] = $deliveryPrice;
-          } else {
-              $sums[$deliveryCurrency] += $deliveryPrice;
-          }
-          $delCurrency = false;
-          if (App::$cur->money) {
-              $delCurrency = Money\Currency::get($deliveryPrice);
-          }
-          ?>
+            $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0;
+            $deliveryPrice = $cart->delivery->price;
+            if (!isset($sums[$deliveryCurrency])) {
+                $sums[$deliveryCurrency] = $deliveryPrice;
+            } else {
+                $sums[$deliveryCurrency] += $deliveryPrice;
+            }
+            $delCurrency = false;
+            if (App::$cur->money) {
+                $delCurrency = Money\Currency::get($deliveryPrice);
+            }
+            ?>
           <tr>
             <td colspan="2"></td>
             <td class="text-right"><b><?= $cart->delivery ? $cart->delivery->name : 'Доставка'; ?></b></td>
@@ -160,24 +160,24 @@ 
             <td colspan="2"></td>
             <td class="text-right"><b>Итого</b></td>
             <td class="text-right"><?php
-              foreach ($sums as $currency_id => $sum) {
-                  if (!$sum) {
-                      continue;
-                  }
-                  echo number_format($sum, 2, '.', ' ');
-                  if (App::$cur->money) {
-                      $currency = Money\Currency::get($currency_id);
-                      if ($currency) {
-                          echo '&nbsp;' . $currency->acronym();
-                      } else {
-                          echo '&nbsp;руб.';
-                      }
-                  } else {
-                      echo '&nbsp;руб.';
-                  }
-                  echo '<br />';
-              }
-              ?></td>
+                foreach ($sums as $currency_id => $sum) {
+                    if (!$sum) {
+                        continue;
+                    }
+                    echo number_format($sum, 2, '.', ' ');
+                    if (App::$cur->money) {
+                        $currency = Money\Currency::get($currency_id);
+                        if ($currency) {
+                            echo '&nbsp;' . $currency->acronym();
+                        } else {
+                            echo '&nbsp;руб.';
+                        }
+                    } else {
+                        echo '&nbsp;руб.';
+                    }
+                    echo '<br />';
+                }
+                ?></td>
             <td></td>
           </tr>
         </tfoot>

Spacing +6 added lines, -6 removed lines

@@ -18,7 +18,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>
@@ -41,7 +41,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>";
                 }
             }
             ?>
@@ -125,7 +125,7 @@ 
                   if (App::$cur->money) {
                       $currency = Money\Currency::get($currency_id);
                       if ($currency) {
-                          echo '&nbsp;' . $currency->acronym();
+                          echo '&nbsp;'.$currency->acronym();
                       } else {
                           echo '&nbsp;руб.';
                       }
@@ -168,7 +168,7 @@ 
                   if (App::$cur->money) {
                       $currency = Money\Currency::get($currency_id);
                       if ($currency) {
-                          echo '&nbsp;' . $currency->acronym();
+                          echo '&nbsp;'.$currency->acronym();
                       } else {
                           echo '&nbsp;руб.';
                       }
@@ -207,7 +207,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 'Товар удален';
                         }
@@ -216,7 +216,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/Migrations/objects/Parser/Object/Value.php

Indentation +30 added lines, -30 removed lines

@@ -13,85 +13,85 @@
 
 class Value extends \Migrations\Parser {
 
-  public function parse() {
+    public function parse() {
     $options = $this->param->options ? json_decode($this->param->options, true) : [];
     $modelName = get_class($this->model);
     $cols = $modelName::$cols;
     $value = $this->data;
     if (is_array($value)) {
-      $value = '';
+        $value = '';
     }
     if (!empty($cols[$this->param->value])) {
-      $col = $cols[$this->param->value];
-      if ($col['type'] == 'dynamicType') {
+        $col = $cols[$this->param->value];
+        if ($col['type'] == 'dynamicType') {
         switch ($col['typeSource']) {
-          case'selfMethod':
+            case'selfMethod':
             $type = $this->model->{$col['selfMethod']}();
             if (is_array($type)) {
-              if (strpos($type['relation'], ':')) {
+                if (strpos($type['relation'], ':')) {
                 $relationPath = explode(':', $type['relation']);
                 $relationName = array_pop($relationPath);
                 $item = $this->model;
                 foreach ($relationPath as $path) {
-                  $item = $item->$path;
+                    $item = $item->$path;
                 }
                 $itemModel = get_class($item);
                 $relation = $itemModel::getRelation($relationName);
                 $sourceModel = $relation['model'];
-              } else {
+                } else {
                 $relation = $modelName::getRelation($type['relation']);
                 $sourceModel = $relation['model'];
-              }
-              $objectId = \App::$cur->migrations->findObject((string) $value, $sourceModel);
-              if ($objectId) {
+                }
+                $objectId = \App::$cur->migrations->findObject((string) $value, $sourceModel);
+                if ($objectId) {
                 $value = $objectId->object_id;
-              }
+                }
             }
             break;
         }
-      } else {
+        } else {
         $type = $col['type'];
-      }
+        }
     } else {
-      $type = 'text';
+        $type = 'text';
     }
 
     if (!empty($options['valueReplace'])) {
-      $values = $this->param->values(['key' => 'original']);
-      if (empty($values[$value])) {
+        $values = $this->param->values(['key' => 'original']);
+        if (empty($values[$value])) {
         $valueObject = new \Migrations\Migration\Object\Param\Value();
         $valueObject->param_id = $this->param->id;
         $valueObject->original = $value;
         $valueObject->save();
-      } else {
+        } else {
         $valueObject = $values[$value];
-      }
-      $value = $valueObject->replace;
+        }
+        $value = $valueObject->replace;
     }
     switch ($type) {
-      case 'image':
+        case 'image':
         $notEq = true;
         $dir = pathinfo($this->object->walker->migtarionLog->source, PATHINFO_DIRNAME);
         if ($this->model->{$this->param->value}) {
-          $file = \Files\File::get($this->model->{$this->param->value});
-          if ($file && $value && file_exists($dir . '/' . $value) && file_exists(\App::$primary->path . $file->path) && md5_file($dir . '/' . $value) == md5_file(\App::$primary->path . $file->path)) {
+            $file = \Files\File::get($this->model->{$this->param->value});
+            if ($file && $value && file_exists($dir . '/' . $value) && file_exists(\App::$primary->path . $file->path) && md5_file($dir . '/' . $value) == md5_file(\App::$primary->path . $file->path)) {
             $notEq = false;
-          }
-          if ($file && $notEq) {
+            }
+            if ($file && $notEq) {
             $file->delete();
             $this->model->{$this->param->value} = 0;
-          }
+            }
         }
         if ($notEq) {
-          $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir . '/' . $value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
+            $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir . '/' . $value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
         }
         break;
-      default:
+        default:
         if (is_array($value)) {
-          $value = implode(' ', $value);
+            $value = implode(' ', $value);
         }
         $this->model->{$this->param->value} = $value;
     }
-  }
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
         $dir = pathinfo($this->object->walker->migtarionLog->source, PATHINFO_DIRNAME);
         if ($this->model->{$this->param->value}) {
           $file = \Files\File::get($this->model->{$this->param->value});
-          if ($file && $value && file_exists($dir . '/' . $value) && file_exists(\App::$primary->path . $file->path) && md5_file($dir . '/' . $value) == md5_file(\App::$primary->path . $file->path)) {
+          if ($file && $value && file_exists($dir.'/'.$value) && file_exists(\App::$primary->path.$file->path) && md5_file($dir.'/'.$value) == md5_file(\App::$primary->path.$file->path)) {
             $notEq = false;
           }
           if ($file && $notEq) {
@@ -83,7 +83,7 @@ 
           }
         }
         if ($notEq) {
-          $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir . '/' . $value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
+          $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir.'/'.$value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
         }
         break;
       default:

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

Indentation +61 added lines, -61 removed lines

@@ -13,63 +13,63 @@ 
 
 class Option extends \Model {
 
-  public static $objectName = 'Свойство';
-  public static $cols = [
-      //Основные параметры
-      'name' => ['type' => 'text'],
-      'filter_name' => ['type' => 'text'],
-      'image_file_id' => ['type' => 'image'],
-      'code' => ['type' => 'text'],
-      'type' => ['type' => 'text'],
-      'postfix' => ['type' => 'text'],
-      'default_val' => ['type' => 'text'],
-      'view' => ['type' => 'bool'],
-      'searchable' => ['type' => 'bool'],
-      //Системные
-      'weight' => ['type' => 'number'],
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
-      'advance' => ['type' => 'text'],
-      'date_create' => ['type' => 'dateTime'],
-      //Менеджеры
-      'item' => ['type' => 'dataManager', 'relation' => 'items'],
-  ];
-  public static $labels = [
-      'name' => 'Название',
-      'filter_name' => 'Название в фильтре',
-      'image_file_id' => 'Иконка',
-      'code' => 'Код',
-      'type' => 'Тип',
-      'postfix' => 'Постфикс',
-      'default_val' => 'Значение по умолчанию',
-      'view' => 'Отображается',
-      'searchable' => 'Используется при поиске',
-      'weight' => 'Вес сортировки',
-      'advance' => 'Дополнительные параметры',
-      'user_id' => 'Создатель',
-      'date_create' => 'Дата создания',
-      'item' => 'Значения для списка'
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Свойства товаров',
-          'cols' => [
-              'name', 'code', 'type', 'item', 'view', 'searchable', 'user_id', 'date_create'
-          ]
-      ]
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['name', 'filter_name'],
-              ['code', 'type', 'image_file_id'],
-              ['default_val', 'postfix'],
-              ['view', 'searchable'],
-              ['item']
-          ]
-      ]
-  ];
+    public static $objectName = 'Свойство';
+    public static $cols = [
+        //Основные параметры
+        'name' => ['type' => 'text'],
+        'filter_name' => ['type' => 'text'],
+        'image_file_id' => ['type' => 'image'],
+        'code' => ['type' => 'text'],
+        'type' => ['type' => 'text'],
+        'postfix' => ['type' => 'text'],
+        'default_val' => ['type' => 'text'],
+        'view' => ['type' => 'bool'],
+        'searchable' => ['type' => 'bool'],
+        //Системные
+        'weight' => ['type' => 'number'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'advance' => ['type' => 'text'],
+        'date_create' => ['type' => 'dateTime'],
+        //Менеджеры
+        'item' => ['type' => 'dataManager', 'relation' => 'items'],
+    ];
+    public static $labels = [
+        'name' => 'Название',
+        'filter_name' => 'Название в фильтре',
+        'image_file_id' => 'Иконка',
+        'code' => 'Код',
+        'type' => 'Тип',
+        'postfix' => 'Постфикс',
+        'default_val' => 'Значение по умолчанию',
+        'view' => 'Отображается',
+        'searchable' => 'Используется при поиске',
+        'weight' => 'Вес сортировки',
+        'advance' => 'Дополнительные параметры',
+        'user_id' => 'Создатель',
+        'date_create' => 'Дата создания',
+        'item' => 'Значения для списка'
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Свойства товаров',
+            'cols' => [
+                'name', 'code', 'type', 'item', 'view', 'searchable', 'user_id', 'date_create'
+            ]
+        ]
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['name', 'filter_name'],
+                ['code', 'type', 'image_file_id'],
+                ['default_val', 'postfix'],
+                ['view', 'searchable'],
+                ['item']
+            ]
+        ]
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'user' => [
             'model' => 'Users\User',
@@ -85,15 +85,15 @@ 
             'col' => 'image_file_id'
         ],
     ];
-  }
+    }
 
-  public function beforeSave() {
+    public function beforeSave() {
     if (!isset($this->id)) {
-      $this->user_id = \Users\User::$cur->id;
+        $this->user_id = \Users\User::$cur->id;
     }
     if ($this->advance && is_array($this->advance)) {
-      $this->advance = json_encode($this->advance);
+        $this->advance = json_encode($this->advance);
+    }
     }
-  }
 
 }

system/modules/Ecommerce/Ecommerce.php

Spacing +45 added lines, -45 removed lines

@@ -48,7 +48,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);
@@ -104,7 +104,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);
@@ -189,7 +189,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'];
@@ -208,22 +208,22 @@ 
       $selectOptions['where'][] = ['image_file_id', 0, '!='];
     }
 
-    $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() .
-        (empty($this->config['show_zero_price']) ? ' and ' . Ecommerce\Item\Offer\Price::colPrefix() . 'price>0' : ''),
+        Ecommerce\Item\Offer::index().' = '.Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer::index().
+        (empty($this->config['show_zero_price']) ? ' and '.Ecommerce\Item\Offer\Price::colPrefix().'price>0' : ''),
         empty($this->config['show_without_price']) ? 'inner' : 'left'];
 
     $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()
+        Ecommerce\Item\Offer\Price\Type::table(), Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer\Price\Type::index().' = '.Ecommerce\Item\Offer\Price\Type::index()
     ];
 
     $selectOptions['where'][] = [
         [Ecommerce\Item\Offer\Price\Type::index(), NULL, 'is'],
         [
-            [Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles', '', '=', 'OR'],
-            [Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles', '%|' . \Users\User::$cur->role_id . '|%', 'LIKE', 'OR'],
+            [Ecommerce\Item\Offer\Price\Type::colPrefix().'roles', '', '=', 'OR'],
+            [Ecommerce\Item\Offer\Price\Type::colPrefix().'roles', '%|'.\Users\User::$cur->role_id.'|%', 'LIKE', 'OR'],
         ],
     ];
 
@@ -231,10 +231,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];
         }
       }
     }
@@ -244,10 +244,10 @@ 
         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':
@@ -258,14 +258,14 @@ 
                 foreach ($optionValue as $val) {
                   $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                 }
-                $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
+                $qstr = 'IN ('.implode(',', $optionValueArr).')';
               } else {
-                $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
+                $qstr = '= '.\App::$cur->db->connection->pdo->quote($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 ' . $qstr . '',
-                  '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 '.$qstr.'',
+                  'inner', 'option'.$optionId];
             }
             break;
           case 'offerOptions':
@@ -277,14 +277,14 @@ 
                 foreach ($optionValue as $val) {
                   $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                 }
-                $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
+                $qstr = 'IN ('.implode(',', $optionValueArr).')';
               } else {
-                $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
+                $qstr = '= '.\App::$cur->db->connection->pdo->quote($optionValue);
               }
-              $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index() . ' = ' . 'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer::index() . ' AND ' .
-                  'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-                  'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . 'value ' . $qstr,
-                  'inner', 'offerOption' . $optionId];
+              $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index().' = '.'offerOption'.$optionId.'.'.Ecommerce\Item\Offer\Param::colPrefix().Ecommerce\Item\Offer::index().' AND '.
+                  'offerOption'.$optionId.'.'.Ecommerce\Item\Offer\Param::colPrefix().Ecommerce\Item\Offer\Option::index().' = "'.(int) $optionId.'" AND '.
+                  'offerOption'.$optionId.'.'.Ecommerce\Item\Offer\Param::colPrefix().'value '.$qstr,
+                  'inner', 'offerOption'.$optionId];
             }
             break;
         }
@@ -299,13 +299,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
@@ -315,7 +315,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)) {
@@ -334,19 +334,19 @@ 
       }
       $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() . '
-                ' . ($warehouseIds ? ' AND iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Warehouse::index() . ' IN(' . implode(',', $warehouseIds) . ')' : '') . '
+          (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().'
+                ' . ($warehouseIds ? ' AND iciw.'.\Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Warehouse::index().' IN('.implode(',', $warehouseIds).')' : '').'
             )
           -
-          (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,
           '>'
@@ -374,7 +374,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;
@@ -405,7 +405,7 @@ 
     if (is_array($counts)) {
       $sum = 0;
       foreach ($counts as $count) {
-        $sum +=$count['count'];
+        $sum += $count['count'];
       }
       return $sum;
     }
@@ -439,7 +439,7 @@ 
 
     if (!empty($conf['files']['aditionTemplateFiels'])) {
       foreach ($conf['files']['aditionTemplateFiels'] as $file) {
-        $return[$file['file']] = '- ' . $file['name'];
+        $return[$file['file']] = '- '.$file['name'];
       }
     }
     return $return;
@@ -513,7 +513,7 @@ 
       $map[] = [
           'name' => $item->name,
           'url' => [
-              'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
+              'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.INJI_DOMAIN_NAME.($item->getHref())
           ],
       ];
     }
@@ -526,7 +526,7 @@ 
         $map[] = [
             'name' => $item->name,
             'url' => [
-                'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
+                'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.INJI_DOMAIN_NAME.($item->getHref())
             ],
         ];
       }

Indentation +238 added lines, -238 removed lines

@@ -10,172 +10,172 @@ 
  */
 class Ecommerce extends Module {
 
-  public function init() {
+    public function init() {
     App::$primary->view->customAsset('js', '/moduleAsset/Ecommerce/js/cart.js');
-  }
+    }
 
-  public function getPayTypeHandlers($forSelect = false) {
+    public function getPayTypeHandlers($forSelect = false) {
     if (!$forSelect) {
-      return $this->getSnippets('payTypeHandler');
+        return $this->getSnippets('payTypeHandler');
     }
     $handlers = ['' => 'Не выбрано'];
     foreach ($this->getSnippets('payTypeHandler') as $key => $handler) {
-      if (empty($handler)) {
+        if (empty($handler)) {
         continue;
-      }
-      $handlers[$key] = $handler['name'];
+        }
+        $handlers[$key] = $handler['name'];
     }
     return $handlers;
-  }
+    }
 
-  public function cartPayRecive($data) {
+    public function cartPayRecive($data) {
     $cart = Ecommerce\Cart::get($data['pay']->data);
     if ($cart) {
-      $payed = true;
-      foreach ($cart->pays as $pay) {
+        $payed = true;
+        foreach ($cart->pays as $pay) {
         if ($pay->pay_status_id != 2) {
-          $payed = false;
-          break;
+            $payed = false;
+            break;
         }
-      }
-      $cart->payed = $payed;
-      $cart->save();
+        }
+        $cart->payed = $payed;
+        $cart->save();
+    }
     }
-  }
 
-  public function parseFields($data, $cart) {
+    public function parseFields($data, $cart) {
     $fields = \Ecommerce\UserAdds\Field::getList();
     $name = '';
     foreach ($fields as $field) {
-      if ($field->save && !empty($data[$field->id])) {
+        if ($field->save && !empty($data[$field->id])) {
         $name .= htmlspecialchars($data[$field->id]) . ' ';
-      }
+        }
     }
     $name = trim($name);
 
     $userAdds = Ecommerce\UserAdds::get([['user_id', $cart->user->id], ['name', $name]]);
     if (!$userAdds) {
-      $userAdds = new Ecommerce\UserAdds();
-      $userAdds->user_id = $cart->user->id;
-      $userAdds->name = $name;
-      $userAdds->save();
-      foreach ($fields as $field) {
+        $userAdds = new Ecommerce\UserAdds();
+        $userAdds->user_id = $cart->user->id;
+        $userAdds->name = $name;
+        $userAdds->save();
+        foreach ($fields as $field) {
         if (!$field->save) {
-          continue;
+            continue;
         }
         $userAddsValue = new Ecommerce\UserAdds\Value();
         $userAddsValue->value = htmlspecialchars($data[$field->id]);
         $userAddsValue->useradds_field_id = $field->id;
         $userAddsValue->useradds_id = $userAdds->id;
         $userAddsValue->save();
-      }
+        }
     }
     $user = \Users\User::get($cart->user_id);
     foreach ($fields as $field) {
-      $info = new \Ecommerce\Cart\Info();
-      $info->name = $field->name;
-      $info->value = htmlspecialchars($data[$field->id]);
-      $info->useradds_field_id = $field->id;
-      $info->cart_id = $cart->id;
-      $info->save();
-      $relations = [];
-      if ($field->userfield) {
+        $info = new \Ecommerce\Cart\Info();
+        $info->name = $field->name;
+        $info->value = htmlspecialchars($data[$field->id]);
+        $info->useradds_field_id = $field->id;
+        $info->cart_id = $cart->id;
+        $info->save();
+        $relations = [];
+        if ($field->userfield) {
         if (strpos($field->userfield, ':')) {
-          $path = explode(':', $field->userfield);
-          if (!$user->{$path[0]}->{$path[1]}) {
+            $path = explode(':', $field->userfield);
+            if (!$user->{$path[0]}->{$path[1]}) {
             $user->{$path[0]}->{$path[1]} = $info->value;
             $relations[$path[0]] = $path[0];
-          }
+            }
         } else {
-          if (!$user->{$field->userfield}) {
+            if (!$user->{$field->userfield}) {
             $user->{$field->userfield} = $info->value;
-          }
+            }
         }
-      }
-      foreach ($relations as $rel) {
+        }
+        foreach ($relations as $rel) {
         $user->$rel->save();
-      }
-      $user->save();
+        }
+        $user->save();
     }
     return $userAdds;
-  }
+    }
 
-  public function parseDeliveryFields($data, $cart, $fields) {
+    public function parseDeliveryFields($data, $cart, $fields) {
     $name = '';
     foreach ($fields as $field) {
-      if ($field->save && !empty($data[$field->id])) {
+        if ($field->save && !empty($data[$field->id])) {
         $name .= htmlspecialchars($data[$field->id]) . ' ';
-      }
+        }
     }
     $name = trim($name);
 
     $save = Ecommerce\Delivery\Save::get([['user_id', $cart->user->id], ['name', $name]]);
     if (!$save) {
-      $save = new Ecommerce\Delivery\Save();
-      $save->user_id = $cart->user->id;
-      $save->name = $name;
-      $save->save();
-      foreach ($fields as $field) {
+        $save = new Ecommerce\Delivery\Save();
+        $save->user_id = $cart->user->id;
+        $save->name = $name;
+        $save->save();
+        foreach ($fields as $field) {
         if (!$field->save) {
-          continue;
+            continue;
         }
         $saveValue = new Ecommerce\Delivery\Value();
         $saveValue->value = htmlspecialchars($data[$field->id]);
         $saveValue->delivery_field_id = $field->id;
         $saveValue->delivery_save_id = $save->id;
         $saveValue->save();
-      }
+        }
     }
     $user = \Users\User::get($cart->user_id);
     foreach ($fields as $field) {
-      $info = new \Ecommerce\Cart\DeliveryInfo();
-      $info->name = $field->name;
-      $info->value = htmlspecialchars($data[$field->id]);
-      $info->delivery_field_id = $field->id;
-      $info->cart_id = $cart->id;
-      $info->save();
-      $relations = [];
-      if ($field->userfield) {
+        $info = new \Ecommerce\Cart\DeliveryInfo();
+        $info->name = $field->name;
+        $info->value = htmlspecialchars($data[$field->id]);
+        $info->delivery_field_id = $field->id;
+        $info->cart_id = $cart->id;
+        $info->save();
+        $relations = [];
+        if ($field->userfield) {
         if (strpos($field->userfield, ':')) {
-          $path = explode(':', $field->userfield);
-          if (!$user->{$path[0]}->{$path[1]}) {
+            $path = explode(':', $field->userfield);
+            if (!$user->{$path[0]}->{$path[1]}) {
             $user->{$path[0]}->{$path[1]} = $info->value;
             $relations[$path[0]] = $path[0];
-          }
+            }
         } else {
-          if (!$user->{$field->userfield}) {
+            if (!$user->{$field->userfield}) {
             $user->{$field->userfield} = $info->value;
-          }
+            }
         }
-      }
-      foreach ($relations as $rel) {
+        }
+        foreach ($relations as $rel) {
         $user->$rel->save();
-      }
-      $user->save();
+        }
+        $user->save();
     }
     return $save;
-  }
+    }
 
-  public function getCurCart($create = true) {
+    public function getCurCart($create = true) {
     $cart = false;
     if (!empty($_SESSION['cart']['cart_id'])) {
-      $cart = Ecommerce\Cart::get((int) $_SESSION['cart']['cart_id']);
+        $cart = Ecommerce\Cart::get((int) $_SESSION['cart']['cart_id']);
     }
     if (!$cart && $create) {
-      $cart = new Ecommerce\Cart();
-      $cart->cart_status_id = 1;
-      $cart->user_id = Users\User::$cur->id;
-      $userCard = \Ecommerce\Card\Item::get(\Users\User::$cur->id, 'user_id');
-      if ($userCard) {
+        $cart = new Ecommerce\Cart();
+        $cart->cart_status_id = 1;
+        $cart->user_id = Users\User::$cur->id;
+        $userCard = \Ecommerce\Card\Item::get(\Users\User::$cur->id, 'user_id');
+        if ($userCard) {
         $cart->card_item_id = $userCard->id;
-      }
-      $cart->save();
-      $_SESSION['cart']['cart_id'] = $cart->id;
+        }
+        $cart->save();
+        $_SESSION['cart']['cart_id'] = $cart->id;
     }
     return $cart;
-  }
+    }
 
-  public function parseOptions($options = []) {
+    public function parseOptions($options = []) {
     $selectOptions = [
         'where' => !empty($options['where']) ? $options['where'] : [],
         'distinct' => false,
@@ -186,29 +186,29 @@ 
         'limit' => !empty($options['count']) ? (int) $options['count'] : 0,
     ];
     if (!empty($options['sort']) && is_array($options['sort'])) {
-      foreach ($options['sort'] as $col => $direction) {
+        foreach ($options['sort'] as $col => $direction) {
         switch ($col) {
-          case 'price':
+            case 'price':
             $selectOptions['order'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
-          case 'name':
+            case 'name':
             $selectOptions['order'][] = ['name', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
-          case 'sales':
+            case 'sales':
             $selectOptions['order'][] = ['sales', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
-          case 'weight':
+            case 'weight':
             $selectOptions['order'][] = ['weight', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
-          case 'new':
+            case 'new':
             $selectOptions['order'][] = ['date_create', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
         }
-      }
+        }
     }
     $selectOptions['where'][] = ['deleted', 0];
     if (empty($this->config['view_empty_image'])) {
-      $selectOptions['where'][] = ['image_file_id', 0, '!='];
+        $selectOptions['where'][] = ['image_file_id', 0, '!='];
     }
 
     $selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index() . ' = ' . Ecommerce\Item\Offer::colPrefix() . Ecommerce\Item::index(), 'inner'];
@@ -232,111 +232,111 @@ 
 
 
     if (!empty($this->config['view_filter'])) {
-      if (!empty($this->config['view_filter']['options'])) {
+        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];
+        }
         }
-      }
     }
     //filters
     if (!empty($options['filters'])) {
-      foreach ($options['filters'] as $col => $filter) {
+        foreach ($options['filters'] as $col => $filter) {
         switch ($col) {
-          case 'price':
+            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':
+            case 'options':
             foreach ($filter as $optionId => $optionValue) {
-              $optionId = (int) $optionId;
-              if (is_array($optionValue)) {
+                $optionId = (int) $optionId;
+                if (is_array($optionValue)) {
                 $optionValueArr = [];
                 foreach ($optionValue as $val) {
-                  $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
+                    $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                 }
                 $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
-              } else {
+                } else {
                 $qstr = '= ' . \App::$cur->db->connection->pdo->quote($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 ' . $qstr . '',
-                  '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 ' . $qstr . '',
+                    'inner', 'option' . $optionId];
             }
             break;
-          case 'offerOptions':
+            case 'offerOptions':
             //$selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index() . ' = offer.' . Ecommerce\Item\Offer::colPrefix() . Ecommerce\Item::index(), 'left', 'offer'];
             foreach ($filter as $optionId => $optionValue) {
-              $optionId = (int) $optionId;
-              if (is_array($optionValue)) {
+                $optionId = (int) $optionId;
+                if (is_array($optionValue)) {
                 $optionValueArr = [];
                 foreach ($optionValue as $val) {
-                  $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
+                    $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                 }
                 $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
-              } else {
+                } else {
                 $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
-              }
-              $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index() . ' = ' . 'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer::index() . ' AND ' .
-                  'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-                  'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . 'value ' . $qstr,
-                  'inner', 'offerOption' . $optionId];
+                }
+                $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index() . ' = ' . 'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer::index() . ' AND ' .
+                    'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer\Option::index() . ' = "' . (int) $optionId . '" AND ' .
+                    'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . 'value ' . $qstr,
+                    'inner', 'offerOption' . $optionId];
             }
             break;
         }
-      }
+        }
     }
     //parents
     if (!empty($options['parent']) && strpos($options['parent'], ',') !== false) {
-      $first = true;
-      $where = [];
-      foreach (explode(',', $options['parent']) as $categoryId) {
+        $first = true;
+        $where = [];
+        foreach (explode(',', $options['parent']) as $categoryId) {
         if (!$categoryId) {
-          continue;
+            continue;
         }
         $category = \Ecommerce\Category::get($categoryId);
         $where[] = ['tree_path', $category->tree_path . (int) $categoryId . '/%', 'LIKE', $first ? 'AND' : 'OR'];
         $first = false;
-      }
-      $selectOptions['where'][] = $where;
+        }
+        $selectOptions['where'][] = $where;
     } elseif (!empty($options['parent'])) {
-      $category = \Ecommerce\Category::get($options['parent']);
-      $selectOptions['where'][] = ['tree_path', $category->tree_path . (int) $options['parent'] . '/%', 'LIKE'];
+        $category = \Ecommerce\Category::get($options['parent']);
+        $selectOptions['where'][] = ['tree_path', $category->tree_path . (int) $options['parent'] . '/%', 'LIKE'];
     }
 
     //search
     if (!empty($options['search'])) {
-      $searchStr = preg_replace('![^A-zА-я0-9 ]!iSu', ' ', $options['search']);
-      $searchArr = [];
-      foreach (explode(' ', $searchStr) as $part) {
+        $searchStr = preg_replace('![^A-zА-я0-9 ]!iSu', ' ', $options['search']);
+        $searchArr = [];
+        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)) {
+        if (!empty($searchArr)) {
         $selectOptions['where'][] = $searchArr;
-      }
+        }
     }
     if (empty($this->config['view_empty_warehouse'])) {
-      $warehouseIds = [];
-      if (App::$cur->geography && \Geography\City::$cur) {
+        $warehouseIds = [];
+        if (App::$cur->geography && \Geography\City::$cur) {
         $warehouses = \Geography\City\Data::get([['code', 'warehouses'], ['city_id', \Geography\City::$cur->id]]);
         if ($warehouses && $warehouses->data) {
-          foreach (explode(',', $warehouses->data) as $id) {
+            foreach (explode(',', $warehouses->data) as $id) {
             $warehouseIds[$id] = $id;
-          }
+            }
+        }
         }
-      }
-      $selectOptions['where'][] = [
-          '(
+        $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() . '
@@ -351,28 +351,28 @@ 
             )
             WHERE iewb.' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . ')
           )',
-          0,
-          '>'
-      ];
+            0,
+            '>'
+        ];
     }
 
     $selectOptions['group'] = Ecommerce\Item::index();
 
     return $selectOptions;
-  }
-
-  /**
-   * Getting items params with params
-   * 
-   * @param array $params
-   * @return array
-   */
-  public function getItemsParams($params = []) {
+    }
+
+    /**
+     * Getting items params with params
+     * 
+     * @param array $params
+     * @return array
+     */
+    public function getItemsParams($params = []) {
     $selectOptions = $this->parseOptions($params);
 
     $items = Ecommerce\Item::getList($selectOptions);
     if (!$items) {
-      return [];
+        return [];
     }
     $items = Ecommerce\Item\Param::getList([
                 'where' => ['item_id', array_keys($items), 'IN'],
@@ -380,58 +380,58 @@ 
                 'distinct' => \Ecommerce\Item\Option::index()
     ]);
     return $items;
-  }
-
-  /**
-   * Getting items with params
-   * 
-   * @param array $params
-   * @return array
-   */
-  public function getItems($params = []) {
+    }
+
+    /**
+     * Getting items with params
+     * 
+     * @param array $params
+     * @return array
+     */
+    public function getItems($params = []) {
     $selectOptions = $this->parseOptions($params);
     $items = Ecommerce\Item::getList($selectOptions);
     return $items;
-  }
-
-  /**
-   * Return count of items with params
-   * 
-   * @param array $params
-   * @return int
-   */
-  public function getItemsCount($params = []) {
+    }
+
+    /**
+     * Return count of items with params
+     * 
+     * @param array $params
+     * @return int
+     */
+    public function getItemsCount($params = []) {
     $selectOptions = $this->parseOptions($params);
     $selectOptions['distinct'] = \Ecommerce\Item::index();
     $counts = Ecommerce\Item::getCount($selectOptions);
     if (is_array($counts)) {
-      $sum = 0;
-      foreach ($counts as $count) {
+        $sum = 0;
+        foreach ($counts as $count) {
         $sum +=$count['count'];
-      }
-      return $sum;
+        }
+        return $sum;
     }
     return $counts;
-  }
+    }
 
-  public function viewsCategoryList($inherit = true) {
+    public function viewsCategoryList($inherit = true) {
     $return = [];
     if ($inherit) {
-      $return['inherit'] = 'Как у родителя';
+        $return['inherit'] = 'Как у родителя';
     }
     $return['itemList'] = 'Список товаров';
     $conf = App::$primary->view->template->config;
     if (!empty($conf['files']['modules']['Ecommerce'])) {
-      foreach ($conf['files']['modules']['Ecommerce'] as $file) {
+        foreach ($conf['files']['modules']['Ecommerce'] as $file) {
         if ($file['type'] == 'Category') {
-          $return[$file['file']] = $file['name'];
+            $return[$file['file']] = $file['name'];
+        }
         }
-      }
     }
     return $return;
-  }
+    }
 
-  public function templatesCategoryList() {
+    public function templatesCategoryList() {
     $return = [
         'inherit' => 'Как у родителя',
         'current' => 'Текущая тема'
@@ -440,107 +440,107 @@ 
     $conf = App::$primary->view->template->config;
 
     if (!empty($conf['files']['aditionTemplateFiels'])) {
-      foreach ($conf['files']['aditionTemplateFiels'] as $file) {
+        foreach ($conf['files']['aditionTemplateFiels'] as $file) {
         $return[$file['file']] = '- ' . $file['name'];
-      }
+        }
     }
     return $return;
-  }
+    }
 
-  public function cartStatusDetector($event) {
+    public function cartStatusDetector($event) {
     $cart = $event['eventObject'];
     if (!empty($cart->_changedParams['cart_cart_status_id'])) {
-      $cart->date_status = date('Y-m-d H:i:s');
-      $event = new Ecommerce\Cart\Event(['cart_id' => $cart->id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 5, 'info' => $cart->cart_status_id]);
-      $event->save();
+        $cart->date_status = date('Y-m-d H:i:s');
+        $event = new Ecommerce\Cart\Event(['cart_id' => $cart->id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 5, 'info' => $cart->cart_status_id]);
+        $event->save();
 
-      $prev_status_id = $cart->_changedParams['cart_cart_status_id'];
-      $now_status_id = $cart->cart_status_id;
+        $prev_status_id = $cart->_changedParams['cart_cart_status_id'];
+        $now_status_id = $cart->cart_status_id;
 
-      $status = Ecommerce\Cart\Status::getList(['where' => ['id', implode(',', [$prev_status_id, $now_status_id]), 'IN']]);
+        $status = Ecommerce\Cart\Status::getList(['where' => ['id', implode(',', [$prev_status_id, $now_status_id]), 'IN']]);
 
-      $prefix = isset(App::$cur->ecommerce->config['orderPrefix']) ? $config = App::$cur->ecommerce->config['orderPrefix'] : '';
-      \App::$cur->users->AddUserActivity($cart->user_id, 3, "Статус вашего заказа номер {$prefix}{$cart->id} изменился с {$status[$prev_status_id]->name} на {$status[$now_status_id]->name}");
+        $prefix = isset(App::$cur->ecommerce->config['orderPrefix']) ? $config = App::$cur->ecommerce->config['orderPrefix'] : '';
+        \App::$cur->users->AddUserActivity($cart->user_id, 3, "Статус вашего заказа номер {$prefix}{$cart->id} изменился с {$status[$prev_status_id]->name} на {$status[$now_status_id]->name}");
 
-      if ($cart->cart_status_id == 5) {
+        if ($cart->cart_status_id == 5) {
         Inji::$inst->event('ecommerceCartClosed', $cart);
-      }
+        }
     }
     return $cart;
-  }
+    }
 
-  public function cardTrigger($event) {
+    public function cardTrigger($event) {
     $cart = $event['eventObject'];
     if ($cart->card) {
-      $sum = 0;
-      foreach ($cart->cartItems as $cartItem) {
+        $sum = 0;
+        foreach ($cart->cartItems as $cartItem) {
         $sum += $cartItem->final_price * $cartItem->count;
-      }
-      $cardItemHistory = new Ecommerce\Card\Item\History();
-      $cardItemHistory->amount = $sum;
-      $cardItemHistory->card_item_id = $cart->card_item_id;
-      $cardItemHistory->save();
-      $cart->card->sum += $sum;
-      $cart->card->save();
+        }
+        $cardItemHistory = new Ecommerce\Card\Item\History();
+        $cardItemHistory->amount = $sum;
+        $cardItemHistory->card_item_id = $cart->card_item_id;
+        $cardItemHistory->save();
+        $cart->card->sum += $sum;
+        $cart->card->save();
     }
     return $cart;
-  }
+    }
 
-  public function bonusTrigger($event) {
+    public function bonusTrigger($event) {
     $cart = $event['eventObject'];
     foreach ($cart->cartItems as $cartItem) {
-      foreach ($cartItem->price->offer->bonuses as $bonus) {
+        foreach ($cartItem->price->offer->bonuses as $bonus) {
         if ($bonus->limited && $bonus->left <= 0) {
-          continue;
+            continue;
         } elseif ($bonus->limited && $bonus->left > 0) {
-          $bonus->left -= 1;
-          $bonus->save();
+            $bonus->left -= 1;
+            $bonus->save();
         }
         switch ($bonus->type) {
-          case'currency':
+            case'currency':
             $currency = \Money\Currency::get($bonus->value);
             $wallets = App::$cur->money->getUserWallets($cart->user->id);
             $wallets[$currency->id]->diff($bonus->count, 'Бонус за покупку');
             break;
         }
-      }
+        }
     }
     return $cart;
-  }
+    }
 
-  function sitemap() {
+    function sitemap() {
     $map = [];
     $zeroItems = \Ecommerce\Item::getList(['where' => ['category_id', 0]]);
     foreach ($zeroItems as $item) {
-      $map[] = [
-          'name' => $item->name,
-          'url' => [
-              'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
-          ],
-      ];
+        $map[] = [
+            'name' => $item->name,
+            'url' => [
+                'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
+            ],
+        ];
     }
 
     $categorys = \Ecommerce\Category::getList(['where' => ['parent_id', 0]]);
     $scan = function($category, $scan) {
-      $map = [];
+        $map = [];
 
-      foreach ($category->items as $item) {
+        foreach ($category->items as $item) {
         $map[] = [
             'name' => $item->name,
             'url' => [
                 'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
             ],
         ];
-      }
-      foreach ($category->catalogs as $child) {
+        }
+        foreach ($category->catalogs as $child) {
         $map = array_merge($map, $scan($child, $scan));
-      }
-      return $map;
+        }
+        return $map;
     };
     foreach ($categorys as $category) {
-      $map = array_merge($map, $scan($category, $scan));
+        $map = array_merge($map, $scan($category, $scan));
     }
     return $map;
-  }
+    }
 
 }

system/modules/Ui/widgets/DataManager/DataManager.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
     'id' => $dataManager->managerId,
     'class' => 'dataManager',
     'data-params' => $params,
-    'data-modelname' => ($model ? get_class($model) : $dataManager->modelName) . ($model && $model->pk() ? ':' . $model->pk() : ''),
+    'data-modelname' => ($model ? get_class($model) : $dataManager->modelName).($model && $model->pk() ? ':'.$model->pk() : ''),
     'data-managername' => $dataManager->managerName,
     'data-cols' => $dataManager->cols,
     'data-options' => array_merge($dataManager->managerOptions, ['actions'=>$dataManager->getActions()])
@@ -22,7 +22,7 @@ 
     'style' => ''
 ];
 if (!empty($dataManager->managerOptions['categorys'])) {
-  $mainCol['style'].='margin-left:260px;';
+  $mainCol['style'] .= 'margin-left:260px;';
   echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">';
   $this->widget('Ui\DataManager/categorys', compact('dataManager'));
   echo '</div>';

Indentation +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
         ], '', true);
 $buttons = $dataManager->getButtons($params, $model);
 if ($buttons) {
-  ?>
+    ?>
   <h3 class="dataManager-title"><?= $dataManager->name; ?> 
     <div class ='pull-right dataManager-managerButtons'>
       <div class="btn-group">
@@ -26,13 +26,13 @@ 
     'style' => ''
 ];
 if (!empty($dataManager->managerOptions['categorys'])) {
-  $mainCol['style'].='margin-left:260px;';
-  echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">';
-  $this->widget('Ui\DataManager/categorys', compact('dataManager'));
-  echo '</div>';
+    $mainCol['style'].='margin-left:260px;';
+    echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">';
+    $this->widget('Ui\DataManager/categorys', compact('dataManager'));
+    echo '</div>';
 }
 if (!empty($dataManager->managerOptions['filters'])) {
-  ?>
+    ?>
   <div class="modal fade" id = "<?= $dataManager->managerId; ?>_filters" >
     <div class="modal-dialog modal-lg">
       <div class="modal-content">