From dddfe2773a6551a65242f1c200f82034d1396cc1 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Fri, 12 Jun 2020 11:26:32 +0200 Subject: [PATCH 1/3] 2293 - getVolume() call to saleVolume --- modules/ticket/back/methods/ticket/getVolume.js | 4 ++-- modules/ticket/back/methods/ticket/specs/getVolume.spec.js | 2 +- modules/ticket/front/volume/index.html | 2 +- modules/ticket/front/volume/index.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/ticket/back/methods/ticket/getVolume.js b/modules/ticket/back/methods/ticket/getVolume.js index 9b4d28edc2..149f650ec6 100644 --- a/modules/ticket/back/methods/ticket/getVolume.js +++ b/modules/ticket/back/methods/ticket/getVolume.js @@ -20,7 +20,7 @@ module.exports = Self => { }); Self.getVolume = async ticketFk => { - let [volume] = await Self.rawSql(`CALL vn.ticketListVolume(?)`, [ticketFk]); - return volume; + return Self.rawSql(`SELECT * FROM vn.saleVolume + WHERE ticketFk = ?`, [ticketFk]); }; }; diff --git a/modules/ticket/back/methods/ticket/specs/getVolume.spec.js b/modules/ticket/back/methods/ticket/specs/getVolume.spec.js index 8acf673afd..6807246611 100644 --- a/modules/ticket/back/methods/ticket/specs/getVolume.spec.js +++ b/modules/ticket/back/methods/ticket/specs/getVolume.spec.js @@ -5,7 +5,7 @@ describe('ticket getVolume()', () => { let ticketFk = 1; await app.models.Ticket.getVolume(ticketFk) .then(response => { - expect(response[0].m3).toEqual(1.09); + expect(response[0].volume).toEqual(1.09); }); }); }); diff --git a/modules/ticket/front/volume/index.html b/modules/ticket/front/volume/index.html index 23f179fc43..3378b70a11 100644 --- a/modules/ticket/front/volume/index.html +++ b/modules/ticket/front/volume/index.html @@ -50,7 +50,7 @@ sub-name="::sale.item.subName"/> {{::sale.quantity}} - {{::sale.volume.m3 | number:3}} + {{::sale.saleVolume.volume | number:3}} diff --git a/modules/ticket/front/volume/index.js b/modules/ticket/front/volume/index.js index 3d690764f2..74ff61c85b 100644 --- a/modules/ticket/front/volume/index.js +++ b/modules/ticket/front/volume/index.js @@ -39,7 +39,7 @@ class Controller extends Section { this.sales.forEach(sale => { this.volumes.forEach(volume => { if (sale.id === volume.saleFk) - sale.volume = volume; + sale.saleVolume = volume; }); }); } From 3d388ad22684f19021c091f05cce49a1f1611ba9 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Fri, 12 Jun 2020 11:39:33 +0200 Subject: [PATCH 2/3] Updated unit test --- modules/ticket/front/volume/index.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ticket/front/volume/index.spec.js b/modules/ticket/front/volume/index.spec.js index 7807bfe10a..77879be678 100644 --- a/modules/ticket/front/volume/index.spec.js +++ b/modules/ticket/front/volume/index.spec.js @@ -61,8 +61,8 @@ describe('ticket', () => { controller.sales = [{id: 1, name: 'Sale one'}, {id: 2, name: 'Sale two'}]; controller.volumes = [{saleFk: 1, m3: 0.012}, {saleFk: 2, m3: 0.015}]; - expect(controller.sales[0].volume.m3).toEqual(0.012); - expect(controller.sales[1].volume.m3).toEqual(0.015); + expect(controller.sales[0].saleVolume.volume).toEqual(0.012); + expect(controller.sales[1].saleVolume.volume).toEqual(0.015); }); }); From 36ec9308783be1fd748406e1f2d48656b3a68886 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Fri, 12 Jun 2020 12:01:53 +0200 Subject: [PATCH 3/3] Updated test --- modules/ticket/front/volume/index.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ticket/front/volume/index.spec.js b/modules/ticket/front/volume/index.spec.js index 77879be678..f7cb5a58d0 100644 --- a/modules/ticket/front/volume/index.spec.js +++ b/modules/ticket/front/volume/index.spec.js @@ -59,7 +59,7 @@ describe('ticket', () => { it(`should apply volumes to the sales if sales and volumes properties are defined on controller`, () => { controller.sales = [{id: 1, name: 'Sale one'}, {id: 2, name: 'Sale two'}]; - controller.volumes = [{saleFk: 1, m3: 0.012}, {saleFk: 2, m3: 0.015}]; + controller.volumes = [{saleFk: 1, volume: 0.012}, {saleFk: 2, volume: 0.015}]; expect(controller.sales[0].saleVolume.volume).toEqual(0.012); expect(controller.sales[1].saleVolume.volume).toEqual(0.015);