verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 66 Releases Wiki Activity

2983 - Invoice tickets from ticket index #685

Merged
carlosjr merged 7 commits from 2983-ticket_invoice into dev 2021-07-01 12:57:59 +00:00
Conversation 0 Commits 7 Files Changed 13 +5 -3
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3246101574 - Show all commits

2
modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js
View File

@ -87,7 +87,7 @@ describe('ticket makeInvoice()', () => {
await tx.rollback(); await tx.rollback();
} }
expect(error.message).toEqual(`One or more tickets are not billable`); expect(error.message).toEqual(`Some of the selected tickets are not billable`);
}); });
it('should success to invoice a ticket', async() => { it('should success to invoice a ticket', async() => {

3
modules/ticket/front/descriptor-menu/index.js
View File

@ -217,7 +217,8 @@ class Controller extends Section {
} }
makeInvoice() { makeInvoice() {
return this.$http.post(`Tickets/${this.id}/makeInvoice`) const params = {ticketsIds: [this.id]};
return this.$http.post(`Tickets/makeInvoice`, params)
.then(() => this.reload()) .then(() => this.reload())
.then(() => this.vnApp.showSuccess(this.$t('Ticket invoiced'))); .then(() => this.vnApp.showSuccess(this.$t('Ticket invoiced')));
} }

3
modules/ticket/front/descriptor-menu/index.spec.js
View File

@ -139,7 +139,8 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
jest.spyOn(controller, 'reload').mockReturnThis(); jest.spyOn(controller, 'reload').mockReturnThis();
jest.spyOn(controller.vnApp, 'showSuccess'); jest.spyOn(controller.vnApp, 'showSuccess');
$httpBackend.expectPOST(`Tickets/${ticket.id}/makeInvoice`).respond(); const expectedParams = {ticketsIds: [ticket.id]};
$httpBackend.expectPOST(`Tickets/makeInvoice`, expectedParams).respond();
controller.makeInvoice(); controller.makeInvoice();
$httpBackend.flush(); $httpBackend.flush();