From 1b6997db9aca68e11a2cbf19c3e287627373269e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Tue, 9 Aug 2022 18:57:56 +0300
Subject: [PATCH] Wizard fixed logo validation issue.

---
 resources/assets/js/views/wizard/Company.vue  | 54 +++++++++++++++----
 .../assets/js/views/wizard/Currencies.vue     | 12 ++---
 2 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/resources/assets/js/views/wizard/Company.vue b/resources/assets/js/views/wizard/Company.vue
index d85852928..268f159f8 100644
--- a/resources/assets/js/views/wizard/Company.vue
+++ b/resources/assets/js/views/wizard/Company.vue
@@ -12,7 +12,15 @@
                     <div class="flex flex-col justify-between">
                         <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5 menu-scroll gap-10">
                             <div class="sm:col-span-6">
-                                <base-input not-required :label="translations.company.api_key" name="api_key" data-name="api_key" :placeholder="translations.company.api_key" v-model="company.api_key"/>
+                                <base-input
+                                    not-required
+                                    :label="translations.company.api_key"
+                                    name="api_key"
+                                    data-name="api_key"
+                                    :placeholder="translations.company.api_key"
+                                    v-model="company.api_key"
+                                    :error="onFailErrorGet('api_key')"
+                                />
 
                                 <div class="mt-2">
                                     <small>
@@ -23,30 +31,45 @@
                             </div>
 
                             <div class="sm:col-span-3">
-                                <base-input not-required type="text" :label="translations.company.tax_number" name="tax_number" data-name="tax_number" :placeholder="translations.company.tax_number" v-model="company.tax_number"/>
+                                <base-input
+                                    not-required
+                                    type="text"
+                                    :label="translations.company.tax_number"
+                                    name="tax_number"
+                                    data-name="tax_number"
+                                    :placeholder="translations.company.tax_number"
+                                    v-model="company.tax_number"
+                                    :error="onFailErrorGet('tax_number')"
+                                />
                             </div>
 
                             <div class="sm:col-span-3">
-                                <akaunting-date not-required :title="translations.company.financial_start" data-name="financial_start" :placeholder="translations.company.financial_start" icon="calendar_today"
+                                <akaunting-date
+                                    not-required 
+                                    :title="translations.company.financial_start"
+                                    data-name="financial_start"
+                                    :placeholder="translations.company.financial_start"
+                                    icon="calendar_today"
                                     :date-config="{
-                                    dateFormat: 'd-m',
-                                    allowInput: false,
-                                    altInput: true,
-                                    altFormat: 'j F'
+                                        dateFormat: 'd-m',
+                                        allowInput: false,
+                                        altInput: true,
+                                        altFormat: 'j F'
                                     }"
                                     v-model="company.financial_start"
+                                    :form-error="onFailErrorGet('financial_start')"
                                 ></akaunting-date>
                             </div>
 
                             <div class="sm:col-span-3 grid gap-10">
                                 <div class="sm:col-span-3">
-                                    <base-input not-required :label="translations.company.address">
+                                    <base-input not-required :label="translations.company.address" :error="onFailErrorGet('address')">
                                         <textarea class="w-full text-sm px-3 py-2.5 mt-1 rounded-lg border border-light-gray text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple" name="address" data-name="address" rows="3" :placeholder="translations.company.address" v-model="company.address"></textarea>
                                     </base-input>
                                 </div>
 
                                 <div class="sm:col-span-3">
-                                    <base-input not-required :label="translations.company.country">
+                                    <base-input not-required :label="translations.company.country" :error="onFailErrorGet('country')">
                                         <el-select v-model="company.country" filterable>
                                             <el-option
                                                 v-for="(country, index) in sortedCountries"
@@ -63,14 +86,21 @@
                             </div>
 
                             <div class="sm:col-span-3">
-                                <label class="text-black text-sm font-medium">{{  translations.company.logo }}</label>
+                                <label class="text-black text-sm font-medium">
+                                    {{  translations.company.logo }}
+                                </label>
+
                                 <akaunting-dropzone-file-upload ref="dropzoneWizard" class="form-file dropzone-column w-2/5" style="height:12.2rem" preview-classes="single" :attachments="logo" :v-model="logo">
                                 </akaunting-dropzone-file-upload>
+
+                                <div v-if="onFailErrorGet('logo')" class="text-red text-sm mt-1 block" v-html="onFailErrorGet('logo')"></div>
                             </div>
                         </div>
 
                         <div class="flex items-center justify-center mt-5 gap-x-10">
-                            <base-button class="w-1/2  flex items-center justify-center px-6 py-1.5 text-base rounded-lg bg-transparent hover:bg-gray-100" @click="next()">{{ translations.company.skip }}</base-button>
+                            <base-button class="w-1/2  flex items-center justify-center px-6 py-1.5 text-base rounded-lg bg-transparent hover:bg-gray-100" @click="next()">
+                                {{ translations.company.skip }}
+                            </base-button>
 
                             <button
                                 type="submit"
@@ -250,6 +280,7 @@ export default {
                         size: company.logo.size,
                         downloadPath: false,
                     }];
+
                     this.logo.push(logo_arr);
                 }
             }
@@ -333,6 +364,7 @@ export default {
                 this.$router.push("/wizard/currencies");
             }, this)
             .catch((error) => {
+                this.onFailError(error);
             }, this);
         },
 
diff --git a/resources/assets/js/views/wizard/Currencies.vue b/resources/assets/js/views/wizard/Currencies.vue
index 8e876e83c..63005fd4d 100644
--- a/resources/assets/js/views/wizard/Currencies.vue
+++ b/resources/assets/js/views/wizard/Currencies.vue
@@ -61,9 +61,9 @@
                                 <td class="w-full p-0 current-tab" v-if="current_tab == index">
                                     <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 py-3">
                                         <base-input name="name" data-name="name"
-                                        form-classes="sm:col-span-2"
-                                        v-model="model.name"
-                                        :error="onFailErrorGet('name')"
+                                            form-classes="sm:col-span-2"
+                                            v-model="model.name"
+                                            :error="onFailErrorGet('name')"
                                         />
 
                                         <base-input class="sm:col-span-2" :error="onFailErrorGet('code')">
@@ -79,9 +79,9 @@
                                         </base-input>
 
                                         <base-input name="rate" data-name="rate" :placeholder="translations.currencies.rate"
-                                        form-classes="sm:col-span-2"
-                                        v-model="model.rate"
-                                        :error="onFailErrorGet('rate')"
+                                            form-classes="sm:col-span-2"
+                                            v-model="model.rate"
+                                            :error="onFailErrorGet('rate')"
                                         />
 
                                         <div class="flex justify-end items-center sm:col-span-6">