From 24981912e48c0bbca7897e26a3f74bfbe8380b46 Mon Sep 17 00:00:00 2001 From: joan Date: Thu, 13 May 2021 09:17:49 +0200 Subject: [PATCH 1/3] 2907 - Proper claim rate percentage --- modules/client/front/summary/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html index b1ec1f781..8a4f6eec7 100644 --- a/modules/client/front/summary/index.html +++ b/modules/client/front/summary/index.html @@ -234,7 +234,7 @@ value="{{$ctrl.summary.mana.mana | currency: 'EUR':2}}"> + value="{{$ctrl.claimRate($ctrl.summary.claimsRatio.priceIncreasing / 100) | percentage}}"> From ac02f8b30982c5aea0abbaf7903251d968c22a75 Mon Sep 17 00:00:00 2001 From: joan Date: Thu, 13 May 2021 12:18:21 +0200 Subject: [PATCH 2/3] Ticket request hotfix --- modules/ticket/front/request/create/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ticket/front/request/create/index.html b/modules/ticket/front/request/create/index.html index f7280b2de..8d25358b5 100644 --- a/modules/ticket/front/request/create/index.html +++ b/modules/ticket/front/request/create/index.html @@ -20,7 +20,7 @@ ng-model="$ctrl.ticketRequest.attenderFk" url="Workers/activeWithRole" show-field="nickname" - where="{role: 'buyer'}" + where="{role: {inq: ['logistic', 'buyer']}}" search-function="{firstName: $search}"> From e6f7ef41b0d8053abd36fc9625935d59e838552b Mon Sep 17 00:00:00 2001 From: joan Date: Wed, 12 May 2021 14:22:29 +0200 Subject: [PATCH 3/3] Hotfix: Catalog items without ink --- modules/order/back/methods/order/catalogFilter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/order/back/methods/order/catalogFilter.js b/modules/order/back/methods/order/catalogFilter.js index b2d49054d..4502435b5 100644 --- a/modules/order/back/methods/order/catalogFilter.js +++ b/modules/order/back/methods/order/catalogFilter.js @@ -118,8 +118,8 @@ module.exports = Self => { FROM tmp.ticketCalculateItem tci JOIN vn.item i ON i.id = tci.itemFk JOIN vn.itemType it ON it.id = i.typeFk - JOIN vn.ink ON ink.id = i.inkFk - JOIN vn.worker w on w.id = it.workerFk`); + JOIN vn.worker w on w.id = it.workerFk + LEFT JOIN vn.ink ON ink.id = i.inkFk`); // Apply order by tag if (orderBy.isTag) {