IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into save-locale

Browse Source
This commit is contained in:
Moriz Wahl 2021-05-17 21:36:46 +02:00
commit 373dee3410
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
community_server/src/Model/Table/TransactionsTable.php
View File

@ -275,6 +275,7 @@ class TransactionsTable extends Table
'type' => 'decay',
'balance' => $balance,
'decay_duration' => $duration,
'last_decay' => true,
'memo' => ''
];
}

6
community_server/src/Template/AppRequests/list_transactions.ctp
View File

@ -11,7 +11,11 @@ $body['decay'] = $this->element('centToFloat', ['cent' => $body['decay'], 'preci
$body['gdtSum'] = $this->element('centToFloat', ['cent' => $body['gdtSum'], 'precision' => 2]);
foreach($body['transactions'] as $i => $transaction) {
$body['transactions'][$i]['balance'] = $this->element('centToFloat', ['cent' => $transaction['balance'], 'precision' => 4]);
$useCeil = false;
if(isset($transaction['last_decay']) && $transaction['last_decay']) {
$useCeil = true;
}
$body['transactions'][$i]['balance'] = $this->element('centToFloat', ['cent' => $transaction['balance'], 'precision' => 4, 'useCeil' => $useCeil]);
if(isset($transaction['creation_amount'])) {
$body['transactions'][$i]['creation_amount'] = $this->element('centToFloat', ['cent' => $transaction['creation_amount'], 'precision' => 4]);
}

6
community_server/src/Template/Element/centToFloat.ctp
View File

@ -9,7 +9,11 @@
$cut_places = $precision - 2;
$transformAmount = $cent;
if($cut_places > 0) {
$transformAmount = floor($cent / pow(10, $cut_places));
if(isset($useCeil) && $useCeil) {
$transformAmount = ceil($cent / pow(10, $cut_places));
} else {
$transformAmount = floor($cent / pow(10, $cut_places));
}
}
if($cut_places < 0) {
$cut_places = 0;