From 1a58424531e919e291f15d6296807205ac2c2c45 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 12 Jun 2023 08:33:31 +0200 Subject: [PATCH 1/9] refs #5327 warnFix(ticket_sale): fix orderBy amount itemPackingType --- modules/ticket/front/sale/index.html | 4 ++-- modules/ticket/front/sale/index.js | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html index f50ef10a5..e0f4e4ed5 100644 --- a/modules/ticket/front/sale/index.html +++ b/modules/ticket/front/sale/index.html @@ -69,7 +69,7 @@ Price Disc Amount - Packaging + Packaging @@ -202,7 +202,7 @@ - {{$ctrl.getSaleTotal(sale) | currency: 'EUR':2}} + {{::sale.amount | currency: 'EUR':2}} {{::sale.item.itemPackingTypeFk | dashIfEmpty}} diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js index 88a59e605..b68db6dc0 100644 --- a/modules/ticket/front/sale/index.js +++ b/modules/ticket/front/sale/index.js @@ -34,6 +34,11 @@ class Controller extends Section { } get sales() { + if (this._sales) { + for (let sale of this._sales) + sale.amount = this.getSaleTotal(sale); + } + return this._sales; } @@ -49,6 +54,7 @@ class Controller extends Section { return ticketState && ticketState.state.code; } + getConfig() { let filter = { fields: ['daysForWarningClaim'], From 2c0c0f24b0083f9c898680da9843ab4b9be690d7 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 12 Jun 2023 08:36:19 +0200 Subject: [PATCH 2/9] reactive --- modules/ticket/front/sale/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html index e0f4e4ed5..be9e81964 100644 --- a/modules/ticket/front/sale/index.html +++ b/modules/ticket/front/sale/index.html @@ -202,7 +202,7 @@ - {{::sale.amount | currency: 'EUR':2}} + {{sale.amount | currency: 'EUR':2}} {{::sale.item.itemPackingTypeFk | dashIfEmpty}} From ef0ae335e81e2bb86da4323165efd7c029167321 Mon Sep 17 00:00:00 2001 From: vicent Date: Fri, 16 Jun 2023 11:56:36 +0200 Subject: [PATCH 3/9] fix: muestra las observaciones de los tickets --- print/templates/reports/invoice/invoice.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html index 727621b2c..d74325dfd 100644 --- a/print/templates/reports/invoice/invoice.html +++ b/print/templates/reports/invoice/invoice.html @@ -242,7 +242,7 @@ -
+
{{$t('observations')}}
@@ -267,9 +267,7 @@ v-bind:left-text="$t('invoiceRef', [invoice.ref])" v-bind:center-text="client.socialName" v-bind:recipient-id="client.id" - v-bind="$props" - - > + v-bind="$props"> From 75bb0f8160d7464dde79ce47e487d0f355f5b069 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 16 Jun 2023 12:19:59 +0200 Subject: [PATCH 4/9] refs #5860 fix hash smbhash --- back/process.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/process.yml b/back/process.yml index 38d2b9eaf..a29323240 100644 --- a/back/process.yml +++ b/back/process.yml @@ -4,4 +4,4 @@ apps: instances: 1 max_restarts: 3 restart_delay: 15000 - node_args: --tls-min-v1.0 + node_args: --tls-min-v1.0 --openssl-legacy-provider From 081cf43eceaeb775d3118b8f169a41049dde7278 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 16 Jun 2023 13:39:24 +0200 Subject: [PATCH 5/9] refs #5667 SupplierAccount translation added --- modules/supplier/back/locale/supplier-account/en.yml | 1 + modules/supplier/back/locale/supplier-account/es.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/supplier/back/locale/supplier-account/en.yml b/modules/supplier/back/locale/supplier-account/en.yml index 2bce50cfa..43c4ba40d 100644 --- a/modules/supplier/back/locale/supplier-account/en.yml +++ b/modules/supplier/back/locale/supplier-account/en.yml @@ -5,3 +5,4 @@ columns: beneficiary: beneficiary supplierFk: supplier bankEntityFk: bank entity + accountingFk: ledger account diff --git a/modules/supplier/back/locale/supplier-account/es.yml b/modules/supplier/back/locale/supplier-account/es.yml index 120293c8a..9db5708a3 100644 --- a/modules/supplier/back/locale/supplier-account/es.yml +++ b/modules/supplier/back/locale/supplier-account/es.yml @@ -5,3 +5,4 @@ columns: beneficiary: beneficiario supplierFk: proveedor bankEntityFk: entidad bancaria + accountingFk: cuenta contable From 63888e2d6441b277250c1ea7873d3a9b13a81933 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 19 Jun 2023 13:52:25 +0200 Subject: [PATCH 6/9] refs #5595 console.log(orderFk, userId) for rawSQL logs --- modules/order/back/methods/order/confirm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/order/back/methods/order/confirm.js b/modules/order/back/methods/order/confirm.js index 5fdab29b3..5a31e7149 100644 --- a/modules/order/back/methods/order/confirm.js +++ b/modules/order/back/methods/order/confirm.js @@ -21,7 +21,7 @@ module.exports = Self => { Self.confirm = async(ctx, orderFk) => { const userId = ctx.req.accessToken.userId; - + console.log(orderFk, userId); const query = `CALL hedera.order_confirmWithUser(?, ?)`; const response = await Self.rawSql(query, [orderFk, userId], {userId}); From 9fa6e2df71ed50fad312acdcdff4cd3f5cd08834 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 19 Jun 2023 14:54:32 +0200 Subject: [PATCH 7/9] refs #5595 VnModel.rawSql() bugfix --- loopback/common/models/vn-model.js | 31 ++++++++++----------- modules/order/back/methods/order/confirm.js | 1 - 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/loopback/common/models/vn-model.js b/loopback/common/models/vn-model.js index f92e1ea09..22b535f62 100644 --- a/loopback/common/models/vn-model.js +++ b/loopback/common/models/vn-model.js @@ -200,22 +200,20 @@ module.exports = function(Self) { const connector = this.dataSource.connector; let conn; let res; - const opts = Object.assign({}, options); try { if (userId) { - conn = await new Promise((resolve, reject) => { - connector.client.getConnection(function(err, conn) { - if (err) - reject(err); - else - resolve(conn); + if (!options.transaction) { + options = Object.assign({}, options); + conn = await new Promise((resolve, reject) => { + connector.client.getConnection(function(err, conn) { + if (err) + reject(err); + else + resolve(conn); + }); }); - }); - - const opts = Object.assign({}, options); - if (!opts.transaction) { - opts.transaction = { + options.transaction = { connection: conn, connector }; @@ -223,15 +221,14 @@ module.exports = function(Self) { await connector.executeP( 'CALL account.myUser_loginWithName((SELECT name FROM account.user WHERE id = ?))', - [userId], opts + [userId], options ); } - res = await connector.executeP(query, params, opts); + res = await connector.executeP(query, params, options); - if (userId) { - await connector.executeP('CALL account.myUser_logout()', null, opts); - } + if (userId) + await connector.executeP('CALL account.myUser_logout()', null, options); } finally { if (conn) conn.release(); } diff --git a/modules/order/back/methods/order/confirm.js b/modules/order/back/methods/order/confirm.js index 5a31e7149..1fcb3a760 100644 --- a/modules/order/back/methods/order/confirm.js +++ b/modules/order/back/methods/order/confirm.js @@ -21,7 +21,6 @@ module.exports = Self => { Self.confirm = async(ctx, orderFk) => { const userId = ctx.req.accessToken.userId; - console.log(orderFk, userId); const query = `CALL hedera.order_confirmWithUser(?, ?)`; const response = await Self.rawSql(query, [orderFk, userId], {userId}); From dcfb991f94a0e74fcc629d12af877389073d90f1 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 20 Jun 2023 09:20:06 +0200 Subject: [PATCH 8/9] hotFix(getLeaves): remoteMethodCtx correct defined --- modules/worker/back/methods/department/getLeaves.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/worker/back/methods/department/getLeaves.js b/modules/worker/back/methods/department/getLeaves.js index 48fe78e08..b1ce2fbe8 100644 --- a/modules/worker/back/methods/department/getLeaves.js +++ b/modules/worker/back/methods/department/getLeaves.js @@ -1,5 +1,5 @@ module.exports = Self => { - Self.remoteMethodCtx, ('getLeaves', { + Self.remoteMethodCtx('getLeaves', { description: 'Returns the nodes for a department', accepts: [{ arg: 'parentId', From 6c00e704cc95f7c5750ca6d9b544cdb2502a76b6 Mon Sep 17 00:00:00 2001 From: vicent Date: Tue, 20 Jun 2023 09:42:08 +0200 Subject: [PATCH 9/9] refs #5697 fix: eliminado por la columna fecha, que no se formatea correctamente --- modules/monitor/front/index/tickets/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/monitor/front/index/tickets/index.html b/modules/monitor/front/index/tickets/index.html index bdd4e76ff..94a950baf 100644 --- a/modules/monitor/front/index/tickets/index.html +++ b/modules/monitor/front/index/tickets/index.html @@ -50,13 +50,13 @@ Salesperson - + Date - + Theoretical - + Practical