Merge pull request #2444 from GeoffreyFrogeye/availablebudgets

Fix wrong indexes in BudgetRepository
This commit is contained in:
James Cole 2019-08-22 18:03:34 +02:00 committed by GitHub
commit 4b1d66bcf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -931,9 +931,9 @@ class BudgetRepository implements BudgetRepositoryInterface
public function updateAvailableBudget(AvailableBudget $availableBudget, array $data): AvailableBudget public function updateAvailableBudget(AvailableBudget $availableBudget, array $data): AvailableBudget
{ {
$existing = $this->user->availableBudgets() $existing = $this->user->availableBudgets()
->where('transaction_currency_id', $data['transaction_currency_id']) ->where('transaction_currency_id', $data['currency_id'])
->where('start_date', $data['start_date']->format('Y-m-d 00:00:00')) ->where('start_date', $data['start']->format('Y-m-d 00:00:00'))
->where('end_date', $data['end_date']->format('Y-m-d 00:00:00')) ->where('end_date', $data['end']->format('Y-m-d 00:00:00'))
->where('id', '!=', $availableBudget->id) ->where('id', '!=', $availableBudget->id)
->first(); ->first();
@ -941,8 +941,8 @@ class BudgetRepository implements BudgetRepositoryInterface
throw new FireflyException(sprintf('An entry already exists for these parameters: available budget object with ID #%d', $existing->id)); throw new FireflyException(sprintf('An entry already exists for these parameters: available budget object with ID #%d', $existing->id));
} }
$availableBudget->transaction_currency_id = $data['currency_id']; $availableBudget->transaction_currency_id = $data['currency_id'];
$availableBudget->start_date = $data['start_date']; $availableBudget->start_date = $data['start'];
$availableBudget->end_date = $data['end_date']; $availableBudget->end_date = $data['end'];
$availableBudget->amount = $data['amount']; $availableBudget->amount = $data['amount'];
$availableBudget->save(); $availableBudget->save();