kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Catch null pointer

Browse Source
This commit is contained in:
James Cole
2020-11-11 19:14:05 +01:00
parent ae9a9c1647
commit 80718baa16
1 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Repositories/Bill/BillRepository.php
View File

@@ -193,6 +193,7 @@ class BillRepository implements BillRepositoryInterface
$fields = ['bills.id', 'bills.created_at', 'bills.updated_at', 'bills.deleted_at', 'bills.user_id', 'bills.name', 'bills.amount_min', $fields = ['bills.id', 'bills.created_at', 'bills.updated_at', 'bills.deleted_at', 'bills.user_id', 'bills.name', 'bills.amount_min',
'bills.amount_max', 'bills.date', 'bills.transaction_currency_id', 'bills.repeat_freq', 'bills.skip', 'bills.automatch', 'bills.active',]; 'bills.amount_max', 'bills.date', 'bills.transaction_currency_id', 'bills.repeat_freq', 'bills.skip', 'bills.automatch', 'bills.active',];
$ids = $accounts->pluck('id')->toArray(); $ids = $accounts->pluck('id')->toArray();
return $this->user->bills() return $this->user->bills()
->leftJoin( ->leftJoin(
'transaction_journals', 'transaction_journals',
@@ -411,6 +412,7 @@ class BillRepository implements BillRepositoryInterface
foreach ($result as $currencyId => $arr) { foreach ($result as $currencyId => $arr) {
$result[$currencyId]['avg'] = bcdiv($arr['sum'], (string)$arr['count']); $result[$currencyId]['avg'] = bcdiv($arr['sum'], (string)$arr['count']);
} }
return $result; return $result;
} }
@@ -438,6 +440,7 @@ class BillRepository implements BillRepositoryInterface
public function getPaidDatesInRange(Bill $bill, Carbon $start, Carbon $end): Collection public function getPaidDatesInRange(Bill $bill, Carbon $start, Carbon $end): Collection
{ {
Log::debug('Now in getPaidDatesInRange()'); Log::debug('Now in getPaidDatesInRange()');
return $bill->transactionJournals() return $bill->transactionJournals()
->before($end)->after($start)->get( ->before($end)->after($start)->get(
[ [
@@ -560,6 +563,9 @@ class BillRepository implements BillRepositoryInterface
foreach ($journals as $journal) { foreach ($journals as $journal) {
/** @var Transaction $transaction */ /** @var Transaction $transaction */
$transaction = $journal->transactions()->where('amount', '<', 0)->first(); $transaction = $journal->transactions()->where('amount', '<', 0)->first();
if (null === $transaction) {
continue;
}
$currencyId = (int)$journal->transaction_currency_id; $currencyId = (int)$journal->transaction_currency_id;
$currency = $journal->transactionCurrency; $currency = $journal->transactionCurrency;
$result[$currencyId] = $result[$currencyId] ?? [ $result[$currencyId] = $result[$currencyId] ?? [
@@ -583,6 +589,7 @@ class BillRepository implements BillRepositoryInterface
foreach ($result as $currencyId => $arr) { foreach ($result as $currencyId => $arr) {
$result[$currencyId]['avg'] = bcdiv($arr['sum'], (string)$arr['count']); $result[$currencyId]['avg'] = bcdiv($arr['sum'], (string)$arr['count']);
} }
return $result; return $result;
} }