| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | |
| 3 | -if (App::$cur->users->config['invites']) {
 | |
| 3 | +if (App::$cur->users->config['invites']) { | |
| 4 | 4 | return [ | 
| 5 | 5 | 'name' => 'Мои партнеры', | 
| 6 | 6 | 'fullWidget' => 'Users\cabinet/usersTree' | 
| @@ -2,9 +2,9 @@ | ||
| 2 | 2 | <div class="row"> | 
| 3 | 3 | <div class="col-md-3"> | 
| 4 | 4 | <?php | 
| 5 | - $category = $material->category; | |
| 6 | -          $this->widget('Materials\categoryTree', ['category' => $category]); | |
| 7 | - ?> | |
| 5 | + $category = $material->category; | |
| 6 | +            $this->widget('Materials\categoryTree', ['category' => $category]); | |
| 7 | + ?> | |
| 8 | 8 | </div> | 
| 9 | 9 | <div class="col-md-9"> | 
| 10 | 10 | <div class="content"> | 
| @@ -16,34 +16,34 @@ discard block | ||
| 16 | 16 | 'type' => 'decimal' | 
| 17 | 17 | ] | 
| 18 | 18 | ], | 
| 19 | -    'viewer' => function ($level) {
 | |
| 19 | +    'viewer' => function ($level) { | |
| 20 | 20 | $levelTypes = [ | 
| 21 | 21 | 'procent' => 'Процент', | 
| 22 | 22 | 'amount' => 'Сумма', | 
| 23 | 23 | ]; | 
| 24 | 24 | return $levelTypes[$level->params['type']->value] . ': ' . $level->params['amount']->value . ' ' . ($level->params['type']->value == 'procent' ? '%' : ($level->params['currency_id']->value ? \Money\Currency::get($level->params['currency_id']->value)->acronym() : '')); | 
| 25 | 25 | }, | 
| 26 | -    'rewarder' => function ($reward, $sums, $user, $rootUser, $level, $rewardGet) {
 | |
| 26 | +    'rewarder' => function ($reward, $sums, $user, $rootUser, $level, $rewardGet) { | |
| 27 | 27 | $wallets = \App::$cur->money->getUserWallets($user->id); | 
| 28 | 28 | $amount = 0; | 
| 29 | -        if (!empty($wallets[$level->params['currency_id']->value])) {
 | |
| 30 | -            switch ($level->params['type']->value) {
 | |
| 29 | +        if (!empty($wallets[$level->params['currency_id']->value])) { | |
| 30 | +            switch ($level->params['type']->value) { | |
| 31 | 31 | case 'procent': | 
| 32 | 32 | $finalSum = 0; | 
| 33 | -                    foreach ($sums as $currency_id => $sum) {
 | |
| 34 | -                        if ($currency_id != $level->params['currency_id']->value) {
 | |
| 33 | +                    foreach ($sums as $currency_id => $sum) { | |
| 34 | +                        if ($currency_id != $level->params['currency_id']->value) { | |
| 35 | 35 | $rate = \Money\Currency\ExchangeRate::get([ | 
| 36 | 36 | ['currency_id', $currency_id], | 
| 37 | 37 | ['target_currency_id', $level->params['currency_id']->value], | 
| 38 | 38 | ]); | 
| 39 | -                            if ($rate) {
 | |
| 39 | +                            if ($rate) { | |
| 40 | 40 | $finalSum += $sum * $rate->rate; | 
| 41 | 41 | } | 
| 42 | -                        } else {
 | |
| 42 | +                        } else { | |
| 43 | 43 | $finalSum += $sum; | 
| 44 | 44 | } | 
| 45 | 45 | } | 
| 46 | -                    switch ($reward->round_type) {
 | |
| 46 | +                    switch ($reward->round_type) { | |
| 47 | 47 | case 'round': | 
| 48 | 48 | $finalSum = round($finalSum, $reward->round_precision); | 
| 49 | 49 | $amount = $finalSum / 100 * (float)$level->params['amount']->value; | 
| @@ -59,33 +59,33 @@ discard block | ||
| 59 | 59 | case 'amount': | 
| 60 | 60 | $amount = (float)$level->params['amount']->value; | 
| 61 | 61 | } | 
| 62 | -            if (!$amount) {
 | |
| 62 | +            if (!$amount) { | |
| 63 | 63 | return 0; | 
| 64 | 64 | } | 
| 65 | 65 | |
| 66 | 66 | $text = 'Вознаграждение по программе "' . $reward->name . '"'; | 
| 67 | -            if ($rootUser->id != $user->id) {
 | |
| 67 | +            if ($rootUser->id != $user->id) { | |
| 68 | 68 | $text .= ' от ' . $rootUser->name(); | 
| 69 | 69 | } | 
| 70 | 70 | |
| 71 | -            if (!$rewardGet && $reward->block) {
 | |
| 71 | +            if (!$rewardGet && $reward->block) { | |
| 72 | 72 | $block = new \Money\Wallet\Block(); | 
| 73 | 73 | $block->wallet_id = $wallets[$level->params['currency_id']->value]->id; | 
| 74 | 74 | $block->amount = $amount; | 
| 75 | 75 | $block->comment = $text; | 
| 76 | 76 | $block->data = 'reward:' . $reward->id; | 
| 77 | 77 |                  $dateGenerators = \App::$cur->money->getSnippets('expiredDateGenerator');
 | 
| 78 | -                if ($reward->block_date_expired && !empty($dateGenerators[$reward->block_date_expired])) {
 | |
| 78 | +                if ($reward->block_date_expired && !empty($dateGenerators[$reward->block_date_expired])) { | |
| 79 | 79 | $date = $dateGenerators[$reward->block_date_expired]($reward, $user); | 
| 80 | -                    if (!empty($date['date'])) {
 | |
| 80 | +                    if (!empty($date['date'])) { | |
| 81 | 81 | $block->date_expired = $date['date']; | 
| 82 | 82 | } | 
| 83 | -                    if (!empty($date['type'])) {
 | |
| 83 | +                    if (!empty($date['type'])) { | |
| 84 | 84 | $block->expired_type = $date['type']; | 
| 85 | 85 | } | 
| 86 | 86 | } | 
| 87 | 87 | $block->save(); | 
| 88 | -            } else {
 | |
| 88 | +            } else { | |
| 89 | 89 | $wallets[$level->params['currency_id']->value]->diff($amount, $text); | 
| 90 | 90 | } | 
| 91 | 91 | \App::$cur->users->AddUserActivity($user->id, 4, $text . '<br />' . $amount . ' ' . $wallets[$level->params['currency_id']->value]->currency->acronym()); | 
| @@ -2,7 +2,7 @@ | ||
| 2 | 2 | |
| 3 | 3 | return [ | 
| 4 | 4 | 'name' => 'Последняя покупка не позднее 90 дней', | 
| 5 | -    'checker' => function ($user) {
 | |
| 5 | +    'checker' => function ($user) { | |
| 6 | 6 | $query = 'SELECT * FROM inji_ecommerce_cart iec WHERE iec.cart_cart_status_id >= 5 AND iec.cart_date_create >= NOW() - INTERVAL 90 DAY AND cart_user_id = ?'; | 
| 7 | 7 | $result = \App::$cur->db->query(['query' => $query, 'params' => [$user->id]]); | 
| 8 | 8 | return (bool)$result ? $result->fetch() : false; | 
| @@ -5,6 +5,6 @@ | ||
| 5 | 5 | 'file' => 'index.html', | 
| 6 | 6 | 'css' => ['style.css'], | 
| 7 | 7 | 'libs' => [ | 
| 8 | - 'JqueryUi', 'PaperTheme','FancyBox' | |
| 8 | + 'JqueryUi', 'PaperTheme','FancyBox' | |
| 9 | 9 | ] | 
| 10 | 10 | ]; | 
| @@ -5,9 +5,9 @@ discard block | ||
| 5 | 5 |    <?php if (empty($noIndicators)) { ?> | 
| 6 | 6 | <ol class="carousel-indicators"> | 
| 7 | 7 | <?php | 
| 8 | - $i = 0; | |
| 9 | -          for ($i = 0; $i < count($slides); $i++) { | |
| 10 | - ?> | |
| 8 | + $i = 0; | |
| 9 | +            for ($i = 0; $i < count($slides); $i++) { | |
| 10 | + ?> | |
| 11 | 11 | <li data-target="#<?= $id; ?>" data-slide-to="<?= $i; ?>" <?= !$i ? 'class="active"' : ''; ?>></li> | 
| 12 | 12 | <?php | 
| 13 | 13 | } | 
| @@ -18,9 +18,9 @@ discard block | ||
| 18 | 18 | <!-- Wrapper for slides --> | 
| 19 | 19 | <div class="carousel-inner" role="listbox"> | 
| 20 | 20 | <?php | 
| 21 | - $i = 0; | |
| 22 | -      foreach ($slides as $item) { | |
| 23 | - ?> | |
| 21 | + $i = 0; | |
| 22 | +        foreach ($slides as $item) { | |
| 23 | + ?> | |
| 24 | 24 | <div class="item <?= !$i ? 'active' : ''; ?>"> | 
| 25 | 25 |                <?= !empty($item['href']) ? "<a href = '{$item['href']}' style = 'display:inline-block;'>" : ''; ?> | 
| 26 | 26 | <img src="<?= $item['image']; ?>" <?= !empty($item['image']) ? 'alt="' . $item['name'] . '"' : ''; ?> /> | 
| @@ -12,20 +12,22 @@ | ||
| 12 | 12 | |
| 13 | 13 |      public static function genArray($data, $level = 0) { | 
| 14 | 14 | $return = ''; | 
| 15 | - if ($level == 0) | |
| 16 | - $return = "["; | |
| 15 | +        if ($level == 0) { | |
| 16 | + $return = "["; | |
| 17 | + } | |
| 17 | 18 |          foreach ($data as $key => $item) { | 
| 18 | 19 |              $return .= "\n" . str_repeat(' ', ($level * 4 + 4)) . "'{$key}' => "; | 
| 19 | - if (!is_array($item)) | |
| 20 | -                $return .= "'{$item}',"; | |
| 21 | -            else { | |
| 20 | +            if (!is_array($item)) { | |
| 21 | +                            $return .= "'{$item}',"; | |
| 22 | +            } else { | |
| 22 | 23 | $return .= "["; | 
| 23 | 24 | $return .= rtrim(self::genArray($item, $level + 1), ','); | 
| 24 | 25 |                  $return .= "\n" . str_repeat(' ', ($level * 4 + 4)) . "],"; | 
| 25 | 26 | } | 
| 26 | 27 | } | 
| 27 | - if ($level == 0) | |
| 28 | - $return = rtrim($return, ',') . "\n];"; | |
| 28 | +        if ($level == 0) { | |
| 29 | + $return = rtrim($return, ',') . "\n];"; | |
| 30 | + } | |
| 29 | 31 | |
| 30 | 32 | return $return; | 
| 31 | 33 | } | 
| @@ -2,17 +2,17 @@ discard block | ||
| 2 | 2 | <?php | 
| 3 | 3 | $currency_id = !empty($_GET['currency_id']) ? (int)$_GET['currency_id'] : 0; | 
| 4 | 4 | $wallets = App::$cur->money->getUserWallets(); | 
| 5 | -if ($currency_id && empty($wallets[$currency_id])) {
 | |
| 5 | +if ($currency_id && empty($wallets[$currency_id])) { | |
| 6 | 6 |      Msg::add('У вас нет такого кошелька');
 | 
| 7 | 7 | Msg::show(); | 
| 8 | 8 | return; | 
| 9 | 9 | } | 
| 10 | 10 | |
| 11 | -if ($currency_id) {
 | |
| 11 | +if ($currency_id) { | |
| 12 | 12 | $ids = $wallets[$currency_id]->id; | 
| 13 | -} else {
 | |
| 13 | +} else { | |
| 14 | 14 | $ids = []; | 
| 15 | -    foreach ($wallets as $wallet) {
 | |
| 15 | +    foreach ($wallets as $wallet) { | |
| 16 | 16 | $ids[] = $wallet->id; | 
| 17 | 17 | } | 
| 18 | 18 |      $ids = implode(',', $ids);
 | 
| @@ -33,7 +33,7 @@ discard block | ||
| 33 | 33 | 'start' => $pages->params['start'], | 
| 34 | 34 | 'limit' => $pages->params['limit'], | 
| 35 | 35 | ]); | 
| 36 | -foreach ($histories as $history) {
 | |
| 36 | +foreach ($histories as $history) { | |
| 37 | 37 | $amount = $history->amount; | 
| 38 | 38 | $table->addRow([ | 
| 39 | 39 | $history->id, | 
| @@ -2,7 +2,7 @@ | ||
| 2 | 2 | <?php | 
| 3 | 3 | $blocked = App::$cur->money->getUserBlocks(); | 
| 4 | 4 | $wallets = App::$cur->money->getUserWallets(); | 
| 5 | -foreach ($wallets as $wallet) {
 | |
| 5 | +foreach ($wallets as $wallet) { | |
| 6 | 6 | ?> | 
| 7 | 7 | <b><?= $wallet->showAmount(); ?></b> <?= $wallet->currency->acronym(); ?><br/> | 
| 8 | 8 | <?php |