@@ -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 |
@@ -5,19 +5,19 @@ |
||
| 5 | 5 | <div class ='pull-right'> |
| 6 | 6 | <div class="btn-group"> |
| 7 | 7 | <?php |
| 8 | - $html = ''; |
|
| 9 | - foreach ($table->buttons as $button) { |
|
| 10 | - $html .= '<a class = "btn btn-primary btn-sm"'; |
|
| 11 | - if (!empty($button['href'])) { |
|
| 12 | - $html .= " href = '{$button['href']}'"; |
|
| 13 | - } |
|
| 14 | - if (!empty($button['onclick'])) { |
|
| 15 | - $html .= " onclick = '{$button['onclick']}'"; |
|
| 16 | - } |
|
| 17 | - $html .= ">{$button['text']}</a> "; |
|
| 18 | - } |
|
| 19 | - echo $html; |
|
| 20 | - ?> |
|
| 8 | + $html = ''; |
|
| 9 | + foreach ($table->buttons as $button) { |
|
| 10 | + $html .= '<a class = "btn btn-primary btn-sm"'; |
|
| 11 | + if (!empty($button['href'])) { |
|
| 12 | + $html .= " href = '{$button['href']}'"; |
|
| 13 | + } |
|
| 14 | + if (!empty($button['onclick'])) { |
|
| 15 | + $html .= " onclick = '{$button['onclick']}'"; |
|
| 16 | + } |
|
| 17 | + $html .= ">{$button['text']}</a> "; |
|
| 18 | + } |
|
| 19 | + echo $html; |
|
| 20 | + ?> |
|
| 21 | 21 | </div> |
| 22 | 22 | </div> |
| 23 | 23 | <?php } ?> |
@@ -168,20 +168,20 @@ |
||
| 168 | 168 | <h5 class="<?= $complete ? 'text-success' : 'text-danger'; ?>"><?= $condition->name(); ?></h5> |
| 169 | 169 | <ul> |
| 170 | 170 | <?php |
| 171 | - foreach ($condition->items as $item) { |
|
| 172 | - $itemComplete = $item->checkComplete($userId); |
|
| 173 | - switch ($item->type) { |
|
| 174 | - case 'event': |
|
| 171 | + foreach ($condition->items as $item) { |
|
| 172 | + $itemComplete = $item->checkComplete($userId); |
|
| 173 | + switch ($item->type) { |
|
| 174 | + case 'event': |
|
| 175 | 175 | $name = \Events\Event::get($item->value, 'event')->name(); |
| 176 | - break; |
|
| 177 | - } |
|
| 178 | - ?> |
|
| 176 | + break; |
|
| 177 | + } |
|
| 178 | + ?> |
|
| 179 | 179 | <li> |
| 180 | 180 | <b class="<?= $itemComplete ? 'text-success' : 'text-danger'; ?>"><?= $name; ?> <?= $item->recivedCount($userId); ?></b>/<?= $item->count; ?> <br /> |
| 181 | 181 | </li> |
| 182 | 182 | <?php |
| 183 | - } |
|
| 184 | - ?> |
|
| 183 | + } |
|
| 184 | + ?> |
|
| 185 | 185 | </ul> |
| 186 | 186 | <?php |
| 187 | 187 | } |
@@ -58,11 +58,11 @@ discard block |
||
| 58 | 58 | ]]); |
| 59 | 59 | ?>)</h3> |
| 60 | 60 | <?php |
| 61 | - foreach (\Dashboard\Comment::getList([ 'where' => [ |
|
| 62 | - ['item_id', $item->id], |
|
| 63 | - ['model', $modelName], |
|
| 64 | - ], 'order' => ['date_create', 'desc']]) as $comment) { |
|
| 65 | - ?> |
|
| 61 | + foreach (\Dashboard\Comment::getList([ 'where' => [ |
|
| 62 | + ['item_id', $item->id], |
|
| 63 | + ['model', $modelName], |
|
| 64 | + ], 'order' => ['date_create', 'desc']]) as $comment) { |
|
| 65 | + ?> |
|
| 66 | 66 | <div class="row"> |
| 67 | 67 | <div class="col-sm-3" style="max-width: 300px;"> |
| 68 | 68 | <a href='/admin/Users/view/User/<?= $comment->user->pk(); ?>'><?= $comment->user->name(); ?></a><br /> |
@@ -73,14 +73,14 @@ discard block |
||
| 73 | 73 | </div> |
| 74 | 74 | </div> |
| 75 | 75 | <?php |
| 76 | - } |
|
| 77 | - ?> |
|
| 76 | + } |
|
| 77 | + ?> |
|
| 78 | 78 | </div> |
| 79 | 79 | <div> |
| 80 | 80 | <?php |
| 81 | - $form = new \Ui\Form(); |
|
| 82 | - $form->begin(); |
|
| 83 | - $form->input('textarea', 'comment', 'Комментарий'); |
|
| 84 | - $form->end(); |
|
| 85 | - ?> |
|
| 81 | + $form = new \Ui\Form(); |
|
| 82 | + $form->begin(); |
|
| 83 | + $form->input('textarea', 'comment', 'Комментарий'); |
|
| 84 | + $form->end(); |
|
| 85 | + ?> |
|
| 86 | 86 | </div> |
@@ -1,16 +1,16 @@ discard block |
||
| 1 | 1 | <fieldset> |
| 2 | 2 | <?php |
| 3 | - if (\Users\User::$cur->id) { |
|
| 4 | - $userAdds = Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id]]); |
|
| 5 | - $values = []; |
|
| 6 | - foreach ($userAdds as $userAdd) { |
|
| 7 | - $values[$userAdd->id] = $userAdd->values(['array' => true]); |
|
| 8 | - } |
|
| 9 | - if ($userAdds) { |
|
| 10 | - $form->input('select', 'userAddsId', 'Ваши контакты', ['values' => ['' => 'Выберите'] + Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id], 'forSelect' => true])]); |
|
| 11 | - echo '<hr />'; |
|
| 12 | - } |
|
| 13 | - ?> |
|
| 3 | + if (\Users\User::$cur->id) { |
|
| 4 | + $userAdds = Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id]]); |
|
| 5 | + $values = []; |
|
| 6 | + foreach ($userAdds as $userAdd) { |
|
| 7 | + $values[$userAdd->id] = $userAdd->values(['array' => true]); |
|
| 8 | + } |
|
| 9 | + if ($userAdds) { |
|
| 10 | + $form->input('select', 'userAddsId', 'Ваши контакты', ['values' => ['' => 'Выберите'] + Ecommerce\UserAdds::getList(['where' => ['user_id', \Users\User::$cur->id], 'forSelect' => true])]); |
|
| 11 | + echo '<hr />'; |
|
| 12 | + } |
|
| 13 | + ?> |
|
| 14 | 14 | <script> |
| 15 | 15 | var userAddsValues = <?= json_encode($values); ?>; |
| 16 | 16 | inji.onLoad(function () { |
@@ -24,9 +24,9 @@ discard block |
||
| 24 | 24 | }) |
| 25 | 25 | </script> |
| 26 | 26 | <?php |
| 27 | - } |
|
| 28 | - foreach (Ecommerce\UserAdds\Field::getList(['order' => ['weight', 'asc']]) as $field) { |
|
| 29 | - $form->input($field->type, "userAdds[fields][{$field->id}]", $field->name, ['required' => $field->required]); |
|
| 30 | - } |
|
| 31 | - ?> |
|
| 27 | + } |
|
| 28 | + foreach (Ecommerce\UserAdds\Field::getList(['order' => ['weight', 'asc']]) as $field) { |
|
| 29 | + $form->input($field->type, "userAdds[fields][{$field->id}]", $field->name, ['required' => $field->required]); |
|
| 30 | + } |
|
| 31 | + ?> |
|
| 32 | 32 | </fieldset> |
| 33 | 33 | \ No newline at end of file |
@@ -17,20 +17,20 @@ |
||
| 17 | 17 | <h1><?= $item->name(); ?></h1> |
| 18 | 18 | <ul class="item-options"> |
| 19 | 19 | <?php |
| 20 | - foreach ($item->options as $param) { |
|
| 21 | - if (!$param->item_option_view || !$param->value) |
|
| 22 | - continue; |
|
| 23 | - if ($param->item_option_type == 'select') { |
|
| 24 | - if (empty($param->option->items[$param->value])) |
|
| 25 | - continue; |
|
| 26 | - $value = $param->option->items[$param->value]->value; |
|
| 27 | - } else { |
|
| 28 | - $value = $param->value; |
|
| 29 | - } |
|
| 30 | - $paramName = $param->item_option_name; |
|
| 31 | - echo "<li>{$paramName}: {$value} {$param->item_option_postfix}</li>"; |
|
| 32 | - } |
|
| 33 | - ?> |
|
| 20 | + foreach ($item->options as $param) { |
|
| 21 | + if (!$param->item_option_view || !$param->value) |
|
| 22 | + continue; |
|
| 23 | + if ($param->item_option_type == 'select') { |
|
| 24 | + if (empty($param->option->items[$param->value])) |
|
| 25 | + continue; |
|
| 26 | + $value = $param->option->items[$param->value]->value; |
|
| 27 | + } else { |
|
| 28 | + $value = $param->value; |
|
| 29 | + } |
|
| 30 | + $paramName = $param->item_option_name; |
|
| 31 | + echo "<li>{$paramName}: {$value} {$param->item_option_postfix}</li>"; |
|
| 32 | + } |
|
| 33 | + ?> |
|
| 34 | 34 | </ul> |
| 35 | 35 | <div class="item-actions"> |
| 36 | 36 | <div class="item-price"> |
@@ -2,17 +2,17 @@ |
||
| 2 | 2 | <div class="table-responsive"> |
| 3 | 3 | <table class="table table-bordered table-condensed table-striped table-hover"> |
| 4 | 4 | <?php |
| 5 | - $i = 0; |
|
| 6 | - foreach ($items as $item) { |
|
| 7 | - ?> |
|
| 5 | + $i = 0; |
|
| 6 | + foreach ($items as $item) { |
|
| 7 | + ?> |
|
| 8 | 8 | <tr> |
| 9 | 9 | <?php $this->widget('Ecommerce\items/item-tablerow', ['item' => $item]); ?> |
| 10 | 10 | </tr> |
| 11 | 11 | <?php |
| 12 | - if (!( ++$i % 3)) { |
|
| 13 | - echo '</div><div class="row">'; |
|
| 14 | - } |
|
| 15 | - } |
|
| 16 | - ?> |
|
| 12 | + if (!( ++$i % 3)) { |
|
| 13 | + echo '</div><div class="row">'; |
|
| 14 | + } |
|
| 15 | + } |
|
| 16 | + ?> |
|
| 17 | 17 | </table></div> |
| 18 | 18 | </div> |
| 19 | 19 | \ No newline at end of file |
@@ -1,21 +1,21 @@ |
||
| 1 | 1 | <div class="ecommerce-sidebar-categorys"> |
| 2 | 2 | <?php |
| 3 | - if (empty($category)) { |
|
| 4 | - $category = []; |
|
| 5 | - } |
|
| 6 | - $tree = new Ui\Tree(); |
|
| 7 | - $tree->ul('\Ecommerce\Category', 0, function($categoryItem) use($category) { |
|
| 8 | - if ($category && $category->id == $categoryItem->id) { |
|
| 9 | - $class = 'active'; |
|
| 10 | - } else { |
|
| 11 | - $class = ''; |
|
| 12 | - } |
|
| 13 | - return [ |
|
| 14 | - 'attributes' => [ |
|
| 15 | - 'class' => $class, |
|
| 16 | - ], |
|
| 17 | - 'text' => "<a {$class} href = '/ecommerce/itemList/{$categoryItem->id}'>{$categoryItem->name}</a>" |
|
| 18 | - ]; |
|
| 19 | - }); |
|
| 20 | - ?> |
|
| 3 | + if (empty($category)) { |
|
| 4 | + $category = []; |
|
| 5 | + } |
|
| 6 | + $tree = new Ui\Tree(); |
|
| 7 | + $tree->ul('\Ecommerce\Category', 0, function($categoryItem) use($category) { |
|
| 8 | + if ($category && $category->id == $categoryItem->id) { |
|
| 9 | + $class = 'active'; |
|
| 10 | + } else { |
|
| 11 | + $class = ''; |
|
| 12 | + } |
|
| 13 | + return [ |
|
| 14 | + 'attributes' => [ |
|
| 15 | + 'class' => $class, |
|
| 16 | + ], |
|
| 17 | + 'text' => "<a {$class} href = '/ecommerce/itemList/{$categoryItem->id}'>{$categoryItem->name}</a>" |
|
| 18 | + ]; |
|
| 19 | + }); |
|
| 20 | + ?> |
|
| 21 | 21 | </div> |
| 22 | 22 | \ No newline at end of file |
@@ -13,23 +13,23 @@ |
||
| 13 | 13 | <div class="ecommerce-best"> |
| 14 | 14 | <h2 class='caption'><span>Рекомендумые товары</span></h2> |
| 15 | 15 | <?php |
| 16 | - $bestItems = App::$cur->ecommerce->getItems(['where' => [['best', '1']], 'sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 3]); |
|
| 17 | - if (count($bestItems) < 3) { |
|
| 18 | - $bestItems = array_merge($bestItems, App::$cur->ecommerce->getItems(['sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 3])); |
|
| 19 | - $bestItems = array_slice($bestItems, 0, 3); |
|
| 20 | - } |
|
| 21 | - $this->widget('Ecommerce\items/icons', ['items' => $bestItems]); |
|
| 22 | - $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]); |
|
| 23 | - ?> |
|
| 16 | + $bestItems = App::$cur->ecommerce->getItems(['where' => [['best', '1']], 'sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 3]); |
|
| 17 | + if (count($bestItems) < 3) { |
|
| 18 | + $bestItems = array_merge($bestItems, App::$cur->ecommerce->getItems(['sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 3])); |
|
| 19 | + $bestItems = array_slice($bestItems, 0, 3); |
|
| 20 | + } |
|
| 21 | + $this->widget('Ecommerce\items/icons', ['items' => $bestItems]); |
|
| 22 | + $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]); |
|
| 23 | + ?> |
|
| 24 | 24 | </div> |
| 25 | 25 | </div> |
| 26 | 26 | <?php |
| 27 | - $this->widget('Ecommerce\items/showOptions'); |
|
| 27 | + $this->widget('Ecommerce\items/showOptions'); |
|
| 28 | 28 | |
| 29 | - $bestItems = App::$cur->ecommerce->getItems(['sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 6]); |
|
| 30 | - $this->widget('Ecommerce\items/icons', ['items' => $bestItems]); |
|
| 31 | - $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]); |
|
| 32 | - ?> |
|
| 29 | + $bestItems = App::$cur->ecommerce->getItems(['sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 6]); |
|
| 30 | + $this->widget('Ecommerce\items/icons', ['items' => $bestItems]); |
|
| 31 | + $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]); |
|
| 32 | + ?> |
|
| 33 | 33 | <a class="ecommerce-showmore" href="/ecommerce/itemList">Показать больше товаров</a> |
| 34 | 34 | </div> |
| 35 | 35 | </div> |