From 0a9d80ca1b437a1e46516ea778a628a750d4248b Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Fri, 28 May 2021 15:45:19 +0300 Subject: [PATCH] Wizard edited --- app/Http/Controllers/Wizard/Data.php | 1 + resources/assets/js/views/wizard/Company.vue | 77 ++++++++-------- .../assets/js/views/wizard/Currencies.vue | 56 ++++++------ resources/assets/js/views/wizard/Finish.vue | 89 ++++++++++++------- resources/assets/js/views/wizard/Taxes.vue | 52 +++++------ .../wizard/wizardAction.js} | 46 +++++----- resources/assets/js/wizard.js | 5 +- 7 files changed, 177 insertions(+), 149 deletions(-) rename resources/assets/js/{mixins/spa-global.js => views/wizard/wizardAction.js} (88%) diff --git a/app/Http/Controllers/Wizard/Data.php b/app/Http/Controllers/Wizard/Data.php index acc9de0cb..fa3a43b9f 100644 --- a/app/Http/Controllers/Wizard/Data.php +++ b/app/Http/Controllers/Wizard/Data.php @@ -98,6 +98,7 @@ class Data extends Controller 'developer' => trans('modules.developer'), 'previous' => trans('pagination.previous'), 'go_to_dashboard' => trans('general.go_to_dashboard'), + 'error_message' => trans('errors.title.500'), ] ]; diff --git a/resources/assets/js/views/wizard/Company.vue b/resources/assets/js/views/wizard/Company.vue index 2ee611486..c5f96fb8b 100644 --- a/resources/assets/js/views/wizard/Company.vue +++ b/resources/assets/js/views/wizard/Company.vue @@ -26,8 +26,11 @@ />

-

Click here - to get your API key. +
+ Click here + to get your API key.

@@ -71,14 +74,16 @@
- - - + + +
@@ -86,7 +91,7 @@
2); - this.$router.push("/wizard/currencies"); - }, - onEditSave() { this.onEditCompany(); this.$router.push("/wizard/currencies"); }, + + next() { + if (this.active++ > 2); + this.$router.push("/wizard/currencies"); + }, }, }; \ No newline at end of file diff --git a/resources/assets/js/views/wizard/Currencies.vue b/resources/assets/js/views/wizard/Currencies.vue index 9f0b5165a..3bbde23c2 100644 --- a/resources/assets/js/views/wizard/Currencies.vue +++ b/resources/assets/js/views/wizard/Currencies.vue @@ -20,7 +20,7 @@ type="success" native-type="button" class="btn-sm" - @click="addItem()" + @click="onAddItem()" >{{ translations.currencies.add_new }}
@@ -63,7 +63,7 @@ {{ translations.currencies.edit }} @@ -100,14 +100,14 @@
- +