@@ -21,7 +21,7 @@ |
||
| 21 | 21 | $inputOptions = [ |
| 22 | 22 | 'value' => $this->value(), |
| 23 | 23 | 'disabled' => $this->readOnly(), |
| 24 | - 'values' => \Ui\ActiveForm::getOptionsList($this->colParams, $this->activeFormParams, !empty($this->modelName)?$this->modelName:$this->activeForm->modelName, $inputName) |
|
| 24 | + 'values' => \Ui\ActiveForm::getOptionsList($this->colParams, $this->activeFormParams, !empty($this->modelName) ? $this->modelName : $this->activeForm->modelName, $inputName) |
|
| 25 | 25 | ]; |
| 26 | 26 | $modelName = ''; |
| 27 | 27 | switch ($inputParams['source']) { |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | 'label' => 'Комментарий', |
| 67 | 67 | ], |
| 68 | 68 | ] |
| 69 | - ],], |
|
| 69 | + ], ], |
|
| 70 | 70 | ] |
| 71 | 71 | ]; |
| 72 | 72 | |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | public function diff($amount, $comment = '') { |
| 88 | - $amount = (float)$amount; |
|
| 88 | + $amount = (float) $amount; |
|
| 89 | 89 | $query = \App::$cur->db->newQuery(); |
| 90 | 90 | $string = 'UPDATE ' . \App::$cur->db->table_prefix . $this->table() . ' SET `' . $this->colPrefix() . 'amount`=`' . $this->colPrefix() . 'amount`+' . $amount . ' where `' . $this->index() . '` = ' . $this->id; |
| 91 | 91 | $query->query($string); |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | public function showAmount() { |
| 106 | 106 | switch ($this->currency->round_type) { |
| 107 | 107 | case 'floor': |
| 108 | - $dif = (float)('1' . str_repeat('0', $this->currency->round_precision)); |
|
| 108 | + $dif = (float) ('1' . str_repeat('0', $this->currency->round_precision)); |
|
| 109 | 109 | return floor($this->amount * $dif) / $dif; |
| 110 | 110 | default: |
| 111 | 111 | return $this->amount; |
@@ -1,21 +1,21 @@ |
||
| 1 | 1 | <h1>Установка модулей</h1> |
| 2 | 2 | <form> |
| 3 | 3 | <?php |
| 4 | - $config = Config::app(App::$primary ? App::$primary : App::$cur); |
|
| 5 | - $modules = array_flip(Module::getInstalled(App::$cur)); |
|
| 6 | - if (file_exists(App::$primary->path . '/modules')) { |
|
| 7 | - $appModules = array_slice(scandir(App::$primary->path . '/modules'), 2); |
|
| 8 | - } |
|
| 9 | - else { |
|
| 10 | - $appModules=[]; |
|
| 11 | - } |
|
| 12 | - $systemModules = array_merge(array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2), $appModules); |
|
| 13 | - foreach ($systemModules as $module) { |
|
| 14 | - $info = Module::getInfo($module); |
|
| 15 | - if (!$info || isset($modules[$module])) { |
|
| 16 | - continue; |
|
| 17 | - } |
|
| 18 | - ?> |
|
| 4 | + $config = Config::app(App::$primary ? App::$primary : App::$cur); |
|
| 5 | + $modules = array_flip(Module::getInstalled(App::$cur)); |
|
| 6 | + if (file_exists(App::$primary->path . '/modules')) { |
|
| 7 | + $appModules = array_slice(scandir(App::$primary->path . '/modules'), 2); |
|
| 8 | + } |
|
| 9 | + else { |
|
| 10 | + $appModules=[]; |
|
| 11 | + } |
|
| 12 | + $systemModules = array_merge(array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2), $appModules); |
|
| 13 | + foreach ($systemModules as $module) { |
|
| 14 | + $info = Module::getInfo($module); |
|
| 15 | + if (!$info || isset($modules[$module])) { |
|
| 16 | + continue; |
|
| 17 | + } |
|
| 18 | + ?> |
|
| 19 | 19 | <div class ="form-group"> |
| 20 | 20 | <div class="checkbox"> |
| 21 | 21 | <label> |
@@ -7,7 +7,7 @@ |
||
| 7 | 7 | $appModules = array_slice(scandir(App::$primary->path . '/modules'), 2); |
| 8 | 8 | } |
| 9 | 9 | else { |
| 10 | - $appModules=[]; |
|
| 10 | + $appModules = []; |
|
| 11 | 11 | } |
| 12 | 12 | $systemModules = array_merge(array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2), $appModules); |
| 13 | 13 | foreach ($systemModules as $module) { |
@@ -5,8 +5,7 @@ |
||
| 5 | 5 | $modules = array_flip(Module::getInstalled(App::$cur)); |
| 6 | 6 | if (file_exists(App::$primary->path . '/modules')) { |
| 7 | 7 | $appModules = array_slice(scandir(App::$primary->path . '/modules'), 2); |
| 8 | - } |
|
| 9 | - else { |
|
| 8 | + } else { |
|
| 10 | 9 | $appModules=[]; |
| 11 | 10 | } |
| 12 | 11 | $systemModules = array_merge(array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2), $appModules); |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | echo 'form not found'; |
| 5 | 5 | return; |
| 6 | 6 | } |
| 7 | -$userForm = \UserForms\Form::get((int)$formId); |
|
| 7 | +$userForm = \UserForms\Form::get((int) $formId); |
|
| 8 | 8 | if (!$userForm) { |
| 9 | 9 | echo 'form not found'; |
| 10 | 10 | return; |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | echo "<p class = 'text-center'>{$userForm->description}</p>"; |
| 19 | 19 | } |
| 20 | 20 | foreach ($userForm->inputs(['order' => ['weight']]) as $input) { |
| 21 | - $form->input($input->type, 'UserForms[' . (int)$formId . '][input' . $input->id . ']', $input->label, ['required' => $input->required]); |
|
| 21 | + $form->input($input->type, 'UserForms[' . (int) $formId . '][input' . $input->id . ']', $input->label, ['required' => $input->required]); |
|
| 22 | 22 | } |
| 23 | 23 | ?> |
| 24 | 24 | <button class='btn btn-success btn-block'><?= urldecode($btnText); ?></button> |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | |
| 26 | 26 | function parseWarehouse($warehouseCount) { |
| 27 | 27 | $count = $warehouseCount['@attributes']['КоличествоНаСкладе']; |
| 28 | - $objectId = \App::$cur->migrations->findObject((string)$warehouseCount['@attributes']['ИдСклада'], 'Ecommerce\Warehouse'); |
|
| 28 | + $objectId = \App::$cur->migrations->findObject((string) $warehouseCount['@attributes']['ИдСклада'], 'Ecommerce\Warehouse'); |
|
| 29 | 29 | if ($objectId) { |
| 30 | 30 | $modelName = get_class($this->model); |
| 31 | 31 | $warehouse = \Ecommerce\Item\Offer\Warehouse::get([[$modelName::index(), $this->model->pk()], [\Ecommerce\Warehouse::index(), $objectId->object_id]]); |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | //walk know pathes |
| 28 | 28 | foreach ($this->map->paths(['where' => ['path', $this->curPath]]) as $path) { |
| 29 | 29 | if (defined('mdebug')) { |
| 30 | - echo $path->item ; |
|
| 30 | + echo $path->item; |
|
| 31 | 31 | } |
| 32 | 32 | if (isset($this->data[$path->item])) { |
| 33 | 33 | if ($path->type == 'container') { |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | $walked = []; |
| 49 | 49 | foreach ($this->object->params as $param) { |
| 50 | - if(defined('mdebug')){ |
|
| 50 | + if (defined('mdebug')) { |
|
| 51 | 51 | echo " -> param ($param->id,$param->type,$param->value) "; |
| 52 | 52 | } |
| 53 | 53 | if ($model && $param->type && $param->type != 'item_key') { |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $parser->parentObject = $this; |
| 60 | 60 | $parser->parentModel = $model; |
| 61 | 61 | $parser->walker = $this->walker; |
| 62 | - if(defined('mdebug')){ |
|
| 62 | + if (defined('mdebug')) { |
|
| 63 | 63 | echo " -> objectParse "; |
| 64 | 64 | } |
| 65 | 65 | $parser->parse(); |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | $parser->param = $param; |
| 75 | 75 | $parser->model = $model; |
| 76 | 76 | $parser->object = $this; |
| 77 | - if(defined('mdebug')){ |
|
| 77 | + if (defined('mdebug')) { |
|
| 78 | 78 | echo " -> parser ($parserName) "; |
| 79 | 79 | } |
| 80 | 80 | $parser->parse(); |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | $walked = []; |
| 49 | 49 | foreach ($this->object->params as $param) { |
| 50 | - if(defined('mdebug')){ |
|
| 50 | + if(defined('mdebug')) { |
|
| 51 | 51 | echo " -> param ($param->id,$param->type,$param->value) "; |
| 52 | 52 | } |
| 53 | 53 | if ($model && $param->type && $param->type != 'item_key') { |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $parser->parentObject = $this; |
| 60 | 60 | $parser->parentModel = $model; |
| 61 | 61 | $parser->walker = $this->walker; |
| 62 | - if(defined('mdebug')){ |
|
| 62 | + if(defined('mdebug')) { |
|
| 63 | 63 | echo " -> objectParse "; |
| 64 | 64 | } |
| 65 | 65 | $parser->parse(); |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | $parser->param = $param; |
| 75 | 75 | $parser->model = $model; |
| 76 | 76 | $parser->object = $this; |
| 77 | - if(defined('mdebug')){ |
|
| 77 | + if(defined('mdebug')) { |
|
| 78 | 78 | echo " -> parser ($parserName) "; |
| 79 | 79 | } |
| 80 | 80 | $parser->parse(); |
@@ -233,7 +233,7 @@ |
||
| 233 | 233 | * Getting items with params |
| 234 | 234 | * |
| 235 | 235 | * @param array $params |
| 236 | - * @return array |
|
| 236 | + * @return Model[] |
|
| 237 | 237 | */ |
| 238 | 238 | public function getItems($params = []) { |
| 239 | 239 | $selectOptions = Ecommerce\OptionsParser::parse($params); |
@@ -16,9 +16,9 @@ discard block |
||
| 16 | 16 | $favs = !empty($_COOKIE['ecommerce_favitems']) ? json_decode($_COOKIE['ecommerce_favitems'], true) : []; |
| 17 | 17 | if ($favs) { |
| 18 | 18 | foreach ($favs as $itemId) { |
| 19 | - $fav = \Ecommerce\Favorite::get([['user_id', Users\User::$cur->id], ['item_id', (int)$itemId]]); |
|
| 19 | + $fav = \Ecommerce\Favorite::get([['user_id', Users\User::$cur->id], ['item_id', (int) $itemId]]); |
|
| 20 | 20 | if (!$fav) { |
| 21 | - $item = \Ecommerce\Item::get((int)$itemId); |
|
| 21 | + $item = \Ecommerce\Item::get((int) $itemId); |
|
| 22 | 22 | if ($item) { |
| 23 | 23 | $fav = new \Ecommerce\Favorite([ |
| 24 | 24 | 'user_id' => Users\User::$cur->id, |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | public function getCurCart($create = true) { |
| 181 | 181 | $cart = false; |
| 182 | 182 | if (!empty($_SESSION['cart']['cart_id'])) { |
| 183 | - $cart = Ecommerce\Cart::get((int)$_SESSION['cart']['cart_id']); |
|
| 183 | + $cart = Ecommerce\Cart::get((int) $_SESSION['cart']['cart_id']); |
|
| 184 | 184 | } |
| 185 | 185 | if (!$cart && $create) { |
| 186 | 186 | $cart = new Ecommerce\Cart(); |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | $path = trim(implode('/', $args)); |
| 18 | 18 | |
| 19 | 19 | if (is_numeric($path)) { |
| 20 | - $material = Materials\Material::get([['id', (int)$path], ['date_publish', null, 'IS NOT']]); |
|
| 20 | + $material = Materials\Material::get([['id', (int) $path], ['date_publish', null, 'IS NOT']]); |
|
| 21 | 21 | } |
| 22 | 22 | if (!$material && $args) { |
| 23 | 23 | foreach ($args as $key => $alias) { |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | if ($category) { |
| 43 | 43 | $where = [ |
| 44 | 44 | ['category_id', $category->id], |
| 45 | - ['id', (int)$args[count($args) - 1]], |
|
| 45 | + ['id', (int) $args[count($args) - 1]], |
|
| 46 | 46 | ['date_publish', null, 'IS NOT'] |
| 47 | 47 | ]; |
| 48 | 48 | } else { |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | $path = trim(implode('/', $args)); |
| 76 | 76 | $category = null; |
| 77 | 77 | if (is_numeric($path)) { |
| 78 | - $category = Materials\Category::get((int)$path); |
|
| 78 | + $category = Materials\Category::get((int) $path); |
|
| 79 | 79 | } |
| 80 | 80 | if (!$category) { |
| 81 | 81 | foreach ($args as $alias) { |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | $material = false; |
| 111 | 111 | if ($alias) { |
| 112 | 112 | if (is_numeric($alias)) { |
| 113 | - $material = Materials\Material::get([['id', (int)$alias], ['date_publish', null, 'IS NOT']]); |
|
| 113 | + $material = Materials\Material::get([['id', (int) $alias], ['date_publish', null, 'IS NOT']]); |
|
| 114 | 114 | } |
| 115 | 115 | if (!$material) { |
| 116 | 116 | $material = Materials\Material::get([['alias', $alias], ['date_publish', null, 'IS NOT']]); |