TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-31 05:31:10 -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

6
resources/assets/js/plugins/de.json
View File

@ -750,6 +750,7 @@
"title": "Rechnungen",
"notes": "Hinweise",
"invoice_prefix": "Rechnung Präfix",
"invoice_number_length": "Rechnungsnummerlänge",
"default_invoice_email_body": "Standard Rechnung E-Mail Inhalt",
"invoice_settings": "Rechnungseinstellungen",
"autogenerate_invoice_number": "Rechnungsnummer automatisch generieren",
@ -764,6 +765,7 @@
"estimates": {
"title": "Kostenvoranschläge",
"estimate_prefix": "Kostenvoranschlag Präfix",
"estimate_number_length": "Angebotsnummerlänge",
"default_estimate_email_body": "Rechnung - E-Mail Text",
"estimate_settings": "Einstellungen Kostenvoranschlag",
"autogenerate_estimate_number": "Kostenvoranschlagsnummer automatisch generieren",
@ -778,6 +780,7 @@
"title": "Zahlungen",
"description": "Transaktionsmodi für Zahlungen",
"payment_prefix": "Zahlung Präfix",
"payment_number_length": "Zahlungsnummerlänge",
"default_payment_email_body": "Zahlung - E-Mail Text",
"payment_settings": "Zahlung Einstellungen",
"autogenerate_payment_number": "Zahlungsnummer automatisch generieren",
@ -1139,7 +1142,8 @@
"address_maxlength": "Die Adresse sollte nicht länger als 255 Zeichen sein.",
"ref_number_maxlength": "Ref Number sollte nicht länger als 255 Zeichen sein.",
"prefix_maxlength": "Das Präfix sollte nicht länger als 5 Zeichen sein.",
"something_went_wrong": "Da ist etwas schief gelaufen"
"something_went_wrong": "Da ist etwas schief gelaufen",
"number_length_minvalue": "Nummernlänge sollte größer als 0 sein"
},
"pdf_estimate_label": "Kostenvoranschlag",
"pdf_estimate_number": "Kostenvoran. Nummer",

6
resources/assets/js/plugins/en.json
View File

@ -751,6 +751,7 @@
"title": "Invoices",
"notes": "Notes",
"invoice_prefix": "Invoice Prefix",
"invoice_number_length": "Invoice number length",
"default_invoice_email_body": "Default Invoice Email Body",
"invoice_settings": "Invoice Settings",
"autogenerate_invoice_number": "Auto-generate Invoice Number",
@ -767,6 +768,7 @@
"estimates": {
"title": "Estimates",
"estimate_prefix": "Estimate Prefix",
"estimate_number_length": "Estimate number length",
"default_estimate_email_body": "Default Estimate Email Body",
"estimate_settings": "Estimate Settings",
"autogenerate_estimate_number": "Auto-generate Estimate Number",
@ -783,6 +785,7 @@
"title": "Payments",
"description": "Modes of transaction for payments",
"payment_prefix": "Payment Prefix",
"payment_number_length": "Payment number lenght",
"default_payment_email_body": "Default Payment Email Body",
"payment_settings": "Payment Settings",
"autogenerate_payment_number": "Auto-generate Payment Number",
@ -1148,7 +1151,8 @@
"address_maxlength": "Address should not be greater than 255 characters.",
"ref_number_maxlength": "Ref Number should not be greater than 255 characters.",
"prefix_maxlength": "Prefix should not be greater than 5 characters.",
"something_went_wrong": "something went wrong"
"something_went_wrong": "something went wrong",
"number_length_minvalue": "Number lenght should be greater than 0"
},
"pdf_estimate_label": "Estimate",
"pdf_estimate_number": "Estimate Number",

3
resources/assets/js/views/settings/CustomizationSetting.vue
View File

@ -61,14 +61,17 @@ export default {
'payment_auto_generate',
'payment_email_attachment',
'payment_prefix',
'payment_number_length',
'payment_mail_body',
'invoice_auto_generate',
'invoice_email_attachment',
'invoice_prefix',
'invoice_number_length',
'invoice_mail_body',
'estimate_auto_generate',
'estimate_email_attachment',
'estimate_prefix',
'estimate_number_length',
'estimate_mail_body',
'invoice_billing_address_format',
'invoice_shipping_address_format',

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,

40
resources/assets/js/views/settings/customization-tabs/InvoicesTab.vue
View File

@ -14,6 +14,19 @@
/>
</sw-input-group>
<sw-input-group
:label="$t('settings.customization.invoices.invoice_number_length')"
:error="invoicenumberLengthError"
class="mt-6 mb-4"
>
<sw-input
v-model="invoices.invoice_number_length"
:invalid="$v.invoices.invoice_number_length.$error"
type="number"
style="max-width: 60px"
/>
</sw-input-group>
<sw-input-group
:label="
$t('settings.customization.invoices.default_invoice_email_body')
@ -132,7 +145,7 @@
</template>
<script>
const { required, maxLength, alpha } = require('vuelidate/lib/validators')
const { required, maxLength, minValue, alpha, numeric } = require('vuelidate/lib/validators')
import { mapActions, mapGetters } from 'vuex'
export default {
@ -151,6 +164,7 @@ export default {
invoices: {
invoice_prefix: null,
invoice_number_length: null,
invoice_mail_body: null,
company_address_format: null,
shipping_address_format: null,
@ -193,11 +207,29 @@ export default {
return this.$t('validation.characters_only')
}
},
invoicenumberLengthError() {
if (!this.$v.invoices.invoice_number_length.$error) {
return ''
}
if (!this.$v.invoices.invoice_number_length.required) {
return this.$t('validation.required')
}
if (!this.$v.invoices.invoice_number_length.minValue) {
return this.$t('validation.number_length_minvalue')
}
if (!this.$v.invoices.invoice_number_length.numeric) {
return this.$t('validation.numbers_only')
}
},
},
watch: {
settings(val) {
this.invoices.invoice_prefix = val ? val.invoice_prefix : ''
this.invoices.invoice_number_length = val ? val.invoice_number_length : ''
this.invoices.invoice_mail_body = val ? val.invoice_mail_body : null
this.invoices.company_address_format = val
@ -235,6 +267,11 @@ export default {
maxLength: maxLength(5),
alpha,
},
invoice_number_length: {
required,
minValue: minValue(1),
numeric
},
},
},
@ -278,6 +315,7 @@ export default {
let data = {
settings: {
invoice_prefix: this.invoices.invoice_prefix,
invoice_number_length: this.invoices.invoice_number_length,
invoice_mail_body: this.invoices.invoice_mail_body,
invoice_company_address_format: this.invoices.company_address_format,
invoice_billing_address_format: this.invoices.billing_address_format,

40
resources/assets/js/views/settings/customization-tabs/PaymentsTab.vue
View File

@ -15,6 +15,19 @@
/>
</sw-input-group>
<sw-input-group
:label="$t('settings.customization.payments.payment_number_length')"
:error="paymentnumberLengthError"
class="mt-6 mb-4"
>
<sw-input
v-model="payments.payment_number_length"
:invalid="$v.payments.payment_number_length.$error"
type="number"
style="max-width: 60px"
/>
</sw-input-group>
<sw-input-group
:label="
$t('settings.customization.payments.default_payment_email_body')
@ -121,7 +134,7 @@
</template>
<script>
import { mapActions, mapGetters } from 'vuex'
const { required, maxLength, alpha } = require('vuelidate/lib/validators')
const { required, maxLength, minValue, alpha, numeric } = require('vuelidate/lib/validators')
export default {
props: {
@ -139,6 +152,7 @@ export default {
payments: {
payment_prefix: null,
payment_number_length: null,
payment_mail_body: null,
from_customer_address_format: null,
company_address_format: null,
@ -179,6 +193,23 @@ export default {
return this.$t('validation.characters_only')
}
},
paymentnumberLengthError() {
if (!this.$v.payments.payment_number_length.$error) {
return ''
}
if (!this.$v.payments.payment_number_length.required) {
return this.$t('validation.required')
}
if (!this.$v.payments.payment_number_length.minValue) {
return this.$t('validation.number_length_minvalue')
}
if (!this.$v.payments.payment_number_length.numeric) {
return this.$t('validation.numbers_only')
}
},
},
validations: {
@ -188,12 +219,18 @@ export default {
maxLength: maxLength(5),
alpha,
},
payment_number_length: {
required,
minValue: minValue(1),
numeric
},
},
},
watch: {
settings(val) {
this.payments.payment_prefix = val ? val.payment_prefix : ''
this.payments.payment_number_length = val ? val.payment_number_length : ''
this.payments.payment_mail_body = val ? val.payment_mail_body : ''
@ -263,6 +300,7 @@ export default {
let data = {
settings: {
payment_prefix: this.payments.payment_prefix,
payment_number_length: this.payments.payment_number_length,
payment_mail_body: this.payments.payment_mail_body,
payment_company_address_format: this.payments.company_address_format,
payment_from_customer_address_format: this.payments