TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-30 13:11:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts and issue with add_number_length migration

Browse Source
This commit is contained in:
Mohit Panjwani
2021-04-12 11:53:03 +05:30
parent 7f9938c80d 909e4f93e4
commit 845f01f170
16 changed files with 237 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
resources/assets/js/views/settings/customization-tabs/EstimatesTab.vue
View File

@ -14,6 +14,19 @@
/>
</sw-input-group>
<sw-input-group
:label="$t('settings.customization.estimates.estimate_number_length')"
:error="estimateNumberLengthError"
class="mt-6 mb-4"
>
<sw-input
v-model="estimates.estimate_number_length"
:invalid="$v.estimates.estimate_number_length.$error"
type="number"
style="max-width: 60px"
/>
</sw-input-group>
<sw-input-group
:label="
$t('settings.customization.estimates.default_estimate_email_body')
@ -127,14 +140,19 @@
<script>
import { mapActions } from 'vuex'
const { required, maxLength, alpha } = require('vuelidate/lib/validators')
const {
required,
maxLength,
minValue,
alpha,
numeric,
} = require('vuelidate/lib/validators')
export default {
props: {
settings: {
type: Object,
require: true,
default: false,
required: true,
},
},
@ -145,6 +163,7 @@ export default {
estimates: {
estimate_prefix: null,
estimate_number_length: null,
estimate_mail_body: null,
estimate_terms_and_conditions: null,
company_address_format: null,
@ -193,6 +212,23 @@ export default {
return this.$t('validation.characters_only')
}
},
estimateNumberLengthError() {
if (!this.$v.estimates.estimate_number_length.$error) {
return ''
}
if (!this.$v.estimates.estimate_number_length.required) {
return this.$t('validation.required')
}
if (!this.$v.estimates.estimate_number_length.minValue) {
return this.$t('validation.number_length_minvalue')
}
if (!this.$v.estimates.estimate_number_length.numeric) {
return this.$t('validation.numbers_only')
}
},
},
validations: {
@ -202,12 +238,20 @@ export default {
maxLength: maxLength(5),
alpha,
},
estimate_number_length: {
required,
minValue: minValue(1),
numeric,
},
},
},
watch: {
settings(val) {
this.estimates.estimate_prefix = val ? val.estimate_prefix : ''
this.estimates.estimate_number_length = val
? val.estimate_number_length
: ''
this.estimates.estimate_mail_body = val ? val.estimate_mail_body : ''
this.estimates.company_address_format = val
@ -278,6 +322,7 @@ export default {
let data = {
settings: {
estimate_prefix: this.estimates.estimate_prefix,
estimate_number_length: this.estimates.estimate_number_length,
estimate_mail_body: this.estimates.estimate_mail_body,
estimate_company_address_format: this.estimates
.company_address_format,