@@ -64,8 +64,8 @@ |
||
64 | 64 | ?> |
65 | 65 | <div class="filter_form_field filter_select"> |
66 | 66 | <?php |
67 | - $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], ['value' => $value, 'values' => $values, 'noContainer' => true]) |
|
68 | - ?> |
|
67 | + $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], ['value' => $value, 'values' => $values, 'noContainer' => true]) |
|
68 | + ?> |
|
69 | 69 | </div> |
70 | 70 | <?php |
71 | 71 | break; |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <div class = 'callbacks'> |
2 | 2 | <h1>Отзывы</h1> |
3 | 3 | <?php |
4 | - $callbacks = Callbacks\Callback::getList(['where' => ['view', '1'], 'order' => ['weight', 'asc']]); |
|
5 | - foreach ($callbacks as $callback) { |
|
6 | - echo "<h3>{$callback->name}<div class = 'time'>{$callback->date_create}</div></h3>"; |
|
7 | - echo "<p>" . nl2br($callback->text) . "</p>"; |
|
8 | - } |
|
9 | - ?> |
|
4 | + $callbacks = Callbacks\Callback::getList(['where' => ['view', '1'], 'order' => ['weight', 'asc']]); |
|
5 | + foreach ($callbacks as $callback) { |
|
6 | + echo "<h3>{$callback->name}<div class = 'time'>{$callback->date_create}</div></h3>"; |
|
7 | + echo "<p>" . nl2br($callback->text) . "</p>"; |
|
8 | + } |
|
9 | + ?> |
|
10 | 10 | </div> |
11 | 11 | <h3>Можете и вы в свободной форме оставить свой отзыв</h3> |
12 | 12 | <?php |
@@ -17,9 +17,9 @@ |
||
17 | 17 | <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) echo \App::$primary->config['site']['description']; ?>' /> |
18 | 18 | </div> |
19 | 19 | <?php |
20 | - $form = new Ui\Form(); |
|
21 | - $form->input('image', 'site_logo', 'Лого сайта', ['value' => !empty(\App::$primary->config['site']['site_logo']) ? \App::$primary->config['site']['site_logo'] : '']); |
|
22 | - ?> |
|
20 | + $form = new Ui\Form(); |
|
21 | + $form->input('image', 'site_logo', 'Лого сайта', ['value' => !empty(\App::$primary->config['site']['site_logo']) ? \App::$primary->config['site']['site_logo'] : '']); |
|
22 | + ?> |
|
23 | 23 | <h2>Дополнительные мета теги</h2> |
24 | 24 | <div class ="form-group"> |
25 | 25 | <button type = 'button' class = 'btn btn-primary ' onclick = 'addMeta()'>Добавить <i class = 'glyphicon glyphicon-plus'></i></button> |
@@ -3,14 +3,14 @@ discard block |
||
3 | 3 | <ul class="nav nav-tabs" role="tablist"> |
4 | 4 | <li role="presentation" class="active"><a href="#home" aria-controls="home" role="tab" data-toggle="tab">Настройки</a></li> |
5 | 5 | <?php |
6 | - $dataManagers = []; |
|
7 | - foreach ($managers as $manager) { |
|
8 | - $dataManager = new Ui\DataManager($manager); |
|
9 | - $dataManagers[$manager] = $dataManager; |
|
10 | - $code = 'tab_' . str_replace('\\', '_', $manager); |
|
11 | - echo "<li role='presentation'><a href='#{$code}' aria-controls='{$code}' role='tab' data-toggle='tab'>{$dataManager->name}</a></li>"; |
|
12 | - } |
|
13 | - ?> |
|
6 | + $dataManagers = []; |
|
7 | + foreach ($managers as $manager) { |
|
8 | + $dataManager = new Ui\DataManager($manager); |
|
9 | + $dataManagers[$manager] = $dataManager; |
|
10 | + $code = 'tab_' . str_replace('\\', '_', $manager); |
|
11 | + echo "<li role='presentation'><a href='#{$code}' aria-controls='{$code}' role='tab' data-toggle='tab'>{$dataManager->name}</a></li>"; |
|
12 | + } |
|
13 | + ?> |
|
14 | 14 | </ul> |
15 | 15 | <div class="tab-content"> |
16 | 16 | <div role="tabpanel" class="tab-pane fade in active" id="home"> |
@@ -52,17 +52,17 @@ discard block |
||
52 | 52 | </script> |
53 | 53 | </div> |
54 | 54 | <?php |
55 | - foreach ($dataManagers as $manager => $dataManager) { |
|
56 | - $code = 'tab_' . str_replace('\\', '_', $manager); |
|
57 | - ?> |
|
55 | + foreach ($dataManagers as $manager => $dataManager) { |
|
56 | + $code = 'tab_' . str_replace('\\', '_', $manager); |
|
57 | + ?> |
|
58 | 58 | <div role="tabpanel" class="tab-pane fade" id="<?= $code; ?>"> |
59 | 59 | <?php |
60 | 60 | $dataManager->draw(); |
61 | 61 | ?> |
62 | 62 | </div> |
63 | 63 | <?php |
64 | - } |
|
65 | - ?> |
|
64 | + } |
|
65 | + ?> |
|
66 | 66 | </div> |
67 | 67 | |
68 | 68 |
@@ -3,13 +3,13 @@ |
||
3 | 3 | ?> |
4 | 4 | <ul class="nav nav-list-main"> |
5 | 5 | <?php |
6 | - $catalogs = Catalog::get_list(['order' => ['catalog_name', 'asc']]); |
|
7 | - foreach ($catalogs as $catalog) { |
|
8 | - if ($catalog->catalog_parent_id == 0) { |
|
9 | - showChildsCatalogs($catalog, $catalogs, $catalogIds); |
|
10 | - } |
|
11 | - } |
|
12 | - ?> |
|
6 | + $catalogs = Catalog::get_list(['order' => ['catalog_name', 'asc']]); |
|
7 | + foreach ($catalogs as $catalog) { |
|
8 | + if ($catalog->catalog_parent_id == 0) { |
|
9 | + showChildsCatalogs($catalog, $catalogs, $catalogIds); |
|
10 | + } |
|
11 | + } |
|
12 | + ?> |
|
13 | 13 | </ul> |
14 | 14 | <?php |
15 | 15 | function showChildsCatalogs($parent, $catalogs, $catalogIds) |
@@ -49,12 +49,12 @@ discard block |
||
49 | 49 | <?php $this->widget('Ecommerce\cart/fields', ['form' => $form, 'cart' => $cart]); ?> |
50 | 50 | </fieldset> |
51 | 51 | <?php |
52 | - $packchecked = ''; |
|
53 | - $packItem = false; |
|
54 | - $packSum = 0; |
|
55 | - if ($packItem) { |
|
56 | - $packchecked = ((!empty($_POST) && empty($_POST['packs']))) ? '' : 'checked'; |
|
57 | - ?> |
|
52 | + $packchecked = ''; |
|
53 | + $packItem = false; |
|
54 | + $packSum = 0; |
|
55 | + if ($packItem) { |
|
56 | + $packchecked = ((!empty($_POST) && empty($_POST['packs']))) ? '' : 'checked'; |
|
57 | + ?> |
|
58 | 58 | <fieldset id="additional"> |
59 | 59 | <h2 class="secondary-title">Дополнительно</h2> |
60 | 60 | <div class=" checkout-payment-form"> |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | </div> |
79 | 79 | </fieldset> |
80 | 80 | <?php |
81 | - } |
|
82 | - ?> |
|
81 | + } |
|
82 | + ?> |
|
83 | 83 | </div> |
84 | 84 | </div> |
85 | 85 | <div class="col-sm-8"> |
@@ -338,8 +338,8 @@ discard block |
||
338 | 338 | <hr /> |
339 | 339 | <div class="order_page-finish"> |
340 | 340 | <?php |
341 | - $form->input('textarea', 'comment', 'Вы можете добавить комментарий к своему заказу', ['value' => (!empty($_POST['comment'])) ? $_POST['comment'] : '']); |
|
342 | - ?> |
|
341 | + $form->input('textarea', 'comment', 'Вы можете добавить комментарий к своему заказу', ['value' => (!empty($_POST['comment'])) ? $_POST['comment'] : '']); |
|
342 | + ?> |
|
343 | 343 | <div class="order_page-orderBtn"> |
344 | 344 | <button name ="action" value ="order" data-loading-text="Подождите.." class="btn btn-primary">Подтверждение заказа</button> |
345 | 345 | </div> |
@@ -6,11 +6,11 @@ discard block |
||
6 | 6 | </tr> |
7 | 7 | </thead> |
8 | 8 | <?php |
9 | - $orderDeatilCols = [ |
|
10 | - 'id' => '№ Заказа', |
|
11 | - 'complete_data' => 'Дата заказа' |
|
12 | - ]; |
|
13 | - ?> |
|
9 | + $orderDeatilCols = [ |
|
10 | + 'id' => '№ Заказа', |
|
11 | + 'complete_data' => 'Дата заказа' |
|
12 | + ]; |
|
13 | + ?> |
|
14 | 14 | <tbody> |
15 | 15 | <tr> |
16 | 16 | <td class="text-left" style="width: 50%;"> |
@@ -63,91 +63,91 @@ discard block |
||
63 | 63 | </thead> |
64 | 64 | <tbody> |
65 | 65 | <?php |
66 | - $sums = []; |
|
67 | - foreach ($cart->cartItems as $cartItem) { |
|
68 | - $item = $cartItem->item; |
|
69 | - $itemName = $item->name(); |
|
70 | - if (!isset($sums[$cartItem->price->currency_id])) { |
|
71 | - $sums[$cartItem->price->currency_id] = $cartItem->price->price; |
|
72 | - } else { |
|
73 | - $sums[$cartItem->price->currency_id] += $cartItem->price->price; |
|
74 | - } |
|
75 | - ?> |
|
66 | + $sums = []; |
|
67 | + foreach ($cart->cartItems as $cartItem) { |
|
68 | + $item = $cartItem->item; |
|
69 | + $itemName = $item->name(); |
|
70 | + if (!isset($sums[$cartItem->price->currency_id])) { |
|
71 | + $sums[$cartItem->price->currency_id] = $cartItem->price->price; |
|
72 | + } else { |
|
73 | + $sums[$cartItem->price->currency_id] += $cartItem->price->price; |
|
74 | + } |
|
75 | + ?> |
|
76 | 76 | <tr> |
77 | 77 | <td class="text-left"><?= $itemName; ?></td> |
78 | 78 | <td class="text-right"><?= $cartItem->count; ?></td> |
79 | 79 | <td class="text-right"><?= $cartItem->price->price; ?> |
80 | 80 | <?php |
81 | - if (App::$cur->money) { |
|
82 | - $currency = Money\Currency::get($cartItem->price->currency_id); |
|
83 | - if ($currency) { |
|
84 | - echo $currency->acronym(); |
|
85 | - } else { |
|
86 | - echo 'руб.'; |
|
87 | - } |
|
88 | - } else { |
|
89 | - echo 'руб.'; |
|
90 | - } |
|
91 | - ?></td> |
|
81 | + if (App::$cur->money) { |
|
82 | + $currency = Money\Currency::get($cartItem->price->currency_id); |
|
83 | + if ($currency) { |
|
84 | + echo $currency->acronym(); |
|
85 | + } else { |
|
86 | + echo 'руб.'; |
|
87 | + } |
|
88 | + } else { |
|
89 | + echo 'руб.'; |
|
90 | + } |
|
91 | + ?></td> |
|
92 | 92 | <td class="text-right"><?= ($cartItem->price->price * $cartItem->count); ?> |
93 | 93 | <?php |
94 | - if (App::$cur->money) { |
|
95 | - $currency = Money\Currency::get($cartItem->price->currency_id); |
|
96 | - if ($currency) { |
|
97 | - echo $currency->acronym(); |
|
98 | - } else { |
|
99 | - echo 'руб.'; |
|
100 | - } |
|
101 | - } else { |
|
102 | - echo 'руб.'; |
|
103 | - } |
|
104 | - ?></td> |
|
94 | + if (App::$cur->money) { |
|
95 | + $currency = Money\Currency::get($cartItem->price->currency_id); |
|
96 | + if ($currency) { |
|
97 | + echo $currency->acronym(); |
|
98 | + } else { |
|
99 | + echo 'руб.'; |
|
100 | + } |
|
101 | + } else { |
|
102 | + echo 'руб.'; |
|
103 | + } |
|
104 | + ?></td> |
|
105 | 105 | <td class="text-right" style="white-space: nowrap;"> |
106 | 106 | <a onclick = 'inji.Ecommerce.Cart.addItem(<?= $item->getPrice()->id; ?>, 1); |
107 | 107 | return false;' data-original-title="Добавить в корзину" href="#" data-toggle="tooltip" title="" class="btn btn-primary"><i class="glyphicon glyphicon-shopping-cart"></i></a> |
108 | 108 | </tr> |
109 | 109 | <?php |
110 | - } |
|
111 | - ?> |
|
110 | + } |
|
111 | + ?> |
|
112 | 112 | </tbody> |
113 | 113 | <tfoot> |
114 | 114 | <tr> |
115 | 115 | <td colspan="2"></td> |
116 | 116 | <td class="text-right"><b>Сумма</b></td> |
117 | 117 | <td class="text-right"><?php |
118 | - foreach ($sums as $currency_id => $sum) { |
|
119 | - if (!$sum) { |
|
120 | - continue; |
|
121 | - } |
|
122 | - echo number_format($sum, 2, '.', ' '); |
|
123 | - if (App::$cur->money) { |
|
124 | - $currency = Money\Currency::get($currency_id); |
|
125 | - if ($currency) { |
|
126 | - echo ' ' . $currency->acronym(); |
|
127 | - } else { |
|
128 | - echo ' руб.'; |
|
129 | - } |
|
130 | - } else { |
|
131 | - echo ' руб.'; |
|
132 | - } |
|
133 | - echo '<br />'; |
|
134 | - } |
|
135 | - ?></td> |
|
118 | + foreach ($sums as $currency_id => $sum) { |
|
119 | + if (!$sum) { |
|
120 | + continue; |
|
121 | + } |
|
122 | + echo number_format($sum, 2, '.', ' '); |
|
123 | + if (App::$cur->money) { |
|
124 | + $currency = Money\Currency::get($currency_id); |
|
125 | + if ($currency) { |
|
126 | + echo ' ' . $currency->acronym(); |
|
127 | + } else { |
|
128 | + echo ' руб.'; |
|
129 | + } |
|
130 | + } else { |
|
131 | + echo ' руб.'; |
|
132 | + } |
|
133 | + echo '<br />'; |
|
134 | + } |
|
135 | + ?></td> |
|
136 | 136 | <td></td> |
137 | 137 | </tr> |
138 | 138 | <?php |
139 | - $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0; |
|
140 | - $deliveryPrice = $cart->delivery->price; |
|
141 | - if (!isset($sums[$deliveryCurrency])) { |
|
142 | - $sums[$deliveryCurrency] = $deliveryPrice; |
|
143 | - } else { |
|
144 | - $sums[$deliveryCurrency] += $deliveryPrice; |
|
145 | - } |
|
146 | - $delCurrency = false; |
|
147 | - if (App::$cur->money) { |
|
148 | - $delCurrency = Money\Currency::get($deliveryPrice); |
|
149 | - } |
|
150 | - ?> |
|
139 | + $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0; |
|
140 | + $deliveryPrice = $cart->delivery->price; |
|
141 | + if (!isset($sums[$deliveryCurrency])) { |
|
142 | + $sums[$deliveryCurrency] = $deliveryPrice; |
|
143 | + } else { |
|
144 | + $sums[$deliveryCurrency] += $deliveryPrice; |
|
145 | + } |
|
146 | + $delCurrency = false; |
|
147 | + if (App::$cur->money) { |
|
148 | + $delCurrency = Money\Currency::get($deliveryPrice); |
|
149 | + } |
|
150 | + ?> |
|
151 | 151 | <tr> |
152 | 152 | <td colspan="2"></td> |
153 | 153 | <td class="text-right"><b><?= $cart->delivery ? $cart->delivery->name : 'Доставка'; ?></b></td> |
@@ -158,24 +158,24 @@ discard block |
||
158 | 158 | <td colspan="2"></td> |
159 | 159 | <td class="text-right"><b>Итого</b></td> |
160 | 160 | <td class="text-right"><?php |
161 | - foreach ($sums as $currency_id => $sum) { |
|
162 | - if (!$sum) { |
|
163 | - continue; |
|
164 | - } |
|
165 | - echo number_format($sum, 2, '.', ' '); |
|
166 | - if (App::$cur->money) { |
|
167 | - $currency = Money\Currency::get($currency_id); |
|
168 | - if ($currency) { |
|
169 | - echo ' ' . $currency->acronym(); |
|
170 | - } else { |
|
171 | - echo ' руб.'; |
|
172 | - } |
|
173 | - } else { |
|
174 | - echo ' руб.'; |
|
175 | - } |
|
176 | - echo '<br />'; |
|
177 | - } |
|
178 | - ?></td> |
|
161 | + foreach ($sums as $currency_id => $sum) { |
|
162 | + if (!$sum) { |
|
163 | + continue; |
|
164 | + } |
|
165 | + echo number_format($sum, 2, '.', ' '); |
|
166 | + if (App::$cur->money) { |
|
167 | + $currency = Money\Currency::get($currency_id); |
|
168 | + if ($currency) { |
|
169 | + echo ' ' . $currency->acronym(); |
|
170 | + } else { |
|
171 | + echo ' руб.'; |
|
172 | + } |
|
173 | + } else { |
|
174 | + echo ' руб.'; |
|
175 | + } |
|
176 | + echo '<br />'; |
|
177 | + } |
|
178 | + ?></td> |
|
179 | 179 | <td></td> |
180 | 180 | </tr> |
181 | 181 | </tfoot> |
@@ -50,12 +50,12 @@ |
||
50 | 50 | <td> |
51 | 51 | <ul> |
52 | 52 | <?php |
53 | - foreach ($card->levels as $level) { |
|
54 | - ?> |
|
53 | + foreach ($card->levels as $level) { |
|
54 | + ?> |
|
55 | 55 | <li><?= $level->name; ?> - <?= $level->discount->name; ?></li> |
56 | 56 | <?php |
57 | - } |
|
58 | - ?> |
|
57 | + } |
|
58 | + ?> |
|
59 | 59 | </ul> |
60 | 60 | </td> |
61 | 61 | <td> |
@@ -19,18 +19,18 @@ |
||
19 | 19 | <div class="items-icons"> |
20 | 20 | <div class="row"> |
21 | 21 | <?php |
22 | - $i = 0; |
|
23 | - foreach ($items as $item) { |
|
24 | - ?> |
|
22 | + $i = 0; |
|
23 | + foreach ($items as $item) { |
|
24 | + ?> |
|
25 | 25 | <div class="col-sm-4"> |
26 | 26 | <?php $this->widget('Ecommerce\items/item', ['item' => $item]); ?> |
27 | 27 | </div> |
28 | 28 | <?php |
29 | - if (!( ++$i % 3)) { |
|
30 | - echo '</div><div class="row">'; |
|
31 | - } |
|
32 | - } |
|
33 | - ?> |
|
29 | + if (!( ++$i % 3)) { |
|
30 | + echo '</div><div class="row">'; |
|
31 | + } |
|
32 | + } |
|
33 | + ?> |
|
34 | 34 | </div> |
35 | 35 | </div> |
36 | 36 | <div class="text-center"> |