@@ -88,7 +88,7 @@ |
||
88 | 88 | } else { |
89 | 89 | $wallets[$level->params['currency_id']->value]->diff($amount, $text); |
90 | 90 | } |
91 | - \App::$cur->users->AddUserActivity($user->id, 4, $text . '<br />' . $amount.' '.$wallets[$level->params['currency_id']->value]->currency->acronym()); |
|
91 | + \App::$cur->users->AddUserActivity($user->id, 4, $text . '<br />' . $amount . ' ' . $wallets[$level->params['currency_id']->value]->currency->acronym()); |
|
92 | 92 | } |
93 | 93 | return $amount; |
94 | 94 | } |
@@ -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 |