@@ -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"> |
@@ -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 |
@@ -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"> |
@@ -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) || ($cart->delivery && $delivery->id == $cart->delivery->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' => $cart->delivery_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) || ($cart->delivery && $delivery->id == $cart->delivery->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' => $cart->delivery_id, |
|
| 18 | + 'attributes' => [ |
|
| 19 | + 'id' => $hiddenId |
|
| 20 | + ], |
|
| 21 | + ]); |
|
| 22 | + ?> |
|
| 23 | 23 | </ul> |
| 24 | 24 | </div> |
| 25 | 25 | <div class="col-md-8"> |