@@ -27,7 +27,8 @@ discard block |
||
27 | 27 | //walk know pathes |
28 | 28 | foreach ($this->map->paths(['where' => ['path', $this->curPath]]) as $path) { |
29 | 29 | if (isset($this->data[$path->item])) { |
30 | - if ($path->type == 'container') { //create walker for container |
|
30 | + if ($path->type == 'container') { |
|
31 | +//create walker for container |
|
31 | 32 | $walker = new Walker(); |
32 | 33 | $walker->migration = $this->migration; |
33 | 34 | $walker->map = $this->map; |
@@ -37,7 +38,8 @@ discard block |
||
37 | 38 | $walker->mapPathParent = $this->mapPath; |
38 | 39 | $walker->migtarionLog = $this->migtarionLog; |
39 | 40 | $walker->walk(); |
40 | - } elseif ($path->type == 'object') { //start parse path data |
|
41 | + } elseif ($path->type == 'object') { |
|
42 | +//start parse path data |
|
41 | 43 | $this->startObjectParse($path->object_id, $this->data[$path->item]); |
42 | 44 | } |
43 | 45 | } |
@@ -54,9 +56,11 @@ discard block |
||
54 | 56 | ['code', $key], |
55 | 57 | ['migration_id', $this->migration->id] |
56 | 58 | ]); |
57 | - if ($object) { //parse as object |
|
59 | + if ($object) { |
|
60 | +//parse as object |
|
58 | 61 | $this->startObjectParse($object, $data); |
59 | - } else { //create new map path for configure unknown path |
|
62 | + } else { |
|
63 | +//create new map path for configure unknown path |
|
60 | 64 | $this->mapPath = new Migration\Map\Path(); |
61 | 65 | $this->mapPath->parent_id = $this->mapPathParent ? $this->mapPathParent->id : 0; |
62 | 66 | $this->mapPath->path = $this->curPath; |
@@ -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,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, |
@@ -9,7 +9,7 @@ |
||
9 | 9 | } |
10 | 10 | |
11 | 11 | $widgetSize = !empty($section['size']) ? $section['size'] : 1; |
12 | - $rowSum+=$widgetSize; |
|
12 | + $rowSum += $widgetSize; |
|
13 | 13 | ?> |
14 | 14 | <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $section['widget'](); ?></div> |
15 | 15 | <?php |
@@ -18,11 +18,13 @@ |
||
18 | 18 | <ul class="item-options"> |
19 | 19 | <?php |
20 | 20 | foreach ($item->options as $param) { |
21 | - if (!$param->item_option_view || !$param->value) |
|
22 | - continue; |
|
21 | + if (!$param->item_option_view || !$param->value) { |
|
22 | + continue; |
|
23 | + } |
|
23 | 24 | if ($param->item_option_type == 'select') { |
24 | - if (empty($param->option->items[$param->value])) |
|
25 | - continue; |
|
25 | + if (empty($param->option->items[$param->value])) { |
|
26 | + continue; |
|
27 | + } |
|
26 | 28 | $value = $param->option->items[$param->value]->value; |
27 | 29 | } else { |
28 | 30 | $value = $param->value; |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function($step = NULL, $params = []) { |
|
3 | +return function($step = null, $params = []) { |
|
4 | 4 | $options = ['max_height' => 1200, 'max_width' => 1200]; |
5 | 5 | $types = [ |
6 | 6 | [ |
@@ -88,8 +88,9 @@ |
||
88 | 88 | $config = static::getConfig(); |
89 | 89 | $merchantCurrency = static::getMerchantCurrency($currency); |
90 | 90 | |
91 | - if (!$description) |
|
92 | - $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME); |
|
91 | + if (!$description) { |
|
92 | + $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME); |
|
93 | + } |
|
93 | 94 | |
94 | 95 | //Секретный ключ интернет-магазина |
95 | 96 | $key = $config['secret']; |
@@ -164,7 +164,7 @@ |
||
164 | 164 | return false; |
165 | 165 | } |
166 | 166 | $reward->checkBlocked(); |
167 | - $reward_count = \Money\Reward\Recive::getCount([ 'where' => [ 'reward_id', $reward_id]]); |
|
167 | + $reward_count = \Money\Reward\Recive::getCount(['where' => ['reward_id', $reward_id]]); |
|
168 | 168 | if ($reward_count >= $reward->quantity && $reward->quantity) { |
169 | 169 | return false; |
170 | 170 | } |