@@ -4,18 +4,18 @@ |
||
4 | 4 | <div class="alert alert-<?= $msg['status']; ?> alert-dismissable"> |
5 | 5 | <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> |
6 | 6 | <strong><?php |
7 | - switch ($msg['status']) { |
|
8 | - case 'success': |
|
7 | + switch ($msg['status']) { |
|
8 | + case 'success': |
|
9 | 9 | echo 'Успех!'; |
10 | - break; |
|
11 | - case 'danger': |
|
10 | + break; |
|
11 | + case 'danger': |
|
12 | 12 | case 'warning': |
13 | 13 | echo 'Внимание!'; |
14 | - break; |
|
15 | - default: |
|
14 | + break; |
|
15 | + default: |
|
16 | 16 | echo 'Информация.'; |
17 | - } |
|
18 | - ?></strong> <?= $msg['text']; ?> |
|
17 | + } |
|
18 | + ?></strong> <?= $msg['text']; ?> |
|
19 | 19 | </div> |
20 | 20 | <?php |
21 | 21 | } |
@@ -43,7 +43,7 @@ |
||
43 | 43 | Tools::redirect('/admin', 'У вас нет прав доступа для просмотра этого объекта', 'danger'); |
44 | 44 | } |
45 | 45 | $item = $fullModelName::get($pk); |
46 | - $this->view->setTitle(($fullModelName::$objectName ? $fullModelName::$objectName : $fullModelName) . ($item ? ( ' - ' . $item->name()) : '')); |
|
46 | + $this->view->setTitle(($fullModelName::$objectName ? $fullModelName::$objectName : $fullModelName) . ($item ? (' - ' . $item->name()) : '')); |
|
47 | 47 | if (!empty($_POST['comment'])) { |
48 | 48 | $comment = new Dashboard\Comment(); |
49 | 49 | $comment->text = $_POST['comment']; |
@@ -1,9 +1,9 @@ |
||
1 | 1 | <div class="row"> |
2 | 2 | <div class="col-lg-12"> |
3 | 3 | <?php |
4 | - $dataManager = new Ui\DataManager('Apps\App', 'setup'); |
|
5 | - $dataManager->draw(); |
|
6 | - ?> |
|
4 | + $dataManager = new Ui\DataManager('Apps\App', 'setup'); |
|
5 | + $dataManager->draw(); |
|
6 | + ?> |
|
7 | 7 | </div> |
8 | 8 | <div class="col-lg-12"> |
9 | 9 | <?php |
@@ -1,13 +1,13 @@ |
||
1 | 1 | <tfoot> |
2 | 2 | <tr> |
3 | 3 | <?php |
4 | - foreach ($table->cols as $col) { |
|
5 | - if (is_string($col)) { |
|
6 | - echo "<th>{$col}</th>"; |
|
7 | - } else { |
|
8 | - echo Html::el('th', !empty($col['attributes']) ? $col['attributes'] : [], $col['text']); |
|
9 | - } |
|
10 | - } |
|
11 | - ?> |
|
4 | + foreach ($table->cols as $col) { |
|
5 | + if (is_string($col)) { |
|
6 | + echo "<th>{$col}</th>"; |
|
7 | + } else { |
|
8 | + echo Html::el('th', !empty($col['attributes']) ? $col['attributes'] : [], $col['text']); |
|
9 | + } |
|
10 | + } |
|
11 | + ?> |
|
12 | 12 | </tr> |
13 | 13 | </tfoot> |
14 | 14 | \ No newline at end of file |
@@ -11,7 +11,7 @@ |
||
11 | 11 | return [ |
12 | 12 | 'classes' => ['Ui\DataManager'], |
13 | 13 | 'get' => function($element) { |
14 | -$access = NULL; |
|
14 | +$access = null; |
|
15 | 15 | $path = [ |
16 | 16 | 'models', |
17 | 17 | $element->modelName, |
@@ -11,7 +11,7 @@ |
||
11 | 11 | return [ |
12 | 12 | 'classes' => ['Ui\DataManager'], |
13 | 13 | 'get' => function($element) { |
14 | -$access = NULL; |
|
14 | +$access = null; |
|
15 | 15 | $path = [ |
16 | 16 | 'models', |
17 | 17 | $element->modelName, |
@@ -27,7 +27,8 @@ discard block |
||
27 | 27 | //walk know pathes |
28 | 28 | foreach ($this->map->paths(['where' => ['path', $this->curPath]]) as $path) { |
29 | 29 | if (isset($this->data[$path->item])) { |
30 | - if ($path->type == 'container') { //create walker for container |
|
30 | + if ($path->type == 'container') { |
|
31 | +//create walker for container |
|
31 | 32 | $walker = new Walker(); |
32 | 33 | $walker->migration = $this->migration; |
33 | 34 | $walker->map = $this->map; |
@@ -37,7 +38,8 @@ discard block |
||
37 | 38 | $walker->mapPathParent = $this->mapPath; |
38 | 39 | $walker->migtarionLog = $this->migtarionLog; |
39 | 40 | $walker->walk(); |
40 | - } elseif ($path->type == 'object') { //start parse path data |
|
41 | + } elseif ($path->type == 'object') { |
|
42 | +//start parse path data |
|
41 | 43 | $this->startObjectParse($path->object_id, $this->data[$path->item]); |
42 | 44 | } |
43 | 45 | } |
@@ -54,9 +56,11 @@ discard block |
||
54 | 56 | ['code', $key], |
55 | 57 | ['migration_id', $this->migration->id] |
56 | 58 | ]); |
57 | - if ($object) { //parse as object |
|
59 | + if ($object) { |
|
60 | +//parse as object |
|
58 | 61 | $this->startObjectParse($object, $data); |
59 | - } else { //create new map path for configure unknown path |
|
62 | + } else { |
|
63 | +//create new map path for configure unknown path |
|
60 | 64 | $this->mapPath = new Migration\Map\Path(); |
61 | 65 | $this->mapPath->parent_id = $this->mapPathParent ? $this->mapPathParent->id : 0; |
62 | 66 | $this->mapPath->path = $this->curPath; |
@@ -35,7 +35,7 @@ |
||
35 | 35 | |
36 | 36 | //add filter for item type user roles by current user role |
37 | 37 | $selectOptions['where'][] = [ |
38 | - [Item\Offer\Price\Type::index(), NULL, 'is'], |
|
38 | + [Item\Offer\Price\Type::index(), null, 'is'], |
|
39 | 39 | [ |
40 | 40 | [Item\Offer\Price\Type::colPrefix() . 'roles', '', '=', 'OR'], |
41 | 41 | [Item\Offer\Price\Type::colPrefix() . 'roles', '%|' . \Users\User::$cur->role_id . '|%', 'LIKE', 'OR'], |
@@ -1,10 +1,10 @@ discard block |
||
1 | 1 | <div class="filters"> |
2 | 2 | <form> |
3 | 3 | <?php |
4 | - $min = App::$cur->ecommerce->getItems(['sort' => ['price' => 'asc'], 'count' => 1, 'key' => false]); |
|
5 | - $max = App::$cur->ecommerce->getItems(['sort' => ['price' => 'desc'], 'count' => 1, 'key' => false]); |
|
6 | - if ($min && $min[0]->getPrice() && $max && $max[0]->getPrice()) { |
|
7 | - ?> |
|
4 | + $min = App::$cur->ecommerce->getItems(['sort' => ['price' => 'asc'], 'count' => 1, 'key' => false]); |
|
5 | + $max = App::$cur->ecommerce->getItems(['sort' => ['price' => 'desc'], 'count' => 1, 'key' => false]); |
|
6 | + if ($min && $min[0]->getPrice() && $max && $max[0]->getPrice()) { |
|
7 | + ?> |
|
8 | 8 | <label>Фильтр по цене</label> |
9 | 9 | <div class="form-group"> |
10 | 10 | <div class="row"> |
@@ -18,24 +18,24 @@ discard block |
||
18 | 18 | ?> |
19 | 19 | <div class="filter"> |
20 | 20 | <?php |
21 | - switch ($option->type) { |
|
22 | - case 'radio': |
|
21 | + switch ($option->type) { |
|
22 | + case 'radio': |
|
23 | 23 | echo "<label>{$option->name}</label>"; |
24 | - foreach ($option->items as $item) { |
|
25 | - $this->widget('Ui\Form/' . $option->type, [ |
|
26 | - 'label' => $item->name, |
|
27 | - 'name' => "filters[options][{$option->id}]", |
|
28 | - !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : false, |
|
29 | - 'options' => [ |
|
30 | - 'value' => $item->id, |
|
31 | - ] |
|
32 | - ]); |
|
33 | - } |
|
34 | - break; |
|
35 | - case 'select': |
|
24 | + foreach ($option->items as $item) { |
|
25 | + $this->widget('Ui\Form/' . $option->type, [ |
|
26 | + 'label' => $item->name, |
|
27 | + 'name' => "filters[options][{$option->id}]", |
|
28 | + !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : false, |
|
29 | + 'options' => [ |
|
30 | + 'value' => $item->id, |
|
31 | + ] |
|
32 | + ]); |
|
33 | + } |
|
34 | + break; |
|
35 | + case 'select': |
|
36 | 36 | echo "<label>{$option->name}</label>"; |
37 | - foreach ($option->items as $item) { |
|
38 | - ?> |
|
37 | + foreach ($option->items as $item) { |
|
38 | + ?> |
|
39 | 39 | <div class="radio"> |
40 | 40 | <label> |
41 | 41 | <input type="checkbox" name = 'filters[options][<?= $option->id; ?>][]' value ="<?= $item->id; ?>" <?= !empty($_GET['filters']['options'][$option->id]) && in_array($item->id, $_GET['filters']['options'][$option->id]) ? 'checked' : ''; ?>> |