From 58bcad7b2d6a2853688cae8214a32e81b354241d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 12 Jun 2023 12:42:30 +0200
Subject: [PATCH] refs #4764 validator create

---
 front/core/lib/validator.js                |  7 +++++--
 front/core/locale/es.yml                   |  1 +
 modules/ticket/back/methods/sale/refund.js | 16 +++++-----------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/front/core/lib/validator.js b/front/core/lib/validator.js
index b0b8f7389..51134f30a 100644
--- a/front/core/lib/validator.js
+++ b/front/core/lib/validator.js
@@ -5,6 +5,10 @@ export const validators = {
         if (validator.isEmpty(value ? String(value) : ''))
             throw new Error(_($translate, `Value can't be empty`));
     },
+    negative: $translate => {
+        if (validator < 0)
+            throw new Error(_($translate, `Negative numbers are not allowed. Please enter a valid number.`));
+    },
     absence: ($translate, value) => {
         if (!validator.isEmpty(value))
             throw new Error(_($translate, `Value should be empty`));
@@ -104,9 +108,8 @@ export function checkNull($translate, value, conf) {
 export function _($translate, text, params = []) {
     text = $translate.instant(text);
 
-    for (let i = 0; i < params.length; i++) {
+    for (let i = 0; i < params.length; i++)
         text = text.replace('%s', params[i]);
-    }
 
     return text;
 }
diff --git a/front/core/locale/es.yml b/front/core/locale/es.yml
index f654c61cf..5bd507083 100644
--- a/front/core/locale/es.yml
+++ b/front/core/locale/es.yml
@@ -16,6 +16,7 @@ Value can't be empty: El valor no puede estar vacío
 Value should be empty: El valor debe estar vacío
 Value should be integer: El valor debe ser entero
 Value should be a number: El valor debe ser numérico
+Negative numbers are not allowed. Please enter a valid number: No se permiten números negativos. Por favor, ingrese un número válido
 Invalid value: Valor incorrecto
 Value can't be blank: El valor no puede estar en blanco
 Value can't be null: El valor no puede ser nulo
diff --git a/modules/ticket/back/methods/sale/refund.js b/modules/ticket/back/methods/sale/refund.js
index 86e2a4570..d3e9257ce 100644
--- a/modules/ticket/back/methods/sale/refund.js
+++ b/modules/ticket/back/methods/sale/refund.js
@@ -10,11 +10,6 @@ module.exports = Self => {
             {
                 arg: 'servicesIds',
                 type: ['number']
-            },
-            {
-                arg: 'withWarehouse',
-                type: 'boolean',
-                required: true
             }
         ],
         returns: {
@@ -27,7 +22,7 @@ module.exports = Self => {
         }
     });
 
-    Self.refund = async(salesIds, servicesIds, withWarehouse, options) => {
+    Self.refund = async(salesIds, servicesIds, options) => {
         const models = Self.app.models;
         const myOptions = {};
         let tx;
@@ -72,7 +67,7 @@ module.exports = Self => {
                 const [firstTicketId] = ticketsIds;
 
                 // eslint-disable-next-line max-len
-                refundTicket = await createTicketRefund(firstTicketId, now, refundAgencyMode, withWarehouse, refoundZoneId, myOptions);
+                refundTicket = await createTicketRefund(firstTicketId, now, refundAgencyMode, refoundZoneId, myOptions);
 
                 for (const sale of sales) {
                     const createdSale = await models.Sale.create({
@@ -103,7 +98,7 @@ module.exports = Self => {
                 const [firstTicketId] = ticketsIds;
 
                 // eslint-disable-next-line max-len
-                refundTicket = await createTicketRefund(firstTicketId, now, refundAgencyMode, withWarehouse, refoundZoneId, myOptions);
+                refundTicket = await createTicketRefund(firstTicketId, now, refundAgencyMode, refoundZoneId, myOptions);
             }
 
             if (servicesIds && servicesIds.length > 0) {
@@ -114,8 +109,8 @@ module.exports = Self => {
                 for (const service of services) {
                     await models.TicketService.create({
                         description: service.description,
-                        quantity: - service.quantity,
-                        price: service.price,
+                        quantity: service.quantity,
+                        price: - service.price,
                         taxClassFk: service.taxClassFk,
                         ticketFk: refundTicket.id,
                         ticketServiceTypeFk: service.ticketServiceTypeFk,
@@ -147,7 +142,6 @@ module.exports = Self => {
             addressFk: ticket.address().id,
             agencyModeFk: refundAgencyMode.id,
             nickname: ticket.address().nickname,
-            warehouseFk: withWarehouse ? ticket.warehouseFk : null,
             companyFk: ticket.companyFk,
             landed: now,
             zoneFk: refoundZoneId