@@ -3,7 +3,7 @@ |
||
3 | 3 | <h2>Подтверждение перевода №<?= $transfer->id; ?></h2> |
4 | 4 | <p>Перевод валюты <?= $transfer->currency->name(); ?> на сумму <?= $transfer->amount; ?> пользователю <?= $transfer->toUser->name(); ?></p> |
5 | 5 | <?php |
6 | - if($transfer->comment){ |
|
6 | + if ($transfer->comment) { |
|
7 | 7 | echo "<p>Комментарий: {$transfer->comment}</p>"; |
8 | 8 | } |
9 | 9 | ?> |
@@ -10,12 +10,12 @@ discard block |
||
10 | 10 | <th></th> |
11 | 11 | </tr> |
12 | 12 | <?php |
13 | - foreach ($merchants as $merchant) { |
|
14 | - $allowCurrencies = $merchant->allowCurrencies($pay); |
|
15 | - if (!$allowCurrencies) { |
|
16 | - continue; |
|
17 | - } |
|
18 | - ?> |
|
13 | + foreach ($merchants as $merchant) { |
|
14 | + $allowCurrencies = $merchant->allowCurrencies($pay); |
|
15 | + if (!$allowCurrencies) { |
|
16 | + continue; |
|
17 | + } |
|
18 | + ?> |
|
19 | 19 | <tr> |
20 | 20 | <td> |
21 | 21 | <img src="<?= Statics::file($merchant->image ? $merchant->image->path : '/static/system/images/no-image.png', '150x150'); ?>" class="img-responsive" /> |
@@ -23,23 +23,23 @@ discard block |
||
23 | 23 | </td> |
24 | 24 | <td> |
25 | 25 | <?php |
26 | - foreach ($allowCurrencies as $allowCurrency) { |
|
27 | - $className = 'Money\MerchantHelper\\' . $merchant->object_name; |
|
28 | - $sum = $className::getFinalSum($pay, $allowCurrency); |
|
29 | - ?> |
|
26 | + foreach ($allowCurrencies as $allowCurrency) { |
|
27 | + $className = 'Money\MerchantHelper\\' . $merchant->object_name; |
|
28 | + $sum = $className::getFinalSum($pay, $allowCurrency); |
|
29 | + ?> |
|
30 | 30 | <b><?= $allowCurrency['currency']->name(); ?></b> |
31 | 31 | <a class="btn btn-primary" href ="/money/merchants/go/<?= $pay->id; ?>/<?= $merchant->id; ?>/<?= $allowCurrency['currency']->id; ?>">Оплатить <?= $sum; ?> <?= $allowCurrency['currency']->acronym(); ?></a> |
32 | 32 | <?php |
33 | - } |
|
34 | - ?> |
|
33 | + } |
|
34 | + ?> |
|
35 | 35 | </td> |
36 | 36 | <td width="100%"> |
37 | 37 | <?= $merchant->previewImage ? '<img src="' . $merchant->previewImage->path . '" class="img-responsive" />' : ''; ?> |
38 | 38 | </td> |
39 | 39 | </tr> |
40 | 40 | <?php |
41 | - } |
|
42 | - ?> |
|
41 | + } |
|
42 | + ?> |
|
43 | 43 | </table> |
44 | 44 | </div> |
45 | 45 | </div> |
46 | 46 | \ No newline at end of file |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | <td> |
25 | 25 | <?php |
26 | 26 | foreach ($allowCurrencies as $allowCurrency) { |
27 | - $className = 'Money\MerchantHelper\\' . $merchant->object_name; |
|
27 | + $className = 'Money\MerchantHelper\\'.$merchant->object_name; |
|
28 | 28 | $sum = $className::getFinalSum($pay, $allowCurrency); |
29 | 29 | ?> |
30 | 30 | <b><?= $allowCurrency['currency']->name(); ?></b> |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | ?> |
35 | 35 | </td> |
36 | 36 | <td width="100%"> |
37 | - <?= $merchant->previewImage ? '<img src="' . $merchant->previewImage->path . '" class="img-responsive" />' : ''; ?> |
|
37 | + <?= $merchant->previewImage ? '<img src="'.$merchant->previewImage->path.'" class="img-responsive" />' : ''; ?> |
|
38 | 38 | </td> |
39 | 39 | </tr> |
40 | 40 | <?php |
@@ -9,10 +9,10 @@ |
||
9 | 9 | </div> |
10 | 10 | <?php |
11 | 11 | ++$i; |
12 | - if (!( $i % 3)) { |
|
12 | + if (!($i % 3)) { |
|
13 | 13 | echo '<div class="clearfix hidden-xs"></div>'; |
14 | 14 | } |
15 | - if (!( $i % 2)) { |
|
15 | + if (!($i % 2)) { |
|
16 | 16 | echo '<div class="clearfix visible-xs"></div>'; |
17 | 17 | } |
18 | 18 | } |
@@ -3,9 +3,9 @@ |
||
3 | 3 | <div class="cart-order_page"> |
4 | 4 | <h2>Быстрое оформление заказа</h2> |
5 | 5 | <?php |
6 | - if (!$cart || !$cart->cartItems) |
|
7 | - echo "<h1>Ваша корзина пуста</h1>"; |
|
8 | - else { |
|
6 | + if (!$cart || !$cart->cartItems) { |
|
7 | + echo "<h1>Ваша корзина пуста</h1>"; |
|
8 | + } else { |
|
9 | 9 | $sums = []; |
10 | 10 | $cartDelivery = $cart->delivery; |
11 | 11 | $deliveryPrice = 0; |
@@ -3,13 +3,13 @@ discard block |
||
3 | 3 | <div class="cart-order_page"> |
4 | 4 | <h2>Быстрое оформление заказа</h2> |
5 | 5 | <?php |
6 | - if (!$cart || !$cart->cartItems) |
|
7 | - echo "<h1>Ваша корзина пуста</h1>"; |
|
8 | - else { |
|
9 | - $form = new Ui\Form; |
|
10 | - $form->action = "/ecommerce/cart"; |
|
11 | - $form->begin(); |
|
12 | - ?> |
|
6 | + if (!$cart || !$cart->cartItems) |
|
7 | + echo "<h1>Ваша корзина пуста</h1>"; |
|
8 | + else { |
|
9 | + $form = new Ui\Form; |
|
10 | + $form->action = "/ecommerce/cart"; |
|
11 | + $form->begin(); |
|
12 | + ?> |
|
13 | 13 | <div class="row"> |
14 | 14 | <div class="col-sm-4"> |
15 | 15 | <div class="order_page-info"> |
@@ -86,14 +86,14 @@ discard block |
||
86 | 86 | </thead> |
87 | 87 | <tbody> |
88 | 88 | <?php |
89 | - if (class_exists('Money\Currency')) { |
|
90 | - $defaultCurrency = Money\Currency::get(\App::$cur->ecommerce->config['defaultCurrency']); |
|
91 | - } else { |
|
92 | - $defaultCurrency = ''; |
|
93 | - } |
|
94 | - foreach ($cart->cartItems as $cartItem) { |
|
95 | - $path = $cartItem->item->image ? $cartItem->item->image->path : '/static/system/images/no-image.png'; |
|
96 | - ?> |
|
89 | + if (class_exists('Money\Currency')) { |
|
90 | + $defaultCurrency = Money\Currency::get(\App::$cur->ecommerce->config['defaultCurrency']); |
|
91 | + } else { |
|
92 | + $defaultCurrency = ''; |
|
93 | + } |
|
94 | + foreach ($cart->cartItems as $cartItem) { |
|
95 | + $path = $cartItem->item->image ? $cartItem->item->image->path : '/static/system/images/no-image.png'; |
|
96 | + ?> |
|
97 | 97 | <tr class="cart_item_id<?= $cartItem->id; ?> item" data-cart_item_id = '<?php echo $cartItem->id; ?>' data-priceam = '<?php echo $cartItem->price->price; ?>' data-item_offer_price_id = '<?php echo $cartItem->price->id; ?>'> |
98 | 98 | <td class="text-center image"> |
99 | 99 | <a href="/ecommerce/view/<?php echo $cartItem->item->id; ?>"> |
@@ -119,41 +119,41 @@ discard block |
||
119 | 119 | </td> |
120 | 120 | </tr> |
121 | 121 | <?php |
122 | - } |
|
123 | - ?> |
|
122 | + } |
|
123 | + ?> |
|
124 | 124 | </tbody> |
125 | 125 | <tfoot> |
126 | 126 | <?php |
127 | - $colspan = $cart->hasDiscount() ? 5 : 4; |
|
128 | - ?> |
|
127 | + $colspan = $cart->hasDiscount() ? 5 : 4; |
|
128 | + ?> |
|
129 | 129 | <tr class="order_page-sum"> |
130 | 130 | <td colspan="<?= $colspan; ?>" class="text-right">Сумма:</td> |
131 | 131 | <td colspan="2" class="text-right"><?= $cart->itemsSum(); ?></td> |
132 | 132 | </tr> |
133 | 133 | <?php |
134 | - if ($cart->hasDiscount()) { |
|
135 | - ?> |
|
134 | + if ($cart->hasDiscount()) { |
|
135 | + ?> |
|
136 | 136 | <tr class="order_page-discountSum"> |
137 | 137 | <td colspan="<?= $colspan; ?>" class="text-right">Скидка:</td> |
138 | 138 | <td colspan="2" class="text-right"><?= $cart->discountSum(); ?></td> |
139 | 139 | </tr> |
140 | 140 | <?php |
141 | - } |
|
142 | - if ($cart->delivery) { |
|
143 | - ?> |
|
141 | + } |
|
142 | + if ($cart->delivery) { |
|
143 | + ?> |
|
144 | 144 | <tr class="order_page-deliverySum"> |
145 | 145 | <td colspan="<?= $colspan; ?>" class="text-right"><?= $cart->delivery->name; ?>:</td> |
146 | 146 | <td colspan="2" class="text-right"><?php |
147 | - if ($cart->delivery && $cart->delivery->price_text) { |
|
148 | - echo $cart->delivery->price_text; |
|
149 | - } else { |
|
150 | - echo $cart->deliverySum(); |
|
151 | - } |
|
152 | - ?></td> |
|
147 | + if ($cart->delivery && $cart->delivery->price_text) { |
|
148 | + echo $cart->delivery->price_text; |
|
149 | + } else { |
|
150 | + echo $cart->deliverySum(); |
|
151 | + } |
|
152 | + ?></td> |
|
153 | 153 | </tr> |
154 | 154 | <?php |
155 | - } |
|
156 | - ?> |
|
155 | + } |
|
156 | + ?> |
|
157 | 157 | <tr class="order_page-total"> |
158 | 158 | <td colspan="<?= $colspan; ?>" class="text-right">Итого:</td> |
159 | 159 | <td colspan="2" class="text-right"><?= $cart->finalSum(); ?></td> |
@@ -165,8 +165,8 @@ discard block |
||
165 | 165 | <div class="clearfix"></div> |
166 | 166 | <div class="order_page-finish"> |
167 | 167 | <?php |
168 | - $form->input('textarea', 'comment', 'Вы можете добавить комментарий к своему заказу', ['value' => (!empty($_POST['comment'])) ? $_POST['comment'] : '']); |
|
169 | - ?> |
|
168 | + $form->input('textarea', 'comment', 'Вы можете добавить комментарий к своему заказу', ['value' => (!empty($_POST['comment'])) ? $_POST['comment'] : '']); |
|
169 | + ?> |
|
170 | 170 | <div class="order_page-orderBtn"> |
171 | 171 | <button name ="action" value ="order" data-loading-text="Подождите.." class="btn btn-primary">Подтверждение заказа</button> |
172 | 172 | </div> |
@@ -175,9 +175,9 @@ discard block |
||
175 | 175 | </div> |
176 | 176 | </div> |
177 | 177 | <?php |
178 | - $form->end(false); |
|
179 | - } |
|
180 | - ?> |
|
178 | + $form->end(false); |
|
179 | + } |
|
180 | + ?> |
|
181 | 181 | </div> |
182 | 182 | </div> |
183 | 183 | </div> |
184 | 184 | \ No newline at end of file |
@@ -101,7 +101,7 @@ |
||
101 | 101 | </a> |
102 | 102 | </td> |
103 | 103 | <td class="text-left name"> |
104 | - <a href="/ecommerce/view/<?= $cartItem->item->id; ?>"><?= $cartItem->item->name() . ($cartItem->price->offer->name && $cartItem->price->offer->name != $cartItem->item->name() ? ' (' . $cartItem->price->offer->name . ')' : ''); ?></a> |
|
104 | + <a href="/ecommerce/view/<?= $cartItem->item->id; ?>"><?= $cartItem->item->name().($cartItem->price->offer->name && $cartItem->price->offer->name != $cartItem->item->name() ? ' ('.$cartItem->price->offer->name.')' : ''); ?></a> |
|
105 | 105 | </td> |
106 | 106 | <td class="text-left quantity"> |
107 | 107 | <?php $this->widget('Ecommerce\cart/ranger', compact('form', 'cart', 'cartItem')); ?> |
@@ -2,10 +2,10 @@ discard block |
||
2 | 2 | <div class="row"> |
3 | 3 | <div class="col-md-3"> |
4 | 4 | <?php |
5 | - \Ui\Tree::ul($category->getRoot(), 0, function($category) { |
|
6 | - echo "<a href='{$category->getHref()}'> {$category->name()}</a>"; |
|
7 | - }); |
|
8 | - ?> |
|
5 | + \Ui\Tree::ul($category->getRoot(), 0, function($category) { |
|
6 | + echo "<a href='{$category->getHref()}'> {$category->name()}</a>"; |
|
7 | + }); |
|
8 | + ?> |
|
9 | 9 | </div> |
10 | 10 | <div class="col-md-9"> |
11 | 11 | <div class="content"> |
@@ -34,8 +34,8 @@ discard block |
||
34 | 34 | ?> |
35 | 35 | </div> |
36 | 36 | <?php |
37 | - $pages->draw(); |
|
38 | - ?> |
|
37 | + $pages->draw(); |
|
38 | + ?> |
|
39 | 39 | </div> |
40 | 40 | </div> |
41 | 41 | </div> |
@@ -2,11 +2,11 @@ |
||
2 | 2 | <div class="row"> |
3 | 3 | <div class="col-md-3"> |
4 | 4 | <?php |
5 | - $category = $material->category; |
|
6 | - \Ui\Tree::ul($category->getRoot(), 0, function($category) { |
|
7 | - echo "<a href='{$category->getHref()}'> {$category->name()}</a>"; |
|
8 | - }); |
|
9 | - ?> |
|
5 | + $category = $material->category; |
|
6 | + \Ui\Tree::ul($category->getRoot(), 0, function($category) { |
|
7 | + echo "<a href='{$category->getHref()}'> {$category->name()}</a>"; |
|
8 | + }); |
|
9 | + ?> |
|
10 | 10 | </div> |
11 | 11 | <div class="col-md-9"> |
12 | 12 | <div class="content"> |
@@ -9,18 +9,20 @@ |
||
9 | 9 | $menu = \Menu\Menu::get($code, 'code'); |
10 | 10 | if ($menu) { |
11 | 11 | foreach ($menu->items(['where' => ['parent_id', 0], 'order' => ['weight', 'asc']]) as $item) { |
12 | - if (urldecode($_SERVER['REQUEST_URI']) == $item->href) |
|
13 | - $active = ' class = "active" '; |
|
14 | - else |
|
15 | - $active = ''; |
|
12 | + if (urldecode($_SERVER['REQUEST_URI']) == $item->href) { |
|
13 | + $active = ' class = "active" '; |
|
14 | + } else { |
|
15 | + $active = ''; |
|
16 | + } |
|
16 | 17 | echo "<li {$active}><a href = '{$item->href}'>{$item->name}</a>"; |
17 | 18 | if ($item->childs(['order' => ['weight', 'asc']])) { |
18 | 19 | echo "<ul>"; |
19 | 20 | foreach ($item->childs as $item) { |
20 | - if (urldecode($_SERVER['REQUEST_URI']) == $item->href) |
|
21 | - $active = ' class = "active" '; |
|
22 | - else |
|
23 | - $active = ''; |
|
21 | + if (urldecode($_SERVER['REQUEST_URI']) == $item->href) { |
|
22 | + $active = ' class = "active" '; |
|
23 | + } else { |
|
24 | + $active = ''; |
|
25 | + } |
|
24 | 26 | echo "<li {$active}><a href = '{$item->href}'>{$item->name}</a>"; |
25 | 27 | } |
26 | 28 | echo "</ul>"; |
@@ -43,7 +43,7 @@ |
||
43 | 43 | 'manager' => [ |
44 | 44 | 'map' => [ |
45 | 45 | ['name', 'code'], |
46 | - ['delivery', 'electronic','discount'] |
|
46 | + ['delivery', 'electronic', 'discount'] |
|
47 | 47 | ] |
48 | 48 | ] |
49 | 49 | ]; |
@@ -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 ($payTypes as $payType) { |
|
7 | - if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || ($cart->payType && $payType->id == $cart->payType->id)) { |
|
8 | - $checked = 'checked'; |
|
9 | - } else { |
|
10 | - $checked = ''; |
|
11 | - } |
|
12 | - echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">'; |
|
13 | - echo $payType->name; |
|
14 | - echo '</a></li>'; |
|
15 | - } |
|
16 | - $form->input('hidden', "payType", '', [ |
|
17 | - 'value' => $cart->paytype_id, |
|
18 | - 'attributes' => [ |
|
19 | - 'id' => $hiddenId |
|
20 | - ], |
|
21 | - ]); |
|
22 | - ?> |
|
5 | + $hiddenId = Tools::randomString(); |
|
6 | + foreach ($payTypes as $payType) { |
|
7 | + if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || ($cart->payType && $payType->id == $cart->payType->id)) { |
|
8 | + $checked = 'checked'; |
|
9 | + } else { |
|
10 | + $checked = ''; |
|
11 | + } |
|
12 | + echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">'; |
|
13 | + echo $payType->name; |
|
14 | + echo '</a></li>'; |
|
15 | + } |
|
16 | + $form->input('hidden', "payType", '', [ |
|
17 | + 'value' => $cart->paytype_id, |
|
18 | + 'attributes' => [ |
|
19 | + 'id' => $hiddenId |
|
20 | + ], |
|
21 | + ]); |
|
22 | + ?> |
|
23 | 23 | </ul> |
24 | 24 | </div> |
25 | 25 | <div class="col-md-8"> |
@@ -9,7 +9,7 @@ |
||
9 | 9 | } else { |
10 | 10 | $checked = ''; |
11 | 11 | } |
12 | - echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">'; |
|
12 | + echo '<li'.($checked ? ' class="active"' : '').'><a href = "#" onclick = "document.getElementById(\''.$hiddenId.'\').value=\''.$payType->id.'\';inji.Ecommerce.Cart.calcSum();return false;">'; |
|
13 | 13 | echo $payType->name; |
14 | 14 | echo '</a></li>'; |
15 | 15 | } |