@@ -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'; |
@@ -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 = 'Изменить'; |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | </div> |
| 49 | 49 | <script> |
| 50 | 50 | inji.onLoad(function () { |
| 51 | - inji.Ui.customSelect.bind($('#<?=$id;?>')); |
|
| 51 | + inji.Ui.customSelect.bind($('#<?=$id; ?>')); |
|
| 52 | 52 | }) |
| 53 | 53 | </script> |
| 54 | 54 | <?php |