diff --git a/modules/client/front/balance/create/index.html b/modules/client/front/balance/create/index.html index f975b06ba..81be14382 100644 --- a/modules/client/front/balance/create/index.html +++ b/modules/client/front/balance/create/index.html @@ -77,7 +77,7 @@ on-change="$ctrl.accountShortToStandard(value)"> - + diff --git a/modules/client/front/balance/create/index.js b/modules/client/front/balance/create/index.js index 95f9d72a8..be05983ca 100644 --- a/modules/client/front/balance/create/index.js +++ b/modules/client/front/balance/create/index.js @@ -121,14 +121,18 @@ class Controller extends Dialog { if (response !== 'accept') return super.responseHandler(response); + let receiptId; return this.$http.post(`Clients/${this.clientFk}/createReceipt`, this.receipt) - .then(() => super.responseHandler(response)) + .then(res => { + receiptId = res.data.id; + super.responseHandler(response); + }) .then(() => this.vnApp.showSuccess(this.$t('Data saved!'))) .then(() => { if (this.viewReceipt) { this.vnReport.show('receipt', { - receiptId: 1, - companyId: 442 + receiptId: receiptId, + companyId: this.companyFk }); } }); diff --git a/modules/client/front/balance/create/index.spec.js b/modules/client/front/balance/create/index.spec.js index 90015be19..df3613cad 100644 --- a/modules/client/front/balance/create/index.spec.js +++ b/modules/client/front/balance/create/index.spec.js @@ -40,6 +40,14 @@ describe('Client', () => { }); }); + describe('amountToReturn() setter', () => { + it('should set the amount to return with a maximum of two decimals', () => { + controller.amountToReturn = 200.1451789; + + expect(controller.amountToReturn).toEqual(200.15); + }); + }); + describe('getAmountPaid()', () => { it('should make an http GET query and then set the receipt amountPaid property', () => { controller.$params = {id: 101}; @@ -62,6 +70,7 @@ describe('Client', () => { describe('responseHandler()', () => { it('should make an http POST query and then call to the parent responseHandler() method', () => { jest.spyOn(controller.vnApp, 'showSuccess'); + jest.spyOn(controller.vnReport, 'show'); controller.$params = {id: 101}; @@ -70,6 +79,25 @@ describe('Client', () => { $httpBackend.flush(); expect(controller.vnApp.showSuccess).toHaveBeenCalled(); + expect(controller.vnReport.show).not.toHaveBeenCalled(); + }); + + it('should make an http POST query and then call to the report show() method', () => { + jest.spyOn(controller.vnApp, 'showSuccess'); + jest.spyOn(controller.vnReport, 'show'); + window.open = jest.fn(); + + controller.$params = {id: 101}; + controller.viewReceipt = true; + + $httpBackend.expect('POST', `Clients/101/createReceipt`).respond({id: 1}); + controller.responseHandler('accept'); + $httpBackend.flush(); + + const expectedParams = {receiptId: 1, companyId: 442}; + + expect(controller.vnApp.showSuccess).toHaveBeenCalled(); + expect(controller.vnReport.show).toHaveBeenCalledWith('receipt', expectedParams); }); }); diff --git a/modules/client/front/balance/create/locale/es.yml b/modules/client/front/balance/create/locale/es.yml new file mode 100644 index 000000000..266e4365c --- /dev/null +++ b/modules/client/front/balance/create/locale/es.yml @@ -0,0 +1 @@ +View receipt: Ver recibo \ No newline at end of file