Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix autocomplete.
James Cole69cae3ae5507
diff --git a/resources/assets/v2/src/pages/transactions/edit.js b/resources/assets/v2/src/pages/transactions/edit.jsindex e95eca4ca4..cae648d243 100644--- a/resources/assets/v2/src/pages/transactions/edit.js+++ b/resources/assets/v2/src/pages/transactions/edit.js@@ -72,8 +72,6 @@ let transactions = function () {resetButton: true,rulesButton: true,webhooksButton: true,--},// form behaviour during transaction@@ -85,7 +83,7 @@ let transactions = function () {// form data (except transactions) is stored in formDataformData: {- defaultCurrency: null,+ primaryCurrency: null,enabledCurrencies: [],primaryCurrencies: [],foreignCurrencies: [],@@ -200,8 +198,7 @@ let transactions = function () {// addedSplit, is called from the HTML// for source accountconst renderAccount = function (item, b, c) {- console.log(item);- return item.title + '<br><small class="text-muted">' + i18next.t('firefly.account_type_' + item.meta.type) + '</small>';+ return item.name_with_balance + '<br><small class="text-muted">' + i18next.t('firefly.account_type_' + item.type) + '</small>';};addAutocomplete({selector: 'input.ac-source',@@ -209,7 +206,7 @@ let transactions = function () {account_types: this.filters.source,onRenderItem: renderAccount,valueField: 'id',- labelField: 'title',+ labelField: 'name',onChange: changeSourceAccount,onSelectItem: selectSourceAccount});@@ -217,7 +214,7 @@ let transactions = function () {selector: 'input.ac-dest',serverUrl: urls.account,valueField: 'id',- labelField: 'title',+ labelField: 'name',account_types: this.filters.destination,onRenderItem: renderAccount,onChange: changeDestinationAccount,@@ -227,7 +224,7 @@ let transactions = function () {selector: 'input.ac-category',serverUrl: urls.category,valueField: 'id',- labelField: 'title',+ labelField: 'name',onChange: changeCategory,onSelectItem: changeCategory});@@ -330,7 +327,7 @@ let transactions = function () {// load meta data.loadCurrencies().then(data => {this.formStates.loadingCurrencies = false;- this.formData.defaultCurrency = data.defaultCurrency;+ this.formData.primaryCurrency = data.primaryCurrency;this.formData.enabledCurrencies = data.enabledCurrencies;this.formData.primaryCurrencies = data.primaryCurrencies;this.formData.foreignCurrencies = data.foreignCurrencies;diff --git a/resources/assets/v2/src/pages/transactions/shared/load-currencies.js b/resources/assets/v2/src/pages/transactions/shared/load-currencies.jsindex 11c05baf67..2580a1389b 100644--- a/resources/assets/v2/src/pages/transactions/shared/load-currencies.js+++ b/resources/assets/v2/src/pages/transactions/shared/load-currencies.js@@ -28,7 +28,7 @@ export function loadCurrencies() {let getter = new Get();return getter.list(params).then((response) => {let returnData = {- defaultCurrency: {},+ primaryCurrency: {},primaryCurrencies: [],foreignCurrencies: [],enabledCurrencies: [],@@ -46,13 +46,13 @@ export function loadCurrencies() {id: current.id,name: current.attributes.name,code: current.attributes.code,- default: current.attributes.default,+ primary: current.attributes.primary,symbol: current.attributes.symbol,decimal_places: current.attributes.decimal_places,};- if (obj.default) {- returnData.defaultCurrency = obj;+ if (obj.primary) {+ returnData.primaryCurrency = obj;}returnData.enabledCurrencies.push(obj);returnData.primaryCurrencies.push(obj);