From 783a8dee485c23a1af6bfe887fda9d5ad4badc00 Mon Sep 17 00:00:00 2001 From: joan Date: Mon, 18 Jan 2021 08:55:57 +0100 Subject: [PATCH 1/3] 2724 - Fix: Create new service type --- modules/ticket/front/services/index.html | 1 + modules/ticket/front/services/index.js | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/modules/ticket/front/services/index.html b/modules/ticket/front/services/index.html index 9fc9e5a311..13fd84b003 100644 --- a/modules/ticket/front/services/index.html +++ b/modules/ticket/front/services/index.html @@ -6,6 +6,7 @@ auto-load="true"> { + this.$.typesModel.refresh(); + return res; + }) .then(res => service.ticketServiceTypeFk = res.data.id); } From 239e64db4825639624b7c82176a6096c67ff6411 Mon Sep 17 00:00:00 2001 From: joan Date: Mon, 18 Jan 2021 09:08:50 +0100 Subject: [PATCH 2/3] Updated unit test --- modules/ticket/front/services/index.spec.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/ticket/front/services/index.spec.js b/modules/ticket/front/services/index.spec.js index 5d8d58505f..affe8a6e7f 100644 --- a/modules/ticket/front/services/index.spec.js +++ b/modules/ticket/front/services/index.spec.js @@ -1,4 +1,5 @@ import './index.js'; +import crudModel from 'core/mocks/crud-model'; describe('Ticket component vnTicketService', () => { let controller; @@ -11,7 +12,7 @@ describe('Ticket component vnTicketService', () => { beforeEach(inject(($componentController, _$httpBackend_, $rootScope) => { $httpBackend = _$httpBackend_; $scope = $rootScope.$new(); - + $scope.typesModel = crudModel; $element = angular.element(`
`); controller = $componentController('vnTicketService', {$scope, $element}); })); From 97c8faaf50e05e00aeba860d7ba1252b49a2f274 Mon Sep 17 00:00:00 2001 From: Jorge Padawan Date: Mon, 18 Jan 2021 11:43:48 +0100 Subject: [PATCH 3/3] Add column multiplier on item section --- modules/item/back/methods/item/filter.js | 1 + modules/item/back/models/item.json | 5 ++++- modules/item/front/index/index.html | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js index 1fefab77e0..f392dba871 100644 --- a/modules/item/back/methods/item/filter.js +++ b/modules/item/back/methods/item/filter.js @@ -119,6 +119,7 @@ module.exports = Self => { ori.code AS origin, ic.name AS category, i.density, + i.stemMultiplier, b.grouping, b.packing, itn.code AS niche, @visibleCalc diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json index 66c32933ed..96fec51611 100644 --- a/modules/item/back/models/item.json +++ b/modules/item/back/models/item.json @@ -65,7 +65,10 @@ "type": "Number", "description": "Density" }, - "image": { + "stemMultiplier": { + "type": "Number", + "description": "Multiplier" + },"image": { "type": "String", "description": "Image" }, diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html index 8b03bc0d6b..71bff05eef 100644 --- a/modules/item/front/index/index.html +++ b/modules/item/front/index/index.html @@ -25,6 +25,7 @@ Origin Buyer Density + Multiplier Active @@ -78,6 +79,7 @@ {{::item.density}} + {{::item.stemMultiplier}}