@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | $query = \App::$cur->db->newQuery(); |
29 | 29 | $query->operation = 'select'; |
30 | 30 | $query->table = \Exchange1c\Exchange::table(); |
31 | - $query->cols = \Exchange1c\Exchange::index().','.\Exchange1c\Exchange::colPrefix() . 'path'; |
|
31 | + $query->cols = \Exchange1c\Exchange::index() . ',' . \Exchange1c\Exchange::colPrefix() . 'path'; |
|
32 | 32 | $queryArr = $query->buildQuery(); |
33 | 33 | $queryArr['query'] .= ' where `' . \Exchange1c\Exchange::colPrefix() . 'cleared` = 0 AND `' . \Exchange1c\Exchange::colPrefix() . 'date_create` < NOW() - INTERVAL ' . \App::$cur->exchange1c->config['maxSaveFilesInterval']; |
34 | 34 | |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | \Tools::delDir($exchangeArr[\Exchange1c\Exchange::colPrefix() . 'path']); |
38 | 38 | $query = \App::$cur->db->newQuery(); |
39 | 39 | $query->where([\Exchange1c\Exchange::index(), $exchangeArr[\Exchange1c\Exchange::index()]]); |
40 | - $query->update(\Exchange1c\Exchange::table(),[\Exchange1c\Exchange::colPrefix() . 'cleared' => 1]); |
|
40 | + $query->update(\Exchange1c\Exchange::table(), [\Exchange1c\Exchange::colPrefix() . 'cleared' => 1]); |
|
41 | 41 | } |
42 | 42 | } |
43 | 43 | } |
@@ -13,11 +13,9 @@ |
||
13 | 13 | |
14 | 14 | use Exchange1c\Exchange; |
15 | 15 | |
16 | -class Init extends \Exchange1c\Mode |
|
17 | -{ |
|
16 | +class Init extends \Exchange1c\Mode { |
|
18 | 17 | |
19 | - public function process() |
|
20 | - { |
|
18 | + public function process() { |
|
21 | 19 | echo "zip=yes\n"; |
22 | 20 | echo 'file_limit=' . \Tools::toBytes(ini_get('upload_max_filesize')); |
23 | 21 | $this->end(); |
@@ -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 () { |
@@ -338,6 +338,9 @@ |
||
338 | 338 | return false; |
339 | 339 | } |
340 | 340 | |
341 | + /** |
|
342 | + * @return \Money\Sums |
|
343 | + */ |
|
341 | 344 | public function deliverySum() { |
342 | 345 | $sum = new \Money\Sums([0 => 0]); |
343 | 346 | if ($this->delivery && $this->needDelivery()) { |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | } |
21 | 21 | } |
22 | 22 | if ($data) { |
23 | - $address = $data['Name'] . ' ' . $data['Number'] . '<br />' . $data['PostCode'] . ', ' . $data['Region'] . ', ' . $data['CitiName'] . ', ' . $data['Address'];// . '<br /><small>' . $data['OutDescription'].'</small>'; |
|
23 | + $address = $data['Name'] . ' ' . $data['Number'] . '<br />' . $data['PostCode'] . ', ' . $data['Region'] . ', ' . $data['CitiName'] . ', ' . $data['Address']; // . '<br /><small>' . $data['OutDescription'].'</small>'; |
|
24 | 24 | } |
25 | 25 | } |
26 | 26 | ?> |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | function my_function(result) { |
33 | 33 | console.log(result); |
34 | 34 | // устанавливаем в скрытое поле ID терминала |
35 | - document.getElementById('<?=$id;?>').value = result.id; |
|
35 | + document.getElementById('<?=$id; ?>').value = result.id; |
|
36 | 36 | // показываем пользователю название точки и адрес доствки |
37 | 37 | document.getElementById('address').innerHTML = result['name'] + '<br />' + result['address']; |
38 | 38 | 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]); |