From 31e8d54709096e4f07cc32a5e79a7078e41de8c7 Mon Sep 17 00:00:00 2001
From: Burak Civan <burakcivan22@gmail.com>
Date: Wed, 26 May 2021 18:45:39 +0300
Subject: [PATCH] Ui design development

---
 resources/assets/js/mixins/spa-global.js        | 3 +++
 resources/assets/js/views/wizard/Company.vue    | 5 ++---
 resources/assets/js/views/wizard/Currencies.vue | 7 +++++++
 resources/assets/js/views/wizard/Taxes.vue      | 7 +++++++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/mixins/spa-global.js b/resources/assets/js/mixins/spa-global.js
index d249281db..487a0e2e8 100644
--- a/resources/assets/js/mixins/spa-global.js
+++ b/resources/assets/js/mixins/spa-global.js
@@ -38,6 +38,9 @@ export default {
                 this.model.select = item.code ? item.code : '';
             }
         },
+        handleClickCancel() {
+            this.currentTab = undefined;
+        },
         dataHandleEvent() {
             this.newDatas = false;
             this.currentTab = undefined;
diff --git a/resources/assets/js/views/wizard/Company.vue b/resources/assets/js/views/wizard/Company.vue
index f4b746d12..f5f3c1dbe 100644
--- a/resources/assets/js/views/wizard/Company.vue
+++ b/resources/assets/js/views/wizard/Company.vue
@@ -68,15 +68,14 @@
                 ></textarea>
               </base-input>
             </div>
-            <div class="col-6">
-              <base-input :label="translations.company.logo">
+            <div class="col-3">
+              <label class="form-control-label">{{ translations.company.logo }}</label>
                 <akaunting-dropzone-file-upload
                   ref="dropzoneWizard"
                   preview-classes="single"
                   :attachments="logo"
                 >
                 </akaunting-dropzone-file-upload>
-              </base-input>
             </div>
           </div>
         </div>
diff --git a/resources/assets/js/views/wizard/Currencies.vue b/resources/assets/js/views/wizard/Currencies.vue
index 3b7fc1a13..162fc4f2f 100644
--- a/resources/assets/js/views/wizard/Currencies.vue
+++ b/resources/assets/js/views/wizard/Currencies.vue
@@ -164,6 +164,13 @@
                           :error="onFailErrorGet('rate')"
                         />
                         <div class="mt-4 col-md-3 current-tab-btn">
+                          <base-button
+                            type="white"
+                            native-type="button"
+                            @click="handleClickCancel()"
+                          >
+                            {{ translations.currencies.cancel }}</base-button
+                          >
                           <base-button
                             type="success"
                             native-type="button"
diff --git a/resources/assets/js/views/wizard/Taxes.vue b/resources/assets/js/views/wizard/Taxes.vue
index 7370b4e4e..1457fc73a 100644
--- a/resources/assets/js/views/wizard/Taxes.vue
+++ b/resources/assets/js/views/wizard/Taxes.vue
@@ -126,6 +126,13 @@
                           :error="onFailErrorGet('rate')"
                         />
                         <div class="mt-4 col-md-4 current-tab-btn">
+                          <base-button
+                            type="white"
+                            native-type="button"
+                            @click="handleClickCancel()"
+                          >
+                            {{ translations.taxes.cancel }}</base-button
+                          >
                           <base-button
                             type="success"
                             native-type="button"