@@ -24,10 +24,10 @@ |
||
| 24 | 24 | public static $cols = [ |
| 25 | 25 | 'name' => ['type' => 'text'], |
| 26 | 26 | 'description' => ['type' => 'html'], |
| 27 | - 'user_id' => [ 'type' => 'select', 'source' => 'relation', 'relation' => 'user'], |
|
| 27 | + 'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'], |
|
| 28 | 28 | 'date_create' => ['type' => 'dateTime'], |
| 29 | 29 | //Менеджеры |
| 30 | - 'inputs' => [ 'type' => 'dataManager', 'relation' => 'inputs'], |
|
| 30 | + 'inputs' => ['type' => 'dataManager', 'relation' => 'inputs'], |
|
| 31 | 31 | ]; |
| 32 | 32 | public static $dataManagers = [ |
| 33 | 33 | 'manager' => [ |
@@ -2,17 +2,17 @@ |
||
| 2 | 2 | <div class="table-responsive"> |
| 3 | 3 | <table class="table table-bordered table-condensed table-striped table-hover"> |
| 4 | 4 | <?php |
| 5 | - $i = 0; |
|
| 6 | - foreach ($items as $item) { |
|
| 7 | - ?> |
|
| 5 | + $i = 0; |
|
| 6 | + foreach ($items as $item) { |
|
| 7 | + ?> |
|
| 8 | 8 | <tr> |
| 9 | 9 | <?php $this->widget('Ecommerce\items/item-tablerow', ['item' => $item]); ?> |
| 10 | 10 | </tr> |
| 11 | 11 | <?php |
| 12 | - if (!( ++$i % 3)) { |
|
| 13 | - echo '</div><div class="row">'; |
|
| 14 | - } |
|
| 15 | - } |
|
| 16 | - ?> |
|
| 12 | + if (!( ++$i % 3)) { |
|
| 13 | + echo '</div><div class="row">'; |
|
| 14 | + } |
|
| 15 | + } |
|
| 16 | + ?> |
|
| 17 | 17 | </table></div> |
| 18 | 18 | </div> |
| 19 | 19 | \ No newline at end of file |
@@ -1,21 +1,21 @@ |
||
| 1 | 1 | <div class="ecommerce-sidebar-categorys"> |
| 2 | 2 | <?php |
| 3 | - if (empty($category)) { |
|
| 4 | - $category = []; |
|
| 5 | - } |
|
| 6 | - $tree = new Ui\Tree(); |
|
| 7 | - $tree->ul('\Ecommerce\Category', 0, function($categoryItem) use($category) { |
|
| 8 | - if ($category && $category->id == $categoryItem->id) { |
|
| 9 | - $class = 'active'; |
|
| 10 | - } else { |
|
| 11 | - $class = ''; |
|
| 12 | - } |
|
| 13 | - return [ |
|
| 14 | - 'attributes' => [ |
|
| 15 | - 'class' => $class, |
|
| 16 | - ], |
|
| 17 | - 'text' => "<a {$class} href = '/ecommerce/itemList/{$categoryItem->id}'>{$categoryItem->name}</a>" |
|
| 18 | - ]; |
|
| 19 | - }); |
|
| 20 | - ?> |
|
| 3 | + if (empty($category)) { |
|
| 4 | + $category = []; |
|
| 5 | + } |
|
| 6 | + $tree = new Ui\Tree(); |
|
| 7 | + $tree->ul('\Ecommerce\Category', 0, function($categoryItem) use($category) { |
|
| 8 | + if ($category && $category->id == $categoryItem->id) { |
|
| 9 | + $class = 'active'; |
|
| 10 | + } else { |
|
| 11 | + $class = ''; |
|
| 12 | + } |
|
| 13 | + return [ |
|
| 14 | + 'attributes' => [ |
|
| 15 | + 'class' => $class, |
|
| 16 | + ], |
|
| 17 | + 'text' => "<a {$class} href = '/ecommerce/itemList/{$categoryItem->id}'>{$categoryItem->name}</a>" |
|
| 18 | + ]; |
|
| 19 | + }); |
|
| 20 | + ?> |
|
| 21 | 21 | </div> |
| 22 | 22 | \ No newline at end of file |
@@ -13,23 +13,23 @@ |
||
| 13 | 13 | <div class="ecommerce-best"> |
| 14 | 14 | <h2 class='caption'><span>Рекомендумые товары</span></h2> |
| 15 | 15 | <?php |
| 16 | - $bestItems = App::$cur->ecommerce->getItems(['where' => [['best', '1']], 'sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 3]); |
|
| 17 | - if (count($bestItems) < 3) { |
|
| 18 | - $bestItems = array_merge($bestItems, App::$cur->ecommerce->getItems(['sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 3])); |
|
| 19 | - $bestItems = array_slice($bestItems, 0, 3); |
|
| 20 | - } |
|
| 21 | - $this->widget('Ecommerce\items/icons', ['items' => $bestItems]); |
|
| 22 | - $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]); |
|
| 23 | - ?> |
|
| 16 | + $bestItems = App::$cur->ecommerce->getItems(['where' => [['best', '1']], 'sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 3]); |
|
| 17 | + if (count($bestItems) < 3) { |
|
| 18 | + $bestItems = array_merge($bestItems, App::$cur->ecommerce->getItems(['sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 3])); |
|
| 19 | + $bestItems = array_slice($bestItems, 0, 3); |
|
| 20 | + } |
|
| 21 | + $this->widget('Ecommerce\items/icons', ['items' => $bestItems]); |
|
| 22 | + $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]); |
|
| 23 | + ?> |
|
| 24 | 24 | </div> |
| 25 | 25 | </div> |
| 26 | 26 | <?php |
| 27 | - $this->widget('Ecommerce\items/showOptions'); |
|
| 27 | + $this->widget('Ecommerce\items/showOptions'); |
|
| 28 | 28 | |
| 29 | - $bestItems = App::$cur->ecommerce->getItems(['sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 6]); |
|
| 30 | - $this->widget('Ecommerce\items/icons', ['items' => $bestItems]); |
|
| 31 | - $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]); |
|
| 32 | - ?> |
|
| 29 | + $bestItems = App::$cur->ecommerce->getItems(['sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 6]); |
|
| 30 | + $this->widget('Ecommerce\items/icons', ['items' => $bestItems]); |
|
| 31 | + $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]); |
|
| 32 | + ?> |
|
| 33 | 33 | <a class="ecommerce-showmore" href="/ecommerce/itemList">Показать больше товаров</a> |
| 34 | 34 | </div> |
| 35 | 35 | </div> |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | $bestItems = array_slice($bestItems, 0, 3); |
| 20 | 20 | } |
| 21 | 21 | $this->widget('Ecommerce\items/icons', ['items' => $bestItems]); |
| 22 | - $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]); |
|
| 22 | + $this->widget('Ecommerce\items/table', ['items'=>$bestItems, 'hide'=>true]); |
|
| 23 | 23 | ?> |
| 24 | 24 | </div> |
| 25 | 25 | </div> |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | $bestItems = App::$cur->ecommerce->getItems(['sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 6]); |
| 30 | 30 | $this->widget('Ecommerce\items/icons', ['items' => $bestItems]); |
| 31 | - $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]); |
|
| 31 | + $this->widget('Ecommerce\items/table', ['items'=>$bestItems, 'hide'=>true]); |
|
| 32 | 32 | ?> |
| 33 | 33 | <a class="ecommerce-showmore" href="/ecommerce/itemList">Показать больше товаров</a> |
| 34 | 34 | </div> |
@@ -10,10 +10,10 @@ discard block |
||
| 10 | 10 | <div class="form-group"> |
| 11 | 11 | <label>Регистрация через соц.сети</label><br /> |
| 12 | 12 | <?php |
| 13 | - foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) { |
|
| 14 | - echo "<a href = '/users/social/auth/{$social->code}'>{$social->name()}</a> "; |
|
| 15 | - } |
|
| 16 | - ?> |
|
| 13 | + foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) { |
|
| 14 | + echo "<a href = '/users/social/auth/{$social->code}'>{$social->name()}</a> "; |
|
| 15 | + } |
|
| 16 | + ?> |
|
| 17 | 17 | </div> |
| 18 | 18 | <?php |
| 19 | 19 | } |
@@ -29,15 +29,15 @@ discard block |
||
| 29 | 29 | <?php $form->input('date', 'user_birthday', 'Дата рождения'); ?> |
| 30 | 30 | <?php $form->input('text', 'user_city', 'Город'); ?> |
| 31 | 31 | <?php |
| 32 | - if (!empty(App::$cur->users->config['invites'])) { |
|
| 33 | - ?> |
|
| 32 | + if (!empty(App::$cur->users->config['invites'])) { |
|
| 33 | + ?> |
|
| 34 | 34 | <div class ='form-group'> |
| 35 | 35 | <label><?= !empty(App::$cur->users->config['invitesName']) ? App::$cur->users->config['invitesName'] : 'Код приглашения'; ?></label> |
| 36 | 36 | <input type ='text' name ='invite_code' class ='form-control' value ="<?= (isset($_POST['invite_code']) ? $_POST['invite_code'] : ((!empty($_COOKIE['invite_code']) ? $_COOKIE['invite_code'] : ((!empty($_GET['invite_code']) ? $_GET['invite_code'] : ''))))); ?>" /> |
| 37 | 37 | </div> |
| 38 | 38 | <?php |
| 39 | - } |
|
| 40 | - ?> |
|
| 39 | + } |
|
| 40 | + ?> |
|
| 41 | 41 | </div> |
| 42 | 42 | <div class="col-sm-6"> |
| 43 | 43 | <div class ='form-group'> |
@@ -26,20 +26,20 @@ |
||
| 26 | 26 | </div> |
| 27 | 27 | <div class="col-sm-9"> |
| 28 | 28 | <?php |
| 29 | - if (empty($activeSection) || empty($sections[$activeSection]['fullWidget'])) { |
|
| 30 | - foreach ($sections as $section) { |
|
| 31 | - if (!empty($section['smallWidget'])) { |
|
| 32 | - $widgetName = is_array($section['smallWidget']) ? $section['smallWidget']['widget'] : $section['smallWidget']; |
|
| 33 | - $widgetSize = !empty($section['smallWidget']['size']) ? $section['smallWidget']['size'] : 1; |
|
| 34 | - ?> |
|
| 29 | + if (empty($activeSection) || empty($sections[$activeSection]['fullWidget'])) { |
|
| 30 | + foreach ($sections as $section) { |
|
| 31 | + if (!empty($section['smallWidget'])) { |
|
| 32 | + $widgetName = is_array($section['smallWidget']) ? $section['smallWidget']['widget'] : $section['smallWidget']; |
|
| 33 | + $widgetSize = !empty($section['smallWidget']['size']) ? $section['smallWidget']['size'] : 1; |
|
| 34 | + ?> |
|
| 35 | 35 | <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $this->widget($widgetName); ?></div> |
| 36 | 36 | <?php |
| 37 | - } |
|
| 38 | - } |
|
| 39 | - } else { |
|
| 40 | - $this->widget($sections[$activeSection]['fullWidget']); |
|
| 41 | - } |
|
| 42 | - ?> |
|
| 37 | + } |
|
| 38 | + } |
|
| 39 | + } else { |
|
| 40 | + $this->widget($sections[$activeSection]['fullWidget']); |
|
| 41 | + } |
|
| 42 | + ?> |
|
| 43 | 43 | </div> |
| 44 | 44 | </div> |
| 45 | 45 | </div> |
@@ -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 | } |