diff --git a/resources/assets/js/components/AkauntingHtmlEditor.vue b/resources/assets/js/components/AkauntingHtmlEditor.vue index 1e608536b..f2e17f273 100644 --- a/resources/assets/js/components/AkauntingHtmlEditor.vue +++ b/resources/assets/js/components/AkauntingHtmlEditor.vue @@ -107,6 +107,6 @@ export default { diff --git a/resources/assets/js/views/banking/transfers.js b/resources/assets/js/views/banking/transfers.js index a81ed42e9..4bf66a73a 100644 --- a/resources/assets/js/views/banking/transfers.js +++ b/resources/assets/js/views/banking/transfers.js @@ -55,6 +55,7 @@ const app = new Vue({ if (this.edit.status && this.edit.form_account < 2) { this.edit.form_account++; + return; } diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js index b849754b4..c9d27d890 100644 --- a/resources/assets/js/views/common/documents.js +++ b/resources/assets/js/views/common/documents.js @@ -147,7 +147,9 @@ const app = new Vue({ } this.form.pay_in_full = true; + let form_amount = (error_amount) ? error_amount : amount; + this.form.amount = parseFloat(form_amount).toFixed(precision); this.form.default_amount = parseFloat(this.form.document_default_amount).toFixed(precision); }, @@ -189,8 +191,6 @@ const app = new Vue({ }, onChangeRatePayment(event) { - debugger; - this.$forceUpdate(); this.form.currency_rate = event.target.value; diff --git a/resources/assets/js/views/common/items.js b/resources/assets/js/views/common/items.js index b9e041c65..902726a81 100644 --- a/resources/assets/js/views/common/items.js +++ b/resources/assets/js/views/common/items.js @@ -44,6 +44,7 @@ const app = new Vue({ 'form.sale_price': function (newVal, oldVal) { if (newVal != '' && newVal.search('^(?=.*?[0-9])[0-9.,]+$') !== 0) { this.form.sale_price = oldVal; + return; } @@ -51,6 +52,7 @@ const app = new Vue({ if (this.form.sale_price.includes(item)) { const removeLastChar = newVal.length - 1; const inputShown = newVal.slice(0, removeLastChar); + this.form.sale_price = inputShown; } } @@ -59,6 +61,7 @@ const app = new Vue({ 'form.purchase_price': function (newVal, oldVal) { if (newVal != '' && newVal.search('^(?=.*?[0-9])[0-9.,]+$') !== 0) { this.form.purchase_price = oldVal; + return; } @@ -66,6 +69,7 @@ const app = new Vue({ if (this.form.purchase_price.includes(item)) { const removeLastChar = newVal.length - 1; const inputShown = newVal.slice(0, removeLastChar); + this.form.purchase_price = inputShown; } } @@ -76,10 +80,12 @@ const app = new Vue({ if (this.form.sale_price != '' && this.form.purchase_price == '') { this.form.sale_information = true; this.form.purchase_information = false; + this.purchase_information = true; } else if (this.form.sale_price == '' && this.form.purchase_price != '') { this.form.sale_information = false; this.form.purchase_information = true; + this.sale_information = true; } else { this.form.sale_information = true; @@ -92,28 +98,34 @@ const app = new Vue({ if (event.target.checked) { if (type == 'sale') { this.sale_information = false; + this.form.sale_price = ''; this.form.purchase_information = true; } else { this.purchase_information = false; + this.form.purchase_price = ''; } } else { if (type == 'sale') { if (! this.form.purchase_information) { this.purchase_information = false; + this.form.purchase_information = true; } this.sale_information = true; + this.form.sale_price = ''; } else { if (! this.form.sale_information) { this.sale_information = false; + this.form.sale_information = true; } this.purchase_information = true; + this.form.purchase_price = ''; } } diff --git a/resources/assets/js/views/install/Language.vue b/resources/assets/js/views/install/Language.vue index 8d7a38246..0e368f436 100644 --- a/resources/assets/js/views/install/Language.vue +++ b/resources/assets/js/views/install/Language.vue @@ -49,6 +49,7 @@ }) .catch((error) => {}); }, + data() { return { form: new Form("form-install"), @@ -56,6 +57,7 @@ active: 0, }; }, + methods: { // Form Submit onSubmit(event) { diff --git a/resources/assets/js/views/install/Settings.vue b/resources/assets/js/views/install/Settings.vue index d2eb65d01..7d7e958b6 100644 --- a/resources/assets/js/views/install/Settings.vue +++ b/resources/assets/js/views/install/Settings.vue @@ -12,7 +12,7 @@ *