kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fixes #346

Browse Source
This commit is contained in:
James Cole
2016-10-06 05:26:38 +02:00
parent 5540697dbd
commit 9920504232
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@ class BillRepository implements BillRepositoryInterface
->get(
[
'bills.*',
DB::raw('((`bills`.`amount_min` + `bills`.`amount_max`) / 2) as `expectedAmount`'),
DB::raw('((bills.amount_min + bills.amount_max) / 2) AS expectedAmount'),
]
)->sortBy('name');
@@ -141,7 +141,7 @@ class BillRepository implements BillRepositoryInterface
[
'transaction_journals.bill_id',
'transaction_journals.id',
DB::raw('SUM(`transactions`.`amount`) as `journalAmount`'),
DB::raw('SUM(transactions.amount) AS journalAmount'),
]
);
@@ -247,7 +247,7 @@ 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`')]);
->first([DB::raw('SUM(transactions.amount) AS sum_amount')]);
$sumAmount = $paid->sum_amount ?? '0';
$amount = bcadd($amount, $sumAmount);
}
@@ -282,7 +282,7 @@ 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`')]);
->first([DB::raw('SUM(transactions.amount) AS sum_amount')]);
$sumAmount = $paid->sum_amount ?? '0';
$paidBill = bcadd($sumAmount, $paidBill);
}