TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 04:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix report download & payments delete issue

Browse Source
This commit is contained in:
raishvaria
2020-01-27 14:46:40 +05:30
parent bc4e6a05ea
commit a7275aaa42
6 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/store/modules/item/actions.js
View File

@ -136,7 +136,9 @@ export const fatchItemUnit = ({ commit, dispatch, state }, id) => {
export const deleteItemUnit = ({ commit, dispatch, state }, id) => { export const deleteItemUnit = ({ commit, dispatch, state }, id) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
window.axios.delete(`/api/units/${id}`).then((response) => { window.axios.delete(`/api/units/${id}`).then((response) => {
if (!response.data.error) {
commit(types.DELETE_ITEM_UNIT, id) commit(types.DELETE_ITEM_UNIT, id)
}
resolve(response) resolve(response)
}).catch((err) => { }).catch((err) => {
reject(err) reject(err)

2
resources/assets/js/store/modules/payment/actions.js
View File

@ -154,7 +154,9 @@ export const fetchPaymentMode = ({ commit, dispatch, state }, data) => {
export const deletePaymentMode = ({ commit, dispatch, state }, id) => { export const deletePaymentMode = ({ commit, dispatch, state }, id) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
window.axios.delete(`/api/payment-methods/${id}`).then((response) => { window.axios.delete(`/api/payment-methods/${id}`).then((response) => {
if (!response.data.error) {
commit(types.DELETE_PAYMENT_MODE, id) commit(types.DELETE_PAYMENT_MODE, id)
}
resolve(response) resolve(response)
}).catch((err) => { }).catch((err) => {
reject(err) reject(err)

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

@ -199,11 +199,9 @@ export default {
if (!this.getReports()) { if (!this.getReports()) {
return false return false
} }
if (navigator.appVersion.indexOf('Mac') !== -1) {
this.url += '&download=true'
} else {
window.open(this.getReportUrl + '&download=true') window.open(this.getReportUrl + '&download=true')
}
setTimeout(() => { 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')}` 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) }, 200)

5
resources/assets/js/views/reports/ProfitLossReport.vue
View File

@ -203,11 +203,8 @@ export default {
if (!this.getReports()) { if (!this.getReports()) {
return false return false
} }
if (navigator.appVersion.indexOf('Mac') !== -1) {
this.url += '&download=true'
} else {
window.open(this.getReportUrl + '&download=true') window.open(this.getReportUrl + '&download=true')
}
setTimeout(() => { 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')}` 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) }, 200)

5
resources/assets/js/views/reports/SalesReports.vue
View File

@ -234,11 +234,8 @@ export default {
if (!this.getReports()) { if (!this.getReports()) {
return false return false
} }
if (navigator.appVersion.indexOf('Mac') !== -1) {
this.url += '&download=true'
} else {
window.open(this.getReportUrl + '&download=true') window.open(this.getReportUrl + '&download=true')
}
setTimeout(() => { setTimeout(() => {
if (this.selectedType === 'By Customer') { 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')}` 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')}`

9
resources/assets/js/views/reports/TaxReport.vue
View File

@ -49,7 +49,8 @@
<div class="col-sm-8 reports-tab-container"> <div class="col-sm-8 reports-tab-container">
<iframe :src="getReportUrl" class="reports-frame-style"/> <iframe :src="getReportUrl" class="reports-frame-style"/>
<a class="base-button btn btn-primary btn-lg report-view-button" @click="viewReportsPDF"> <a class="base-button btn btn-primary btn-lg report-view-button" @click="viewReportsPDF">
<font-awesome-icon icon="file-pdf" class="vue-icon icon-left svg-inline--fa fa-download fa-w-16 mr-2" /> <span>{{ $t('reports.view_pdf') }}</span> <font-awesome-icon icon="file-pdf" class="vue-icon icon-left svg-inline--fa fa-download fa-w-16 mr-2" />
<span>{{ $t('reports.view_pdf') }}</span>
</a> </a>
</div> </div>
</div> </div>
@ -199,11 +200,9 @@ export default {
if (!this.getReports()) { if (!this.getReports()) {
return false return false
} }
if (navigator.appVersion.indexOf('Mac') !== -1) {
this.url += '&download=true'
} else {
window.open(this.url + '&download=true') window.open(this.url + '&download=true')
}
setTimeout(() => { 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')}` 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) }, 200)