@@ -716,7 +716,7 @@ |
||
716 | 716 | return []; |
717 | 717 | } |
718 | 718 | $tree = new Tree(); |
719 | - $tree->ul($this->managerOptions['categorys']['model'], 0, function($category) { |
|
719 | + $tree->ul($this->managerOptions['categorys']['model'], 0, function ($category) { |
|
720 | 720 | $path = $category->tree_path . ($category->pk() ? $category->pk() . "/" : ''); |
721 | 721 | $cleanClassName = str_replace('\\', '\\\\', get_class($category)); |
722 | 722 | return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='{$category->index()}' data-path ='{$path}' data-id='{$category->pk()}' data-model='{$this->managerOptions['categorys']['model']}'> {$category->name}</a> |
@@ -396,6 +396,9 @@ |
||
396 | 396 | return $rows; |
397 | 397 | } |
398 | 398 | |
399 | + /** |
|
400 | + * @param DataManager $dataManager |
|
401 | + */ |
|
399 | 402 | public static function drawCol($item, $colName, $params = [], $dataManager = null, $originalCol = '', $originalItem = null) { |
400 | 403 | $modelName = get_class($item); |
401 | 404 | if (!class_exists($modelName)) { |
@@ -8,7 +8,7 @@ |
||
8 | 8 | * @covers Inji::unlisten |
9 | 9 | */ |
10 | 10 | public function testNotSavingEvent() { |
11 | - \Inji::$inst->listen('testEvent', 'testCallback', function() { |
|
11 | + \Inji::$inst->listen('testEvent', 'testCallback', function () { |
|
12 | 12 | return true; |
13 | 13 | }); |
14 | 14 | $this->assertEquals(true, Inji::$inst->event('testEvent')); |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | |
16 | 16 | define('INJI_DOMAIN_NAME', 'test.app'); |
17 | 17 | |
18 | -spl_autoload_register(function($class_name) { |
|
18 | +spl_autoload_register(function ($class_name) { |
|
19 | 19 | if (file_exists(INJI_SYSTEM_DIR . '/Inji/' . $class_name . '.php')) { |
20 | 20 | include_once INJI_SYSTEM_DIR . '/Inji/' . $class_name . '.php'; |
21 | 21 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | //load core |
25 | 25 | Inji::$inst = new Inji(); |
26 | 26 | Inji::$config = Config::system(); |
27 | -Inji::$inst->listen('Config-change-system', 'systemConfig', function($event) { |
|
27 | +Inji::$inst->listen('Config-change-system', 'systemConfig', function ($event) { |
|
28 | 28 | Inji::$config = $event['eventObject']; |
29 | 29 | return $event['eventObject']; |
30 | 30 | }); |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | App::$cur->params = []; |
46 | 46 | App::$cur->config = Config::app(App::$cur); |
47 | 47 | App::$primary = App::$cur; |
48 | -Inji::$inst->listen('Config-change-app-' . App::$cur->name, 'curAppConfig', function($event) { |
|
48 | +Inji::$inst->listen('Config-change-app-' . App::$cur->name, 'curAppConfig', function ($event) { |
|
49 | 49 | App::$cur->config = $event['eventObject']; |
50 | 50 | return $event['eventObject']; |
51 | 51 | }); |
@@ -5,6 +5,6 @@ |
||
5 | 5 | 'file' => 'index.html', |
6 | 6 | 'css' => ['style.css'], |
7 | 7 | 'libs' => [ |
8 | - 'JqueryUi', 'PaperTheme','FancyBox' |
|
8 | + 'JqueryUi', 'PaperTheme','FancyBox' |
|
9 | 9 | ] |
10 | 10 | ]; |
@@ -5,6 +5,6 @@ |
||
5 | 5 | 'file' => 'index.html', |
6 | 6 | 'css' => ['style.css'], |
7 | 7 | 'libs' => [ |
8 | - 'JqueryUi', 'PaperTheme','FancyBox' |
|
8 | + 'JqueryUi', 'PaperTheme', 'FancyBox' |
|
9 | 9 | ] |
10 | 10 | ]; |
@@ -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) { |
@@ -31,25 +31,25 @@ |
||
31 | 31 | <span class="caption">Вид:</span> |
32 | 32 | <span class="group"> |
33 | 33 | <?php |
34 | - for ($i = 2; $i < 5; $i++) { |
|
35 | - $curLimit = $limit * $i; |
|
36 | - $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
37 | - echo " <a href='{$path}?{$curQuery}'>"; |
|
38 | - echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
39 | - echo $curLimit; |
|
40 | - echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
41 | - echo "</a> "; |
|
42 | - } |
|
43 | - if (!empty(App::$cur->ecommerce->config['list_all'])) { |
|
44 | - $curLimit = 'all'; |
|
45 | - $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
46 | - echo " <a href='{$path}?{$curQuery}'>"; |
|
47 | - echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
48 | - echo 'Все'; |
|
49 | - echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
50 | - echo "</a> "; |
|
51 | - } |
|
52 | - ?> |
|
34 | + for ($i = 2; $i < 5; $i++) { |
|
35 | + $curLimit = $limit * $i; |
|
36 | + $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
37 | + echo " <a href='{$path}?{$curQuery}'>"; |
|
38 | + echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
39 | + echo $curLimit; |
|
40 | + echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
41 | + echo "</a> "; |
|
42 | + } |
|
43 | + if (!empty(App::$cur->ecommerce->config['list_all'])) { |
|
44 | + $curLimit = 'all'; |
|
45 | + $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
46 | + echo " <a href='{$path}?{$curQuery}'>"; |
|
47 | + echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
48 | + echo 'Все'; |
|
49 | + echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
50 | + echo "</a> "; |
|
51 | + } |
|
52 | + ?> |
|
53 | 53 | </span> |
54 | 54 | <span class="group"> |
55 | 55 | <a href ='#' onclick="inji.onLoad(function () { |
@@ -17,12 +17,12 @@ |
||
17 | 17 | <div class="row"> |
18 | 18 | <div class="col-sm-6 ecommerce-showoptions-sort"> |
19 | 19 | <span class="caption">Сортировка:</span> |
20 | - <a href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['price' => sortToggler('price','asc')]])); ?>">По цене<?= sortDirectionIcon('price'); ?></a> |
|
21 | - <a href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['sales' => sortToggler('sales','desc')]])); ?>">По популярности<?= sortDirectionIcon('sales'); ?></a> |
|
20 | + <a href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['price' => sortToggler('price', 'asc')]])); ?>">По цене<?= sortDirectionIcon('price'); ?></a> |
|
21 | + <a href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['sales' => sortToggler('sales', 'desc')]])); ?>">По популярности<?= sortDirectionIcon('sales'); ?></a> |
|
22 | 22 | <?php |
23 | 23 | if (!empty(App::$cur->ecommerce->config['isset_sort'])) { |
24 | 24 | ?> |
25 | - <a href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['isset' => sortToggler('isset','desc')]])); ?>">По наличию<?= sortDirectionIcon('isset'); ?></a> |
|
25 | + <a href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['isset' => sortToggler('isset', 'desc')]])); ?>">По наличию<?= sortDirectionIcon('isset'); ?></a> |
|
26 | 26 | <?php |
27 | 27 | } |
28 | 28 | ?> |
@@ -5,9 +5,9 @@ discard block |
||
5 | 5 | <?php if (empty($noIndicators)) { ?> |
6 | 6 | <ol class="carousel-indicators"> |
7 | 7 | <?php |
8 | - $i = 0; |
|
9 | - for ($i = 0; $i < count($slides); $i++) { |
|
10 | - ?> |
|
8 | + $i = 0; |
|
9 | + for ($i = 0; $i < count($slides); $i++) { |
|
10 | + ?> |
|
11 | 11 | <li data-target="#<?= $id; ?>" data-slide-to="<?= $i; ?>" <?= !$i ? 'class="active"' : ''; ?>></li> |
12 | 12 | <?php |
13 | 13 | } |
@@ -18,9 +18,9 @@ discard block |
||
18 | 18 | <!-- Wrapper for slides --> |
19 | 19 | <div class="carousel-inner" role="listbox"> |
20 | 20 | <?php |
21 | - $i = 0; |
|
22 | - foreach ($slides as $item) { |
|
23 | - ?> |
|
21 | + $i = 0; |
|
22 | + foreach ($slides as $item) { |
|
23 | + ?> |
|
24 | 24 | <div class="item <?= !$i ? 'active' : ''; ?>"> |
25 | 25 | <?= !empty($item['href']) ? "<a href = '{$item['href']}' style = 'display:inline-block;'>" : ''; ?> |
26 | 26 | <img src="<?= $item['image']; ?>" <?= !empty($item['image']) ? 'alt="' . $item['name'] . '"' : ''; ?> /> |
@@ -1,9 +1,9 @@ |
||
1 | 1 | <div class="item"> |
2 | 2 | <?php |
3 | - if ($item->badge && $item->badge->image) { |
|
4 | - echo "<img class = 'item-icon-badge' src = '{$item->badge->image->path}' />"; |
|
5 | - } |
|
6 | - ?> |
|
3 | + if ($item->badge && $item->badge->image) { |
|
4 | + echo "<img class = 'item-icon-badge' src = '{$item->badge->image->path}' />"; |
|
5 | + } |
|
6 | + ?> |
|
7 | 7 | <h4 class="item-name"> |
8 | 8 | <a href="/ecommerce/view/<?= $item->id; ?>"> |
9 | 9 | <?= $item->name(); ?> |
@@ -61,6 +61,10 @@ |
||
61 | 61 | Inji::$inst->unBlockParallel(); |
62 | 62 | } |
63 | 63 | |
64 | + /** |
|
65 | + * @param string $command |
|
66 | + * @param string $path |
|
67 | + */ |
|
64 | 68 | public static function command($command, $needOutput = true, $path = null) { |
65 | 69 | while (!Inji::$inst->blockParallel()) { |
66 | 70 | sleep(2); |