From edab602bb7401fa90ebeafc06c82547b2d460a22 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 9 Feb 2025 05:26:37 +0100 Subject: [PATCH] Fix #9784 --- .../Autocomplete/AccountController.php | 5 + resources/assets/v1/mix-manifest.json | 8 + .../src/components/exchange-rates/Rates.vue | 2 +- .../components/transactions/AccountSelect.vue | 9 +- .../transactions/CreateTransaction.vue | 12 + .../transactions/EditTransaction.vue | 43 +- .../transactions/ForeignAmountSelect.vue | 378 +++++++++--------- 7 files changed, 255 insertions(+), 202 deletions(-) diff --git a/app/Api/V1/Controllers/Autocomplete/AccountController.php b/app/Api/V1/Controllers/Autocomplete/AccountController.php index 295b8456f2..6474d79c8b 100644 --- a/app/Api/V1/Controllers/Autocomplete/AccountController.php +++ b/app/Api/V1/Controllers/Autocomplete/AccountController.php @@ -113,6 +113,11 @@ class AccountController extends Controller 'currency_code' => $useCurrency->code, 'currency_symbol' => $useCurrency->symbol, 'currency_decimal_places' => $useCurrency->decimal_places, + 'account_currency_id' => (string) $currency->id, + 'account_currency_name' => $currency->name, + 'account_currency_code' => $currency->code, + 'account_currency_symbol' => $currency->symbol, + 'account_currency_decimal_places' => $currency->decimal_places, ]; } diff --git a/resources/assets/v1/mix-manifest.json b/resources/assets/v1/mix-manifest.json index ff2938f703..9f22a4fe0f 100644 --- a/resources/assets/v1/mix-manifest.json +++ b/resources/assets/v1/mix-manifest.json @@ -20,8 +20,12 @@ "/public/v1/js/app.js.LICENSE.txt": "/public/v1/js/app.js.LICENSE.txt", "/public/v1/js/app_vue.js": "/public/v1/js/app_vue.js", "/public/v1/js/app_vue.js.LICENSE.txt": "/public/v1/js/app_vue.js.LICENSE.txt", + "/public/v1/js/create.js": "/public/v1/js/create.js", + "/public/v1/js/create.js.LICENSE.txt": "/public/v1/js/create.js.LICENSE.txt", "/public/v1/js/create_transaction.js": "/public/v1/js/create_transaction.js", "/public/v1/js/create_transaction.js.LICENSE.txt": "/public/v1/js/create_transaction.js.LICENSE.txt", + "/public/v1/js/edit.js": "/public/v1/js/edit.js", + "/public/v1/js/edit.js.LICENSE.txt": "/public/v1/js/edit.js.LICENSE.txt", "/public/v1/js/edit_transaction.js": "/public/v1/js/edit_transaction.js", "/public/v1/js/edit_transaction.js.LICENSE.txt": "/public/v1/js/edit_transaction.js.LICENSE.txt", "/public/v1/js/exchange-rates/index.js": "/public/v1/js/exchange-rates/index.js", @@ -96,6 +100,8 @@ "/public/v1/js/ff/transactions/mass/edit-bulk.js": "/public/v1/js/ff/transactions/mass/edit-bulk.js", "/public/v1/js/ff/transactions/mass/edit.js": "/public/v1/js/ff/transactions/mass/edit.js", "/public/v1/js/ff/transactions/show.js": "/public/v1/js/ff/transactions/show.js", + "/public/v1/js/index.js": "/public/v1/js/index.js", + "/public/v1/js/index.js.LICENSE.txt": "/public/v1/js/index.js.LICENSE.txt", "/public/v1/js/lib/Chart.bundle.min.js": "/public/v1/js/lib/Chart.bundle.min.js", "/public/v1/js/lib/accounting.min.js": "/public/v1/js/lib/accounting.min.js", "/public/v1/js/lib/bootstrap-multiselect.js": "/public/v1/js/lib/bootstrap-multiselect.js", @@ -154,6 +160,8 @@ "/public/v1/js/lib/vue.js": "/public/v1/js/lib/vue.js", "/public/v1/js/profile.js": "/public/v1/js/profile.js", "/public/v1/js/profile.js.LICENSE.txt": "/public/v1/js/profile.js.LICENSE.txt", + "/public/v1/js/show.js": "/public/v1/js/show.js", + "/public/v1/js/show.js.LICENSE.txt": "/public/v1/js/show.js.LICENSE.txt", "/public/v1/js/webhooks/create.js": "/public/v1/js/webhooks/create.js", "/public/v1/js/webhooks/create.js.LICENSE.txt": "/public/v1/js/webhooks/create.js.LICENSE.txt", "/public/v1/js/webhooks/edit.js": "/public/v1/js/webhooks/edit.js", diff --git a/resources/assets/v1/src/components/exchange-rates/Rates.vue b/resources/assets/v1/src/components/exchange-rates/Rates.vue index 51cd0c6131..2ac2a6ef25 100644 --- a/resources/assets/v1/src/components/exchange-rates/Rates.vue +++ b/resources/assets/v1/src/components/exchange-rates/Rates.vue @@ -381,7 +381,7 @@ export default { this.totalPages = parseInt(response.data.meta.pagination.total_pages); this.loading = false; this.rates = Object.values(this.tempRates); - console.log('Do not download more pages. Now on page ' + this.page + ' of ' + this.totalPages); + // console.log('Do not download more pages. Now on page ' + this.page + ' of ' + this.totalPages); }); } }, diff --git a/resources/assets/v1/src/components/transactions/AccountSelect.vue b/resources/assets/v1/src/components/transactions/AccountSelect.vue index 917aebde02..097a3bcf1b 100644 --- a/resources/assets/v1/src/components/transactions/AccountSelect.vue +++ b/resources/assets/v1/src/components/transactions/AccountSelect.vue @@ -36,7 +36,6 @@ class="form-control" data-role="input" type="text" - v-on:keypress="handleEnter" v-on:submit.prevent>