@@ -79,10 +79,12 @@ discard block |
||
| 79 | 79 | if (!empty($log['status'])) { |
| 80 | 80 | echo "<tr class = '{$log['status']}'><td>{$log['name']}</td><td>{$log['status']}</td></tr>"; |
| 81 | 81 | } else { |
| 82 | - if (empty($log['end'])) |
|
| 83 | - $log['end'] = microtime(true); |
|
| 84 | - if (empty($log['start'])) |
|
| 85 | - $log['start'] = microtime(true); |
|
| 82 | + if (empty($log['end'])) { |
|
| 83 | + $log['end'] = microtime(true); |
|
| 84 | + } |
|
| 85 | + if (empty($log['start'])) { |
|
| 86 | + $log['start'] = microtime(true); |
|
| 87 | + } |
|
| 86 | 88 | echo "<tr><td>{$log['name']}</td><td" . (round(($log['end'] - $log['start']), 5) > 0.1 ? ' class ="danger"' : '') . ">" . round(($log['end'] - $log['start']), 5) . "</td></tr>"; |
| 87 | 89 | } |
| 88 | 90 | } |
@@ -93,12 +95,13 @@ discard block |
||
| 93 | 95 | function convertSize($size) |
| 94 | 96 | { |
| 95 | 97 | |
| 96 | - if ($size < 1024) |
|
| 97 | - return $size . "B"; |
|
| 98 | - elseif ($size < 1048576) |
|
| 99 | - return round($size / 1024, 2) . "KB"; |
|
| 100 | - else |
|
| 101 | - return round($size / 1048576, 2) . "MB"; |
|
| 98 | + if ($size < 1024) { |
|
| 99 | + return $size . "B"; |
|
| 100 | + } elseif ($size < 1048576) { |
|
| 101 | + return round($size / 1024, 2) . "KB"; |
|
| 102 | + } else { |
|
| 103 | + return round($size / 1048576, 2) . "MB"; |
|
| 104 | + } |
|
| 102 | 105 | } |
| 103 | 106 | |
| 104 | 107 | function __destruct() |
@@ -52,8 +52,9 @@ |
||
| 52 | 52 | */ |
| 53 | 53 | static function get($clean = false) |
| 54 | 54 | { |
| 55 | - if (empty($_SESSION['_INJI_MSG'])) |
|
| 56 | - return []; |
|
| 55 | + if (empty($_SESSION['_INJI_MSG'])) { |
|
| 56 | + return []; |
|
| 57 | + } |
|
| 57 | 58 | $msgs = $_SESSION['_INJI_MSG']; |
| 58 | 59 | if ($clean) { |
| 59 | 60 | $_SESSION['_INJI_MSG'] = []; |
@@ -15,8 +15,9 @@ discard block |
||
| 15 | 15 | if (!$app) { |
| 16 | 16 | $app = $this->app->type; |
| 17 | 17 | } |
| 18 | - if (!empty($this->config['access']['accessTree'][$app]['deniedUrl'])) |
|
| 19 | - return $this->config['access']['accessTree'][$app]['deniedUrl']; |
|
| 18 | + if (!empty($this->config['access']['accessTree'][$app]['deniedUrl'])) { |
|
| 19 | + return $this->config['access']['accessTree'][$app]['deniedUrl']; |
|
| 20 | + } |
|
| 20 | 21 | |
| 21 | 22 | return '/'; |
| 22 | 23 | } |
@@ -50,8 +51,9 @@ discard block |
||
| 50 | 51 | return true; |
| 51 | 52 | } |
| 52 | 53 | |
| 53 | - if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access))) |
|
| 54 | - return false; |
|
| 54 | + if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access))) { |
|
| 55 | + return false; |
|
| 56 | + } |
|
| 55 | 57 | |
| 56 | 58 | return true; |
| 57 | 59 | } |
@@ -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> |
@@ -2,27 +2,45 @@ |
||
| 2 | 2 | <form action = '' method = 'POST' enctype="multipart/form-data"> |
| 3 | 3 | <div class ="form-group"> |
| 4 | 4 | <label>Название сайта</label> |
| 5 | - <input class ="form-control" type = 'text' name = 'site_name' value = '<?php if (!empty(\App::$primary->config['site']['name'])) echo \App::$primary->config['site']['name']; ?>' /> |
|
| 5 | + <input class ="form-control" type = 'text' name = 'site_name' value = '<?php if (!empty(\App::$primary->config['site']['name'])) { |
|
| 6 | + echo \App::$primary->config['site']['name']; |
|
| 7 | +} |
|
| 8 | +?>' /> |
|
| 6 | 9 | </div> |
| 7 | 10 | <div class ="form-group"> |
| 8 | 11 | <label>Название компании</label> |
| 9 | - <input class ="form-control" type = 'text' name = 'company_name' value = '<?php if (!empty(\App::$primary->config['site']['company_name'])) echo \App::$primary->config['site']['company_name']; ?>' /> |
|
| 12 | + <input class ="form-control" type = 'text' name = 'company_name' value = '<?php if (!empty(\App::$primary->config['site']['company_name'])) { |
|
| 13 | + echo \App::$primary->config['site']['company_name']; |
|
| 14 | +} |
|
| 15 | +?>' /> |
|
| 10 | 16 | </div> |
| 11 | 17 | <div class ="form-group"> |
| 12 | 18 | <label>Основной домен</label> |
| 13 | - <input class ="form-control" type = 'text' name = 'site_domain' value = '<?php if (!empty(\App::$primary->config['site']['domain'])) echo \App::$primary->config['site']['domain']; ?>' /> |
|
| 19 | + <input class ="form-control" type = 'text' name = 'site_domain' value = '<?php if (!empty(\App::$primary->config['site']['domain'])) { |
|
| 20 | + echo \App::$primary->config['site']['domain']; |
|
| 21 | +} |
|
| 22 | +?>' /> |
|
| 14 | 23 | </div> |
| 15 | 24 | <div class ="form-group"> |
| 16 | 25 | <label>Контактный email</label> |
| 17 | - <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) echo \App::$primary->config['site']['email']; ?>' /> |
|
| 26 | + <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) { |
|
| 27 | + echo \App::$primary->config['site']['email']; |
|
| 28 | +} |
|
| 29 | +?>' /> |
|
| 18 | 30 | </div> |
| 19 | 31 | <div class ="form-group"> |
| 20 | 32 | <label>Ключевые слова</label> |
| 21 | - <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) echo \App::$primary->config['site']['keywords']; ?>' /> |
|
| 33 | + <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) { |
|
| 34 | + echo \App::$primary->config['site']['keywords']; |
|
| 35 | +} |
|
| 36 | +?>' /> |
|
| 22 | 37 | </div> |
| 23 | 38 | <div class ="form-group"> |
| 24 | 39 | <label>Краткое описание сайта</label> |
| 25 | - <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) echo \App::$primary->config['site']['description']; ?>' /> |
|
| 40 | + <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) { |
|
| 41 | + echo \App::$primary->config['site']['description']; |
|
| 42 | +} |
|
| 43 | +?>' /> |
|
| 26 | 44 | </div> |
| 27 | 45 | <?php |
| 28 | 46 | $form = new Ui\Form(); |
@@ -16,8 +16,9 @@ |
||
| 16 | 16 | $param = isset($this->config['default']) ? $this->config['default'] : 'local'; |
| 17 | 17 | } |
| 18 | 18 | if (!is_array($param)) { |
| 19 | - if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true]))) |
|
| 20 | - return false; |
|
| 19 | + if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true]))) { |
|
| 20 | + return false; |
|
| 21 | + } |
|
| 21 | 22 | |
| 22 | 23 | $db = $dbOption; |
| 23 | 24 | } else { |
@@ -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 | |
@@ -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,87 +19,87 @@ discard block |
||
| 19 | 19 | </thead> |
| 20 | 20 | <tbody> |
| 21 | 21 | <?php |
| 22 | - foreach ($carts as $cart) { |
|
| 23 | - $sums = []; |
|
| 24 | - foreach ($cart->cartItems as $cartItem) { |
|
| 25 | - $currency_id = $cartItem->price && $cartItem->price->currency ? $cartItem->price->currency->id : (!empty(\App::$cur->ecommerce->config['defaultCurrency']) ? \App::$cur->ecommerce->config['defaultCurrency'] : 0); |
|
| 26 | - if (empty($sums[$currency_id])) { |
|
| 27 | - $sums[$currency_id] = $cartItem->final_price * $cartItem->count; |
|
| 28 | - } else { |
|
| 29 | - $sums[$currency_id] += $cartItem->final_price * $cartItem->count; |
|
| 30 | - } |
|
| 31 | - } |
|
| 32 | - if ($cart->delivery && $cart->delivery->price) { |
|
| 33 | - $currency_id = $cart->delivery->currency_id; |
|
| 34 | - if (empty($sums[$currency_id])) { |
|
| 35 | - $sums[$currency_id] = $cart->delivery->price; |
|
| 36 | - } else { |
|
| 37 | - $sums[$currency_id] += $cart->delivery->price; |
|
| 38 | - } |
|
| 39 | - } |
|
| 40 | - foreach ($cart->extras as $extra) { |
|
| 41 | - $currency_id = $extra->currency ? $extra->currency->id : \App::$cur->ecommerce->config['defaultCurrency']; |
|
| 42 | - if (empty($sums[$currency_id])) { |
|
| 43 | - $sums[$currency_id] = $extra->price * $extra->count; |
|
| 44 | - } else { |
|
| 45 | - $sums[$currency_id] += $extra->price * $extra->count; |
|
| 46 | - } |
|
| 47 | - } |
|
| 48 | - ?> |
|
| 22 | + foreach ($carts as $cart) { |
|
| 23 | + $sums = []; |
|
| 24 | + foreach ($cart->cartItems as $cartItem) { |
|
| 25 | + $currency_id = $cartItem->price && $cartItem->price->currency ? $cartItem->price->currency->id : (!empty(\App::$cur->ecommerce->config['defaultCurrency']) ? \App::$cur->ecommerce->config['defaultCurrency'] : 0); |
|
| 26 | + if (empty($sums[$currency_id])) { |
|
| 27 | + $sums[$currency_id] = $cartItem->final_price * $cartItem->count; |
|
| 28 | + } else { |
|
| 29 | + $sums[$currency_id] += $cartItem->final_price * $cartItem->count; |
|
| 30 | + } |
|
| 31 | + } |
|
| 32 | + if ($cart->delivery && $cart->delivery->price) { |
|
| 33 | + $currency_id = $cart->delivery->currency_id; |
|
| 34 | + if (empty($sums[$currency_id])) { |
|
| 35 | + $sums[$currency_id] = $cart->delivery->price; |
|
| 36 | + } else { |
|
| 37 | + $sums[$currency_id] += $cart->delivery->price; |
|
| 38 | + } |
|
| 39 | + } |
|
| 40 | + foreach ($cart->extras as $extra) { |
|
| 41 | + $currency_id = $extra->currency ? $extra->currency->id : \App::$cur->ecommerce->config['defaultCurrency']; |
|
| 42 | + if (empty($sums[$currency_id])) { |
|
| 43 | + $sums[$currency_id] = $extra->price * $extra->count; |
|
| 44 | + } else { |
|
| 45 | + $sums[$currency_id] += $extra->price * $extra->count; |
|
| 46 | + } |
|
| 47 | + } |
|
| 48 | + ?> |
|
| 49 | 49 | <tr> |
| 50 | 50 | <td class="text-right">#<?= $cart->id; ?></td> |
| 51 | 51 | <td class="text-left"><?= $cart->status ? $cart->status->name : 'Наполняется'; ?></td> |
| 52 | 52 | <td class="text-right"><?= count($cart->cartItems); ?></td> |
| 53 | 53 | <td class="text-right"><?php |
| 54 | - if ($sums) { |
|
| 55 | - foreach ($sums as $currency_id => $sum) { |
|
| 56 | - if (!$sum) { |
|
| 57 | - continue; |
|
| 58 | - } |
|
| 59 | - echo number_format($sum, 2, '.', ' '); |
|
| 60 | - if (App::$cur->money) { |
|
| 61 | - $currency = Money\Currency::get($currency_id); |
|
| 62 | - if ($currency) { |
|
| 63 | - echo ' ' . $currency->acronym(); |
|
| 64 | - } else { |
|
| 65 | - echo ' р.'; |
|
| 66 | - } |
|
| 67 | - } else { |
|
| 68 | - echo ' р.'; |
|
| 69 | - } |
|
| 70 | - echo '<br />'; |
|
| 71 | - } |
|
| 72 | - } |
|
| 73 | - ?></td> |
|
| 54 | + if ($sums) { |
|
| 55 | + foreach ($sums as $currency_id => $sum) { |
|
| 56 | + if (!$sum) { |
|
| 57 | + continue; |
|
| 58 | + } |
|
| 59 | + echo number_format($sum, 2, '.', ' '); |
|
| 60 | + if (App::$cur->money) { |
|
| 61 | + $currency = Money\Currency::get($currency_id); |
|
| 62 | + if ($currency) { |
|
| 63 | + echo ' ' . $currency->acronym(); |
|
| 64 | + } else { |
|
| 65 | + echo ' р.'; |
|
| 66 | + } |
|
| 67 | + } else { |
|
| 68 | + echo ' р.'; |
|
| 69 | + } |
|
| 70 | + echo '<br />'; |
|
| 71 | + } |
|
| 72 | + } |
|
| 73 | + ?></td> |
|
| 74 | 74 | <td class="text-left"><?= $cart->complete_data; ?></td> |
| 75 | 75 | <td><?php |
| 76 | - if ($cart->payed) { |
|
| 77 | - echo 'Оплачено'; |
|
| 78 | - } elseif (!App::$cur->money) { |
|
| 79 | - echo 'Не оплачено'; |
|
| 80 | - } else { |
|
| 81 | - $handlers = App::$cur->ecommerce->getSnippets('payTypeHandler'); |
|
| 82 | - $redirect = ['/ecommerce/cart/success']; |
|
| 83 | - if ($cart->payType && !empty($handlers[$cart->payType->handler]['handler'])) { |
|
| 84 | - $newRedirect = $handlers[$cart->payType->handler]['handler']($cart); |
|
| 85 | - } |
|
| 86 | - if (!empty($newRedirect[0])) { |
|
| 87 | - echo '<a class="btn btn-warning btn-sm" href = "' . $newRedirect[0] . '">Оплатить</a>'; |
|
| 88 | - } else { |
|
| 89 | - echo 'Не оплачено'; |
|
| 90 | - } |
|
| 91 | - } |
|
| 92 | - ?></td> |
|
| 76 | + if ($cart->payed) { |
|
| 77 | + echo 'Оплачено'; |
|
| 78 | + } elseif (!App::$cur->money) { |
|
| 79 | + echo 'Не оплачено'; |
|
| 80 | + } else { |
|
| 81 | + $handlers = App::$cur->ecommerce->getSnippets('payTypeHandler'); |
|
| 82 | + $redirect = ['/ecommerce/cart/success']; |
|
| 83 | + if ($cart->payType && !empty($handlers[$cart->payType->handler]['handler'])) { |
|
| 84 | + $newRedirect = $handlers[$cart->payType->handler]['handler']($cart); |
|
| 85 | + } |
|
| 86 | + if (!empty($newRedirect[0])) { |
|
| 87 | + echo '<a class="btn btn-warning btn-sm" href = "' . $newRedirect[0] . '">Оплатить</a>'; |
|
| 88 | + } else { |
|
| 89 | + echo 'Не оплачено'; |
|
| 90 | + } |
|
| 91 | + } |
|
| 92 | + ?></td> |
|
| 93 | 93 | <td class="text-right"> |
| 94 | 94 | <?php |
| 95 | - if ($cart->cart_status_id < 2) { |
|
| 96 | - ?> |
|
| 95 | + if ($cart->cart_status_id < 2) { |
|
| 96 | + ?> |
|
| 97 | 97 | <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> |
| 98 | 98 | <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> |
| 99 | 99 | <?php |
| 100 | - } |
|
| 101 | - if ($cart->cart_status_id >= 2) { |
|
| 102 | - ?> |
|
| 100 | + } |
|
| 101 | + if ($cart->cart_status_id >= 2) { |
|
| 102 | + ?> |
|
| 103 | 103 | <a title="Просмотр" href="/ecommerce/cart/orderDetail/<?= $cart->id; ?>" data-toggle="tooltip" title="" class="btn btn-info btn-sm"><i class="glyphicon glyphicon-eye-open"></i></a> |
| 104 | 104 | <a title="Заказать повторно" href="/ecommerce/cart/refill/<?= $cart->id; ?>" data-toggle="tooltip" title="" class="btn btn-primary btn-sm"><i class="glyphicon glyphicon-refresh"></i></a> |
| 105 | 105 | <?php |
@@ -108,8 +108,8 @@ discard block |
||
| 108 | 108 | </td> |
| 109 | 109 | </tr> |
| 110 | 110 | <?php |
| 111 | - } |
|
| 112 | - ?> |
|
| 111 | + } |
|
| 112 | + ?> |
|
| 113 | 113 | </tbody> |
| 114 | 114 | </table> |
| 115 | 115 | </div> |