From 65e15ada69e85583b22a0f0cd1bed6ba2c8a7585 Mon Sep 17 00:00:00 2001 From: vicent Date: Wed, 21 Sep 2022 14:53:02 +0200 Subject: [PATCH 1/4] refator: delete line break --- modules/ticket/back/methods/ticket/componentUpdate.js | 4 ++-- modules/ticket/back/methods/ticket/priceDifference.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ticket/back/methods/ticket/componentUpdate.js b/modules/ticket/back/methods/ticket/componentUpdate.js index 6b385992c..2b2862d2a 100644 --- a/modules/ticket/back/methods/ticket/componentUpdate.js +++ b/modules/ticket/back/methods/ticket/componentUpdate.js @@ -126,8 +126,8 @@ module.exports = Self => { myOptions); if (!zoneShipped || zoneShipped.zoneFk != args.zoneFk) { - const error = `You don't have privileges to change the zone or - for these parameters there are more than one shipping options, talk to agencies`; + const error = `You don't have privileges to change the zone or ` + + `for these parameters there are more than one shipping options, talk to agencies`; throw new UserError(error); } diff --git a/modules/ticket/back/methods/ticket/priceDifference.js b/modules/ticket/back/methods/ticket/priceDifference.js index 0e8cc2e06..14d4c08e7 100644 --- a/modules/ticket/back/methods/ticket/priceDifference.js +++ b/modules/ticket/back/methods/ticket/priceDifference.js @@ -88,8 +88,8 @@ module.exports = Self => { myOptions); if (!zoneShipped || zoneShipped.zoneFk != args.zoneId) { - const error = `You don't have privileges to change the zone or - for these parameters there are more than one shipping options, talk to agencies`; + const error = `You don't have privileges to change the zone or ` + + `for these parameters there are more than one shipping options, talk to agencies`; throw new UserError(error); } -- 2.40.1 From fae1516b33304721939d0da749e98e47a6c818d2 Mon Sep 17 00:00:00 2001 From: vicent Date: Wed, 21 Sep 2022 14:55:43 +0200 Subject: [PATCH 2/4] refactor: correct bleeding --- modules/ticket/back/methods/ticket/componentUpdate.js | 2 +- modules/ticket/back/methods/ticket/priceDifference.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ticket/back/methods/ticket/componentUpdate.js b/modules/ticket/back/methods/ticket/componentUpdate.js index 2b2862d2a..147be06f9 100644 --- a/modules/ticket/back/methods/ticket/componentUpdate.js +++ b/modules/ticket/back/methods/ticket/componentUpdate.js @@ -127,7 +127,7 @@ module.exports = Self => { if (!zoneShipped || zoneShipped.zoneFk != args.zoneFk) { const error = `You don't have privileges to change the zone or ` + - `for these parameters there are more than one shipping options, talk to agencies`; + `for these parameters there are more than one shipping options, talk to agencies`; throw new UserError(error); } diff --git a/modules/ticket/back/methods/ticket/priceDifference.js b/modules/ticket/back/methods/ticket/priceDifference.js index 14d4c08e7..16197f21b 100644 --- a/modules/ticket/back/methods/ticket/priceDifference.js +++ b/modules/ticket/back/methods/ticket/priceDifference.js @@ -89,7 +89,7 @@ module.exports = Self => { if (!zoneShipped || zoneShipped.zoneFk != args.zoneId) { const error = `You don't have privileges to change the zone or ` + - `for these parameters there are more than one shipping options, talk to agencies`; + `for these parameters there are more than one shipping options, talk to agencies`; throw new UserError(error); } -- 2.40.1 From 197bbf392b29e9e675c875b72779925c1ca89df6 Mon Sep 17 00:00:00 2001 From: vicent Date: Tue, 4 Oct 2022 07:50:37 +0200 Subject: [PATCH 3/4] refator: updates translations --- loopback/locale/en.json | 4 +++- loopback/locale/es.json | 2 +- modules/ticket/back/methods/ticket/componentUpdate.js | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/loopback/locale/en.json b/loopback/locale/en.json index fdea4ad4f..73e186802 100644 --- a/loopback/locale/en.json +++ b/loopback/locale/en.json @@ -131,5 +131,7 @@ "Fichadas impares": "Odd signs", "Descanso diario 9h.": "Daily rest 9h.", "Descanso semanal 36h. / 72h.": "Weekly rest 36h. / 72h.", - "Password does not meet requirements": "Password does not meet requirements" + "Password does not meet requirements": "Password does not meet requirements", + "You don't have privileges to change the zone": "You don't have privileges to change the zone or for these parameters there are more than one shipping options, talk to agencies" + } \ No newline at end of file diff --git a/loopback/locale/es.json b/loopback/locale/es.json index 327568685..95e996c48 100644 --- a/loopback/locale/es.json +++ b/loopback/locale/es.json @@ -96,7 +96,7 @@ "This postcode already exists": "Este código postal ya existe", "Concept cannot be blank": "El concepto no puede quedar en blanco", "File doesn't exists": "El archivo no existe", - "You don't have privileges to change the zone or for these parameters there are more than one shipping options, talk to agencies": "No tienes permisos para cambiar la zona o para esos parámetros hay más de una opción de envío, hable con las agencias", + "You don't have privileges to change the zone": "No tienes permisos para cambiar la zona o para esos parámetros hay más de una opción de envío, hable con las agencias", "This ticket is already on weekly tickets": "Este ticket ya está en tickets programados", "Ticket id cannot be blank": "El id de ticket no puede quedar en blanco", "Weekday cannot be blank": "El día de la semana no puede quedar en blanco", diff --git a/modules/ticket/back/methods/ticket/componentUpdate.js b/modules/ticket/back/methods/ticket/componentUpdate.js index 147be06f9..baa6a0b41 100644 --- a/modules/ticket/back/methods/ticket/componentUpdate.js +++ b/modules/ticket/back/methods/ticket/componentUpdate.js @@ -126,8 +126,7 @@ module.exports = Self => { myOptions); if (!zoneShipped || zoneShipped.zoneFk != args.zoneFk) { - const error = `You don't have privileges to change the zone or ` + - `for these parameters there are more than one shipping options, talk to agencies`; + const error = `You don't have privileges to change the zone`; throw new UserError(error); } -- 2.40.1 From f510e2614144ffa3f831e728b7b1aeae072a10a3 Mon Sep 17 00:00:00 2001 From: vicent Date: Tue, 4 Oct 2022 07:55:30 +0200 Subject: [PATCH 4/4] refactor: translation --- modules/ticket/back/methods/ticket/priceDifference.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/ticket/back/methods/ticket/priceDifference.js b/modules/ticket/back/methods/ticket/priceDifference.js index 16197f21b..989e0e5ce 100644 --- a/modules/ticket/back/methods/ticket/priceDifference.js +++ b/modules/ticket/back/methods/ticket/priceDifference.js @@ -88,8 +88,7 @@ module.exports = Self => { myOptions); if (!zoneShipped || zoneShipped.zoneFk != args.zoneId) { - const error = `You don't have privileges to change the zone or ` + - `for these parameters there are more than one shipping options, talk to agencies`; + const error = `You don't have privileges to change the zone`; throw new UserError(error); } -- 2.40.1