Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-04 22:14:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for expense currency not setting default

Browse Source
This commit is contained in:
David Bomba 2020-12-14 07:58:18 +11:00
parent 2c4aaa2131
commit 8b808c97fa
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requests/Expense/StoreExpenseRequest.php
View File

@ -58,8 +58,8 @@ class StoreExpenseRequest extends Request
$input['category_id'] = $this->decodePrimaryKey($input['category_id']); $input['category_id'] = $this->decodePrimaryKey($input['category_id']);
} }
if (! array_key_exists('currency_id', $input)) { if (! array_key_exists('currency_id', $input) || strlen($input['currency_id']) == 0) {
$input['currency_id'] = auth()->user()->company()->settings->currency_id; $input['currency_id'] = (string)auth()->user()->company()->settings->currency_id;
} }
$this->replace($input); $this->replace($input);

1
app/Repositories/ExpenseRepository.php
View File

@ -33,6 +33,7 @@ class ExpenseRepository extends BaseRepository
*/ */
public function save(array $data, Expense $expense) : ?Expense public function save(array $data, Expense $expense) : ?Expense
{ {
$expense->fill($data); $expense->fill($data);
$expense->number = empty($expense->number) ? $this->getNextExpenseNumber($expense) : $expense->number; $expense->number = empty($expense->number) ? $this->getNextExpenseNumber($expense) : $expense->number;
$expense->save(); $expense->save();

2
app/Transformers/ExpenseTransformer.php
View File

@ -59,7 +59,7 @@ class ExpenseTransformer extends EntityTransformer
'bank_id' => (string) $expense->bank_id ?: '', 'bank_id' => (string) $expense->bank_id ?: '',
'invoice_currency_id' => (string) $expense->invoice_currency_id ?: '', 'invoice_currency_id' => (string) $expense->invoice_currency_id ?: '',
'expense_currency_id' => '', //todo remove redundant in 5.0.25 '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), 'category_id' => $this->encodePrimaryKey($expense->category_id),
'payment_type_id' => (string) $expense->payment_type_id ?: '', 'payment_type_id' => (string) $expense->payment_type_id ?: '',
'recurring_expense_id' => (string) $expense->recurring_expense_id ?: '', 'recurring_expense_id' => (string) $expense->recurring_expense_id ?: '',