From 9fae62e3b8cf1b4261055effbe128c4d604778da Mon Sep 17 00:00:00 2001
From: batuhanbas <b1atuhanb1as@gmail.com>
Date: Sun, 2 Feb 2020 21:05:11 +0300
Subject: [PATCH] wizard passing extra steps issue updated

---
 resources/assets/js/views/wizard/company.js       |  4 +---
 resources/assets/js/views/wizard/currencies.js    |  4 ----
 resources/assets/js/views/wizard/finish.js        |  6 ++----
 resources/assets/js/views/wizard/taxes.js         |  4 ----
 resources/views/wizard/companies/edit.blade.php   |  6 +++---
 resources/views/wizard/currencies/index.blade.php | 10 ++++++----
 resources/views/wizard/finish/index.blade.php     | 10 ++++++----
 resources/views/wizard/taxes/index.blade.php      | 10 ++++++----
 8 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/resources/assets/js/views/wizard/company.js b/resources/assets/js/views/wizard/company.js
index ee551e9b5..a982c5005 100644
--- a/resources/assets/js/views/wizard/company.js
+++ b/resources/assets/js/views/wizard/company.js
@@ -39,8 +39,6 @@ const app = new Vue({
     },
 
     methods: {
-        next() {
-            if (this.active++ > 3);
-        }
+
     }
 });
diff --git a/resources/assets/js/views/wizard/currencies.js b/resources/assets/js/views/wizard/currencies.js
index fb4b009ba..c487327ad 100644
--- a/resources/assets/js/views/wizard/currencies.js
+++ b/resources/assets/js/views/wizard/currencies.js
@@ -106,9 +106,5 @@ const app = new Vue({
             .catch(error => {
             });
         },
-
-        next() {
-            if (this.active++ > 3);
-        }
     }
 });
diff --git a/resources/assets/js/views/wizard/finish.js b/resources/assets/js/views/wizard/finish.js
index d1fdffbd9..090fb9857 100644
--- a/resources/assets/js/views/wizard/finish.js
+++ b/resources/assets/js/views/wizard/finish.js
@@ -31,13 +31,11 @@ const app = new Vue({
 
     data: function () {
         return {
-            active: 3
+            active: 3,
         }
     },
 
     methods: {
-        next() {
-            if (this.active++ > 3);
-        }
+
     }
 });
diff --git a/resources/assets/js/views/wizard/taxes.js b/resources/assets/js/views/wizard/taxes.js
index e947ca289..fa5ccfb4e 100644
--- a/resources/assets/js/views/wizard/taxes.js
+++ b/resources/assets/js/views/wizard/taxes.js
@@ -78,9 +78,5 @@ const app = new Vue({
 
             this.show = true;
         },
-
-        next() {
-            if (this.active++ > 3);
-        }
     }
 });
diff --git a/resources/views/wizard/companies/edit.blade.php b/resources/views/wizard/companies/edit.blade.php
index 911b3b3b4..d61931da6 100644
--- a/resources/views/wizard/companies/edit.blade.php
+++ b/resources/views/wizard/companies/edit.blade.php
@@ -19,7 +19,6 @@
             <div id="wizard-loading"></div>
             @include('partials.wizard.steps')
 
-
             <div class="card-body">
                 <div id="wizard-loading"></div>
                 <div class="row mb--4">
@@ -68,8 +67,9 @@
                             '<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-save"></i></span>' . '<span v-if="!form.loading" class="btn-inner--text"> ' . trans('general.save') . '</span>',
                                 [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
 
-                        <a href="{{ url('wizard/currencies') }}" id="wizard-skip" class="btn btn-white header-button-top" @click="next">
-                            <span class="fas fa-arrow-right"></span> &nbsp;{{ trans('general.skip') }}
+                        <a href="{{ url('wizard/currencies') }}" id="wizard-skip" class="btn btn-icon btn-white header-button-top">
+                            <span class="btn-inner--icon"><i class="fas fa-arrow-right"></i></span>
+                            <span class="btn-inner--text">{{ trans('general.skip') }}</span>
                         </a>
                     </div>
                 </div>
diff --git a/resources/views/wizard/currencies/index.blade.php b/resources/views/wizard/currencies/index.blade.php
index 231a340be..68f84d880 100644
--- a/resources/views/wizard/currencies/index.blade.php
+++ b/resources/views/wizard/currencies/index.blade.php
@@ -123,13 +123,15 @@
         <div class="card-footer">
             <div class="row">
                 <div class="col-sm-6">
-                    <a href="{{ url('wizard/companies') }}" class="btn btn-white header-button-top">
-                        <span class="fas fa-arrow-left"></span> &nbsp;{{ trans('modules.back') }}
+                    <a href="{{ url('wizard/companies') }}" class="btn btn-icon btn-white header-button-top">
+                        <span class="btn-inner--icon"><i class="fas fa-arrow-left"></i></span>
+                        <span class="btn-inner--text">{{ trans('modules.back') }}</span>
                     </a>
                 </div>
                 <div class="col-sm-6 text-right">
-                    <a href="{{ url('wizard/taxes') }}" id="wizard-skip" class="btn btn-white header-button-top" @click="next">
-                        <span class="fas fa-arrow-right"></span> &nbsp;{{ trans('general.skip') }}
+                    <a href="{{ url('wizard/taxes') }}" id="wizard-skip" class="btn btn-icon btn-white header-button-top">
+                        <span class="btn-inner--icon"><i class="fas fa-arrow-right"></i></span>
+                        <span class="btn-inner--text">{{ trans('general.skip') }}</span>
                     </a>
                 </div>
             </div>
diff --git a/resources/views/wizard/finish/index.blade.php b/resources/views/wizard/finish/index.blade.php
index 9b1aa356b..90beef77f 100644
--- a/resources/views/wizard/finish/index.blade.php
+++ b/resources/views/wizard/finish/index.blade.php
@@ -50,13 +50,15 @@
         <div class="card-footer">
             <div class="row">
                 <div class="col-sm-6">
-                    <a href="{{ url('wizard/taxes') }}" class="btn btn-white header-button-top">
-                        <span class="fas fa-arrow-left"></span> &nbsp;{{ trans('modules.back') }}
+                    <a href="{{ url('wizard/taxes') }}" class="btn btn-icon btn-white header-button-top">
+                        <span class="btn-inner--icon"><i class="fas fa-arrow-left"></i></span>
+                        <span class="btn-inner--text">{{ trans('modules.back') }}</span>
                     </a>
                 </div>
                 <div class="col-sm-6 text-right">
-                    <a href="{{ url('/') }}" class="btn btn-success header-button-top" @click="next">
-                        <span class="fa fa-tachometer-alt"></span> &nbsp;{{ trans('general.go_to', ['name' => trans_choice('general.dashboards', 1)]) }}
+                    <a href="{{ url('/') }}" id="wizard-skip" class="btn btn-icon btn-success header-button-top">
+                        <span class="btn-inner--icon"><i class="fa fa-tachometer-alt"></i></span>
+                        <span class="btn-inner--text">{{ trans('general.go_to', ['name' => trans_choice('general.dashboards', 1)]) }}</span>
                     </a>
                 </div>
             </div>
diff --git a/resources/views/wizard/taxes/index.blade.php b/resources/views/wizard/taxes/index.blade.php
index 42b97ea6b..56f3161d9 100644
--- a/resources/views/wizard/taxes/index.blade.php
+++ b/resources/views/wizard/taxes/index.blade.php
@@ -106,13 +106,15 @@
         <div class="card-footer">
             <div class="row">
                 <div class="col-sm-6">
-                    <a href="{{ url('wizard/currencies') }}" class="btn btn-white header-button-top">
-                        <span class="fas fa-arrow-left"></span> &nbsp;{{ trans('modules.back') }}
+                    <a href="{{ url('wizard/currencies') }}" class="btn btn-icon btn-white header-button-top">
+                        <span class="btn-inner--icon"><i class="fas fa-arrow-left"></i></span>
+                        <span class="btn-inner--text">{{ trans('modules.back') }}</span>
                     </a>
                 </div>
                 <div class="col-sm-6 text-right">
-                    <a href="{{ url('wizard/finish') }}" id="wizard-skip" class="btn btn-white header-button-top" @click="next">
-                        <span class="fas fa-arrow-right"></span> &nbsp;{{ trans('general.skip') }}
+                    <a href="{{ url('wizard/finish') }}" id="wizard-skip" class="btn btn-icon btn-white header-button-top">
+                        <span class="btn-inner--icon"><i class="fas fa-arrow-right"></i></span>
+                        <span class="btn-inner--text">{{ trans('general.skip') }}</span>
                     </a>
                 </div>
             </div>