Fix an issue with due date + expiry date not setting correctly & mark as sent button issue

This commit is contained in:
yashkanakiya
2021-12-17 08:25:56 +00:00
committed by Mohit Panjwani
parent 4a85a5d2ab
commit 848970fc08
8 changed files with 15 additions and 17 deletions

View File

@ -496,9 +496,11 @@ export const useEstimateStore = (useWindow = false) => {
this.newEstimate.discount_per_item =
companyStore.selectedCompanySettings.discount_per_item
this.newEstimate.estimate_date = moment().format('YYYY-MM-DD')
this.newEstimate.expiry_date = moment()
.add(7, 'days')
.format('YYYY-MM-DD')
if (companyStore.selectedCompanySettings.estimate_set_expiry_date_automatically === 'YES') {
this.newEstimate.expiry_date = moment()
.add(companyStore.selectedCompanySettings.estimate_expiry_date_days, 'days')
.format('YYYY-MM-DD')
}
} else {
editActions = [this.fetchEstimate(route.params.id)]
}

View File

@ -449,9 +449,11 @@ export const useInvoiceStore = (useWindow = false) => {
this.newInvoice.discount_per_item =
companyStore.selectedCompanySettings.discount_per_item
this.newInvoice.invoice_date = moment().format('YYYY-MM-DD')
this.newInvoice.due_date = moment()
.add(7, 'days')
.format('YYYY-MM-DD')
if (companyStore.selectedCompanySettings.invoice_set_due_date_automatically ==='YES') {
this.newInvoice.due_date = moment()
.add(companyStore.selectedCompanySettings.invoice_due_date_days, 'days')
.format('YYYY-MM-DD')
}
} else {
editActions = [this.fetchInvoice(route.params.id)]
}