@@ -52,8 +52,9 @@ |
||
52 | 52 | */ |
53 | 53 | static function get($clean = false) |
54 | 54 | { |
55 | - if (empty($_SESSION['_INJI_MSG'])) |
|
56 | - return []; |
|
55 | + if (empty($_SESSION['_INJI_MSG'])) { |
|
56 | + return []; |
|
57 | + } |
|
57 | 58 | $msgs = $_SESSION['_INJI_MSG']; |
58 | 59 | if ($clean) { |
59 | 60 | $_SESSION['_INJI_MSG'] = []; |
@@ -1,28 +1,28 @@ |
||
1 | 1 | <ul class="<?= $class; ?>"><?php |
2 | - if ($pagesInstance->params['page'] > 1) { |
|
3 | - $getArr['page'] = $pagesInstance->params['page'] - 1; |
|
4 | - echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>←</a></li>"; |
|
5 | - } |
|
2 | + if ($pagesInstance->params['page'] > 1) { |
|
3 | + $getArr['page'] = $pagesInstance->params['page'] - 1; |
|
4 | + echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>←</a></li>"; |
|
5 | + } |
|
6 | 6 | |
7 | - for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) { |
|
8 | - if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) { |
|
9 | - echo '<li '; |
|
10 | - if ($pagesInstance->params['page'] == $i) |
|
11 | - echo 'class = "active"'; |
|
12 | - echo ">"; |
|
13 | - $getArr['page'] = $i; |
|
14 | - echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>"; |
|
15 | - } |
|
16 | - elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) { |
|
17 | - $getArr['page'] = round($pagesInstance->params['page'] / 2); |
|
18 | - echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>"; |
|
19 | - } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) { |
|
20 | - $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page']; |
|
21 | - echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>"; |
|
22 | - } |
|
23 | - } |
|
24 | - if ($pagesInstance->params['page'] < $pagesInstance->params['pages']) { |
|
25 | - $getArr['page'] = $pagesInstance->params['page'] + 1; |
|
26 | - echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>→</a></li>"; |
|
27 | - } |
|
28 | - ?></ul> |
|
29 | 7 | \ No newline at end of file |
8 | + for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) { |
|
9 | + if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) { |
|
10 | + echo '<li '; |
|
11 | + if ($pagesInstance->params['page'] == $i) |
|
12 | + echo 'class = "active"'; |
|
13 | + echo ">"; |
|
14 | + $getArr['page'] = $i; |
|
15 | + echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>"; |
|
16 | + } |
|
17 | + elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) { |
|
18 | + $getArr['page'] = round($pagesInstance->params['page'] / 2); |
|
19 | + echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>"; |
|
20 | + } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) { |
|
21 | + $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page']; |
|
22 | + echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>"; |
|
23 | + } |
|
24 | + } |
|
25 | + if ($pagesInstance->params['page'] < $pagesInstance->params['pages']) { |
|
26 | + $getArr['page'] = $pagesInstance->params['page'] + 1; |
|
27 | + echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>→</a></li>"; |
|
28 | + } |
|
29 | + ?></ul> |
|
30 | 30 | \ No newline at end of file |
@@ -7,8 +7,9 @@ discard block |
||
7 | 7 | for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) { |
8 | 8 | if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) { |
9 | 9 | echo '<li '; |
10 | - if ($pagesInstance->params['page'] == $i) |
|
11 | - echo 'class = "active"'; |
|
10 | + if ($pagesInstance->params['page'] == $i) { |
|
11 | + echo 'class = "active"'; |
|
12 | + } |
|
12 | 13 | echo ">"; |
13 | 14 | $getArr['page'] = $i; |
14 | 15 | echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>"; |
@@ -16,7 +17,8 @@ discard block |
||
16 | 17 | elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) { |
17 | 18 | $getArr['page'] = round($pagesInstance->params['page'] / 2); |
18 | 19 | echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>"; |
19 | - } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) { |
|
20 | + } |
|
21 | + elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) { |
|
20 | 22 | $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page']; |
21 | 23 | echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>"; |
22 | 24 | } |
@@ -22,16 +22,19 @@ discard block |
||
22 | 22 | |
23 | 23 | $sitePath = App::$primary->path; |
24 | 24 | |
25 | - if (!is_uploaded_file($file['tmp_name'])) |
|
26 | - return 0; |
|
25 | + if (!is_uploaded_file($file['tmp_name'])) { |
|
26 | + return 0; |
|
27 | + } |
|
27 | 28 | |
28 | 29 | $fileinfo = pathinfo($file['name']); |
29 | - if (empty($fileinfo['extension'])) |
|
30 | - return 0; |
|
30 | + if (empty($fileinfo['extension'])) { |
|
31 | + return 0; |
|
32 | + } |
|
31 | 33 | |
32 | 34 | $type = Files\Type::get($fileinfo['extension'], 'ext'); |
33 | - if (!$type) |
|
34 | - return 0; |
|
35 | + if (!$type) { |
|
36 | + return 0; |
|
37 | + } |
|
35 | 38 | |
36 | 39 | if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) { |
37 | 40 | return 0; |
@@ -47,8 +50,9 @@ discard block |
||
47 | 50 | } |
48 | 51 | $fileObject->name = $fileinfo['filename']; |
49 | 52 | $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension']; |
50 | - if ($fileObject->id && file_exists($sitePath . $fileObject->path)) |
|
51 | - unlink($sitePath . $fileObject->path); |
|
53 | + if ($fileObject->id && file_exists($sitePath . $fileObject->path)) { |
|
54 | + unlink($sitePath . $fileObject->path); |
|
55 | + } |
|
52 | 56 | |
53 | 57 | Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/'); |
54 | 58 | |
@@ -84,12 +88,14 @@ discard block |
||
84 | 88 | $sitePath = App::$primary->path; |
85 | 89 | |
86 | 90 | $fileinfo = pathinfo($url); |
87 | - if (empty($fileinfo['extension'])) |
|
88 | - return 0; |
|
91 | + if (empty($fileinfo['extension'])) { |
|
92 | + return 0; |
|
93 | + } |
|
89 | 94 | |
90 | 95 | $type = Files\Type::get($fileinfo['extension'], 'ext'); |
91 | - if (!$type) |
|
92 | - return 0; |
|
96 | + if (!$type) { |
|
97 | + return 0; |
|
98 | + } |
|
93 | 99 | |
94 | 100 | if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) { |
95 | 101 | return 0; |
@@ -105,8 +111,9 @@ discard block |
||
105 | 111 | } |
106 | 112 | $fileObject->name = $fileinfo['filename']; |
107 | 113 | $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension']; |
108 | - if ($fileObject->id && file_exists($sitePath . $fileObject->path)) |
|
109 | - unlink($sitePath . $fileObject->path); |
|
114 | + if ($fileObject->id && file_exists($sitePath . $fileObject->path)) { |
|
115 | + unlink($sitePath . $fileObject->path); |
|
116 | + } |
|
110 | 117 | |
111 | 118 | Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/'); |
112 | 119 |
@@ -1,33 +1,33 @@ |
||
1 | 1 | <div class="container-fluid"> |
2 | 2 | <div class="row panel"> |
3 | 3 | <?php |
4 | - if (!empty($_FILES['file'])) { |
|
5 | - App::$cur->files->upload($_FILES['file'], ['upload_code' => 'editorManager']); |
|
6 | - } |
|
7 | - $form = new Ui\Form(); |
|
8 | - $form->begin(); |
|
9 | - $form->input('file', 'file', 'Загрузить файл'); |
|
10 | - echo '<div class="form-group"><button class ="btn btn-primary btn-sm">Загузить</button></div>'; |
|
11 | - $form->end(false); |
|
12 | - ?> |
|
4 | + if (!empty($_FILES['file'])) { |
|
5 | + App::$cur->files->upload($_FILES['file'], ['upload_code' => 'editorManager']); |
|
6 | + } |
|
7 | + $form = new Ui\Form(); |
|
8 | + $form->begin(); |
|
9 | + $form->input('file', 'file', 'Загрузить файл'); |
|
10 | + echo '<div class="form-group"><button class ="btn btn-primary btn-sm">Загузить</button></div>'; |
|
11 | + $form->end(false); |
|
12 | + ?> |
|
13 | 13 | </div> |
14 | 14 | <h2>Последние файлы</h2> |
15 | 15 | <div class="row"> |
16 | 16 | <?php |
17 | - $files = Files\File::getList(['where' => ['upload_code', 'editorManager'], 'limit' => 12, 'order' => ['date_create', 'DESC']]); |
|
18 | - $i = 0; |
|
19 | - foreach ($files as $file) { |
|
20 | - ?> |
|
17 | + $files = Files\File::getList(['where' => ['upload_code', 'editorManager'], 'limit' => 12, 'order' => ['date_create', 'DESC']]); |
|
18 | + $i = 0; |
|
19 | + foreach ($files as $file) { |
|
20 | + ?> |
|
21 | 21 | <div class="col-xs-6 col-sm-2 fileChooser" onclick="OpenFile('<?= $file->path; ?>'); |
22 | 22 | return false;"> |
23 | 23 | <div class="thumbnail"> |
24 | 24 | <?php |
25 | - if ($file->type->group == 'image') { |
|
26 | - echo "<img class='img-responsive' src ='{$file->path}?resize=200x200' />"; |
|
27 | - } else { |
|
28 | - echo "<img class='img-responsive' src ='/static/moduleAsset/Files/images/formats/" . pathinfo($file->path, PATHINFO_EXTENSION) . ".png' />"; |
|
29 | - } |
|
30 | - ?> |
|
25 | + if ($file->type->group == 'image') { |
|
26 | + echo "<img class='img-responsive' src ='{$file->path}?resize=200x200' />"; |
|
27 | + } else { |
|
28 | + echo "<img class='img-responsive' src ='/static/moduleAsset/Files/images/formats/" . pathinfo($file->path, PATHINFO_EXTENSION) . ".png' />"; |
|
29 | + } |
|
30 | + ?> |
|
31 | 31 | |
32 | 32 | <?= $file->name; ?><br /> |
33 | 33 | <small class="text-muted"> |
@@ -24,7 +24,8 @@ |
||
24 | 24 | <?php |
25 | 25 | if ($file->type->group == 'image') { |
26 | 26 | echo "<img class='img-responsive' src ='{$file->path}?resize=200x200' />"; |
27 | - } else { |
|
27 | + } |
|
28 | + else { |
|
28 | 29 | echo "<img class='img-responsive' src ='/static/moduleAsset/Files/images/formats/" . pathinfo($file->path, PATHINFO_EXTENSION) . ".png' />"; |
29 | 30 | } |
30 | 31 | ?> |
@@ -15,23 +15,23 @@ |
||
15 | 15 | <div class="tab-content"> |
16 | 16 | <div role="tabpanel" class="tab-pane fade in active" id="home"> |
17 | 17 | <?php |
18 | - $form = new Ui\Form(); |
|
19 | - $form->begin(); |
|
20 | - $form->input('checkbox', 'config[view_empty_warehouse]', 'Показывать отсутствующие товары', ['value' => App::$cur->ecommerce->config['view_empty_warehouse']]); |
|
21 | - $form->input('checkbox', 'config[view_empty_image]', 'Показывать товары без изображения', ['value' => App::$cur->ecommerce->config['view_empty_image']]); |
|
22 | - $form->input('checkbox', 'config[sell_empty_warehouse]', 'Продавать отсутствующие товары', ['value' => App::$cur->ecommerce->config['sell_empty_warehouse']]); |
|
23 | - $form->input('checkbox', 'config[sell_over_warehouse]', 'Продавать сверх остатоков на складе', ['value' => App::$cur->ecommerce->config['sell_over_warehouse']]); |
|
24 | - $form->input('checkbox', 'config[show_zero_price]', 'Показывать товары с нулевой ценой', ['value' => App::$cur->ecommerce->config['show_zero_price']]); |
|
25 | - $form->input('checkbox', 'config[show_without_price]', 'Показывать товары без цен', ['value' => App::$cur->ecommerce->config['show_without_price']]); |
|
26 | - $form->input('select', 'config[defaultCategoryView]', 'Стандартный вид категории', ['value' => App::$cur->ecommerce->config['defaultCategoryView'], 'values' => App::$cur->ecommerce->viewsCategoryList()]); |
|
27 | - if (App::$cur->money) { |
|
28 | - $form->input('select', 'config[defaultCurrency]', 'Валюта по умолчанию', ['value' => App::$cur->ecommerce->config['defaultCurrency'], 'values' => ['' => 'Выберите'] + \Money\Currency::getList()]); |
|
29 | - } |
|
30 | - $form->input('text', 'config[orderPrefix]', 'Префикс для номеров заказов', ['value' => App::$cur->ecommerce->config['orderPrefix']]); |
|
31 | - $form->input('text', 'config[notify_mail]', 'E-mail оповещений о новых заказах', ['value' => App::$cur->ecommerce->config['notify_mail']]); |
|
32 | - $form->input('hidden', 'config[save]', '', ['value' => 1]); |
|
33 | - $form->end('Сохранить'); |
|
34 | - ?> |
|
18 | + $form = new Ui\Form(); |
|
19 | + $form->begin(); |
|
20 | + $form->input('checkbox', 'config[view_empty_warehouse]', 'Показывать отсутствующие товары', ['value' => App::$cur->ecommerce->config['view_empty_warehouse']]); |
|
21 | + $form->input('checkbox', 'config[view_empty_image]', 'Показывать товары без изображения', ['value' => App::$cur->ecommerce->config['view_empty_image']]); |
|
22 | + $form->input('checkbox', 'config[sell_empty_warehouse]', 'Продавать отсутствующие товары', ['value' => App::$cur->ecommerce->config['sell_empty_warehouse']]); |
|
23 | + $form->input('checkbox', 'config[sell_over_warehouse]', 'Продавать сверх остатоков на складе', ['value' => App::$cur->ecommerce->config['sell_over_warehouse']]); |
|
24 | + $form->input('checkbox', 'config[show_zero_price]', 'Показывать товары с нулевой ценой', ['value' => App::$cur->ecommerce->config['show_zero_price']]); |
|
25 | + $form->input('checkbox', 'config[show_without_price]', 'Показывать товары без цен', ['value' => App::$cur->ecommerce->config['show_without_price']]); |
|
26 | + $form->input('select', 'config[defaultCategoryView]', 'Стандартный вид категории', ['value' => App::$cur->ecommerce->config['defaultCategoryView'], 'values' => App::$cur->ecommerce->viewsCategoryList()]); |
|
27 | + if (App::$cur->money) { |
|
28 | + $form->input('select', 'config[defaultCurrency]', 'Валюта по умолчанию', ['value' => App::$cur->ecommerce->config['defaultCurrency'], 'values' => ['' => 'Выберите'] + \Money\Currency::getList()]); |
|
29 | + } |
|
30 | + $form->input('text', 'config[orderPrefix]', 'Префикс для номеров заказов', ['value' => App::$cur->ecommerce->config['orderPrefix']]); |
|
31 | + $form->input('text', 'config[notify_mail]', 'E-mail оповещений о новых заказах', ['value' => App::$cur->ecommerce->config['notify_mail']]); |
|
32 | + $form->input('hidden', 'config[save]', '', ['value' => 1]); |
|
33 | + $form->end('Сохранить'); |
|
34 | + ?> |
|
35 | 35 | <h3>Обслужвание</h3> |
36 | 36 | <a href="/admin/ecommerce/reSearchIndex" class="btn btn-primary">Обновить поисковые индексы</a> |
37 | 37 | <h3>Уведомления в браузере</h3> |
@@ -68,7 +68,8 @@ |
||
68 | 68 | $items = Ecommerce\Item::getList(['start' => $i * $count, 'limit' => $count]); |
69 | 69 | if (!$items) { |
70 | 70 | Tools::redirect('/admin/ecommerce/configure', 'Поисковый индекс обновлен'); |
71 | - } else { |
|
71 | + } |
|
72 | + else { |
|
72 | 73 | $i++; |
73 | 74 | foreach ($items as $key => $item) { |
74 | 75 | $item->save(); |
@@ -27,7 +27,8 @@ |
||
27 | 27 | 'callback_method' => 'cartPayRecive' |
28 | 28 | ]); |
29 | 29 | $pay->save(); |
30 | - } elseif ($pay->sum != $sum) { |
|
30 | + } |
|
31 | + elseif ($pay->sum != $sum) { |
|
31 | 32 | $pay->sum = $sum; |
32 | 33 | $pay->save(); |
33 | 34 | } |
@@ -7,7 +7,8 @@ |
||
7 | 7 | $tree->ul('\Ecommerce\Category', 0, function($categoryItem) use($category) { |
8 | 8 | if ($category && $category->id == $categoryItem->id) { |
9 | 9 | $class = 'active'; |
10 | - } else { |
|
10 | + } |
|
11 | + else { |
|
11 | 12 | $class = ''; |
12 | 13 | } |
13 | 14 | return [ |
@@ -18,7 +18,8 @@ |
||
18 | 18 | "relation": "infos"} |
19 | 19 | )'><?= $count . ' ' . Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов']); ?></a> |
20 | 20 | <?php |
21 | -} else { |
|
21 | +} |
|
22 | +else { |
|
22 | 23 | foreach ($item->infos as $info) { |
23 | 24 | echo $info->value . ' '; |
24 | 25 | } |