diff --git a/resources/assets/js/views/reports/ExpensesReport.vue b/resources/assets/js/views/reports/ExpensesReport.vue index ea94af8b..f1b89ba5 100644 --- a/resources/assets/js/views/reports/ExpensesReport.vue +++ b/resources/assets/js/views/reports/ExpensesReport.vue @@ -196,7 +196,14 @@ export default { return true }, downloadReport () { - this.url += '&download=true' + if (!this.getReports()) { + return false + } + if (navigator.appVersion.indexOf('Mac') !== -1) { + this.url += '&download=true' + } else { + window.open(this.getReportUrl + '&download=true') + } setTimeout(() => { this.url = `${this.siteURL}?from_date=${moment(this.formData.from_date).format('DD/MM/YYYY')}&to_date=${moment(this.formData.to_date).format('DD/MM/YYYY')}` }, 200) diff --git a/resources/assets/js/views/reports/ProfitLossReport.vue b/resources/assets/js/views/reports/ProfitLossReport.vue index c63c6678..2b6b5cc5 100644 --- a/resources/assets/js/views/reports/ProfitLossReport.vue +++ b/resources/assets/js/views/reports/ProfitLossReport.vue @@ -200,7 +200,14 @@ export default { return true }, downloadReport () { - this.url += '&download=true' + if (!this.getReports()) { + return false + } + if (navigator.appVersion.indexOf('Mac') !== -1) { + this.url += '&download=true' + } else { + window.open(this.getReportUrl + '&download=true') + } setTimeout(() => { this.url = `${this.siteURL}?from_date=${moment(this.formData.from_date).format('DD/MM/YYYY')}&to_date=${moment(this.formData.to_date).format('DD/MM/YYYY')}` }, 200) diff --git a/resources/assets/js/views/reports/SalesReports.vue b/resources/assets/js/views/reports/SalesReports.vue index cdf8d96a..7778d56c 100644 --- a/resources/assets/js/views/reports/SalesReports.vue +++ b/resources/assets/js/views/reports/SalesReports.vue @@ -238,7 +238,14 @@ export default { return true }, downloadReport () { - this.url += '&download=true' + if (!this.getReports()) { + return false + } + if (navigator.appVersion.indexOf('Mac') !== -1) { + this.url += '&download=true' + } else { + window.open(this.getReportUrl + '&download=true') + } setTimeout(() => { if (this.selectedType === 'By Customer') { this.url = `${this.customerSiteURL}?from_date=${moment(this.formData.from_date).format('DD/MM/YYYY')}&to_date=${moment(this.formData.to_date).format('DD/MM/YYYY')}` diff --git a/resources/assets/js/views/reports/TaxReport.vue b/resources/assets/js/views/reports/TaxReport.vue index 02a2a240..3a9aded5 100644 --- a/resources/assets/js/views/reports/TaxReport.vue +++ b/resources/assets/js/views/reports/TaxReport.vue @@ -189,14 +189,21 @@ export default { this.$v.formData.$touch() if (this.$v.$invalid) { - return true + return false } this.url = `${this.siteURL}?from_date=${moment(this.formData.from_date).format('DD/MM/YYYY')}&to_date=${moment(this.formData.to_date).format('DD/MM/YYYY')}` return true }, downloadReport () { - this.url += '&download=true' + if (!this.getReports()) { + return false + } + if (navigator.appVersion.indexOf('Mac') !== -1) { + this.url += '&download=true' + } else { + window.open(this.url + '&download=true') + } setTimeout(() => { this.url = `${this.siteURL}?from_date=${moment(this.formData.from_date).format('DD/MM/YYYY')}&to_date=${moment(this.formData.to_date).format('DD/MM/YYYY')}` }, 200)