@@ -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'] = []; |
@@ -13,20 +13,22 @@ |
||
| 13 | 13 | static function genArray($data, $level = 0) |
| 14 | 14 | { |
| 15 | 15 | $return = ''; |
| 16 | - if ($level == 0) |
|
| 17 | - $return = "["; |
|
| 16 | + if ($level == 0) { |
|
| 17 | + $return = "["; |
|
| 18 | + } |
|
| 18 | 19 | foreach ($data as $key => $item) { |
| 19 | 20 | $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "'{$key}' => "; |
| 20 | - if (!is_array($item)) |
|
| 21 | - $return .= "'{$item}',"; |
|
| 22 | - else { |
|
| 21 | + if (!is_array($item)) { |
|
| 22 | + $return .= "'{$item}',"; |
|
| 23 | + } else { |
|
| 23 | 24 | $return .= "["; |
| 24 | 25 | $return .= rtrim(self::genArray($item, $level + 1), ','); |
| 25 | 26 | $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "],"; |
| 26 | 27 | } |
| 27 | 28 | } |
| 28 | - if ($level == 0) |
|
| 29 | - $return = rtrim($return, ',') . "\n];"; |
|
| 29 | + if ($level == 0) { |
|
| 30 | + $return = rtrim($return, ',') . "\n];"; |
|
| 31 | + } |
|
| 30 | 32 | |
| 31 | 33 | return $return; |
| 32 | 34 | } |
@@ -189,17 +189,20 @@ |
||
| 189 | 189 | |
| 190 | 190 | public function get($idn = false, $ltype = 'id') |
| 191 | 191 | { |
| 192 | - if (!$idn) |
|
| 193 | - return false; |
|
| 192 | + if (!$idn) { |
|
| 193 | + return false; |
|
| 194 | + } |
|
| 194 | 195 | |
| 195 | - if (is_numeric($idn) && $ltype != 'login') |
|
| 196 | - $user = Users\User::get($idn, 'id'); |
|
| 197 | - elseif ($ltype == 'login') |
|
| 198 | - $user = Users\User::get($idn, 'login'); |
|
| 199 | - else |
|
| 200 | - $user = Users\User::get($idn, 'mail'); |
|
| 201 | - if (!$user) |
|
| 202 | - return []; |
|
| 196 | + if (is_numeric($idn) && $ltype != 'login') { |
|
| 197 | + $user = Users\User::get($idn, 'id'); |
|
| 198 | + } elseif ($ltype == 'login') { |
|
| 199 | + $user = Users\User::get($idn, 'login'); |
|
| 200 | + } else { |
|
| 201 | + $user = Users\User::get($idn, 'mail'); |
|
| 202 | + } |
|
| 203 | + if (!$user) { |
|
| 204 | + return []; |
|
| 205 | + } |
|
| 203 | 206 | |
| 204 | 207 | return $user; |
| 205 | 208 | } |
@@ -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,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 |
@@ -1,13 +1,13 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if (!empty($params[0])) {
|
|
| 2 | +if (!empty($params[0])) { |
|
| 3 | 3 | $form_id = $params[0]; |
| 4 | 4 | } |
| 5 | -if (empty($form_id)) {
|
|
| 5 | +if (empty($form_id)) { |
|
| 6 | 6 | echo('form not found');
|
| 7 | 7 | return; |
| 8 | 8 | } |
| 9 | 9 | $userForm = \UserForms\Form::get((int) $form_id); |
| 10 | -if (!$userForm) {
|
|
| 10 | +if (!$userForm) { |
|
| 11 | 11 | echo('form not found');
|
| 12 | 12 | return; |
| 13 | 13 | } |
@@ -15,10 +15,10 @@ discard block |
||
| 15 | 15 | $form->begin(); |
| 16 | 16 | ?> |
| 17 | 17 | <?php |
| 18 | -if ($userForm->description) {
|
|
| 18 | +if ($userForm->description) { |
|
| 19 | 19 | echo "<p class = 'text-center'>{$userForm->description}</p>";
|
| 20 | 20 | } |
| 21 | -foreach ($userForm->inputs(['order' => ['weight']]) as $input) {
|
|
| 21 | +foreach ($userForm->inputs(['order' => ['weight']]) as $input) { |
|
| 22 | 22 | $form->input($input->type, 'UserForms[' . (int) $form_id . '][input' . $input->id . ']', $input->label, ['required' => $input->required]); |
| 23 | 23 | } |
| 24 | 24 | ?> |
@@ -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 ? $history->amount : $history->new - $history->old; |
| 38 | 38 | $table->addRow([ |
| 39 | 39 | $history->id, |
@@ -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 ? $history->amount : $history->new - $history->old; |
| 38 | 38 | $table->addRow([ |
| 39 | 39 | $history->id, |
@@ -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()); |