TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2026-02-11 13:22:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix date range issue in reports

Browse Source
This commit is contained in:
raishvaria
2020-12-07 12:34:12 +05:30
parent fd3742b926
commit 599e6270e8
4 changed files with 62 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
resources/assets/js/views/reports/ExpensesReport.vue
View File

@@ -163,6 +163,14 @@ export default {
return this.$t('validation.required')
}
},
dateRangeUrl () {
return `${this.siteURL}?from_date=${moment(
this.formData.from_date
).format('YYYY-MM-DD')}&to_date=${moment(this.formData.to_date).format(
'YYYY-MM-DD'
)}`
}
},
watch: {
@@ -174,11 +182,7 @@ export default {
mounted() {
this.siteURL = `/reports/expenses/${this.getSelectedCompany.unique_hash}`
this.url = `${this.siteURL}?from_date=${moment(
this.formData.from_date
).format('YYYY-MM-DD')}&to_date=${moment(this.formData.to_date).format(
'YYYY-MM-DD'
)}`
this.url = this.dateRangeUrl
},
methods: {
@@ -243,6 +247,7 @@ export default {
setRangeToCustom() {
this.selectedRange = 'Custom'
},
async viewReportsPDF() {
let data = await this.getReports()
window.open(this.getReportUrl, '_blank')
@@ -257,7 +262,7 @@ export default {
return true
}
this.url = `${this.siteURL}?from_date=${this.formData.from_date}&to_date=${this.formData.to_date}`
this.url = this.dateRangeUrl
return true
},
@@ -269,7 +274,7 @@ export default {
window.open(this.getReportUrl + '&download=true')
setTimeout(() => {
this.url = `${this.siteURL}?from_date=${this.formData.from_date}&to_date=${this.formData.to_date}`
this.url = this.dateRangeUrl
}, 200)
},
},