From 42309975981dd8cfa28d5a014f3767df2eb87fd1 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Sat, 29 May 2021 08:15:18 +0300 Subject: [PATCH] Testing result fixed --- resources/assets/js/views/wizard/Company.vue | 69 +++++++++- .../assets/js/views/wizard/Currencies.vue | 2 +- resources/assets/js/views/wizard/Taxes.vue | 2 +- .../assets/js/views/wizard/wizardAction.js | 126 +++--------------- 4 files changed, 89 insertions(+), 110 deletions(-) diff --git a/resources/assets/js/views/wizard/Company.vue b/resources/assets/js/views/wizard/Company.vue index c5f96fb8b..73c94f347 100644 --- a/resources/assets/js/views/wizard/Company.vue +++ b/resources/assets/js/views/wizard/Company.vue @@ -51,7 +51,7 @@ :title="translations.company.financial_start" data-name="financial_start" :placeholder="translations.company.financial_start" - prepend-icon="fas fa-calendar" + icon="fas fa-calendar" :date-config="{ dateFormat: 'd-m', allowInput: true, @@ -84,6 +84,7 @@ :v-model="logo" > +
The logo must be a file of type: pdf, jpeg, jpg, png.
@@ -93,7 +94,7 @@ {{ translations.company.save }} @@ -170,8 +171,68 @@ export default { }, onEditSave() { - this.onEditCompany(); - this.$router.push("/wizard/currencies"); + FormData.prototype.appendRecursive = function (data, wrapper = null) { + for (var name in data) { + if (name == "previewElement" || name == "previewTemplate") { + continue; + } + if (wrapper) { + if ( + (typeof data[name] == "object" || Array.isArray(data[name])) && + data[name] instanceof File != true && + data[name] instanceof Blob != true + ) { + this.appendRecursive(data[name], wrapper + "[" + name + "]"); + } else { + this.append(wrapper + "[" + name + "]", data[name]); + } + } else { + if ( + (typeof data[name] == "object" || Array.isArray(data[name])) && + data[name] instanceof File != true && + data[name] instanceof Blob != true + ) { + this.appendRecursive(data[name], name); + } else { + this.append(name, data[name]); + } + } + } + }; + + const formData = new FormData(this.$refs["form"]); + let data_name = {}; + + for (let [key, val] of formData.entries()) { + Object.assign(data_name, { + [key]: val, + ["logo"]: this.$refs.dropzoneWizard.files[1] + ? this.$refs.dropzoneWizard.files[1] + : this.$refs.dropzoneWizard.files[0], + ["_prefix"]: "company", + ["_token"]: window.Laravel.csrfToken, + ["_method"]: "POST", + }); + } + + formData.appendRecursive(data_name); + window + .axios({ + method: "POST", + url: url + "/wizard/companies", + data: formData, + headers: { + "X-CSRF-TOKEN": window.Laravel.csrfToken, + "X-Requested-With": "XMLHttpRequest", + "Content-Type": "multipart/form-data", + }, + }) + .then((response) => { + this.onSuccessMessage(response); + this.$router.push("/wizard/currencies"); + }, this) + .catch((error) => { + }, this); }, next() { diff --git a/resources/assets/js/views/wizard/Currencies.vue b/resources/assets/js/views/wizard/Currencies.vue index 3bbde23c2..6dea7923c 100644 --- a/resources/assets/js/views/wizard/Currencies.vue +++ b/resources/assets/js/views/wizard/Currencies.vue @@ -389,7 +389,7 @@ export default { }, onEditForm(item) { - this.onEditItemEvent( + this.onSubmitEvent( "PATCH", url + "/wizard/currencies/" + item.id, "", diff --git a/resources/assets/js/views/wizard/Taxes.vue b/resources/assets/js/views/wizard/Taxes.vue index d65c05cb5..f2e809f14 100644 --- a/resources/assets/js/views/wizard/Taxes.vue +++ b/resources/assets/js/views/wizard/Taxes.vue @@ -282,7 +282,7 @@ export default { }, onEditForm(item) { - this.onEditItemEvent( + this.onSubmitEvent( "PATCH", url + "/wizard/taxes/" + item.id, "type", diff --git a/resources/assets/js/views/wizard/wizardAction.js b/resources/assets/js/views/wizard/wizardAction.js index b57e0e7b1..dd1c3d7a7 100644 --- a/resources/assets/js/views/wizard/wizardAction.js +++ b/resources/assets/js/views/wizard/wizardAction.js @@ -95,7 +95,7 @@ export default { }); }, - onEditItemEvent(form_method, form_url, plus_data, form_list, form_id) { + onSubmitEvent(form_method, form_url, plus_data, form_list, form_id) { const formData = new FormData(this.$refs["form"]); const data = {}; @@ -110,61 +110,34 @@ export default { ['type']: 'normal', }); } - + window.axios({ method: form_method, url: form_url, data: data, }) .then(response => { - if (form_list.length) { - form_list.forEach(item => { - if (item.id == form_id) { - item.name = response.data.data.name; - item.code = response.data.data.code; - item.rate = response.data.data.rate; - item.type = plus_data == undefined ? 'normal' : '' - } - }); + if(form_list.length && form_list.length != undefined) { + if(form_method == 'POST') { + form_list.push({ + "id": response.data.data.id, + "name": response.data.data.name, + "code": response.data.data.code, + "rate": response.data.data.rate, + "enabled": response.data.data.enabled != undefined ? response.data.data.enabled : 'true' + }); + } + + if(form_method == 'PATCH') { + form_list.forEach(item => { + if (item.id == form_id) { + item.name = response.data.data.name; + item.code = response.data.data.code; + item.rate = response.data.data.rate; + } + }); + } } - - this.onSuccessMessage(response); - }, this) - .catch(error => { - this.onFailError(error) - }, this); - }, - - onSubmitEvent(form_method, form_url, plus_data, form_list) { - const formData = new FormData(this.$refs["form"]); - const data = {}; - - for (let [key, val] of formData.entries()) { - Object.assign(data, { - [key]: val, - }); - } - - if(plus_data == 'type') { - Object.assign(data, { - ['type']: 'normal', - }); - } - - window.axios({ - method: form_method, - url: form_url, - data: data, - }) - .then(response => { - form_list.push({ - "id": response.data.data.id, - "name": response.data.data.name, - "code": response.data.data.code, - "rate": response.data.data.rate, - "enabled": response.data.data.enabled != undefined ? response.data.data.enabled : 'true' - }); - this.onSuccessMessage(response); }, this) .catch(error => { @@ -172,61 +145,6 @@ export default { }, this); }, - onEditCompany() { - FormData.prototype.appendRecursive = function(data, wrapper = null) { - for(var name in data) { - if (name == "previewElement" || name == "previewTemplate") { - continue; - } - if (wrapper) { - if ((typeof data[name] == 'object' || Array.isArray(data[name])) && ((data[name] instanceof File != true ) && (data[name] instanceof Blob != true))) { - this.appendRecursive(data[name], wrapper + '[' + name + ']'); - } else { - this.append(wrapper + '[' + name + ']', data[name]); - } - } else { - if ((typeof data[name] == 'object' || Array.isArray(data[name])) && ((data[name] instanceof File != true ) && (data[name] instanceof Blob != true))) { - this.appendRecursive(data[name], name); - } else { - this.append(name, data[name]); - } - } - } - } - - const formData = new FormData(this.$refs["form"]); - let data_name = {}; - - for (let [key, val] of formData.entries()) { - Object.assign(data_name, { - [key]: val, - ['logo']: this.$refs.dropzoneWizard.files[1] ? this.$refs.dropzoneWizard.files[1] : this.$refs.dropzoneWizard.files[0], - ['_prefix']: 'company', - ['_token']: window.Laravel.csrfToken, - ['_method']: 'POST', - }); - } - - formData.appendRecursive(data_name); - - window.axios({ - method: 'POST', - url: url + "/wizard/companies", - data: formData, - headers: { - 'X-CSRF-TOKEN': window.Laravel.csrfToken, - 'X-Requested-With': 'XMLHttpRequest', - 'Content-Type': 'multipart/form-data' - } - }) - .then(response => { - this.onSuccessMessage(response); - }, this) - .catch(error => { - this.onFailError(error) - }, this); - }, - onEjetItem(event, form_list, event_id) { form_list.forEach(function (item, index) { if (item.id == event_id) {