From dbbad60b6e4bd8136d018333486cb85075f8f72d Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Fri, 21 May 2021 14:13:09 +0300 Subject: [PATCH] 'Validation code refactor' --- resources/assets/js/mixins/spa-global.js | 24 ++++++------------- .../assets/js/views/wizard/Currencies.vue | 8 +++---- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/resources/assets/js/mixins/spa-global.js b/resources/assets/js/mixins/spa-global.js index 2752fef35..5656be8bc 100644 --- a/resources/assets/js/mixins/spa-global.js +++ b/resources/assets/js/mixins/spa-global.js @@ -1,3 +1,4 @@ + export default { data: function () { return { @@ -9,7 +10,6 @@ export default { select: "", enabled: 1 }, - error_field: false, error_field_name: '' } }, @@ -18,7 +18,6 @@ export default { addItem() { this.newDatas = true; this.currentTab = undefined; - this.error_field = true; this.error_field_name = ''; if (this.model) { @@ -31,7 +30,6 @@ export default { handeClickEdit(item, index) { this.newDatas = false; this.currentTab = index; - this.error_field = true; this.error_field_name = ''; if (this.model) { @@ -64,7 +62,6 @@ export default { }); this.dataHandleEvent(); - }, onSuccessDelete(event) { let type = event.success ? 'success' : 'error'; @@ -84,8 +81,6 @@ export default { this.dataHandleEvent(); }, onEditEvent(form_method, form_url, plus_data, form_list, form_id) { - let self = this; - const formData = new FormData(this.$refs["form"]); const data = {}; @@ -118,16 +113,13 @@ export default { } this.onSuccessEvent(response); - this.error_field = false; + }, this) .catch(error => { - self.onFailError(error) - this.success = false; - }); + this.onFailError(error) + }, this); }, onSubmitEvent(form_method, form_url, plus_data, form_list) { - let self = this; - const formData = new FormData(this.$refs["form"]); const data = {}; @@ -157,16 +149,14 @@ export default { }); this.onSuccessEvent(response); - this.error_field = false; + }, this) .catch(error => { - self.onFailError(error) - this.success = false; - }); + this.onFailError(error) + }, this); }, onFailError(error) { this.error_field_name = error.response.data.errors; - this.error_field = true; } }, } diff --git a/resources/assets/js/views/wizard/Currencies.vue b/resources/assets/js/views/wizard/Currencies.vue index edf5563c9..11688b2da 100644 --- a/resources/assets/js/views/wizard/Currencies.vue +++ b/resources/assets/js/views/wizard/Currencies.vue @@ -313,7 +313,6 @@ export default { bulk_action: new BulkAction(url + "/settings/currencies"), }; }, - methods: { inputHandle(item) { this.onStatus(item.id, event); @@ -347,8 +346,6 @@ export default { }, onChangeCode(code) { - let self = this; - const formData = new FormData(this.$refs["form"]); const data = { rate: "", @@ -374,14 +371,15 @@ export default { }, }) .then((response) => { + debugger; data.rate = response.data.rate; data.precision = response.data.precision; data.symbol = response.data.symbol; data.symbol_first = response.data.symbol_first; data.decimal_mark = response.data.decimal_mark; data.thousands_separator = response.data.thousands_separator; - self.model.rate = response.data.rate; - }); + this.model.rate = response.data.rate; + }, this); }, onEditSave(item) {