From 47c4307494b7b82537dc34b32f84735848fc7c58 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Tue, 13 Dec 2022 15:18:18 +0300 Subject: [PATCH 1/4] modal refactoring --- .../assets/js/components/AkauntingModalAddNew.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/resources/assets/js/components/AkauntingModalAddNew.vue b/resources/assets/js/components/AkauntingModalAddNew.vue index e86d1f184..a118087a0 100644 --- a/resources/assets/js/components/AkauntingModalAddNew.vue +++ b/resources/assets/js/components/AkauntingModalAddNew.vue @@ -199,6 +199,12 @@ export default { precision: 2, masked: false /* doesn't work with directive */ }; + + if (this.$root.$options.methods) { + for (let method in this.$root.$options.methods) { + this[method] = this.$options.methods[method] !== undefined ? this.$options.methods[method] : this.$root.$options.methods[method]; + } + } }, mounted() { @@ -233,10 +239,15 @@ export default { item_name_input: false, price_name_input: false, quantity_name_input: false, + set_modal_function: null, } }, methods: { + example() { + console.log('example', 'component'); + }, + setMinDate(date) { this.min_date = date; }, From b9c9b7c5760f6f61368890d84abb4a48a6d46b68 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Tue, 13 Dec 2022 15:21:04 +0300 Subject: [PATCH 2/4] modal refactoring --- resources/assets/js/components/AkauntingModalAddNew.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/resources/assets/js/components/AkauntingModalAddNew.vue b/resources/assets/js/components/AkauntingModalAddNew.vue index a118087a0..ad8b05cd8 100644 --- a/resources/assets/js/components/AkauntingModalAddNew.vue +++ b/resources/assets/js/components/AkauntingModalAddNew.vue @@ -244,10 +244,6 @@ export default { }, methods: { - example() { - console.log('example', 'component'); - }, - setMinDate(date) { this.min_date = date; }, From 3cc5d4055ca81aeccbde470c77b5d80b4f1d4d43 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Tue, 13 Dec 2022 15:23:05 +0300 Subject: [PATCH 3/4] unused code ejected --- resources/assets/js/components/AkauntingModalAddNew.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/assets/js/components/AkauntingModalAddNew.vue b/resources/assets/js/components/AkauntingModalAddNew.vue index ad8b05cd8..54ad320c5 100644 --- a/resources/assets/js/components/AkauntingModalAddNew.vue +++ b/resources/assets/js/components/AkauntingModalAddNew.vue @@ -239,7 +239,6 @@ export default { item_name_input: false, price_name_input: false, quantity_name_input: false, - set_modal_function: null, } }, From 62077dfd5005c0e282b9df33528c5a74b534de05 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Tue, 13 Dec 2022 17:50:18 +0300 Subject: [PATCH 4/4] unused code ejected --- resources/assets/js/views/common/documents.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js index 2570b4ece..6e29eb03e 100644 --- a/resources/assets/js/views/common/documents.js +++ b/resources/assets/js/views/common/documents.js @@ -814,11 +814,6 @@ const app = new Vue({ watch: { 'form.discount': function (newVal, oldVal) { - if (newVal > 99) { - newVal = oldVal; - return; - } - if (newVal != '' && newVal.search('^[-+]?([0-9]|[1-9][0-9]|100)*\.?[0-9]+$') !== 0) { this.form.discount = oldVal; this.form.discount = this.form.discount ? this.form.discount.replace(',', '.') : '';