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

Fix #2687

Browse Source
This commit is contained in:
James Cole
2019-10-05 05:18:40 +02:00
parent 67f9d23714
commit 9b001f7c15
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Repositories/Budget/BudgetLimitRepository.php
View File

@@ -69,12 +69,15 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
public function budgeted(Carbon $start, Carbon $end, TransactionCurrency $currency, ?Collection $budgets = null): string
{
$query = BudgetLimit
::where('start_date', $start->format('Y-m-d 00:00:00'))
->where('end_date', $end->format('Y-m-d 00:00:00'))
->where('transaction_currency_id', $currency->id);
::leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
->where('budget_limits.start_date', $start->format('Y-m-d 00:00:00'))
->where('budget_limits.end_date', $end->format('Y-m-d 00:00:00'))
->where('budget_limits.transaction_currency_id', $currency->id)
->where('budgets.user_id', $this->user->id);
if (null !== $budgets && $budgets->count() > 0) {
$query->whereIn('budget_id', $budgets->pluck('id')->toArray());
$query->whereIn('budget_limits.budget_id', $budgets->pluck('id')->toArray());
}
$set = $query->get(['budget_limits.*']);
$result = '0';
/** @var BudgetLimit $budgetLimit */