From b032210a3312f8ebed49d1b3275fa3ed4ecd7e50 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 21 Oct 2023 07:45:28 +0200 Subject: [PATCH] Small changes to create transaction form --- .../Transaction/CreateController.php | 2 +- .../assets/v2/pages/transactions/create.js | 9 ++++ .../views/v2/transactions/create.blade.php | 54 +++++++++++++------ 3 files changed, 48 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.php index 9aa1d0d39e..164454e996 100644 --- a/app/Http/Controllers/Transaction/CreateController.php +++ b/app/Http/Controllers/Transaction/CreateController.php @@ -92,7 +92,7 @@ class CreateController extends Controller if('edit' === $request->get('redirect')) { return response()->json(['redirect' => route('transactions.edit', [$newGroup->id])]); } - + return response()->json(['redirect' => route('transactions.show', [$newGroup->id])]); } } diff --git a/resources/assets/v2/pages/transactions/create.js b/resources/assets/v2/pages/transactions/create.js index 7c6b800727..a6288f9df8 100644 --- a/resources/assets/v2/pages/transactions/create.js +++ b/resources/assets/v2/pages/transactions/create.js @@ -44,6 +44,10 @@ let transactions = function () { showSuccessMessage: false, showErrorMessage: false, entries: [], + loadingCurrencies: true, + enabledCurrencies: [], + nativeCurrencies: [], + foreignCurrencies: [], filters: { source: [], destination: [], @@ -123,6 +127,9 @@ let transactions = function () { }; console.log('Changed destination account into a known ' + item.type.toLowerCase()); }, + loadCurrencies() { + console.log('Loading user currencies.'); + }, changeSourceAccount(item, ac) { if (typeof item === 'undefined') { const index = parseInt(ac._searchInput.attributes['data-index'].value); @@ -161,6 +168,7 @@ let transactions = function () { addedSplit() { console.log('addedSplit'); + // TODO improve code location Autocomplete.init("input.ac-source", { server: urls.account, serverParams: { @@ -229,6 +237,7 @@ let transactions = function () { }); }); + this.loadCurrencies(); // source can never be expense account this.filters.source = ['Asset account', 'Loan', 'Debt', 'Mortgage', 'Revenue account']; diff --git a/resources/views/v2/transactions/create.blade.php b/resources/views/v2/transactions/create.blade.php index c237d7dbb6..561b194413 100644 --- a/resources/views/v2/transactions/create.blade.php +++ b/resources/views/v2/transactions/create.blade.php @@ -37,7 +37,7 @@ :data-bs-target="'#split-'+index+'-pane'" type="button" role="tab" :aria-controls="'split-'+index+'-pane'" - aria-selected="true">Split # + aria-selected="true">{{ __('firefly.single_split') }} # @@ -49,7 +49,7 @@ @@ -72,45 +72,52 @@
-

{{ __('firefly.basic_journal_information') }}

+

{{ __('firefly.basic_journal_information') }}

-
+ placeholder="{{ __('firefly.description') }}">
-
-
@@ -136,10 +143,25 @@
- -
+
+ + +
+