From aaa7f796702799b70e6148e4fcc6188a34ab048f Mon Sep 17 00:00:00 2001
From: Burak Civan <burakcivan22@gmail.com>
Date: Fri, 28 May 2021 14:16:40 +0300
Subject: [PATCH] Code refactoring

---
 resources/assets/js/Wizard.vue                | 33 ++++++++++---------
 .../assets/js/components/Inputs/BaseInput.vue |  2 +-
 resources/assets/js/mixins/spa-global.js      | 10 ++----
 resources/assets/js/views/wizard/Company.vue  | 11 +++++--
 .../assets/js/views/wizard/Currencies.vue     |  3 --
 resources/assets/js/views/wizard/Taxes.vue    |  6 ++++
 6 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/resources/assets/js/Wizard.vue b/resources/assets/js/Wizard.vue
index 3c70749dc..609523d1c 100644
--- a/resources/assets/js/Wizard.vue
+++ b/resources/assets/js/Wizard.vue
@@ -11,12 +11,12 @@
 
 <script>
 export default {
-    name: 'Wizard',
-    data: function () {
-        return {
-            page_loaded: true,
-        }
-    },
+  name: "Wizard",
+  data: function () {
+    return {
+      page_loaded: true,
+    };
+  },
   created() {
     let self = this;
 
@@ -36,9 +36,12 @@ export default {
           return data.currency_codes[key];
         });
 
-        setTimeout(function() {
+        setTimeout(
+          function () {
             self.page_loaded = false;
-        }.bind(self), 800);
+          }.bind(self),
+          800
+        );
       });
   },
 
@@ -93,24 +96,24 @@ export default {
 
 .form-container .has-error {
   position: relative;
-  margin-bottom:unset !important;
+  margin-bottom: unset !important;
 }
 
 .form-container .has-error .form-control {
   border-top-right-radius: 5px;
   border-bottom-right-radius: 5px;
-  border-right:1px solid;
+  border-right: 1px solid;
 }
 
- .el-step__icon {
-    -webkit-transition: unset;
-    transition: unset;
-  }
+.el-step__icon {
+  -webkit-transition: unset;
+  transition: unset;
+}
 
 @media screen and (max-width: 991px) {
   .form-container .has-error {
     position: relative;
-    margin-bottom:1.5rem !important;
+    margin-bottom: 1.5rem !important;
   }
 
   .current-tab-btn {
diff --git a/resources/assets/js/components/Inputs/BaseInput.vue b/resources/assets/js/components/Inputs/BaseInput.vue
index 70c9e6694..a8fda25d2 100644
--- a/resources/assets/js/components/Inputs/BaseInput.vue
+++ b/resources/assets/js/components/Inputs/BaseInput.vue
@@ -86,7 +86,7 @@
         description: "Input label (text before input)"
       },
       error: {
-        type: [String, Object, Array],
+        type: String,
         description: "Input error (below input)"
       },
       footerError: {
diff --git a/resources/assets/js/mixins/spa-global.js b/resources/assets/js/mixins/spa-global.js
index 4546d3459..936866f36 100644
--- a/resources/assets/js/mixins/spa-global.js
+++ b/resources/assets/js/mixins/spa-global.js
@@ -10,10 +10,9 @@ export default {
                 select: "",
                 enabled: 1
             },
-            error_field: {}
+            error_field: {},
         }
     },
-
     methods: {
         addItem() {
             this.newDatas = true;
@@ -99,7 +98,6 @@ export default {
         onEditEvent(form_method, form_url, plus_data, form_list, form_id) {
             const formData = new FormData(this.$refs["form"]);
             const data = {};
-            let file = {};
 
             for (let [key, val] of formData.entries()) {
                 Object.assign(data, {
@@ -131,7 +129,6 @@ export default {
                     }
 
                     this.onSuccessEvent(response);
-
                 }, this)
                 .catch(error => {
                     this.onFailError(error)
@@ -169,7 +166,6 @@ export default {
                     });
 
                     this.onSuccessEvent(response);
-
                 }, this)
                 .catch(error => {
                     this.onFailError(error);
@@ -199,8 +195,8 @@ export default {
             }
 
             const formData = new FormData(this.$refs["form"]);
-            
             let data_name = {};
+
             for (let [key, val] of formData.entries()) {
                 Object.assign(data_name, {
                     [key]: val,
@@ -210,6 +206,7 @@ export default {
                     ['_method']: 'POST',
                 });
             }
+
             formData.appendRecursive(data_name);
            
             window.axios({
@@ -224,7 +221,6 @@ export default {
                 })
                 .then(response => {
                     this.onSuccessEvent(response);
-
                 }, this)
                 .catch(error => {
                     this.onFailError(error)
diff --git a/resources/assets/js/views/wizard/Company.vue b/resources/assets/js/views/wizard/Company.vue
index 8bf8b74de..2ee611486 100644
--- a/resources/assets/js/views/wizard/Company.vue
+++ b/resources/assets/js/views/wizard/Company.vue
@@ -26,7 +26,9 @@
               />
               <p class="mb-0 mt--3">
                 <small>
-                  <div v-html="translations.company.get_api_key"></div>
+                  <div><a href="https://akaunting.com/dashboard" target="_blank">Click here</a>
+                   to get your API key.
+                  </div>
                 </small>
               </p>
             </div>
@@ -123,6 +125,10 @@ export default {
     translations: {
       type: [Object, Array],
     },
+    url: {
+      type: String,
+      default: 'text'
+    }
   },
   data() {
     return {
@@ -133,9 +139,7 @@ export default {
   },
   mounted() {
     let company_data = this.company;
-    setTimeout(() => {
       this.dataWatch(company_data);
-    }, 500);
   },
   watch: {
     company: function (company) {
@@ -159,6 +163,7 @@ export default {
       this.real_date = company.financial_start;
       }
     },
+
     next() {
       if (this.active++ > 2);
       this.$router.push("/wizard/currencies");
diff --git a/resources/assets/js/views/wizard/Currencies.vue b/resources/assets/js/views/wizard/Currencies.vue
index bbe09cdeb..9f0b5165a 100644
--- a/resources/assets/js/views/wizard/Currencies.vue
+++ b/resources/assets/js/views/wizard/Currencies.vue
@@ -300,9 +300,7 @@ import MixinsSpaGlobal from "./../../mixins/spa-global";
 
 export default {
   name: "Currencies",
-
   mixins: [MixinsGlobal, MixinsSpaGlobal],
-
   components: {
     [Step.name]: Step,
     [Steps.name]: Steps,
@@ -310,7 +308,6 @@ export default {
     [Option.name]: Option,
     AkauntingRadioGroup,
   },
-
   props: {
     currencies: {
       type: [Object, Array],
diff --git a/resources/assets/js/views/wizard/Taxes.vue b/resources/assets/js/views/wizard/Taxes.vue
index c60741987..566576730 100644
--- a/resources/assets/js/views/wizard/Taxes.vue
+++ b/resources/assets/js/views/wizard/Taxes.vue
@@ -255,6 +255,7 @@ export default {
       this.onStatus(item.id, event);
       this.onStatusControl(this.taxes, item.id, event);
     },
+
     handleClickDelete(item) {
       this.confirmDelete(
         `${
@@ -275,14 +276,17 @@ export default {
         this.translations.taxes.delete
       );
     },
+
     next() {
       if (this.active++ > 2);
       this.$router.push("/wizard/finish");
     },
+
     prev() {
       if (this.active-- > 2);
       this.$router.push("/wizard/currencies");
     },
+
     onEditSave(item) {
       this.onEditEvent(
         "PATCH",
@@ -292,9 +296,11 @@ export default {
         item.id
       );
     },
+
     onSubmitForm() {
       this.onSubmitEvent("POST", url + "/wizard/taxes", "type", this.taxes);
     },
+    
     deleteCurrency(event) {
       this.onDeleteEvent(event, this.taxes, event.tax_id);
     },