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 an issue with due date + expiry date not setting correctly & mark as sent button issue

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/scripts/stores/estimate.js
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)]
}

8
resources/scripts/stores/invoice.js
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)]
}

3
resources/scripts/views/estimates/View.vue
View File

@ -195,7 +195,7 @@
truncate
"
/>
<div
class="
mt-1
@ -461,6 +461,7 @@ async function onMarkAsSent() {
estimateData.value.status = 'SENT'
isMarkAsSent.value = true
}
isMarkAsSent.value = false
})
}

3
resources/scripts/views/estimates/create/EstimateCreate.vue
View File

@ -185,9 +185,6 @@ const rules = {
estimate_date: {
required: helpers.withMessage(t('validation.required'), required),
},
expiry_date: {
required: helpers.withMessage(t('validation.required'), required),
},
estimate_number: {
required: helpers.withMessage(t('validation.required'), required),
},

4
resources/scripts/views/estimates/create/EstimateCreateBasicFields.vue
View File

@ -26,8 +26,6 @@
<BaseInputGroup
:label="$t('estimates.expiry_date')"
:content-loading="isLoading"
required
:error="v.expiry_date.$error && v.expiry_date.$errors[0].$message"
>
<BaseDatePicker
v-model="estimateStore.newEstimate.expiry_date"
@ -82,6 +80,8 @@
<script setup>
import { useEstimateStore } from '@/scripts/stores/estimate'
import ExchangeRateConverter from '@/scripts/components/estimate-invoice-common/ExchangeRateConverter.vue'
import { useCompanyStore } from '@/scripts/stores/company'
import { reactive, inject } from 'vue'
const props = defineProps({
v: {

1
resources/scripts/views/invoices/View.vue
View File

@ -101,6 +101,7 @@ async function onMarkAsSent() {
invoiceData.value.status = 'SENT'
isMarkAsSent.value = true
}
isMarkAsSent.value = false
})
}

3
resources/scripts/views/invoices/create/InvoiceCreate.vue
View File

@ -186,9 +186,6 @@ const rules = {
invoice_date: {
required: helpers.withMessage(t('validation.required'), required),
},
due_date: {
required: helpers.withMessage(t('validation.required'), required),
},
reference_number: {
maxLength: helpers.withMessage(
t('validation.price_maxlength'),

2
resources/scripts/views/invoices/create/InvoiceCreateBasicFields.vue
View File

@ -26,8 +26,6 @@
<BaseInputGroup
:label="$t('invoices.due_date')"
:content-loading="isLoading"
required
:error="v.due_date.$error && v.due_date.$errors[0].$message"
>
<BaseDatePicker
v-model="invoiceStore.newInvoice.due_date"