Fix #9784

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,
             ];
         }
 

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",

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);
             });
         }
     },

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>
         <span class="input-group-btn">
             <button
@@ -217,7 +216,7 @@ export default {
           }
         },
         selectedItem: function (e) {
-          // console.log('In SelectedItem()');
+          console.log('In SelectedItem()');
           if (typeof this.name === 'undefined') {
             // console.log('Is undefined');
             return;
@@ -239,12 +238,6 @@ export default {
           this.name = '';
           // some event?
           this.$emit('clear:value')
-        },
-        handleEnter: function (e) {
-          // TODO feels sloppy. Can be removed.
-          if (e.keyCode === 13) {
-            //e.preventDefault();
-          }
         }
       }
 }

resources/assets/v1/src/components/transactions/CreateTransaction.vue

@@ -922,6 +922,12 @@ export default {
                     allowed_types: this.transactions[index].source_account.allowed_types,
                     default_allowed_types: ['Asset account', 'Revenue account', 'Loan', 'Debt', 'Mortgage']
                 };
+                if(model.hasOwnProperty('account_currency_id') && null !== model.account_currency_id) {
+                    this.transactions[index].source_account.currency_id = model.account_currency_id;
+                    this.transactions[index].source_account.currency_name = model.account_currency_name;
+                    this.transactions[index].source_account.currency_code = model.account_currency_code;
+                    this.transactions[index].source_account.currency_decimal_places = model.account_currency_decimal_places;
+                }
 
                 // force types on destination selector.
                 this.transactions[index].destination_account.allowed_types = window.allowedOpposingTypes.source[model.type];
@@ -946,6 +952,12 @@ export default {
                     allowed_types: this.transactions[index].destination_account.allowed_types,
                     default_allowed_types: ['Asset account', 'Expense account', 'Loan', 'Debt', 'Mortgage']
                 };
+                if(model.hasOwnProperty('account_currency_id') && null !== model.account_currency_id) {
+                    this.transactions[index].destination_account.currency_id = model.account_currency_id;
+                    this.transactions[index].destination_account.currency_name = model.account_currency_name;
+                    this.transactions[index].destination_account.currency_code = model.account_currency_code;
+                    this.transactions[index].destination_account.currency_decimal_places = model.account_currency_decimal_places;
+                }
 
                 // force types on destination selector.
                 this.transactions[index].source_account.allowed_types = window.allowedOpposingTypes.destination[model.type];

resources/assets/v1/src/components/transactions/EditTransaction.vue

@@ -322,6 +322,12 @@ export default {
                 currency_decimal_places: model.currency_decimal_places,
                 allowed_types: this.transactions[index].source_account.allowed_types
             };
+            if(model.hasOwnProperty('account_currency_id') && null !== model.account_currency_id) {
+                this.transactions[index].source_account.currency_id = model.account_currency_id;
+                this.transactions[index].source_account.currency_name = model.account_currency_name;
+                this.transactions[index].source_account.currency_code = model.account_currency_code;
+                this.transactions[index].source_account.currency_decimal_places = model.account_currency_decimal_places;
+            }
         },
         selectedDestinationAccount(index, model) {
             if (typeof model === 'string') {
@@ -341,6 +347,12 @@ export default {
                 currency_decimal_places: model.currency_decimal_places,
                 allowed_types: this.transactions[index].destination_account.allowed_types
             };
+            if(model.hasOwnProperty('account_currency_id') && null !== model.account_currency_id) {
+                this.transactions[index].destination_account.currency_id = model.account_currency_id;
+                this.transactions[index].destination_account.currency_name = model.account_currency_name;
+                this.transactions[index].destination_account.currency_code = model.account_currency_code;
+                this.transactions[index].destination_account.currency_decimal_places = model.account_currency_decimal_places;
+            }
         },
         clearSource(index) {
             // reset source account:
@@ -437,7 +449,7 @@ export default {
             //console.log('EditTransaction: processIncomingGroupRow()');
             this.setTransactionType(transaction.type);
 
-            if(true === transaction.reconciled) {
+            if (true === transaction.reconciled) {
                 this.isReconciled = true;
             }
 
@@ -528,7 +540,16 @@ export default {
                     allowed_types: window.expectedSourceTypes.destination[this.ucFirst(transaction.type)]
                 }
             };
-            if(null === transaction.foreign_amount) {
+            // if transaction type is transfer, the destination currency_id etc. MUST match the actual account currency info.
+            if ('transfer' === transaction.type && null !== transaction.foreign_currency_code) {
+                result.destination_account.currency_id = transaction.foreign_currency_id;
+                result.destination_account.currency_name = transaction.foreign_currency_name;
+                result.destination_account.currency_code = transaction.foreign_currency_code;
+                result.destination_account.currency_decimal_places = transaction.foreign_currency_decimal_places;
+            }
+
+
+            if (null === transaction.foreign_amount) {
                 result.foreign_amount.amount = '';
             }
             this.transactions.push(result);
@@ -736,7 +757,7 @@ export default {
             if (parseInt(row.piggy_bank) > 0) {
                 currentArray.piggy_bank_id = parseInt(row.piggy_bank);
             }
-            if(this.isReconciled && !this.storeAsNew && true === row.reconciled) {
+            if (this.isReconciled && !this.storeAsNew && true === row.reconciled) {
                 // drop content from array:
                 delete currentArray.source_id;
                 delete currentArray.source_name;
@@ -748,7 +769,7 @@ export default {
                 delete currentArray.currency_id;
                 currentArray.reconciled = true;
             }
-            if(true === row.isReconciled) {
+            if (true === row.isReconciled) {
                 this.isReconciled = false;
             }
 
@@ -801,10 +822,16 @@ export default {
                 this.setDefaultErrors();
                 // do message if update or new:
                 if (this.storeAsNew) {
-                    this.success_message = this.$t('firefly.transaction_new_stored_link', {ID: groupId, title: this.escapeHtml(title)});
+                    this.success_message = this.$t('firefly.transaction_new_stored_link', {
+                        ID: groupId,
+                        title: this.escapeHtml(title)
+                    });
                     this.error_message = '';
                 } else {
-                    this.success_message = this.$t('firefly.transaction_updated_link', {ID: groupId, title: this.escapeHtml(title)});
+                    this.success_message = this.$t('firefly.transaction_updated_link', {
+                        ID: groupId,
+                        title: this.escapeHtml(title)
+                    });
                     this.error_message = '';
                 }
             } else {

resources/assets/v1/src/components/transactions/ForeignAmountSelect.vue

@@ -42,7 +42,8 @@
         </div>
         <div class="col-sm-8">
             <div class="input-group">
-        <input v-if="this.enabledCurrencies.length > 0" ref="amount" :placeholder="this.title" :title="this.title" :value="value.amount" autocomplete="off"
+                <input v-if="this.enabledCurrencies.length > 0" ref="amount" :placeholder="this.title"
+                       :title="this.title" :value="value.amount" autocomplete="off"
                        class="form-control" name="foreign_amount[]"
                        step="any" type="number" @input="handleInput">
                 <span class="input-group-btn">
@@ -67,29 +68,30 @@ export default {
     props: ['source', 'destination', 'transactionType', 'value', 'error', 'no_currency', 'title',],
     mounted() {
         this.liability = false;
+        // console.log('I am mounted with a ' + this.transactionType + ' transaction type and currency id!');
+        // console.log(this.value);
         this.loadCurrencies();
-
     },
     data() {
         return {
             currencies: [],
             enabledCurrencies: [],
             exclude: null,
-      // liability overrules the drop down list if the source or dest is a liability
+            // liability overrules the drop-down list if the source or dest is a liability
             liability: false
         }
     },
     watch: {
         source: function () {
-      //console.log('ForeignAmountSelect watch source');
+            // console.log('ForeignAmountSelect watch source');
             this.changeData();
         },
         destination: function () {
-      //console.log('ForeignAmountSelect watch destination');
+            // console.log('ForeignAmountSelect watch destination');
             this.changeData();
         },
         transactionType: function () {
-      //console.log('ForeignAmountSelect watch transaction type (is now ' + this.transactionType + ')');
+            // console.log('ForeignAmountSelect watch transaction type (is now ' + this.transactionType + ')');
             this.changeData();
         }
     },
@@ -105,7 +107,7 @@ export default {
             return this.error.length > 0;
         },
         handleInput(e) {
-      //console.log('ForeignAmountSelect handleInput');
+            // console.log('ForeignAmountSelect handleInput');
             let obj = {
                 amount: this.$refs.amount.value,
                 currency_id: this.$refs.currency_select.value,
@@ -126,7 +128,7 @@ export default {
 
             // console.log(srcType + ' (source) is a liability: ' + sourceIsLiability);
             // console.log(destType + ' (dest) is a liability: ' + destIsLiability);
-
+            // console.log('tType: ' + tType);
             if (tType === 'transfer' || destIsLiability || sourceIsLiability) {
                 // console.log('Source is liability OR dest is liability, OR transfer. Lock list on currency of destination.');
                 // console.log('Length of currencies is ' + this.currencies.length);
@@ -135,9 +137,13 @@ export default {
                 // lock dropdown list on currencyID of destination.
                 for (const key in this.currencies) {
                     if (this.currencies.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
-            // console.log('this.currencies[key].id = ' + this.currencies[key].id);
+
-            // console.log('this.destination.currency_id = ' + this.destination.currency_id);
+                        if (
-            if (parseInt(this.currencies[key].id) === parseInt(this.destination.currency_id)) {
+                            parseInt(this.currencies[key].id) === parseInt(this.destination.currency_id)
+                        ) {
+                            // console.log('Enable currency!!');
+                            // console.log(this.destination);
+                            // console.log(this.currencies[key]);
                             this.enabledCurrencies.push(this.currencies[key]);
                         }
                     }
@@ -176,6 +182,7 @@ export default {
             }
         },
         loadCurrencies: function () {
+            // console.log('loadCurrencies');
             // reset list of currencies:
             this.currencies = [
                 {
@@ -199,8 +206,7 @@ export default {
 
             this.getCurrencies(1);
         },
-    getCurrencies: function(page) {
+        getCurrencies: function (page) {
-      // console.log('loadCurrencies on page ' + page);
             let url = document.getElementsByTagName('base')[0].href + "api/v1/currencies?page=" + page;
             axios.get(url, {}).then((res) => {
 
@@ -213,9 +219,11 @@ export default {
                         }
                     }
                 }
-        if(res.data.meta.pagination.current_page < res.data.meta.pagination.total_pages) {
+                if (res.data.meta.pagination.current_page < res.data.meta.pagination.total_pages) {
                     this.getCurrencies(res.data.meta.pagination.current_page + 1);
+                    return;
                 }
+                this.changeData();
             });
         }
     }