Merge branch 'master' of gitlab.com:mohit.panjvani/crater-web

This commit is contained in:
Mohit Panjwani
2019-11-16 13:37:22 +05:30
16 changed files with 34 additions and 200602 deletions

View File

@ -141,7 +141,6 @@
v-model="newEstimate.reference_number"
:invalid="$v.newEstimate.reference_number.$error"
icon="hashtag"
type="number"
@input="$v.newEstimate.reference_number.$touch()"
/>
<div v-if="$v.newEstimate.reference_number.$error" class="text-danger">{{ $tc('validation.ref_number_maxlength') }}</div>
@ -383,7 +382,7 @@ export default {
maxLength: maxLength(255)
},
reference_number: {
maxLength: maxLength(10)
maxLength: maxLength(255)
}
},
selectedCustomer: {

View File

@ -305,12 +305,12 @@ export default {
quantity: {
required,
minValue: minValue(1),
maxLength: maxLength(10)
maxLength: maxLength(20)
},
price: {
required,
minValue: minValue(1),
maxLength: maxLength(10)
maxLength: maxLength(20)
},
discount_val: {
between: between(0, this.maxDiscount)

View File

@ -90,16 +90,16 @@
<label>{{ $t('expenses.amount') }}</label> <span class="text-danger"> * </span>
<div class="base-input">
<money
:class="{'invalid' : $v.formData.amount.$error}"
v-model="amount"
v-bind="defaultCurrencyForInput"
:class="{'invalid' : $v.formData.amount.$error}"
class="input-field"
/>
</div>
<div v-if="$v.formData.amount.$error">
<span v-if="!$v.formData.amount.required" class="text-danger">{{ $t('validation.required') }}</span>
<span v-if="!$v.formData.amount.maxLength" class="text-danger">{{ $t('validation.amount_maxlength') }}</span>
<span v-if="!$v.formData.amount.maxValue" class="text-danger">{{ $t('validation.amount_minvalue') }}</span>
<span v-if="!$v.formData.amount.required" class="text-danger">{{ $t('validation.required') }} </span>
<span v-if="!$v.formData.amount.maxLength" class="text-danger">{{ $t('validation.price_maxlength') }}</span>
<span v-if="!$v.formData.amount.minValue" class="text-danger">{{ $t('validation.price_minvalue') }}</span>
</div>
</div>
<div class="form-group col-sm-6">
@ -198,8 +198,8 @@ export default {
},
amount: {
required,
maxLength: maxLength(10),
minValue: minValue(0.1)
minValue: minValue(0.1),
maxLength: maxLength(20)
},
notes: {
maxLength: maxLength(255)

View File

@ -141,7 +141,6 @@
v-model="newInvoice.reference_number"
:invalid="$v.newInvoice.reference_number.$error"
icon="hashtag"
type="number"
@input="$v.newInvoice.reference_number.$touch()"
/>
<div v-if="$v.newInvoice.reference_number.$error" class="text-danger">{{ $tc('validation.ref_number_maxlength') }}</div>
@ -384,7 +383,7 @@ export default {
maxLength: maxLength(255)
},
reference_number: {
maxLength: maxLength(10)
maxLength: maxLength(255)
}
},
selectedCustomer: {

View File

@ -306,12 +306,12 @@ export default {
quantity: {
required,
minValue: minValue(1),
maxLength: maxLength(10)
maxLength: maxLength(20)
},
price: {
required,
minValue: minValue(1),
maxLength: maxLength(10)
maxLength: maxLength(20)
},
discount_val: {
between: between(0, this.maxDiscount)

View File

@ -92,7 +92,7 @@
<script>
import { validationMixin } from 'vuelidate'
import { mapActions, mapGetters } from 'vuex'
const { required, minLength, numeric, alpha, minValue, maxLength } = require('vuelidate/lib/validators')
const { required, minLength, numeric, minValue, maxLength } = require('vuelidate/lib/validators')
export default {
mixins: {
@ -163,7 +163,7 @@ export default {
price: {
required,
numeric,
maxLength: maxLength(10),
maxLength: maxLength(20),
minValue: minValue(0.1)
},
description: {