@@ -38,25 +38,25 @@ |
||
38 | 38 | <span class="caption">Вид:</span> |
39 | 39 | <span class="group"> |
40 | 40 | <?php |
41 | - for ($i = 2; $i < 5; $i++) { |
|
42 | - $curLimit = $limit * $i; |
|
43 | - $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
44 | - echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
45 | - echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
46 | - echo $curLimit; |
|
47 | - echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
48 | - echo "</a> "; |
|
49 | - } |
|
50 | - if (!empty(App::$cur->ecommerce->config['list_all'])) { |
|
51 | - $curLimit = 'all'; |
|
52 | - $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
53 | - echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
54 | - echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
55 | - echo 'Все'; |
|
56 | - echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
57 | - echo "</a> "; |
|
58 | - } |
|
59 | - ?> |
|
41 | + for ($i = 2; $i < 5; $i++) { |
|
42 | + $curLimit = $limit * $i; |
|
43 | + $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
44 | + echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
45 | + echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
46 | + echo $curLimit; |
|
47 | + echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
48 | + echo "</a> "; |
|
49 | + } |
|
50 | + if (!empty(App::$cur->ecommerce->config['list_all'])) { |
|
51 | + $curLimit = 'all'; |
|
52 | + $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
53 | + echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
54 | + echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
55 | + echo 'Все'; |
|
56 | + echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
57 | + echo "</a> "; |
|
58 | + } |
|
59 | + ?> |
|
60 | 60 | </span> |
61 | 61 | <span class="group"> |
62 | 62 | <a rel="nofollow" href='#' onclick="inji.onLoad(function () { |
@@ -23,7 +23,7 @@ |
||
23 | 23 | $handle = fopen(__DIR__ . '/../vendor/CdekPVZ.csv', 'r'); |
24 | 24 | $row = 1; |
25 | 25 | $cols = []; |
26 | - while (($data = fgetcsv($handle, 10000, ";")) !== FALSE) { |
|
26 | + while (($data = fgetcsv($handle, 10000, ";")) !== false) { |
|
27 | 27 | if ($row === 1) { |
28 | 28 | $cols = $data; |
29 | 29 | } else { |
@@ -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]); |
@@ -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 = 'Изменить'; |
@@ -35,8 +35,11 @@ |
||
35 | 35 | $contents = curl_exec($c); |
36 | 36 | curl_close($c); |
37 | 37 | |
38 | - if ($contents) return $contents; |
|
39 | - else return FALSE; |
|
38 | + if ($contents) { |
|
39 | + return $contents; |
|
40 | + } else { |
|
41 | + return FALSE; |
|
42 | + } |
|
40 | 43 | } |
41 | 44 | |
42 | 45 | static function deliveryTime($cart) { |
@@ -36,7 +36,7 @@ |
||
36 | 36 | curl_close($c); |
37 | 37 | |
38 | 38 | if ($contents) return $contents; |
39 | - else return FALSE; |
|
39 | + else return false; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | static function deliveryTime($cart) { |