shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wizard fixed logo validation issue.

Browse Source
This commit is contained in:
Cüneyt Şentürk 2022-08-09 18:57:56 +03:00
parent cadfff459c
commit 1b6997db9a
2 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
resources/assets/js/views/wizard/Company.vue
View File

@ -12,7 +12,15 @@
<div class="flex flex-col justify-between"> <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="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5 menu-scroll gap-10">
<div class="sm:col-span-6"> <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"> <div class="mt-2">
<small> <small>
@ -23,30 +31,45 @@
</div> </div>
<div class="sm:col-span-3"> <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>
<div class="sm:col-span-3"> <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="{ :date-config="{
dateFormat: 'd-m', dateFormat: 'd-m',
allowInput: false, allowInput: false,
altInput: true, altInput: true,
altFormat: 'j F' altFormat: 'j F'
}" }"
v-model="company.financial_start" v-model="company.financial_start"
:form-error="onFailErrorGet('financial_start')"
></akaunting-date> ></akaunting-date>
</div> </div>
<div class="sm:col-span-3 grid gap-10"> <div class="sm:col-span-3 grid gap-10">
<div class="sm:col-span-3"> <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> <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> </base-input>
</div> </div>
<div class="sm:col-span-3"> <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-select v-model="company.country" filterable>
<el-option <el-option
v-for="(country, index) in sortedCountries" v-for="(country, index) in sortedCountries"
@ -63,14 +86,21 @@
</div> </div>
<div class="sm:col-span-3"> <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 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> </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> </div>
<div class="flex items-center justify-center mt-5 gap-x-10"> <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 <button
type="submit" type="submit"
@ -250,6 +280,7 @@ export default {
size: company.logo.size, size: company.logo.size,
downloadPath: false, downloadPath: false,
}]; }];
this.logo.push(logo_arr); this.logo.push(logo_arr);
} }
} }
@ -333,6 +364,7 @@ export default {
this.$router.push("/wizard/currencies"); this.$router.push("/wizard/currencies");
}, this) }, this)
.catch((error) => { .catch((error) => {
this.onFailError(error);
}, this); }, this);
}, },

12
resources/assets/js/views/wizard/Currencies.vue
View File

@ -61,9 +61,9 @@
<td class="w-full p-0 current-tab" v-if="current_tab == index"> <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"> <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 py-3">
<base-input name="name" data-name="name" <base-input name="name" data-name="name"
form-classes="sm:col-span-2" form-classes="sm:col-span-2"
v-model="model.name" v-model="model.name"
:error="onFailErrorGet('name')" :error="onFailErrorGet('name')"
/> />
<base-input class="sm:col-span-2" :error="onFailErrorGet('code')"> <base-input class="sm:col-span-2" :error="onFailErrorGet('code')">
@ -79,9 +79,9 @@
</base-input> </base-input>
<base-input name="rate" data-name="rate" :placeholder="translations.currencies.rate" <base-input name="rate" data-name="rate" :placeholder="translations.currencies.rate"
form-classes="sm:col-span-2" form-classes="sm:col-span-2"
v-model="model.rate" v-model="model.rate"
:error="onFailErrorGet('rate')" :error="onFailErrorGet('rate')"
/> />
<div class="flex justify-end items-center sm:col-span-6"> <div class="flex justify-end items-center sm:col-span-6">