small fix

This commit is contained in:
yogesh_gohil
2019-11-20 13:26:06 +05:30
parent 665fc76856
commit 41a543ea9c
8 changed files with 23 additions and 63 deletions

View File

@ -148,7 +148,11 @@ export default {
}
if (response.data) {
window.toastr['success'](this.$t('settings.expense_category.created_message'))
if (!this.isEdit) {
window.toastr['success'](this.$t('settings.expense_category.created_message'))
} else {
window.toastr['success'](this.$t('settings.expense_category.updated_message'))
}
window.hub.$emit('newCategory', response.data.category)
this.closeCategoryModal()
this.isLoading = false

View File

@ -67,15 +67,10 @@
<label class="col-sm-4 col-form-label input-label">{{ $t('customers.phone') }}</label>
<div class="col-sm-7">
<base-input
:invalid="$v.formData.phone.$error"
v-model.trim="formData.phone"
type="text"
name="phone"
@input="$v.formData.phone.$touch()"
/>
<div v-if="$v.formData.phone.$error">
<span v-if="!$v.formData.phone.numeric" class="text-danger">{{ $tc('validation.numbers_only') }}</span>
</div>
</div>
</div>
<div class="form-group row">
@ -113,15 +108,10 @@
<label class="col-sm-4 col-form-label input-label">{{ $t('customers.phone') }}</label>
<div class="col-sm-7">
<base-input
:invalid="$v.billing.phone.$error"
v-model.trim="billing.phone"
type="text"
name="phone"
@input="$v.billing.phone.$touch()"
/>
<div v-if="$v.billing.phone.$error">
<span v-if="!$v.billing.phone.numberic" class="text-danger">{{ $tc('validation.numbers_only') }}</span>
</div>
</div>
</div>
@ -249,15 +239,10 @@
<label class="col-sm-4 col-form-label input-label">{{ $t('customers.phone') }}</label>
<div class="col-sm-7">
<base-input
:invalid="$v.shipping.phone.$error"
v-model.trim="shipping.phone"
type="text"
name="phone"
@input="$v.shipping.phone.$touch()"
/>
<div v-if="$v.shipping.phone.$error">
<span v-if="!$v.shipping.phone.numberic" class="text-danger">{{ $tc('validation.numbers_only') }}</span>
</div>
</div>
</div>
@ -426,17 +411,11 @@ export default {
email: {
email
},
phone: {
numeric
},
website: {
url
}
},
billing: {
phone: {
numeric
},
address_street_1: {
maxLength: maxLength(255)
},
@ -445,9 +424,6 @@ export default {
}
},
shipping: {
phone: {
numeric
},
address_street_1: {
maxLength: maxLength(255)
},

View File

@ -189,7 +189,11 @@ export default {
response = await this.updateTaxType(this.formData)
}
if (response.data) {
window.toastr['success'](this.$t('settings.tax_types.created_message'))
if (!this.isEdit) {
window.toastr['success'](this.$t('settings.tax_types.created_message'))
} else {
window.toastr['success'](this.$t('settings.tax_types.updated_message'))
}
window.hub.$emit('newTax', response.data.taxType)
this.closeTaxModal()
this.isLoading = false