@@ -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 | } |
@@ -21,16 +21,16 @@ |
||
21 | 21 | zoom: 13 |
22 | 22 | }); |
23 | 23 | <?php |
24 | - if (!empty($options['value'])) { |
|
25 | - ?> |
|
24 | + if (!empty($options['value'])) { |
|
25 | + ?> |
|
26 | 26 | myMapCurPin = new ymaps.Placemark(["<?= !empty($options['value']['lat']) ? $options['value']['lat'] : '56.01'; ?>", "<?= !empty($options['value']['lng']) ? $options['value']['lng'] : '92.85'; ?>"], |
27 | 27 | {iconContent: "<?= !empty($options['value']['address']) ? $options['value']['address'] : implode(',', $options['value']); ?>"}, |
28 | 28 | {preset: 'islands#greenStretchyIcon'} |
29 | 29 | ); |
30 | 30 | myMap.geoObjects.add(myMapCurPin, 0); |
31 | 31 | <?php |
32 | - } |
|
33 | - ?> |
|
32 | + } |
|
33 | + ?> |
|
34 | 34 | myMap.events.add('click', function (e) { |
35 | 35 | var myCoords = e.get('coords'); |
36 | 36 | $('#mapinputs' + uid + ' .lat').val(myCoords[0]); |
@@ -10,6 +10,10 @@ |
||
10 | 10 | class Text extends \Object { |
11 | 11 | public static $strings = []; |
12 | 12 | |
13 | + /** |
|
14 | + * @param string $module |
|
15 | + * @param string $code |
|
16 | + */ |
|
13 | 17 | public static function module($module, $code, $params = [], $default = false, $lang = false) { |
14 | 18 | $paramsKeys = array_keys($params); |
15 | 19 | foreach ($paramsKeys as &$paramsKey) { |
@@ -100,6 +100,9 @@ |
||
100 | 100 | return !empty($this->_objects[$moduleName]); |
101 | 101 | } |
102 | 102 | |
103 | + /** |
|
104 | + * @return string |
|
105 | + */ |
|
103 | 106 | public function getDomain($decode = false) { |
104 | 107 | return !empty($this->config['site']['domain']) ? $this->config['site']['domain'] : ($decode ? idn_to_utf8(INJI_DOMAIN_NAME) : INJI_DOMAIN_NAME); |
105 | 108 | } |
@@ -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'; |
@@ -128,6 +128,7 @@ |
||
128 | 128 | * Get cache dir for app |
129 | 129 | * |
130 | 130 | * @param App $app |
131 | + * @param string $dirname |
|
131 | 132 | * @return string |
132 | 133 | */ |
133 | 134 | public static function getDir($dirname, $app = null) { |
@@ -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 = 'Изменить'; |