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

give balance as float value in GDD (not lpnger GDD cent)

Browse Source
This commit is contained in:
einhornimmond 2021-05-03 11:51:27 +02:00
parent 1dad6dff06
commit b88a7dd029
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
community_server/src/Controller/AppRequestsController.php
View File

@ -286,7 +286,7 @@ class AppRequestsController extends AppController
$now = new FrozenTime(); $now = new FrozenTime();
return $this->returnJson([ return $this->returnJson([
'state' => 'success', 'state' => 'success',
'balance' => $state_balance->amount, 'balance' => $state_balance->amount_float,
'decay' => $state_balance->partDecay($now), 'decay' => $state_balance->partDecay($now),
'decay_date' => $now 'decay_date' => $now
]); ]);

8
community_server/src/Model/Entity/StateBalance.php
View File

@ -34,7 +34,7 @@ class StateBalance extends Entity
'state_user' => true 'state_user' => true
]; ];
protected $_virtual = ['decay']; protected $_virtual = ['decay','amount_float'];
private function convertToTimestamp($dateOrTime) private function convertToTimestamp($dateOrTime)
{ {
@ -67,6 +67,12 @@ class StateBalance extends Entity
return intval($this->amount * pow(0.99999997802044727, $decay_duration)); return intval($this->amount * pow(0.99999997802044727, $decay_duration));
} }
protected function _getAmountFloat()
{
return floatval($this->amount) / 10000.0;
}
public function partDecay($target_date) public function partDecay($target_date)
{ {
$decay_duration = intval($this->convertToTimestamp($target_date) - $this->convertToTimestamp($this->record_date)); $decay_duration = intval($this->convertToTimestamp($target_date) - $this->convertToTimestamp($this->record_date));

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

@ -188,7 +188,7 @@ class TransactionsTable extends Table
//echo "prev balance: " . $prev->balance . ", diff_amount: $diff_amount, summe: " . (-intval($prev->balance - $diff_amount)) . "<br>"; //echo "prev balance: " . $prev->balance . ", diff_amount: $diff_amount, summe: " . (-intval($prev->balance - $diff_amount)) . "<br>";
$final_transactions[] = [ $final_transactions[] = [
'type' => 'decay', 'type' => 'decay',
'balance' => -intval($prev->balance - $diff_amount), 'balance' => floatval(-intval($prev->balance - $diff_amount)) / 10000.0,
'decay_duration' => $interval->format('%a days, %H hours, %I minutes, %S seconds'), 'decay_duration' => $interval->format('%a days, %H hours, %I minutes, %S seconds'),
'memo' => '' 'memo' => ''
]; ];
@ -212,7 +212,7 @@ class TransactionsTable extends Table
'type' => 'creation', 'type' => 'creation',
'transaction_id' => $transaction->id, 'transaction_id' => $transaction->id,
'date' => $creation->target_date, 'date' => $creation->target_date,
'balance' => $creation->amount, 'balance' => $creation->amount_float,
'memo' => $transaction->memo 'memo' => $transaction->memo
]; ];
} else if($su_transaction->transaction_type_id == 2) { // transfer or send coins } else if($su_transaction->transaction_type_id == 2) { // transfer or send coins
@ -245,7 +245,7 @@ class TransactionsTable extends Table
'type' => $type, 'type' => $type,
'transaction_id' => $sendCoins->transaction_id, 'transaction_id' => $sendCoins->transaction_id,
'date' => $transaction->received, 'date' => $transaction->received,
'balance' => $sendCoins->amount, 'balance' => $sendCoins->amount_float,
'memo' => $transaction->memo, 'memo' => $transaction->memo,
'pubkey' => $other_user_public 'pubkey' => $other_user_public
]; ];
@ -256,7 +256,7 @@ class TransactionsTable extends Table
$state_balance->record_date = $su_transaction->balance_date; $state_balance->record_date = $su_transaction->balance_date;
$final_transactions[] = [ $final_transactions[] = [
'type' => 'decay', 'type' => 'decay',
'balance' => -intval($su_transaction->balance - $state_balance->decay), 'balance' => floatval(-intval($su_transaction->balance - $state_balance->decay)) / 10000,
'decay_duration' => $su_transaction->balance_date->timeAgoInWords(), 'decay_duration' => $su_transaction->balance_date->timeAgoInWords(),
'memo' => '' 'memo' => ''
]; ];