From 8b808c97fa0acc362a93446c1adc8a55a094cec8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 14 Dec 2020 07:58:18 +1100 Subject: [PATCH] Fixes for expense currency not setting default --- app/Http/Requests/Expense/StoreExpenseRequest.php | 4 ++-- app/Repositories/ExpenseRepository.php | 1 + app/Transformers/ExpenseTransformer.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Requests/Expense/StoreExpenseRequest.php b/app/Http/Requests/Expense/StoreExpenseRequest.php index e2b5aa3ff2..544fb576c3 100644 --- a/app/Http/Requests/Expense/StoreExpenseRequest.php +++ b/app/Http/Requests/Expense/StoreExpenseRequest.php @@ -58,8 +58,8 @@ class StoreExpenseRequest extends Request $input['category_id'] = $this->decodePrimaryKey($input['category_id']); } - if (! array_key_exists('currency_id', $input)) { - $input['currency_id'] = auth()->user()->company()->settings->currency_id; + if (! array_key_exists('currency_id', $input) || strlen($input['currency_id']) == 0) { + $input['currency_id'] = (string)auth()->user()->company()->settings->currency_id; } $this->replace($input); diff --git a/app/Repositories/ExpenseRepository.php b/app/Repositories/ExpenseRepository.php index e08a7b88cc..e5058c21ba 100644 --- a/app/Repositories/ExpenseRepository.php +++ b/app/Repositories/ExpenseRepository.php @@ -33,6 +33,7 @@ class ExpenseRepository extends BaseRepository */ public function save(array $data, Expense $expense) : ?Expense { + $expense->fill($data); $expense->number = empty($expense->number) ? $this->getNextExpenseNumber($expense) : $expense->number; $expense->save(); diff --git a/app/Transformers/ExpenseTransformer.php b/app/Transformers/ExpenseTransformer.php index 2760fe9c00..b7f3c54748 100644 --- a/app/Transformers/ExpenseTransformer.php +++ b/app/Transformers/ExpenseTransformer.php @@ -59,7 +59,7 @@ class ExpenseTransformer extends EntityTransformer 'bank_id' => (string) $expense->bank_id ?: '', 'invoice_currency_id' => (string) $expense->invoice_currency_id ?: '', 'expense_currency_id' => '', //todo remove redundant in 5.0.25 - 'currency_id' => (string) $expense->expense_currency_id ?: '', + 'currency_id' => (string) $expense->currency_id ?: '', 'category_id' => $this->encodePrimaryKey($expense->category_id), 'payment_type_id' => (string) $expense->payment_type_id ?: '', 'recurring_expense_id' => (string) $expense->recurring_expense_id ?: '',