From a3d4f674c6a1dc56c2050dec9cd7eb84bbe697c6 Mon Sep 17 00:00:00 2001 From: bernat Date: Wed, 20 Jan 2021 11:28:15 +0100 Subject: [PATCH 1/4] order index changes --- modules/order/back/methods/order/filter.js | 4 ++-- modules/order/front/index/index.html | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/order/back/methods/order/filter.js b/modules/order/back/methods/order/filter.js index 9f5977cd5..29c073552 100644 --- a/modules/order/back/methods/order/filter.js +++ b/modules/order/back/methods/order/filter.js @@ -154,8 +154,8 @@ module.exports = Self => { u.name name, co.code companyCode, zed.zoneFk, - zed.hourTheoretical, - zed.hourEffective + IF(zed.hourTheoretical, zed.hourTheoretical, zed.hourEffective) AS hour, + am.name AS agencyName FROM hedera.order o LEFT JOIN address a ON a.id = o.address_id LEFT JOIN agencyMode am ON am.id = o.agency_id diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html index 7ad34a501..1a2ff6009 100644 --- a/modules/order/front/index/index.html +++ b/modules/order/front/index/index.html @@ -15,8 +15,8 @@ Confirmed Created Landed - T. Hour - Real hour + Hour + agency Total @@ -52,8 +52,8 @@ {{::order.landed | date:'dd/MM/yyyy'}} - {{::order.hourTheoretical | date: 'HH:mm' | dashIfEmpty}} - {{::ticket.hourEffective | date: 'HH:mm' | dashIfEmpty}} + {{::order.hour | date: 'HH:mm' | dashIfEmpty}} + {{::order.agencyName}} {{::order.total | currency: 'EUR': 2 | dashIfEmpty}} Date: Wed, 20 Jan 2021 15:00:44 +0100 Subject: [PATCH 2/4] Worker photo max width and height --- front/salix/components/descriptor/style.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/salix/components/descriptor/style.scss b/front/salix/components/descriptor/style.scss index afef37aa4..f51137620 100644 --- a/front/salix/components/descriptor/style.scss +++ b/front/salix/components/descriptor/style.scss @@ -11,8 +11,8 @@ vn-descriptor-content { & > img[ng-src] { min-height: 16em; display: block; - height: 100%; - width: 100%; + width: 256px; + height: 256px; } vn-float-button { From b25ef7016ae764201879abea3efd7f8e9d9ea674 Mon Sep 17 00:00:00 2001 From: bernat Date: Thu, 21 Jan 2021 18:42:40 +0100 Subject: [PATCH 3/4] cr changes --- modules/order/back/methods/order/filter.js | 3 ++- modules/order/front/index/index.html | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/order/back/methods/order/filter.js b/modules/order/back/methods/order/filter.js index 29c073552..ef6ea8a44 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 1a2ff6009..230916ba3 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}} From 1c7325c1c0ddb82979fe38883618baf109177082 Mon Sep 17 00:00:00 2001 From: joan Date: Fri, 22 Jan 2021 07:26:29 +0100 Subject: [PATCH 4/4] 2739 - Invoice fix --- modules/ticket/front/descriptor-menu/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js index 9d4191530..d2dea6c0a 100644 --- a/modules/ticket/front/descriptor-menu/index.js +++ b/modules/ticket/front/descriptor-menu/index.js @@ -60,7 +60,8 @@ class Controller extends Section { } }, {relation: 'ship'}, - {relation: 'stowaway'}] + {relation: 'stowaway'}, + {relation: 'invoiceOut'}] }; return this.$http.get(`Tickets/${this.ticketId}`, {filter})