@@ -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 = 'Изменить'; |
@@ -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 |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | if (!empty($options['attributes'])) { |
| 38 | 38 | $attributes = array_merge($attributes, $options['attributes']); |
| 39 | 39 | } |
| 40 | -if(!empty($attributes['onchange'])){ |
|
| 40 | +if (!empty($attributes['onchange'])) { |
|
| 41 | 41 | unset($attributes['onchange']); |
| 42 | 42 | } |
| 43 | 43 | echo Html::el('input', $attributes, '', null); |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | <script> |
| 60 | 60 | inji.onLoad(function () { |
| 61 | 61 | setTimeout(function () { |
| 62 | - inji.Ui.autocomplete.bind(inji.get('#<?=$id;?>'), '<?=$options['snippet'];?>', <?=json_encode($options['snippetParams']);?>); |
|
| 62 | + inji.Ui.autocomplete.bind(inji.get('#<?=$id; ?>'), '<?=$options['snippet']; ?>', <?=json_encode($options['snippetParams']); ?>); |
|
| 63 | 63 | }, 100); |
| 64 | 64 | }); |
| 65 | 65 | </script> |