From d9ba4c47d9e950385d22734dbbc3a8bf475d7bf2 Mon Sep 17 00:00:00 2001
From: Burak Civan <burakcivan22@gmail.com>
Date: Fri, 28 May 2021 10:04:51 +0300
Subject: [PATCH] File upload development for form patch

---
 resources/assets/js/mixins/spa-global.js     | 21 +++-----------------
 resources/assets/js/views/wizard/Company.vue | 10 ++--------
 resources/assets/js/views/wizard/Finish.vue  | 12 +++++++----
 routes/wizard.php                            |  2 +-
 4 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/resources/assets/js/mixins/spa-global.js b/resources/assets/js/mixins/spa-global.js
index a74369bb0..fb78ec750 100644
--- a/resources/assets/js/mixins/spa-global.js
+++ b/resources/assets/js/mixins/spa-global.js
@@ -98,20 +98,6 @@ export default {
                     [key]: val,
                 });
             }
-           
-            if(this.$refs.dropzoneWizard) {
-                if(this.$refs.dropzoneWizard.dropzone.files.length) {
-                    file = this.$refs.dropzoneWizard.dropzone.files[0];
-                } else {
-                    file = this.$refs.dropzoneWizard.files[0];
-                }
-            }
-            
-            if(plus_data == 'logo') {
-                Object.assign(data, {
-                    ['logo']: file
-                });
-            }
 
             if(plus_data == 'type') {
                 Object.assign(data, {
@@ -210,17 +196,16 @@ export default {
             for (let [key, val] of formData.entries()) {
                 Object.assign(data_name, {
                     [key]: val,
-                    ['logo']: this.$refs.dropzoneWizard.files[1],
+                    ['logo']: this.$refs.dropzoneWizard.files[1] ? this.$refs.dropzoneWizard.files[1] : this.$refs.dropzoneWizard.files[0],
                     ['_prefix']: 'company',
                     ['_token']: window.Laravel.csrfToken,
-                    ['_method']: 'PATCH',
+                    ['_method']: 'POST',
                 });
             }
-           
             formData.appendRecursive(data_name);
            
             window.axios({
-                    method: 'PATCH',
+                    method: 'POST',
                     url: url + "/wizard/companies",
                     data: formData,
                     headers: {
diff --git a/resources/assets/js/views/wizard/Company.vue b/resources/assets/js/views/wizard/Company.vue
index 1f744c37c..8bf8b74de 100644
--- a/resources/assets/js/views/wizard/Company.vue
+++ b/resources/assets/js/views/wizard/Company.vue
@@ -12,7 +12,7 @@
           <el-step :title="translations.finish.title"></el-step>
         </el-steps>
       </div>
-      <form id="company-name" ref="form" class="w-100" method="PATCH">
+      <form ref="form" class="w-100">
         <div class="card-body">
           <div class="row mb-4">
             <div class="col-12 mb-4">
@@ -170,10 +170,4 @@ export default {
     },
   },
 };
-</script>
-
-<style scoped>
-form {
-  flex-flow: row wrap;
-}
-</style>
+</script>
\ No newline at end of file
diff --git a/resources/assets/js/views/wizard/Finish.vue b/resources/assets/js/views/wizard/Finish.vue
index 19f9ad0a9..0a8b35aac 100644
--- a/resources/assets/js/views/wizard/Finish.vue
+++ b/resources/assets/js/views/wizard/Finish.vue
@@ -57,7 +57,7 @@
             <base-button type="white" native-type="submit" @click="prev()"
               >{{ translations.finish.previous }}</base-button
             >
-            <base-button type="success" native-type="submit" @click="finish()"
+            <base-button type="success" native-type="submit" v-if="button_show" @click="finish()"
               >{{ translations.finish.go_to_dashboard }}</base-button
             >
           </div>
@@ -79,9 +79,12 @@ export default {
   },
   created() {
     window.axios({
-      method: 'GET',
-      url
+      method: 'PATCH',
+      url: url + '/wizard/finish'
     }).then(response => {
+      if(response.status == "200") {
+        this.button_show = true;
+      }
 
     }).catch(error => {
       
@@ -99,11 +102,12 @@ export default {
     return {
       active: 3,
       route_url: url,
+      button_show: false
     };
   },
   methods: {
     finish() {
-      window.location.href = "";
+      window.location.href = url;
     },
     prev() {
       if (this.active-- > 2);
diff --git a/routes/wizard.php b/routes/wizard.php
index d7d43bc09..3f3f951ec 100644
--- a/routes/wizard.php
+++ b/routes/wizard.php
@@ -12,7 +12,7 @@ Route::group(['as' => 'wizard.'], function () {
     Route::get('data', 'Wizard\Data@index')->name('data.index');
 
     Route::get('companies', 'Wizard\Companies@edit')->name('companies.edit');
-    Route::patch('companies', 'Wizard\Companies@update')->middleware('dropzone')->name('companies.update');
+    Route::post('companies', 'Wizard\Companies@update')->middleware('dropzone')->name('companies.update');
 
     Route::get('currencies/{currency}/enable', 'Settings\Currencies@enable')->name('currencies.enable');
     Route::get('currencies/{currency}/disable', 'Settings\Currencies@disable')->name('currencies.disable');