@@ -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 = 'Изменить'; |
@@ -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> |
@@ -37,7 +37,7 @@ |
||
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); |
@@ -11,8 +11,6 @@ |
||
11 | 11 | namespace Ecommerce\DeliveryProvider; |
12 | 12 | |
13 | 13 | |
14 | -use Ecommerce\UserAdds\Field; |
|
15 | - |
|
16 | 14 | class RussianPost extends \Ecommerce\DeliveryProvider { |
17 | 15 | static $name = 'PickPoint - курьерская служба'; |
18 | 16 |
@@ -13,11 +13,9 @@ |
||
13 | 13 | |
14 | 14 | use Exchange1c\Exchange; |
15 | 15 | |
16 | -class Info extends \Exchange1c\Mode |
|
17 | -{ |
|
16 | +class Info extends \Exchange1c\Mode { |
|
18 | 17 | |
19 | - public function process() |
|
20 | - { |
|
18 | + public function process() { |
|
21 | 19 | echo "version=2.03"; |
22 | 20 | $this->end(); |
23 | 21 | } |
@@ -549,6 +549,9 @@ |
||
549 | 549 | return $summarys; |
550 | 550 | } |
551 | 551 | |
552 | + /** |
|
553 | + * @param DataManager $dataManager |
|
554 | + */ |
|
552 | 555 | public static function drawCol($item, $colName, $params = [], $dataManager = null, $originalCol = '', $originalItem = null) { |
553 | 556 | $modelName = get_class($item); |
554 | 557 | if (!class_exists($modelName)) { |
@@ -144,7 +144,7 @@ |
||
144 | 144 | } |
145 | 145 | |
146 | 146 | $result->content['rows'] = ob_get_contents(); |
147 | - $result->content['summary'] = $dataManager->getSummary($request['params'], $request['model']); |
|
147 | + $result->content['summary'] = $dataManager->getSummary($request['params'], $request['model']); |
|
148 | 148 | ob_clean(); |
149 | 149 | |
150 | 150 | $result->content['pages'] = ''; |