TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2026-02-10 04:42:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix validation and translation issues

Browse Source
This commit is contained in:
Mohit Panjwani
2019-11-11 13:44:24 +05:30
parent d3310b71bd
commit ae6290108b
10 changed files with 105 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/views/errors/404.vue
View File

@@ -3,7 +3,7 @@
<div class="row">
<div class="col-sm-12 text-sm-center">
<h1>{{ $t('general.four_zero_four') }}</h1>
<h5>{{ $t('general.yot_got_lost') }}</h5>
<h5>{{ $t('general.you_got_lost') }}</h5>
<router-link
class="btn btn-lg bg-yellow text-white"
to="/">

2
resources/assets/js/views/payments/Create.vue
View File

@@ -103,7 +103,7 @@
<span v-if="!$v.formData.amount.required" class="text-danger">{{ $t('validation.required') }}</span>
<span v-if="!$v.formData.amount.numeric" class="text-danger">{{ $t('validation.numbers_only') }}</span>
<span v-if="!$v.formData.amount.between && $v.formData.amount.numeric && amount <= 0" class="text-danger">{{ $t('validation.payment_greater_than_zero') }}</span>
<span v-if="!$v.formData.amount.between && amount > 0" class="text-danger">{{ $t('validation.payment_grater_than_due_amount') }}</span>
<span v-if="!$v.formData.amount.between && amount > 0" class="text-danger">{{ $t('validation.payment_greater_than_due_amount') }}</span>
</div>
</div>
</div>

20
resources/assets/js/views/settings/CompanyInfo.vue
View File

@@ -116,13 +116,23 @@
<base-text-area
v-model="formData.address_street_1"
:placeholder="$tc('general.street_1')"
:class="{'invalid': $v.formData.address_street_1.$error }"
rows="2"
@input="$v.formData.address_street_1.$touch()"
/>
<div v-if="$v.formData.address_street_1.$error">
<span v-if="!$v.formData.address_street_1.maxLength" class="text-danger">{{ $tc('validation.address_maxlength') }}</span>
</div>
<base-text-area
v-model="formData.address_street_2"
:placeholder="$tc('general.street_1')"
:placeholder="$tc('general.street_2')"
:class="{'invalid': $v.formData.address_street_2.$error }"
rows="2"
@input="$v.formData.address_street_2.$touch()"
/>
<div v-if="$v.formData.address_street_2.$error">
<span v-if="!$v.formData.address_street_2.maxLength" class="text-danger">{{ $tc('validation.address_maxlength') }}</span>
</div>
</div>
</div>
<div class="row">
@@ -148,7 +158,7 @@ import ImageBox from '../components/ImageBox.vue'
import AvatarCropper from 'vue-avatar-cropper'
import { validationMixin } from 'vuelidate'
import { mapActions } from 'vuex'
const { required, email, numeric } = require('vuelidate/lib/validators')
const { required, email, numeric, maxLength } = require('vuelidate/lib/validators')
export default {
components: { AvatarCropper, IconUpload, ImageBox },
@@ -251,6 +261,12 @@ export default {
},
phone: {
numeric
},
address_street_1: {
maxLength: maxLength(255)
},
address_street_2: {
maxLength: maxLength(255)
}
}
},