From 34730f48edc6473b20f0d7cfcd36f9d1a142cff5 Mon Sep 17 00:00:00 2001 From: vicent Date: Wed, 16 Feb 2022 12:51:45 +0100 Subject: [PATCH 1/6] fix: add role salesBoss to filter --- modules/claim/front/search-panel/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/claim/front/search-panel/index.html b/modules/claim/front/search-panel/index.html index dbbc3a46be..22faf9ec42 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: {inq: ['salesPerson', 'officeBoss']}}" + where="{role: {inq: ['salesBoss', 'salesPerson', 'officeBoss']}}" label="Salesperson"> {{firstName}} {{name}} @@ -38,7 +38,7 @@ url="Workers/activeWithRole" search-function="{firstName: $search}" value-field="id" - where="{role: 'salesPerson'}" + where="{role: {inq: ['salesBoss', 'salesPerson']}}" label="Attended by"> {{firstName}} {{name}} From 743972e9c31466ebca89bf051bf73303fdff692b Mon Sep 17 00:00:00 2001 From: joan Date: Thu, 17 Feb 2022 11:23:27 +0100 Subject: [PATCH 2/6] fix(invoice): prevent report empty pages --- print/templates/reports/invoice/assets/css/style.css | 9 ++++++--- print/templates/reports/invoice/invoice.html | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/print/templates/reports/invoice/assets/css/style.css b/print/templates/reports/invoice/assets/css/style.css index cd605db9bc..9fda2a6138 100644 --- a/print/templates/reports/invoice/assets/css/style.css +++ b/print/templates/reports/invoice/assets/css/style.css @@ -5,7 +5,7 @@ h2 { .table-title { margin-bottom: 15px; - font-size: 0.8rem + font-size: .8rem } .table-title h2 { @@ -16,9 +16,12 @@ h2 { font-size: 22px } + #nickname h2 { - max-width: 400px; - word-wrap: break-word + max-width: 400px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; } #phytosanitary { diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html index 8b13f2a157..1d646a0db9 100644 --- a/print/templates/reports/invoice/invoice.html +++ b/print/templates/reports/invoice/invoice.html @@ -85,7 +85,7 @@ -
+

{{$t('deliveryNote')}} From 2bdb1075fbc57d2b4ae8064b11e77c6014e6ca1e Mon Sep 17 00:00:00 2001 From: joan Date: Thu, 17 Feb 2022 11:23:27 +0100 Subject: [PATCH 3/6] fix(invoice): prevent report empty pages --- print/templates/reports/invoice/assets/css/style.css | 9 ++++++--- print/templates/reports/invoice/invoice.html | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/print/templates/reports/invoice/assets/css/style.css b/print/templates/reports/invoice/assets/css/style.css index cd605db9bc..9fda2a6138 100644 --- a/print/templates/reports/invoice/assets/css/style.css +++ b/print/templates/reports/invoice/assets/css/style.css @@ -5,7 +5,7 @@ h2 { .table-title { margin-bottom: 15px; - font-size: 0.8rem + font-size: .8rem } .table-title h2 { @@ -16,9 +16,12 @@ h2 { font-size: 22px } + #nickname h2 { - max-width: 400px; - word-wrap: break-word + max-width: 400px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; } #phytosanitary { diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html index 8b13f2a157..1d646a0db9 100644 --- a/print/templates/reports/invoice/invoice.html +++ b/print/templates/reports/invoice/invoice.html @@ -85,7 +85,7 @@ -
+

{{$t('deliveryNote')}} From 05aa5791564d4bc9883f9c8e1f566d4a080760bb Mon Sep 17 00:00:00 2001 From: vicent Date: Wed, 16 Feb 2022 12:51:45 +0100 Subject: [PATCH 4/6] fix: add role salesBoss to filter --- modules/claim/front/search-panel/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/claim/front/search-panel/index.html b/modules/claim/front/search-panel/index.html index 6efd6603b1..b48d94d219 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: {inq: ['salesPerson', 'officeBoss']}}" + where="{role: {inq: ['salesBoss', 'salesPerson', 'officeBoss']}}" label="Salesperson"> {{firstName}} {{name}} @@ -38,7 +38,7 @@ url="Workers/activeWithRole" search-function="{firstName: $search}" value-field="id" - where="{role: 'salesPerson'}" + where="{role: {inq: ['salesBoss', 'salesPerson']}}" label="Attended by"> {{firstName}} {{name}} From 46488aa60002df15f3fde5435e8372c6738e4e6a Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 3 Feb 2022 11:52:55 +0100 Subject: [PATCH 5/6] fix(icon): icon-plant --- front/core/styles/icons/salixfont.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/core/styles/icons/salixfont.css b/front/core/styles/icons/salixfont.css index ff2eaa1f54..e37ccbc1fd 100644 --- a/front/core/styles/icons/salixfont.css +++ b/front/core/styles/icons/salixfont.css @@ -290,7 +290,7 @@ .icon-photo:before { content: "\e924"; } -.icon-planta:before { +.icon-plant:before { content: "\e908"; } .icon-polizon:before { From c260917e20a8a87b65a13823625e4245918609e2 Mon Sep 17 00:00:00 2001 From: joan Date: Fri, 18 Feb 2022 08:49:31 +0100 Subject: [PATCH 6/6] fix(closure): removed transaction --- print/methods/closure/closure.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/print/methods/closure/closure.js b/print/methods/closure/closure.js index 8cce8237c0..2b58205e38 100644 --- a/print/methods/closure/closure.js +++ b/print/methods/closure/closure.js @@ -12,8 +12,6 @@ module.exports = { const failedtickets = []; for (const ticket of tickets) { try { - await db.rawSql('START TRANSACTION'); - await db.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id]); const invoiceOut = await db.findOne(` @@ -91,9 +89,7 @@ module.exports = { const email = new Email('delivery-note-link', args); await email.send(); } - await db.rawSql('COMMIT'); } catch (error) { - await db.rawSql('ROLLBACK'); // Domain not found if (error.responseCode == 450) return invalidEmail(ticket);