diff --git a/modules/order/back/methods/order/filter.js b/modules/order/back/methods/order/filter.js index 29c0735526..ef6ea8a44b 100644 --- a/modules/order/back/methods/order/filter.js +++ b/modules/order/back/methods/order/filter.js @@ -154,7 +154,8 @@ module.exports = Self => { u.name name, co.code companyCode, zed.zoneFk, - IF(zed.hourTheoretical, zed.hourTheoretical, zed.hourEffective) AS hour, + zed.hourTheoretical, + zed.hourEffective, am.name AS agencyName FROM hedera.order o LEFT JOIN address a ON a.id = o.address_id diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html index 1a2ff60098..230916ba3d 100644 --- a/modules/order/front/index/index.html +++ b/modules/order/front/index/index.html @@ -16,7 +16,7 @@ Created Landed Hour - agency + Agency Total @@ -52,7 +52,10 @@ {{::order.landed | date:'dd/MM/yyyy'}} - {{::order.hour | date: 'HH:mm' | dashIfEmpty}} + {{::(order.hourTheoretical + ? order.hourTheoretical + : order.hourEffective) | dashIfEmpty + }} {{::order.agencyName}} {{::order.total | currency: 'EUR': 2 | dashIfEmpty}}