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 pull request #652 from gradido/community_fix_644

Browse Source 
fix display error with creation
This commit is contained in:
einhornimmond 2021-07-21 16:32:42 +02:00 committed by GitHub
commit 0ce57fd7a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,13 +236,12 @@ class TransactionsTable extends Table
if($su_transaction->transaction_type_id == 1) { // creation if($su_transaction->transaction_type_id == 1) { // creation
$creation = $transaction->transaction_creation; $creation = $transaction->transaction_creation;
$balance = $stateBalancesTable->calculateDecay($creation->amount, $creation->target_date, $transaction->received);
$final_transaction['name'] = 'Gradido Akademie'; $final_transaction['name'] = 'Gradido Akademie';
$final_transaction['type'] = 'creation'; $final_transaction['type'] = 'creation';
$final_transaction['target_date'] = $creation->target_date; $final_transaction['target_date'] = $creation->target_date;
$final_transaction['creation_amount'] = $creation->amount; //$final_transaction['creation_amount'] = $creation->amount;
$final_transaction['balance'] = $balance; $final_transaction['balance'] = $creation->amount;
} else if($su_transaction->transaction_type_id == 2) { // transfer or send coins } else if($su_transaction->transaction_type_id == 2) { // transfer or send coins
$sendCoins = $transaction->transaction_send_coin; $sendCoins = $transaction->transaction_send_coin;

1
community_server/tests/TestCase/Controller/AppRequestControllerTest.php
View File

@ -168,7 +168,6 @@ class AppRequestControllerTest extends TestCase
"name": "Gradido Akademie", "name": "Gradido Akademie",
"type": "creation", "type": "creation",
"target_date": "2021-01-01T00:00:00+00:00", "target_date": "2021-01-01T00:00:00+00:00",
"creation_amount": 10000000,
"balance": 10000000 "balance": 10000000
}, },
{ {