From 3f73084c7d746e22beda2e3d29ea5f6ce94228fc Mon Sep 17 00:00:00 2001 From: joan Date: Fri, 29 Oct 2021 11:42:03 +0200 Subject: [PATCH 1/5] Changed report translations --- print/templates/email/osticket-report/locale/es.yml | 3 ++- print/templates/email/osticket-report/osticket-report.html | 6 ++++++ print/templates/reports/claim-pickup-order/locale/es.yml | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/print/templates/email/osticket-report/locale/es.yml b/print/templates/email/osticket-report/locale/es.yml index c231aa1389..46c38a91c6 100644 --- a/print/templates/email/osticket-report/locale/es.yml +++ b/print/templates/email/osticket-report/locale/es.yml @@ -10,4 +10,5 @@ closed: Cerrado ticketSubject: Asunto ticketDescription: Descripción resolution: Resolución -grafanaLink: "Puedes ver la gráfica desde el siguiente enlace:" \ No newline at end of file +grafanaLink: "Puedes ver la gráfica desde el siguiente enlace:" +redmineLink: "Desde el siguiente enlace puedes ver el resumen semanal de tareas de refactor:" \ No newline at end of file diff --git a/print/templates/email/osticket-report/osticket-report.html b/print/templates/email/osticket-report/osticket-report.html index 431ee2631c..76973c8e17 100644 --- a/print/templates/email/osticket-report/osticket-report.html +++ b/print/templates/email/osticket-report/osticket-report.html @@ -33,6 +33,12 @@ https://grafana.verdnatura.es/d/2kaHDi9Mk/osticket?orgId=1&from={{startedTime}}&to={{endedTime}} +

+
+ + https://redmine.verdnatura.es/projects/refactor/issues?query_id=112 + +
diff --git a/print/templates/reports/claim-pickup-order/locale/es.yml b/print/templates/reports/claim-pickup-order/locale/es.yml index 28bfa73a93..385a54917a 100644 --- a/print/templates/reports/claim-pickup-order/locale/es.yml +++ b/print/templates/reports/claim-pickup-order/locale/es.yml @@ -11,5 +11,5 @@ clientSignature: Firma del cliente claim: Reclamación {0} sections: agency: - description: 'Para agilizar su recogida, por favor, póngase en contacto con la oficina - de integrados.
Tlf: 96 166 77 88 - Ana Gómez (Ext. 2113) (agomezf@integra2.com)' + description: 'Para agilizar su recogida, por favor, póngase en contacto con la oficina + de Logista Parcel.
Tlf: 96 166 77 88 - Ana Gómez (Ext. 2113) (atcsalidas.i2valencia@integra2.es)' From b01298ed17acc33a1ab4b591739191968add0dee Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 2 Nov 2021 08:25:43 +0100 Subject: [PATCH 2/5] feat(entry_descriptor): add supplier button --- modules/entry/front/descriptor/index.html | 9 ++++++++- modules/entry/front/descriptor/locale/es.yml | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/entry/front/descriptor/index.html b/modules/entry/front/descriptor/index.html index 8955b3ee94..04bef0024e 100644 --- a/modules/entry/front/descriptor/index.html +++ b/modules/entry/front/descriptor/index.html @@ -34,13 +34,20 @@
+ + +
+
-
+
Date: Tue, 2 Nov 2021 11:24:52 +0100 Subject: [PATCH 3/5] fix(claim): salesPersonFk where add officeBoss --- modules/claim/front/search-panel/index.html | 2 +- modules/item/front/request-search-panel/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/claim/front/search-panel/index.html b/modules/claim/front/search-panel/index.html index b6ac71989f..6efd6603b1 100644 --- a/modules/claim/front/search-panel/index.html +++ b/modules/claim/front/search-panel/index.html @@ -28,7 +28,7 @@ url="Workers/activeWithRole" search-function="{firstName: $search}" value-field="id" - where="{role: 'salesPerson'}" + where="{role: {inq: ['salesPerson', 'officeBoss']}}" label="Salesperson"> {{firstName}} {{name}} diff --git a/modules/item/front/request-search-panel/index.html b/modules/item/front/request-search-panel/index.html index 299c08d511..8c9d04b644 100644 --- a/modules/item/front/request-search-panel/index.html +++ b/modules/item/front/request-search-panel/index.html @@ -20,7 +20,7 @@ url="Workers/activeWithRole" search-function="{firstName: $search}" value-field="id" - wwhere="{role: {inq: ['logistic', 'buyer']}}" + where="{role: {inq: ['logistic', 'buyer']}}" label="Atender"> {{nickname}} From 06b72ae708ec31851d5d66dbae2a1f7235003a0f Mon Sep 17 00:00:00 2001 From: joan Date: Mon, 8 Nov 2021 07:41:10 +0100 Subject: [PATCH 4/5] fix(pickup-order): changed sql query from pickup order --- print/templates/reports/claim-pickup-order/sql/client.sql | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/print/templates/reports/claim-pickup-order/sql/client.sql b/print/templates/reports/claim-pickup-order/sql/client.sql index 2498574333..30a42d5c88 100644 --- a/print/templates/reports/claim-pickup-order/sql/client.sql +++ b/print/templates/reports/claim-pickup-order/sql/client.sql @@ -12,8 +12,9 @@ SELECT FROM claim cl JOIN client c ON c.id = cl.clientFk JOIN account.user u ON u.id = c.id - JOIN country ct ON ct.id = c.countryFk JOIN ticket t ON t.id = cl.ticketFk JOIN address a ON a.id = t.addressFk - LEFT JOIN province p ON p.id = c.provinceFk + LEFT JOIN province p ON p.id = a.provinceFk + LEFT JOIN autonomy amy ON amy.id = p.autonomyFk + LEFT JOIN country ct ON ct.id = amy.countryFk WHERE cl.id = ? \ No newline at end of file From 7dc95b8cbfbdbb688683403847904c72874fcbde Mon Sep 17 00:00:00 2001 From: joan Date: Mon, 8 Nov 2021 12:50:13 +0100 Subject: [PATCH 5/5] Group first --- modules/order/back/methods/order/filter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/order/back/methods/order/filter.js b/modules/order/back/methods/order/filter.js index bd987dd5b0..ddbaba5bdd 100644 --- a/modules/order/back/methods/order/filter.js +++ b/modules/order/back/methods/order/filter.js @@ -172,11 +172,11 @@ module.exports = Self => { LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk`); stmt.merge(conn.makeWhere(filter.where)); + stmt.merge(`GROUP BY id`); stmt.merge(conn.makePagination(filter)); stmts.push(stmt); stmt = new ParameterizedSQL(`SELECT * FROM tmp.filter`); - stmt.merge(`GROUP BY id`); stmt.merge(conn.makeOrderBy(filter.order)); const ordersIndex = stmts.push(stmt) - 1;