fix conflicts

This commit is contained in:
yogesh_gohil
2019-11-14 15:51:48 +05:30
parent 4839e57791
commit 2dda0baa3f
51 changed files with 576 additions and 226 deletions

View File

@ -229,12 +229,22 @@ export default {
return true
},
async onMarkAsSent () {
this.isRequestOnGoing = true
let response = await this.markAsSent({id: this.invoice.id})
this.isRequestOnGoing = false
if (response.data) {
window.toastr['success'](this.$tc('invoices.marked_as_sent_message'))
}
swal({
title: this.$t('general.are_you_sure'),
text: this.$t('invoices.invoice_mark_as_sent'),
icon: '/assets/icon/check-circle-solid.svg',
buttons: true,
dangerMode: true
}).then(async (MarkAsSend_Invoice) => {
if (MarkAsSend_Invoice) {
this.isRequestOnGoing = true
let response = await this.markAsSent({id: this.invoice.id})
this.isRequestOnGoing = false
if (response.data) {
window.toastr['success'](this.$tc('invoices.marked_as_sent_message'))
}
}
})
},
async removeInvoice (id) {
this.selectInvoice([parseInt(id)])
@ -242,7 +252,7 @@ export default {
swal({
title: 'Deleted',
text: 'you will not be able to recover this invoice!',
icon: 'error',
icon: '/assets/icon/trash-solid.svg',
buttons: true,
dangerMode: true
}).then(async (willDelete) => {