From c05a942862151efe86463dab95027b4d92386300 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 1 Apr 2016 05:36:29 +0200 Subject: [PATCH] This fixes a null pointer exception. [skip ci] --- app/Repositories/Bill/BillRepository.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 7c5bc3da07..fcda2b7703 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -252,7 +252,7 @@ class BillRepository implements BillRepositoryInterface foreach ($creditCards as $creditCard) { if ($creditCard->balance == 0) { // find a transfer TO the credit card which should account for anything paid. If not, the CC is not yet used. - $set = TransactionJournal::whereIn( + $set = TransactionJournal::whereIn( 'transaction_journals.id', function (Builder $q) use ($creditCard, $start, $end) { $q->select('transaction_journals.id') ->from('transactions') @@ -270,8 +270,8 @@ class BillRepository implements BillRepositoryInterface $join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where('transactions.amount', '>', 0); } )->first([DB::raw('SUM(`transactions`.`amount`) as `sum_amount`')]); - - $amount = bcadd($amount, $set->sum_amount); + $sumAmount = $set->sum_amount ?? '0'; + $amount = bcadd($amount, $sumAmount); } else { $amount = bcadd($amount, $creditCard->balance); }