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 #640 from gradido/community_fix_639

Browse Source 
check for null date
This commit is contained in:
einhornimmond 2021-07-15 14:05:23 +02:00 committed by GitHub
commit 035cd97acf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,11 @@ class TransactionsTable extends Table
if($decay_start_transaction->count()) {
$decay_start_transaction_id = $decay_start_transaction->first()->id;
}
$decay_start_time = $stateBalancesTable->getDecayStartDateCached()->getTimestamp();
$decay_start_date = $stateBalancesTable->getDecayStartDateCached();
$decay_start_time = 0;
if($decay_start_date) {
$decay_start_time = $decay_start_date->getTimestamp();
}
foreach($stateUserTransactions as $i => $su_transaction)
{
@ -206,7 +210,7 @@ class TransactionsTable extends Table
'decay_start' => $calculated_decay['start_date'],
'decay_end' => $calculated_decay['end_date']
];
if($prev->transaction_id < $decay_start_transaction_id &&
if($decay_start_time && $prev->transaction_id < $decay_start_transaction_id &&
$current->transaction_id > $decay_start_transaction_id) {
$final_transaction['decay']['decay_start_block'] = $decay_start_time;
}