From eb6917c10d19929c9ff4869e32096879b0d291e8 Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 4 Sep 2023 13:08:01 +0200 Subject: [PATCH 1/9] refs #6194 change link --- print/templates/email/printer-setup/locale/es.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/print/templates/email/printer-setup/locale/es.yml b/print/templates/email/printer-setup/locale/es.yml index b96d6d5f4..1884493ca 100644 --- a/print/templates/email/printer-setup/locale/es.yml +++ b/print/templates/email/printer-setup/locale/es.yml @@ -8,8 +8,8 @@ description: https://www.youtube.com/watch?v=qhb0kgQF3o8. También necesitarás el GoLabel, el programa para imprimir las cintas. - downloadFrom: Puedes descargarlo desde este enlace https://godex.s3-accelerate.amazonaws.com/_6f5glRrVhQAEBGhdUsqJA.file?v01 + downloadFrom: Puedes descargarlo desde este enlace https://godex.s3-accelerate.amazonaws.com/bF8ttaXcClv24092,4vQCQ.file?v01 downloadDriver: En este enlace puedes descargar el driver de la impresora https://es.seagullscientific.com/support/downloads/drivers/godex/download/ sections: @@ -40,4 +40,4 @@ help: Cualquier duda que te surja, no dudes en consultarla, ¡estamos pa atenderte! salesPersonName: Soy tu comercial y mi nombre es salesPersonPhone: Teléfono y whatsapp -salesPersonEmail: Dirección de e-mail \ No newline at end of file +salesPersonEmail: Dirección de e-mail From 2711ed579cca76ef9d8ebb7d142cbe80c0c9151c Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 4 Sep 2023 13:26:08 +0200 Subject: [PATCH 2/9] refs #6194 generical url --- print/templates/email/printer-setup/locale/es.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/print/templates/email/printer-setup/locale/es.yml b/print/templates/email/printer-setup/locale/es.yml index 1884493ca..b07b88ffc 100644 --- a/print/templates/email/printer-setup/locale/es.yml +++ b/print/templates/email/printer-setup/locale/es.yml @@ -8,8 +8,8 @@ description: https://www.youtube.com/watch?v=qhb0kgQF3o8. También necesitarás el GoLabel, el programa para imprimir las cintas. - downloadFrom: Puedes descargarlo desde este enlace https://godex.s3-accelerate.amazonaws.com/bF8ttaXcClv24092,4vQCQ.file?v01 + downloadFrom: Puedes descargarlo desde este enlace, una vez dentro, abajo a la derecha podrás encontrar la sección de "Downloads", donde pulsando el icono de descarga, se iniciará la descarga automáticamente https://www.godexintl.com/product/16681379086423723?locale=en downloadDriver: En este enlace puedes descargar el driver de la impresora https://es.seagullscientific.com/support/downloads/drivers/godex/download/ sections: From b81dd1a9e81656dbae31e8401a0d5a1c8677e080 Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 4 Sep 2023 14:01:36 +0200 Subject: [PATCH 3/9] refs #6194 new url verdnatura --- print/templates/email/printer-setup/locale/es.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/print/templates/email/printer-setup/locale/es.yml b/print/templates/email/printer-setup/locale/es.yml index b07b88ffc..00795b34b 100644 --- a/print/templates/email/printer-setup/locale/es.yml +++ b/print/templates/email/printer-setup/locale/es.yml @@ -8,8 +8,8 @@ description: https://www.youtube.com/watch?v=qhb0kgQF3o8. También necesitarás el GoLabel, el programa para imprimir las cintas. - downloadFrom: Puedes descargarlo desde este enlace, una vez dentro, abajo a la derecha podrás encontrar la sección de "Downloads", donde pulsando el icono de descarga, se iniciará la descarga automáticamente https://www.godexintl.com/product/16681379086423723?locale=en + downloadFrom: Puedes descargarlo desde este enlace https://cdn.verdnatura.es/public/GoLabel_II.zip downloadDriver: En este enlace puedes descargar el driver de la impresora https://es.seagullscientific.com/support/downloads/drivers/godex/download/ sections: From 8141cd7834c0dbb503ea9579d2c0a3b98976573e Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 4 Sep 2023 14:08:17 +0200 Subject: [PATCH 4/9] refs #6194 url verdnatura --- print/templates/email/printer-setup/locale/es.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/print/templates/email/printer-setup/locale/es.yml b/print/templates/email/printer-setup/locale/es.yml index 00795b34b..39e83b1a8 100644 --- a/print/templates/email/printer-setup/locale/es.yml +++ b/print/templates/email/printer-setup/locale/es.yml @@ -8,8 +8,8 @@ description: https://www.youtube.com/watch?v=qhb0kgQF3o8. También necesitarás el GoLabel, el programa para imprimir las cintas. - downloadFrom: Puedes descargarlo desde este enlace https://cdn.verdnatura.es/public/GoLabel_II.zip + downloadFrom: Puedes descargarlo desde este enlace https://cdn.verdnatura.es/public/GoLabel.zip downloadDriver: En este enlace puedes descargar el driver de la impresora https://es.seagullscientific.com/support/downloads/drivers/godex/download/ sections: From da9182783d1a5f0a584a0826cc379e951addac97 Mon Sep 17 00:00:00 2001 From: pablone Date: Thu, 7 Sep 2023 11:02:47 +0200 Subject: [PATCH 5/9] refs #5881 changes --- db/changes/233601/00-createClaimReader.sql | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/db/changes/233601/00-createClaimReader.sql b/db/changes/233601/00-createClaimReader.sql index 666bf232e..e913c0ed9 100644 --- a/db/changes/233601/00-createClaimReader.sql +++ b/db/changes/233601/00-createClaimReader.sql @@ -1,4 +1,4 @@ -INSERT INTO `account`.`role` (`id`, `name`, `description`, `hasLogin`) +INSERT INTO `account`.`role` (`name`, `description`, `hasLogin`) VALUES ('claimViewer','Trabajadores que consulta las reclamaciones ',1); INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`) @@ -10,7 +10,7 @@ INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`) 'buyer', 'deliveryBoss', 'handmadeBoss' - ) + ); DELETE FROM `salix`.`ACL` WHERE `model`= 'claim' @@ -28,5 +28,4 @@ INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`princip INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`) VALUES ('Claim','findById','READ','ALLOW','ROLE','claimViewer'); INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`) - VALUES ('Claim','getSummary','READ','ALLOW','ROLE','claimViewer'); - + VALUES ('Claim','getSummary','READ','ALLOW','ROLE','claimViewer'); \ No newline at end of file From 4c1ff2e4d7b53a7eaf15dea69b7b6f10bb6949d5 Mon Sep 17 00:00:00 2001 From: sergiodt Date: Thu, 14 Sep 2023 08:27:49 +0200 Subject: [PATCH 6/9] refs #6141feat:buyer model --- back/model-config.json | 3 +++ back/models/buyer.json | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 back/models/buyer.json diff --git a/back/model-config.json b/back/model-config.json index b88956dee..ebc0e321b 100644 --- a/back/model-config.json +++ b/back/model-config.json @@ -15,6 +15,9 @@ }, "Bank": { "dataSource": "vn" + }, + "Buyer": { + "dataSource": "vn" }, "Campaign": { "dataSource": "vn" diff --git a/back/models/buyer.json b/back/models/buyer.json new file mode 100644 index 000000000..a17d3b538 --- /dev/null +++ b/back/models/buyer.json @@ -0,0 +1,28 @@ +{ + "name": "Buyer", + "base": "VnModel", + "options": { + "mysql": { + "table": "buyer" + } + }, + "properties": { + "userFk": { + "type": "number", + "required": true, + "id": true + }, + "nickname": { + "type": "string", + "required": true + } + }, + "acls": [ + { + "accessType": "READ", + "principalType": "ROLE", + "principalId": "employee", + "permission": "ALLOW" + } + ] +} From 82631d6fcdf53aa8378e9848062f03e1f59ed72f Mon Sep 17 00:00:00 2001 From: jgallego Date: Thu, 14 Sep 2023 10:26:59 +0200 Subject: [PATCH 7/9] claimingRate divide por 100 --- modules/client/front/summary/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html index 15a55ec8c..c622913bb 100644 --- a/modules/client/front/summary/index.html +++ b/modules/client/front/summary/index.html @@ -255,7 +255,7 @@ value="{{$ctrl.summary.averageInvoiced.invoiced | currency: 'EUR':2}}"> + value="{{$ctrl.claimingRate($ctrl.summary.claimsRatio.claimingRate / 100) | percentage}}"> From 11109d72a69b9402387f507b318017b4d9f1c192 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 14 Sep 2023 11:36:09 +0200 Subject: [PATCH 8/9] move sql --- db/changes/{233601 => 233801}/00-firstScript.sql | 0 db/changes/{233401 => 233801}/01-deviceLog_acl.sql | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename db/changes/{233601 => 233801}/00-firstScript.sql (100%) rename db/changes/{233401 => 233801}/01-deviceLog_acl.sql (100%) diff --git a/db/changes/233601/00-firstScript.sql b/db/changes/233801/00-firstScript.sql similarity index 100% rename from db/changes/233601/00-firstScript.sql rename to db/changes/233801/00-firstScript.sql diff --git a/db/changes/233401/01-deviceLog_acl.sql b/db/changes/233801/01-deviceLog_acl.sql similarity index 100% rename from db/changes/233401/01-deviceLog_acl.sql rename to db/changes/233801/01-deviceLog_acl.sql From ca2257d29b858ddcd0eef6c1f602c02b5b29cbac Mon Sep 17 00:00:00 2001 From: jgallego Date: Thu, 14 Sep 2023 13:47:04 +0200 Subject: [PATCH 9/9] subo version 2340 --- CHANGELOG.md | 7 +++++++ db/changes/234001/.gitkeep | 0 package.json | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 db/changes/234001/.gitkeep diff --git a/CHANGELOG.md b/CHANGELOG.md index acb5d7457..0573a6790 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2340.01] - 2023-10-05 + +### Added +### Changed + +### Fixed + ## [2338.01] - 2023-09-21 ### Added diff --git a/db/changes/234001/.gitkeep b/db/changes/234001/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/package.json b/package.json index 44a651af4..d250071a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salix-back", - "version": "23.38.01", + "version": "23.40.01", "author": "Verdnatura Levante SL", "description": "Salix backend", "license": "GPL-3.0",