@@ -164,12 +164,12 @@ |
||
| 164 | 164 | <li><a href ='' onclick='inji.Ui.dataManagers.get(this).rowSelection("inverse");return false;'>Инвертировать</a></li> |
| 165 | 165 | <li role="separator" class="divider"></li> |
| 166 | 166 | <?php |
| 167 | - foreach ($actions as $action => $actionParams) { |
|
| 168 | - if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) { |
|
| 169 | - echo "<li><a href ='' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>"; |
|
| 170 | - } |
|
| 171 | - } |
|
| 172 | - ?> |
|
| 167 | + foreach ($actions as $action => $actionParams) { |
|
| 168 | + if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) { |
|
| 169 | + echo "<li><a href ='' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>"; |
|
| 170 | + } |
|
| 171 | + } |
|
| 172 | + ?> |
|
| 173 | 173 | </ul> |
| 174 | 174 | </div> |
| 175 | 175 | <?php |
@@ -23,17 +23,17 @@ |
||
| 23 | 23 | ?> |
| 24 | 24 | <ul class="treeview" data-col='tree_path'> |
| 25 | 25 | <?php |
| 26 | - if (is_string($objectRoot)) { |
|
| 27 | - $items = $objectRoot::getList(['where' => ['parent_id', 0]]); |
|
| 28 | - } else { |
|
| 29 | - $class = get_class($objectRoot); |
|
| 30 | - $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()]]); |
|
| 31 | - } |
|
| 32 | - $count += count($items); |
|
| 33 | - foreach ($items as $objectChild) { |
|
| 34 | - $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc); |
|
| 35 | - } |
|
| 36 | - ?> |
|
| 26 | + if (is_string($objectRoot)) { |
|
| 27 | + $items = $objectRoot::getList(['where' => ['parent_id', 0]]); |
|
| 28 | + } else { |
|
| 29 | + $class = get_class($objectRoot); |
|
| 30 | + $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()]]); |
|
| 31 | + } |
|
| 32 | + $count += count($items); |
|
| 33 | + foreach ($items as $objectChild) { |
|
| 34 | + $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc); |
|
| 35 | + } |
|
| 36 | + ?> |
|
| 37 | 37 | </ul> |
| 38 | 38 | <?php |
| 39 | 39 | return $count; |
@@ -2,24 +2,24 @@ |
||
| 2 | 2 | <div class="col-md-4"> |
| 3 | 3 | <ul class="nav nav-pills nav-stacked"> |
| 4 | 4 | <?php |
| 5 | - $hiddenId = Tools::randomString(); |
|
| 6 | - foreach ($deliverys as $delivery) {
|
|
| 7 | - if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || $delivery->id == $cartDelivery->id) {
|
|
| 8 | - $checked = 'checked'; |
|
| 9 | - } else {
|
|
| 10 | - $checked = ''; |
|
| 11 | - } |
|
| 12 | - echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">'; |
|
| 13 | - echo $delivery->name; |
|
| 14 | - echo '</a></li>'; |
|
| 15 | - } |
|
| 16 | - $form->input('hidden', "delivery", '', [
|
|
| 17 | - 'value' => $cartDelivery->id, |
|
| 18 | - 'attributes' => [ |
|
| 19 | - 'id' => $hiddenId |
|
| 20 | - ], |
|
| 21 | - ]); |
|
| 22 | - ?> |
|
| 5 | + $hiddenId = Tools::randomString(); |
|
| 6 | + foreach ($deliverys as $delivery) {
|
|
| 7 | + if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || $delivery->id == $cartDelivery->id) {
|
|
| 8 | + $checked = 'checked'; |
|
| 9 | + } else {
|
|
| 10 | + $checked = ''; |
|
| 11 | + } |
|
| 12 | + echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">'; |
|
| 13 | + echo $delivery->name; |
|
| 14 | + echo '</a></li>'; |
|
| 15 | + } |
|
| 16 | + $form->input('hidden', "delivery", '', [
|
|
| 17 | + 'value' => $cartDelivery->id, |
|
| 18 | + 'attributes' => [ |
|
| 19 | + 'id' => $hiddenId |
|
| 20 | + ], |
|
| 21 | + ]); |
|
| 22 | + ?> |
|
| 23 | 23 | </ul> |
| 24 | 24 | </div> |
| 25 | 25 | <div class="col-md-8"> |
@@ -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 |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Files module |
|
| 4 | - * |
|
| 5 | - * @author Alexey Krupskiy <[email protected]> |
|
| 6 | - * @link http://inji.ru/ |
|
| 7 | - * @copyright 2015 Alexey Krupskiy |
|
| 8 | - * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE |
|
| 9 | - */ |
|
| 3 | + * Files module |
|
| 4 | + * |
|
| 5 | + * @author Alexey Krupskiy <[email protected]> |
|
| 6 | + * @link http://inji.ru/ |
|
| 7 | + * @copyright 2015 Alexey Krupskiy |
|
| 8 | + * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE |
|
| 9 | + */ |
|
| 10 | 10 | class Files extends Module |
| 11 | 11 | { |
| 12 | 12 | /** |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Recaptcha admin controller |
|
| 4 | - * |
|
| 5 | - * @author Alexey Krupskiy <[email protected]> |
|
| 6 | - * @link http://inji.ru/ |
|
| 7 | - * @copyright 2015 Alexey Krupskiy |
|
| 8 | - * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE |
|
| 9 | - */ |
|
| 3 | + * Recaptcha admin controller |
|
| 4 | + * |
|
| 5 | + * @author Alexey Krupskiy <[email protected]> |
|
| 6 | + * @link http://inji.ru/ |
|
| 7 | + * @copyright 2015 Alexey Krupskiy |
|
| 8 | + * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE |
|
| 9 | + */ |
|
| 10 | 10 | class RecaptchaController extends Controller |
| 11 | 11 | { |
| 12 | 12 | public function indexAction() |
@@ -17,30 +17,30 @@ discard block |
||
| 17 | 17 | ?> |
| 18 | 18 | <div class="filter"> |
| 19 | 19 | <?php |
| 20 | - switch ($option->type) { |
|
| 21 | - case 'radio': |
|
| 20 | + switch ($option->type) { |
|
| 21 | + case 'radio': |
|
| 22 | 22 | foreach ($option->items as $item) { |
| 23 | - $this->widget('Ui\Form/' . $option->type, [ |
|
| 24 | - 'label' => $item->name, |
|
| 25 | - 'name' => "filters[options][{$option->id}]", |
|
| 26 | - !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : false, |
|
| 27 | - 'options' => [ |
|
| 28 | - 'value' => $item->id, |
|
| 29 | - ] |
|
| 30 | - ]); |
|
| 31 | - } |
|
| 32 | - break; |
|
| 33 | - default: |
|
| 23 | + $this->widget('Ui\Form/' . $option->type, [ |
|
| 24 | + 'label' => $item->name, |
|
| 25 | + 'name' => "filters[options][{$option->id}]", |
|
| 26 | + !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : false, |
|
| 27 | + 'options' => [ |
|
| 28 | + 'value' => $item->id, |
|
| 29 | + ] |
|
| 30 | + ]); |
|
| 31 | + } |
|
| 32 | + break; |
|
| 33 | + default: |
|
| 34 | 34 | $this->widget('Ui\Form/' . $option->type, [ |
| 35 | - 'label' => $option->name, |
|
| 36 | - 'name' => "filters[options][{$option->id}]", |
|
| 37 | - 'options' => [ |
|
| 38 | - 'value' => !empty($_GET['filters']['options'][$option->id]) ? $_GET['filters']['options'][$option->id] : '', |
|
| 39 | - ] |
|
| 40 | - ]); |
|
| 41 | - } |
|
| 42 | - foreach ($option->items as $item) { |
|
| 43 | - ?> |
|
| 35 | + 'label' => $option->name, |
|
| 36 | + 'name' => "filters[options][{$option->id}]", |
|
| 37 | + 'options' => [ |
|
| 38 | + 'value' => !empty($_GET['filters']['options'][$option->id]) ? $_GET['filters']['options'][$option->id] : '', |
|
| 39 | + ] |
|
| 40 | + ]); |
|
| 41 | + } |
|
| 42 | + foreach ($option->items as $item) { |
|
| 43 | + ?> |
|
| 44 | 44 | <div class="radio"> |
| 45 | 45 | <label> |
| 46 | 46 | <input type="radio" name = 'filters[options][<?= $option->id; ?>]' value ="<?= $item->id; ?>" <?= !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : ''; ?>> |
@@ -48,8 +48,8 @@ discard block |
||
| 48 | 48 | </label> |
| 49 | 49 | </div> |
| 50 | 50 | <?php |
| 51 | - } |
|
| 52 | - ?> |
|
| 51 | + } |
|
| 52 | + ?> |
|
| 53 | 53 | </div> |
| 54 | 54 | <?php |
| 55 | 55 | } |
@@ -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 |