@@ -22,16 +22,19 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | $sitePath = App::$primary->path; |
| 24 | 24 | |
| 25 | - if (!is_uploaded_file($file['tmp_name'])) |
|
| 26 | - return 0; |
|
| 25 | + if (!is_uploaded_file($file['tmp_name'])) { |
|
| 26 | + return 0; |
|
| 27 | + } |
|
| 27 | 28 | |
| 28 | 29 | $fileinfo = pathinfo($file['name']); |
| 29 | - if (empty($fileinfo['extension'])) |
|
| 30 | - return 0; |
|
| 30 | + if (empty($fileinfo['extension'])) { |
|
| 31 | + return 0; |
|
| 32 | + } |
|
| 31 | 33 | |
| 32 | 34 | $type = Files\Type::get($fileinfo['extension'], 'ext'); |
| 33 | - if (!$type) |
|
| 34 | - return 0; |
|
| 35 | + if (!$type) { |
|
| 36 | + return 0; |
|
| 37 | + } |
|
| 35 | 38 | |
| 36 | 39 | if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) { |
| 37 | 40 | return 0; |
@@ -47,8 +50,9 @@ discard block |
||
| 47 | 50 | } |
| 48 | 51 | $fileObject->name = $fileinfo['filename']; |
| 49 | 52 | $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension']; |
| 50 | - if ($fileObject->id && file_exists($sitePath . $fileObject->path)) |
|
| 51 | - unlink($sitePath . $fileObject->path); |
|
| 53 | + if ($fileObject->id && file_exists($sitePath . $fileObject->path)) { |
|
| 54 | + unlink($sitePath . $fileObject->path); |
|
| 55 | + } |
|
| 52 | 56 | |
| 53 | 57 | Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/'); |
| 54 | 58 | |
@@ -84,12 +88,14 @@ discard block |
||
| 84 | 88 | $sitePath = App::$primary->path; |
| 85 | 89 | |
| 86 | 90 | $fileinfo = pathinfo($url); |
| 87 | - if (empty($fileinfo['extension'])) |
|
| 88 | - return 0; |
|
| 91 | + if (empty($fileinfo['extension'])) { |
|
| 92 | + return 0; |
|
| 93 | + } |
|
| 89 | 94 | |
| 90 | 95 | $type = Files\Type::get($fileinfo['extension'], 'ext'); |
| 91 | - if (!$type) |
|
| 92 | - return 0; |
|
| 96 | + if (!$type) { |
|
| 97 | + return 0; |
|
| 98 | + } |
|
| 93 | 99 | |
| 94 | 100 | if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) { |
| 95 | 101 | return 0; |
@@ -105,8 +111,9 @@ discard block |
||
| 105 | 111 | } |
| 106 | 112 | $fileObject->name = $fileinfo['filename']; |
| 107 | 113 | $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension']; |
| 108 | - if ($fileObject->id && file_exists($sitePath . $fileObject->path)) |
|
| 109 | - unlink($sitePath . $fileObject->path); |
|
| 114 | + if ($fileObject->id && file_exists($sitePath . $fileObject->path)) { |
|
| 115 | + unlink($sitePath . $fileObject->path); |
|
| 116 | + } |
|
| 110 | 117 | |
| 111 | 118 | Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/'); |
| 112 | 119 | |
@@ -1,33 +1,33 @@ |
||
| 1 | 1 | <div class="container-fluid"> |
| 2 | 2 | <div class="row panel"> |
| 3 | 3 | <?php |
| 4 | - if (!empty($_FILES['file'])) { |
|
| 5 | - App::$cur->files->upload($_FILES['file'], ['upload_code' => 'editorManager']); |
|
| 6 | - } |
|
| 7 | - $form = new Ui\Form(); |
|
| 8 | - $form->begin(); |
|
| 9 | - $form->input('file', 'file', 'Загрузить файл'); |
|
| 10 | - echo '<div class="form-group"><button class ="btn btn-primary btn-sm">Загузить</button></div>'; |
|
| 11 | - $form->end(false); |
|
| 12 | - ?> |
|
| 4 | + if (!empty($_FILES['file'])) { |
|
| 5 | + App::$cur->files->upload($_FILES['file'], ['upload_code' => 'editorManager']); |
|
| 6 | + } |
|
| 7 | + $form = new Ui\Form(); |
|
| 8 | + $form->begin(); |
|
| 9 | + $form->input('file', 'file', 'Загрузить файл'); |
|
| 10 | + echo '<div class="form-group"><button class ="btn btn-primary btn-sm">Загузить</button></div>'; |
|
| 11 | + $form->end(false); |
|
| 12 | + ?> |
|
| 13 | 13 | </div> |
| 14 | 14 | <h2>Последние файлы</h2> |
| 15 | 15 | <div class="row"> |
| 16 | 16 | <?php |
| 17 | - $files = Files\File::getList(['where' => ['upload_code', 'editorManager'], 'limit' => 12, 'order' => ['date_create', 'DESC']]); |
|
| 18 | - $i = 0; |
|
| 19 | - foreach ($files as $file) { |
|
| 20 | - ?> |
|
| 17 | + $files = Files\File::getList(['where' => ['upload_code', 'editorManager'], 'limit' => 12, 'order' => ['date_create', 'DESC']]); |
|
| 18 | + $i = 0; |
|
| 19 | + foreach ($files as $file) { |
|
| 20 | + ?> |
|
| 21 | 21 | <div class="col-xs-6 col-sm-2 fileChooser" onclick="OpenFile('<?= $file->path; ?>'); |
| 22 | 22 | return false;"> |
| 23 | 23 | <div class="thumbnail"> |
| 24 | 24 | <?php |
| 25 | - if ($file->type->group == 'image') { |
|
| 26 | - echo "<img class='img-responsive' src ='{$file->path}?resize=200x200' />"; |
|
| 27 | - } else { |
|
| 28 | - echo "<img class='img-responsive' src ='/static/moduleAsset/Files/images/formats/" . pathinfo($file->path, PATHINFO_EXTENSION) . ".png' />"; |
|
| 29 | - } |
|
| 30 | - ?> |
|
| 25 | + if ($file->type->group == 'image') { |
|
| 26 | + echo "<img class='img-responsive' src ='{$file->path}?resize=200x200' />"; |
|
| 27 | + } else { |
|
| 28 | + echo "<img class='img-responsive' src ='/static/moduleAsset/Files/images/formats/" . pathinfo($file->path, PATHINFO_EXTENSION) . ".png' />"; |
|
| 29 | + } |
|
| 30 | + ?> |
|
| 31 | 31 | |
| 32 | 32 | <?= $file->name; ?><br /> |
| 33 | 33 | <small class="text-muted"> |
@@ -24,7 +24,8 @@ |
||
| 24 | 24 | <?php |
| 25 | 25 | if ($file->type->group == 'image') { |
| 26 | 26 | echo "<img class='img-responsive' src ='{$file->path}?resize=200x200' />"; |
| 27 | - } else { |
|
| 27 | + } |
|
| 28 | + else { |
|
| 28 | 29 | echo "<img class='img-responsive' src ='/static/moduleAsset/Files/images/formats/" . pathinfo($file->path, PATHINFO_EXTENSION) . ".png' />"; |
| 29 | 30 | } |
| 30 | 31 | ?> |
@@ -15,23 +15,23 @@ |
||
| 15 | 15 | <div class="tab-content"> |
| 16 | 16 | <div role="tabpanel" class="tab-pane fade in active" id="home"> |
| 17 | 17 | <?php |
| 18 | - $form = new Ui\Form(); |
|
| 19 | - $form->begin(); |
|
| 20 | - $form->input('checkbox', 'config[view_empty_warehouse]', 'Показывать отсутствующие товары', ['value' => App::$cur->ecommerce->config['view_empty_warehouse']]); |
|
| 21 | - $form->input('checkbox', 'config[view_empty_image]', 'Показывать товары без изображения', ['value' => App::$cur->ecommerce->config['view_empty_image']]); |
|
| 22 | - $form->input('checkbox', 'config[sell_empty_warehouse]', 'Продавать отсутствующие товары', ['value' => App::$cur->ecommerce->config['sell_empty_warehouse']]); |
|
| 23 | - $form->input('checkbox', 'config[sell_over_warehouse]', 'Продавать сверх остатоков на складе', ['value' => App::$cur->ecommerce->config['sell_over_warehouse']]); |
|
| 24 | - $form->input('checkbox', 'config[show_zero_price]', 'Показывать товары с нулевой ценой', ['value' => App::$cur->ecommerce->config['show_zero_price']]); |
|
| 25 | - $form->input('checkbox', 'config[show_without_price]', 'Показывать товары без цен', ['value' => App::$cur->ecommerce->config['show_without_price']]); |
|
| 26 | - $form->input('select', 'config[defaultCategoryView]', 'Стандартный вид категории', ['value' => App::$cur->ecommerce->config['defaultCategoryView'], 'values' => App::$cur->ecommerce->viewsCategoryList()]); |
|
| 27 | - if (App::$cur->money) { |
|
| 28 | - $form->input('select', 'config[defaultCurrency]', 'Валюта по умолчанию', ['value' => App::$cur->ecommerce->config['defaultCurrency'], 'values' => ['' => 'Выберите'] + \Money\Currency::getList()]); |
|
| 29 | - } |
|
| 30 | - $form->input('text', 'config[orderPrefix]', 'Префикс для номеров заказов', ['value' => App::$cur->ecommerce->config['orderPrefix']]); |
|
| 31 | - $form->input('text', 'config[notify_mail]', 'E-mail оповещений о новых заказах', ['value' => App::$cur->ecommerce->config['notify_mail']]); |
|
| 32 | - $form->input('hidden', 'config[save]', '', ['value' => 1]); |
|
| 33 | - $form->end('Сохранить'); |
|
| 34 | - ?> |
|
| 18 | + $form = new Ui\Form(); |
|
| 19 | + $form->begin(); |
|
| 20 | + $form->input('checkbox', 'config[view_empty_warehouse]', 'Показывать отсутствующие товары', ['value' => App::$cur->ecommerce->config['view_empty_warehouse']]); |
|
| 21 | + $form->input('checkbox', 'config[view_empty_image]', 'Показывать товары без изображения', ['value' => App::$cur->ecommerce->config['view_empty_image']]); |
|
| 22 | + $form->input('checkbox', 'config[sell_empty_warehouse]', 'Продавать отсутствующие товары', ['value' => App::$cur->ecommerce->config['sell_empty_warehouse']]); |
|
| 23 | + $form->input('checkbox', 'config[sell_over_warehouse]', 'Продавать сверх остатоков на складе', ['value' => App::$cur->ecommerce->config['sell_over_warehouse']]); |
|
| 24 | + $form->input('checkbox', 'config[show_zero_price]', 'Показывать товары с нулевой ценой', ['value' => App::$cur->ecommerce->config['show_zero_price']]); |
|
| 25 | + $form->input('checkbox', 'config[show_without_price]', 'Показывать товары без цен', ['value' => App::$cur->ecommerce->config['show_without_price']]); |
|
| 26 | + $form->input('select', 'config[defaultCategoryView]', 'Стандартный вид категории', ['value' => App::$cur->ecommerce->config['defaultCategoryView'], 'values' => App::$cur->ecommerce->viewsCategoryList()]); |
|
| 27 | + if (App::$cur->money) { |
|
| 28 | + $form->input('select', 'config[defaultCurrency]', 'Валюта по умолчанию', ['value' => App::$cur->ecommerce->config['defaultCurrency'], 'values' => ['' => 'Выберите'] + \Money\Currency::getList()]); |
|
| 29 | + } |
|
| 30 | + $form->input('text', 'config[orderPrefix]', 'Префикс для номеров заказов', ['value' => App::$cur->ecommerce->config['orderPrefix']]); |
|
| 31 | + $form->input('text', 'config[notify_mail]', 'E-mail оповещений о новых заказах', ['value' => App::$cur->ecommerce->config['notify_mail']]); |
|
| 32 | + $form->input('hidden', 'config[save]', '', ['value' => 1]); |
|
| 33 | + $form->end('Сохранить'); |
|
| 34 | + ?> |
|
| 35 | 35 | <h3>Обслужвание</h3> |
| 36 | 36 | <a href="/admin/ecommerce/reSearchIndex" class="btn btn-primary">Обновить поисковые индексы</a> |
| 37 | 37 | <h3>Уведомления в браузере</h3> |
@@ -1,9 +1,9 @@ |
||
| 1 | 1 | <div class="items-icons"> |
| 2 | 2 | <div class="row"> |
| 3 | 3 | <?php |
| 4 | - $i = 0; |
|
| 5 | - foreach ($items as $item) { |
|
| 6 | - ?> |
|
| 4 | + $i = 0; |
|
| 5 | + foreach ($items as $item) { |
|
| 6 | + ?> |
|
| 7 | 7 | <div class="col-xs-6 col-sm-4"> |
| 8 | 8 | <?php $this->widget('Ecommerce\items/item-icon', ['item' => $item]); ?> |
| 9 | 9 | </div> |
@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <div class="filters"> |
| 2 | 2 | <form> |
| 3 | 3 | <?php |
| 4 | - $min = App::$cur->ecommerce->getItems(['sort' => ['price' => 'asc'], 'count' => 1, 'key' => false]); |
|
| 5 | - $max = App::$cur->ecommerce->getItems(['sort' => ['price' => 'desc'], 'count' => 1, 'key' => false]); |
|
| 6 | - if ($min && $min[0]->getPrice() && $max && $max[0]->getPrice()) { |
|
| 7 | - ?> |
|
| 4 | + $min = App::$cur->ecommerce->getItems(['sort' => ['price' => 'asc'], 'count' => 1, 'key' => false]); |
|
| 5 | + $max = App::$cur->ecommerce->getItems(['sort' => ['price' => 'desc'], 'count' => 1, 'key' => false]); |
|
| 6 | + if ($min && $min[0]->getPrice() && $max && $max[0]->getPrice()) { |
|
| 7 | + ?> |
|
| 8 | 8 | <h4>Фильтр по цене</h4> |
| 9 | 9 | <div class="form-group"> |
| 10 | 10 | <div class="row"> |
@@ -20,81 +20,81 @@ |
||
| 20 | 20 | </thead> |
| 21 | 21 | <tbody> |
| 22 | 22 | <?php |
| 23 | - foreach ($carts as $cart) { |
|
| 24 | - $sums = []; |
|
| 25 | - foreach ($cart->cartItems as $cartItem) { |
|
| 26 | - $currency_id = $cartItem->price && $cartItem->price->currency ? $cartItem->price->currency->id : (!empty(\App::$cur->ecommerce->config['defaultCurrency']) ? \App::$cur->ecommerce->config['defaultCurrency'] : 0); |
|
| 27 | - if (empty($sums[$currency_id])) { |
|
| 28 | - $sums[$currency_id] = $cartItem->final_price * $cartItem->count; |
|
| 29 | - } else { |
|
| 30 | - $sums[$currency_id] += $cartItem->final_price * $cartItem->count; |
|
| 31 | - } |
|
| 32 | - } |
|
| 33 | - if ($cart->delivery && $cart->delivery->price) { |
|
| 34 | - $currency_id = $cart->delivery->currency_id; |
|
| 35 | - if (empty($sums[$currency_id])) { |
|
| 36 | - $sums[$currency_id] = $cart->delivery->price; |
|
| 37 | - } else { |
|
| 38 | - $sums[$currency_id] += $cart->delivery->price; |
|
| 39 | - } |
|
| 40 | - } |
|
| 41 | - foreach ($cart->extras as $extra) { |
|
| 42 | - $currency_id = $extra->currency ? $extra->currency->id : \App::$cur->ecommerce->config['defaultCurrency']; |
|
| 43 | - if (empty($sums[$currency_id])) { |
|
| 44 | - $sums[$currency_id] = $extra->price * $extra->count; |
|
| 45 | - } else { |
|
| 46 | - $sums[$currency_id] += $extra->price * $extra->count; |
|
| 47 | - } |
|
| 48 | - } |
|
| 49 | - ?> |
|
| 23 | + foreach ($carts as $cart) { |
|
| 24 | + $sums = []; |
|
| 25 | + foreach ($cart->cartItems as $cartItem) { |
|
| 26 | + $currency_id = $cartItem->price && $cartItem->price->currency ? $cartItem->price->currency->id : (!empty(\App::$cur->ecommerce->config['defaultCurrency']) ? \App::$cur->ecommerce->config['defaultCurrency'] : 0); |
|
| 27 | + if (empty($sums[$currency_id])) { |
|
| 28 | + $sums[$currency_id] = $cartItem->final_price * $cartItem->count; |
|
| 29 | + } else { |
|
| 30 | + $sums[$currency_id] += $cartItem->final_price * $cartItem->count; |
|
| 31 | + } |
|
| 32 | + } |
|
| 33 | + if ($cart->delivery && $cart->delivery->price) { |
|
| 34 | + $currency_id = $cart->delivery->currency_id; |
|
| 35 | + if (empty($sums[$currency_id])) { |
|
| 36 | + $sums[$currency_id] = $cart->delivery->price; |
|
| 37 | + } else { |
|
| 38 | + $sums[$currency_id] += $cart->delivery->price; |
|
| 39 | + } |
|
| 40 | + } |
|
| 41 | + foreach ($cart->extras as $extra) { |
|
| 42 | + $currency_id = $extra->currency ? $extra->currency->id : \App::$cur->ecommerce->config['defaultCurrency']; |
|
| 43 | + if (empty($sums[$currency_id])) { |
|
| 44 | + $sums[$currency_id] = $extra->price * $extra->count; |
|
| 45 | + } else { |
|
| 46 | + $sums[$currency_id] += $extra->price * $extra->count; |
|
| 47 | + } |
|
| 48 | + } |
|
| 49 | + ?> |
|
| 50 | 50 | <tr> |
| 51 | 51 | <td class="text-right"><?= $prefix ?><?= $cart->id; ?></td> |
| 52 | 52 | <td class="text-left"><?= $cart->status ? $cart->status->name : 'Наполняется'; ?></td> |
| 53 | 53 | <td class="text-right"><?= count($cart->cartItems); ?></td> |
| 54 | 54 | <td class="text-right"><?php |
| 55 | - if ($sums) { |
|
| 56 | - foreach ($sums as $currency_id => $sum) { |
|
| 57 | - if (!$sum) { |
|
| 58 | - continue; |
|
| 59 | - } |
|
| 60 | - echo number_format($sum, 2, '.', ' '); |
|
| 61 | - if (App::$cur->money) { |
|
| 62 | - $currency = Money\Currency::get($currency_id); |
|
| 63 | - if ($currency) { |
|
| 64 | - echo ' ' . $currency->acronym(); |
|
| 65 | - } else { |
|
| 66 | - echo ' р.'; |
|
| 67 | - } |
|
| 68 | - } else { |
|
| 69 | - echo ' р.'; |
|
| 70 | - } |
|
| 71 | - echo '<br />'; |
|
| 72 | - } |
|
| 73 | - } |
|
| 74 | - ?></td> |
|
| 55 | + if ($sums) { |
|
| 56 | + foreach ($sums as $currency_id => $sum) { |
|
| 57 | + if (!$sum) { |
|
| 58 | + continue; |
|
| 59 | + } |
|
| 60 | + echo number_format($sum, 2, '.', ' '); |
|
| 61 | + if (App::$cur->money) { |
|
| 62 | + $currency = Money\Currency::get($currency_id); |
|
| 63 | + if ($currency) { |
|
| 64 | + echo ' ' . $currency->acronym(); |
|
| 65 | + } else { |
|
| 66 | + echo ' р.'; |
|
| 67 | + } |
|
| 68 | + } else { |
|
| 69 | + echo ' р.'; |
|
| 70 | + } |
|
| 71 | + echo '<br />'; |
|
| 72 | + } |
|
| 73 | + } |
|
| 74 | + ?></td> |
|
| 75 | 75 | <td class="text-left"><?= $cart->complete_data; ?></td> |
| 76 | 76 | <td><?php |
| 77 | - if ($cart->payed) { |
|
| 78 | - echo 'Оплачено'; |
|
| 79 | - } elseif (!App::$cur->money) { |
|
| 80 | - echo 'Не оплачено'; |
|
| 81 | - } else { |
|
| 82 | - $handlers = App::$cur->ecommerce->getSnippets('payTypeHandler'); |
|
| 83 | - $redirect = ['/ecommerce/cart/success']; |
|
| 84 | - if ($cart->payType && !empty($handlers[$cart->payType->handler]['handler'])) { |
|
| 85 | - $newRedirect = $handlers[$cart->payType->handler]['handler']($cart); |
|
| 86 | - } |
|
| 87 | - if (!empty($newRedirect[0])) { |
|
| 88 | - echo '<a class="btn btn-warning btn-sm" href = "' . $newRedirect[0] . '">Оплатить</a>'; |
|
| 89 | - } else { |
|
| 90 | - echo 'Не оплачено'; |
|
| 91 | - } |
|
| 92 | - } |
|
| 93 | - ?></td> |
|
| 77 | + if ($cart->payed) { |
|
| 78 | + echo 'Оплачено'; |
|
| 79 | + } elseif (!App::$cur->money) { |
|
| 80 | + echo 'Не оплачено'; |
|
| 81 | + } else { |
|
| 82 | + $handlers = App::$cur->ecommerce->getSnippets('payTypeHandler'); |
|
| 83 | + $redirect = ['/ecommerce/cart/success']; |
|
| 84 | + if ($cart->payType && !empty($handlers[$cart->payType->handler]['handler'])) { |
|
| 85 | + $newRedirect = $handlers[$cart->payType->handler]['handler']($cart); |
|
| 86 | + } |
|
| 87 | + if (!empty($newRedirect[0])) { |
|
| 88 | + echo '<a class="btn btn-warning btn-sm" href = "' . $newRedirect[0] . '">Оплатить</a>'; |
|
| 89 | + } else { |
|
| 90 | + echo 'Не оплачено'; |
|
| 91 | + } |
|
| 92 | + } |
|
| 93 | + ?></td> |
|
| 94 | 94 | <td class="text-right"> |
| 95 | 95 | <?php |
| 96 | - if ($cart->cart_status_id < 2) { |
|
| 97 | - ?> |
|
| 96 | + if ($cart->cart_status_id < 2) { |
|
| 97 | + ?> |
|
| 98 | 98 | <a title="Продолжить покупки" href="/ecommerce/cart/continue/<?= $cart->id; ?>" data-toggle="tooltip" title="" class="btn btn-success btn-sm"><i class="glyphicon glyphicon-chevron-right"></i></a> |
| 99 | 99 | <a title="Удалить заказ" onclick="return confirm('Вы уверены?')" href="/ecommerce/cart/delete/<?= $cart->id; ?>" data-toggle="tooltip" title="" class="btn btn-danger btn-sm"><i class="glyphicon glyphicon-trash"></i></a> |
| 100 | 100 | <?php |
@@ -26,7 +26,8 @@ discard block |
||
| 26 | 26 | $currency_id = $cartItem->price && $cartItem->price->currency ? $cartItem->price->currency->id : (!empty(\App::$cur->ecommerce->config['defaultCurrency']) ? \App::$cur->ecommerce->config['defaultCurrency'] : 0); |
| 27 | 27 | if (empty($sums[$currency_id])) { |
| 28 | 28 | $sums[$currency_id] = $cartItem->final_price * $cartItem->count; |
| 29 | - } else { |
|
| 29 | + } |
|
| 30 | + else { |
|
| 30 | 31 | $sums[$currency_id] += $cartItem->final_price * $cartItem->count; |
| 31 | 32 | } |
| 32 | 33 | } |
@@ -34,7 +35,8 @@ discard block |
||
| 34 | 35 | $currency_id = $cart->delivery->currency_id; |
| 35 | 36 | if (empty($sums[$currency_id])) { |
| 36 | 37 | $sums[$currency_id] = $cart->delivery->price; |
| 37 | - } else { |
|
| 38 | + } |
|
| 39 | + else { |
|
| 38 | 40 | $sums[$currency_id] += $cart->delivery->price; |
| 39 | 41 | } |
| 40 | 42 | } |
@@ -42,7 +44,8 @@ discard block |
||
| 42 | 44 | $currency_id = $extra->currency ? $extra->currency->id : \App::$cur->ecommerce->config['defaultCurrency']; |
| 43 | 45 | if (empty($sums[$currency_id])) { |
| 44 | 46 | $sums[$currency_id] = $extra->price * $extra->count; |
| 45 | - } else { |
|
| 47 | + } |
|
| 48 | + else { |
|
| 46 | 49 | $sums[$currency_id] += $extra->price * $extra->count; |
| 47 | 50 | } |
| 48 | 51 | } |
@@ -62,10 +65,12 @@ discard block |
||
| 62 | 65 | $currency = Money\Currency::get($currency_id); |
| 63 | 66 | if ($currency) { |
| 64 | 67 | echo ' ' . $currency->acronym(); |
| 65 | - } else { |
|
| 68 | + } |
|
| 69 | + else { |
|
| 66 | 70 | echo ' р.'; |
| 67 | 71 | } |
| 68 | - } else { |
|
| 72 | + } |
|
| 73 | + else { |
|
| 69 | 74 | echo ' р.'; |
| 70 | 75 | } |
| 71 | 76 | echo '<br />'; |
@@ -76,9 +81,11 @@ discard block |
||
| 76 | 81 | <td><?php |
| 77 | 82 | if ($cart->payed) { |
| 78 | 83 | echo 'Оплачено'; |
| 79 | - } elseif (!App::$cur->money) { |
|
| 84 | + } |
|
| 85 | + elseif (!App::$cur->money) { |
|
| 80 | 86 | echo 'Не оплачено'; |
| 81 | - } else { |
|
| 87 | + } |
|
| 88 | + else { |
|
| 82 | 89 | $handlers = App::$cur->ecommerce->getSnippets('payTypeHandler'); |
| 83 | 90 | $redirect = ['/ecommerce/cart/success']; |
| 84 | 91 | if ($cart->payType && !empty($handlers[$cart->payType->handler]['handler'])) { |
@@ -86,7 +93,8 @@ discard block |
||
| 86 | 93 | } |
| 87 | 94 | if (!empty($newRedirect[0])) { |
| 88 | 95 | echo '<a class="btn btn-warning btn-sm" href = "' . $newRedirect[0] . '">Оплатить</a>'; |
| 89 | - } else { |
|
| 96 | + } |
|
| 97 | + else { |
|
| 90 | 98 | echo 'Не оплачено'; |
| 91 | 99 | } |
| 92 | 100 | } |
@@ -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"> |
@@ -6,7 +6,8 @@ discard block |
||
| 6 | 6 | foreach ($payTypes as $payType) { |
| 7 | 7 | if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || ($cart->payType && $payType->id == $cart->payType->id)) { |
| 8 | 8 | $checked = 'checked'; |
| 9 | - } else { |
|
| 9 | + } |
|
| 10 | + else { |
|
| 10 | 11 | $checked = ''; |
| 11 | 12 | } |
| 12 | 13 | echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">'; |
@@ -27,7 +28,8 @@ discard block |
||
| 27 | 28 | if ($cart->payType) { |
| 28 | 29 | echo "<h4>Информация об оплате</h4>"; |
| 29 | 30 | echo $cart->payType->info; |
| 30 | - } else { |
|
| 31 | + } |
|
| 32 | + else { |
|
| 31 | 33 | echo "<h4>Выберите способ оплаты</h4>"; |
| 32 | 34 | } |
| 33 | 35 | ?> |
@@ -1,16 +1,16 @@ |
||
| 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 () { |
@@ -3,7 +3,8 @@ discard block |
||
| 3 | 3 | $price = $cartItem->item->getPrice(); |
| 4 | 4 | if (empty(App::$cur->ecommerce->config['sell_over_warehouse'])) { |
| 5 | 5 | $max = $price->offer->warehouseCount((!empty($_SESSION['cart']['cart_id']) ? $_SESSION['cart']['cart_id'] : 0)); |
| 6 | -} else { |
|
| 6 | +} |
|
| 7 | +else { |
|
| 7 | 8 | $max = 100; |
| 8 | 9 | } |
| 9 | 10 | if (!empty($options[16]) && $options[16]->value) { |
@@ -15,7 +16,8 @@ discard block |
||
| 15 | 16 | <input type = "text" data-miltiple="1000" class ="combineRanger item-counter" data-step ="<?= $step; ?>" data-max="<?= $max; ?>" data-price ="<?= $price->price; ?>" name="cartItems[<?php echo $cartItem->id; ?>]" value ="<?= $cartItem->count; ?>" /> |
| 16 | 17 | <?php |
| 17 | 18 | echo '</div>'; |
| 18 | -} else { |
|
| 19 | +} |
|
| 20 | +else { |
|
| 19 | 21 | ?> |
| 20 | 22 | <div class="input-group number-spinner" > |
| 21 | 23 | <span class="input-group-btn"> |