@@ -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]]); |
@@ -71,8 +71,8 @@ |
||
71 | 71 | $where[] = ['data', $_GET['data']]; |
72 | 72 | } |
73 | 73 | $pays = Money\Pay::getList(['where' => $where, 'order' => ['date_create', 'DESC']]); |
74 | - if(count($pays)===1){ |
|
75 | - Tools::redirect('/money/merchants/pay/'.current($pays)->id); |
|
74 | + if (count($pays) === 1) { |
|
75 | + Tools::redirect('/money/merchants/pay/' . current($pays)->id); |
|
76 | 76 | } |
77 | 77 | $this->view->page(['content' => 'pays', 'data' => compact('bread', 'pays')]); |
78 | 78 | } else { |
@@ -71,7 +71,7 @@ |
||
71 | 71 | $where[] = ['data', $_GET['data']]; |
72 | 72 | } |
73 | 73 | $pays = Money\Pay::getList(['where' => $where, 'order' => ['date_create', 'DESC']]); |
74 | - if(count($pays)===1){ |
|
74 | + if(count($pays)===1) { |
|
75 | 75 | Tools::redirect('/money/merchants/pay/'.current($pays)->id); |
76 | 76 | } |
77 | 77 | $this->view->page(['content' => 'pays', 'data' => compact('bread', 'pays')]); |
@@ -33,7 +33,7 @@ |
||
33 | 33 | )); |
34 | 34 | $context = stream_context_create($options); |
35 | 35 | echo "<style>.tmg {margin:0 auto}</style>"; |
36 | - echo file_get_contents("http://{$config['domain']}.paykeeper.ru/order/inline/", FALSE, $context); |
|
36 | + echo file_get_contents("http://{$config['domain']}.paykeeper.ru/order/inline/", false, $context); |
|
37 | 37 | |
38 | 38 | } |
39 | 39 |
@@ -236,17 +236,20 @@ |
||
236 | 236 | * @return boolean|\Users\User |
237 | 237 | */ |
238 | 238 | public function get($idn, $ltype = 'id') { |
239 | - if (!$idn) |
|
240 | - return false; |
|
239 | + if (!$idn) { |
|
240 | + return false; |
|
241 | + } |
|
241 | 242 | |
242 | - if (is_numeric($idn) && $ltype != 'login') |
|
243 | - $user = Users\User::get($idn, 'id'); |
|
244 | - elseif ($ltype == 'login') |
|
245 | - $user = Users\User::get($idn, 'login'); |
|
246 | - else |
|
247 | - $user = Users\User::get($idn, 'mail'); |
|
248 | - if (!$user) |
|
249 | - return []; |
|
243 | + if (is_numeric($idn) && $ltype != 'login') { |
|
244 | + $user = Users\User::get($idn, 'id'); |
|
245 | + } elseif ($ltype == 'login') { |
|
246 | + $user = Users\User::get($idn, 'login'); |
|
247 | + } else { |
|
248 | + $user = Users\User::get($idn, 'mail'); |
|
249 | + } |
|
250 | + if (!$user) { |
|
251 | + return []; |
|
252 | + } |
|
250 | 253 | |
251 | 254 | return $user; |
252 | 255 | } |
@@ -257,6 +257,9 @@ |
||
257 | 257 | return $user; |
258 | 258 | } |
259 | 259 | |
260 | + /** |
|
261 | + * @param boolean $msg |
|
262 | + */ |
|
260 | 263 | private function msgOrErr($err, $msg) { |
261 | 264 | if ($msg) { |
262 | 265 | Msg::add($err, 'danger'); |
@@ -16,11 +16,11 @@ |
||
16 | 16 | public static $cols = [ |
17 | 17 | 'name' => ['type' => 'text'], |
18 | 18 | 'code' => ['type' => 'text'], |
19 | - 'message' => ['type' => 'dataManager','relation'=>'messages'], |
|
19 | + 'message' => ['type' => 'dataManager', 'relation'=>'messages'], |
|
20 | 20 | ]; |
21 | 21 | public static $dataManagers = [ |
22 | 22 | 'manager' => [ |
23 | - 'cols' => ['name', 'code','message'] |
|
23 | + 'cols' => ['name', 'code', 'message'] |
|
24 | 24 | ] |
25 | 25 | ]; |
26 | 26 | public static $forms = [ |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | */ |
186 | 186 | public function getGoodslist() { |
187 | 187 | if (!isset($this->goodsList)) { |
188 | - return NULL; |
|
188 | + return null; |
|
189 | 189 | } |
190 | 190 | return $this->goodsList; |
191 | 191 | } |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | */ |
214 | 214 | private function _getTariffList() { |
215 | 215 | if (!isset($this->tariffList)) { |
216 | - return NULL; |
|
216 | + return null; |
|
217 | 217 | } |
218 | 218 | return $this->tariffList; |
219 | 219 | } |