@@ -14,13 +14,13 @@ |
||
14 | 14 | \App::$cur->view->customAsset('js', '/static/moduleAsset/UserForms/js/formCatcher.js'); |
15 | 15 | if (!empty($_POST['UserForms'])) { |
16 | 16 | foreach ($_POST['UserForms'] as $form_id => $inputs) { |
17 | - $form = \UserForms\Form::get((int)$form_id); |
|
17 | + $form = \UserForms\Form::get((int) $form_id); |
|
18 | 18 | if (!$form) { |
19 | 19 | continue; |
20 | 20 | } |
21 | 21 | $formRecive = new \UserForms\Recive(); |
22 | - $formRecive->user_id = (int)\Users\User::$cur->id; |
|
23 | - $formRecive->form_id = (int)$form_id; |
|
22 | + $formRecive->user_id = (int) \Users\User::$cur->id; |
|
23 | + $formRecive->form_id = (int) $form_id; |
|
24 | 24 | $data = []; |
25 | 25 | $error = false; |
26 | 26 | foreach ($form->inputs as $input) { |
@@ -19,7 +19,7 @@ |
||
19 | 19 | $type = !empty($colInfo['colParams']['type']) ? $colInfo['colParams']['type'] : 'string'; |
20 | 20 | if ($type != 'dataManager') { |
21 | 21 | $table->addRow([ |
22 | - str_replace(' ',' ',!empty($modelName::$labels[$colName]) ? $modelName::$labels[$colName] : $colName), |
|
22 | + str_replace(' ', ' ', !empty($modelName::$labels[$colName]) ? $modelName::$labels[$colName] : $colName), |
|
23 | 23 | \Model::resloveTypeValue($item, $colName, true) |
24 | 24 | ]); |
25 | 25 | } |
@@ -2,7 +2,7 @@ |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | 'up' => function () { |
5 | - \Ecommerce\Delivery\Field\Item::get(1,'data'); |
|
5 | + \Ecommerce\Delivery\Field\Item::get(1, 'data'); |
|
6 | 6 | $field = new \Ecommerce\Delivery\Field( |
7 | 7 | [ |
8 | 8 | 'name' => 'Город', |
@@ -513,13 +513,13 @@ |
||
513 | 513 | case 'to': |
514 | 514 | $relCol = $relations[$rel]['col']; |
515 | 515 | static::fixPrefix($relCol); |
516 | - $rootModel::$relJoins[$joinName] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol, 'left','']; |
|
516 | + $rootModel::$relJoins[$joinName] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol, 'left', '']; |
|
517 | 517 | break; |
518 | 518 | case 'one': |
519 | 519 | case 'many': |
520 | 520 | $relCol = $relations[$rel]['col']; |
521 | 521 | $relations[$rel]['model']::fixPrefix($relCol); |
522 | - $rootModel::$relJoins[$joinName] = [$relations[$rel]['model']::table(), static::index() . ' = ' . $relCol, 'left','']; |
|
522 | + $rootModel::$relJoins[$joinName] = [$relations[$rel]['model']::table(), static::index() . ' = ' . $relCol, 'left', '']; |
|
523 | 523 | break; |
524 | 524 | } |
525 | 525 | $relations[$rel]['model']::fixPrefix($col, 'key', $rootModel); |
@@ -14,7 +14,7 @@ |
||
14 | 14 | $form->end('Выбрать'); |
15 | 15 | foreach ($rates as $rate) { |
16 | 16 | $form = new Ui\Form(); |
17 | - $form->id = 'form_'.Tools::randomString(); |
|
17 | + $form->id = 'form_' . Tools::randomString(); |
|
18 | 18 | $form->method = "GET"; |
19 | 19 | $form->begin(); |
20 | 20 | ?> |
@@ -2,7 +2,7 @@ |
||
2 | 2 | <div class="col-md-4"> |
3 | 3 | <ul class="nav nav-pills nav-stacked"> |
4 | 4 | <?php |
5 | - $hiddenId = 'paytype_'.Tools::randomString(); |
|
5 | + $hiddenId = 'paytype_' . Tools::randomString(); |
|
6 | 6 | foreach ($payTypes as $payType) { |
7 | 7 | if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || ($cart->payType && $payType->id == $cart->payType->id)) { |
8 | 8 | $checked = 'checked'; |
@@ -2,7 +2,7 @@ |
||
2 | 2 | <div class="col-md-4"> |
3 | 3 | <ul class="nav nav-pills nav-stacked"> |
4 | 4 | <?php |
5 | - $hiddenId = 'paytype_'.Tools::randomString(); |
|
5 | + $hiddenId = 'paytype_' . Tools::randomString(); |
|
6 | 6 | foreach ($deliverys as $delivery) { |
7 | 7 | if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || ($cart->delivery && $delivery->id == $cart->delivery->id)) { |
8 | 8 | $checked = 'checked'; |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | ob_end_clean(); |
197 | 197 | |
198 | 198 | $cols = []; |
199 | - if($actions) { |
|
199 | + if ($actions) { |
|
200 | 200 | $cols[] = ['label' => $dropdown]; |
201 | 201 | } |
202 | 202 | $cols['id'] = ['label' => '№', 'sortable' => true]; |
@@ -244,10 +244,10 @@ discard block |
||
244 | 244 | $queryParams = []; |
245 | 245 | if (empty($params['all'])) { |
246 | 246 | if (!empty($params['limit'])) { |
247 | - $this->limit = (int)$params['limit']; |
|
247 | + $this->limit = (int) $params['limit']; |
|
248 | 248 | } |
249 | 249 | if (!empty($params['page'])) { |
250 | - $this->page = (int)$params['page']; |
|
250 | + $this->page = (int) $params['page']; |
|
251 | 251 | } |
252 | 252 | $queryParams['limit'] = $this->limit; |
253 | 253 | $queryParams['start'] = $this->page * $this->limit - $this->limit; |
@@ -492,8 +492,8 @@ discard block |
||
492 | 492 | } elseif (\App::$cur->name == 'admin' && $colName == 'name') { |
493 | 493 | $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem)); |
494 | 494 | return "<a href ='/admin/{$item->genViewLink()}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>"; |
495 | - } elseif ($modelName::$cols[$colName]['type'] == 'html' || $modelName::$cols[$colName]['type']=='textarea') { |
|
496 | - $uid = 'text_'.\Tools::randomString(); |
|
495 | + } elseif ($modelName::$cols[$colName]['type'] == 'html' || $modelName::$cols[$colName]['type'] == 'textarea') { |
|
496 | + $uid = 'text_' . \Tools::randomString(); |
|
497 | 497 | $script = "<script>inji.onLoad(function(){ |
498 | 498 | var el{$uid}=$('#{$uid}'); |
499 | 499 | var height{$uid} = el{$uid}.height(); |
@@ -557,10 +557,10 @@ discard block |
||
557 | 557 | return []; |
558 | 558 | } |
559 | 559 | if (!empty($params['limit'])) { |
560 | - $this->limit = (int)$params['limit']; |
|
560 | + $this->limit = (int) $params['limit']; |
|
561 | 561 | } |
562 | 562 | if (!empty($params['page'])) { |
563 | - $this->page = (int)$params['page']; |
|
563 | + $this->page = (int) $params['page']; |
|
564 | 564 | } |
565 | 565 | $queryParams = [ |
566 | 566 | 'count' => true |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | } |
19 | 19 | } |
20 | 20 | if ($data) { |
21 | - $address = $data['Name'] . ' ' . $data['Number'] . '<br />' . $data['PostCode'] . ', ' . $data['Region'] . ', ' . $data['CitiName'] . ', ' . $data['Address'];// . '<br /><small>' . $data['OutDescription'].'</small>'; |
|
21 | + $address = $data['Name'] . ' ' . $data['Number'] . '<br />' . $data['PostCode'] . ', ' . $data['Region'] . ', ' . $data['CitiName'] . ', ' . $data['Address']; // . '<br /><small>' . $data['OutDescription'].'</small>'; |
|
22 | 22 | } |
23 | 23 | } |
24 | 24 | ?> |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | function my_function(result) { |
37 | 37 | console.log(result); |
38 | 38 | // устанавливаем в скрытое поле ID терминала |
39 | - document.getElementById('<?=$id;?>').value = result.id; |
|
39 | + document.getElementById('<?=$id; ?>').value = result.id; |
|
40 | 40 | // показываем пользователю название точки и адрес доствки |
41 | 41 | document.getElementById('address').innerHTML = result['name'] + '<br />' + result['address']; |
42 | 42 | document.getElementById('addressbtn').innerHTML = 'Изменить'; |