From 3b9bdc18bfc20871d7a1894bad0de4c7e4ad09d2 Mon Sep 17 00:00:00 2001 From: jgallego Date: Thu, 12 Aug 2021 09:23:19 +0200 Subject: [PATCH 1/3] funciona --- loopback/locale/es.json | 12 ++----- .../methods/sales-monitor/deleteOrders.js | 2 +- .../back/methods/ticket/componentUpdate.js | 35 +++++++------------ 3 files changed, 16 insertions(+), 33 deletions(-) diff --git a/loopback/locale/es.json b/loopback/locale/es.json index 9c8f15a946..e108aceafa 100644 --- a/loopback/locale/es.json +++ b/loopback/locale/es.json @@ -195,14 +195,6 @@ "This document already exists on this ticket": "Este documento ya existe en el ticket", "Some of the selected tickets are not billable": "Algunos de los tickets seleccionados no son facturables", "You can't invoice tickets from multiple clients": "No puedes facturar tickets de multiples clientes", - "This client is not invoiceable": "Este cliente no es facturable", - "serial non editable": "Esta serie no permite asignar la referencia", - "Max shipped required": "La fecha límite es requerida", - "Can't invoice to future": "No se puede facturar a futuro", - "Can't invoice to past": "No se puede facturar a pasado", - "This ticket is already invoiced": "Este ticket ya está facturado", - "A ticket with an amount of zero can't be invoiced": "No se puede facturar un ticket con importe cero", - "A ticket with a negative base can't be invoiced": "No se puede facturar un ticket con una base negativa", - "Global invoicing failed": "[Facturación global] No se han podido facturar algunos clientes", - "Wasn't able to invoice the following clients": "No se han podido facturar los siguientes clientes" + "INACTIVE_PROVIDER": "INACTIVE_PROVIDER", + "nickname": "nickname" } \ No newline at end of file diff --git a/modules/monitor/back/methods/sales-monitor/deleteOrders.js b/modules/monitor/back/methods/sales-monitor/deleteOrders.js index 15a8d862a6..d9e1e35f96 100644 --- a/modules/monitor/back/methods/sales-monitor/deleteOrders.js +++ b/modules/monitor/back/methods/sales-monitor/deleteOrders.js @@ -18,7 +18,7 @@ module.exports = Self => { } }); - Self.deleteOrders = async(deletes, options) => { + Self.deleteOrders = async(deletes = [], options) => { const models = Self.app.models; let myOptions = {}; diff --git a/modules/ticket/back/methods/ticket/componentUpdate.js b/modules/ticket/back/methods/ticket/componentUpdate.js index 9ebd51bf42..7cf6da831d 100644 --- a/modules/ticket/back/methods/ticket/componentUpdate.js +++ b/modules/ticket/back/methods/ticket/componentUpdate.js @@ -167,35 +167,26 @@ module.exports = Self => { args.option ], myOptions); - if (originalTicket.addressFk != updatedTicket.addressFk) { - const ticketObservation = await models.TicketObservation.findOne({ - where: { - ticketFk: args.id, - observationTypeFk: observationTypeDelivery.id} + if (originalTicket.addressFk != updatedTicket.addressFk && args.id) { + await models.TicketObservation.destroyAll({ + ticketFk: args.id }, myOptions); - if (ticketObservation) - await ticketObservation.destroy(myOptions); - const address = await models.Address.findOne({ where: {id: args.addressFk}, include: { - relation: 'observations', - scope: { - where: {observationTypeFk: observationTypeDelivery.id}, - include: { - relation: 'observationType' - } - } + relation: 'observations' } }, myOptions); - const [observation] = address.observations(); - if (observation) { - await models.TicketObservation.create({ - ticketFk: args.id, - observationTypeFk: observation.observationTypeFk, - description: observation.description - }, myOptions); + const observations = address.observations(); + if (observations.length) { + const clonedObservations = observations.map(observation => { + observation.ticketFk = args.id; + observation.id = undefined; + return observation; + }); + + await models.TicketObservation.create(clonedObservations, myOptions); } } From f2a81974d0aa8db3f6b1d70daa220eeed67daf9d Mon Sep 17 00:00:00 2001 From: jgallego Date: Fri, 13 Aug 2021 09:19:58 +0200 Subject: [PATCH 2/3] dbChanges --- db/changes/10350-august/00-ticketTrigger.sql | 33 ++++++++++++++++++++ db/changes/10350-august/deleteMe.keep | 1 - 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 db/changes/10350-august/00-ticketTrigger.sql delete mode 100644 db/changes/10350-august/deleteMe.keep diff --git a/db/changes/10350-august/00-ticketTrigger.sql b/db/changes/10350-august/00-ticketTrigger.sql new file mode 100644 index 0000000000..7f579d7b6f --- /dev/null +++ b/db/changes/10350-august/00-ticketTrigger.sql @@ -0,0 +1,33 @@ +DROP TRIGGER IF EXISTS vn.ticket_afterUpdate; + +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`%` TRIGGER vn.`ticket_afterUpdate` + AFTER UPDATE ON `ticket` + FOR EACH ROW +BEGIN + + IF !(NEW.id <=> OLD.id) + OR !(NEW.warehouseFk <=> OLD.warehouseFk) + OR !(NEW.shipped <=> OLD.shipped) THEN + CALL stock.log_add('ticket', NEW.id, OLD.id); + END IF; + + IF !(NEW.clientFk <=> OLD.clientFk) + OR !(NEW.addressFk <=> OLD.addressFk) + OR !(NEW.companyFk <=> OLD.companyFk) THEN + CALL ticket_requestRecalc(NEW.id); + END IF; + + IF NEW.clientFk = 2067 AND !(NEW.clientFk <=> OLD.clientFk) THEN + -- Fallo que se insertan no se sabe como tickets en este cliente + INSERT INTO vn.mail SET + `sender` = 'jgallego@verdnatura.es', + `replyTo` = 'jgallego@verdnatura.es', + `subject` = 'Modificado ticket al cliente 2067', + `body` = CONCAT(account.myUserGetName(), ' ha modificado el ticket ', + NEW.id); + END IF; + +END$$ +DELIMITER ; diff --git a/db/changes/10350-august/deleteMe.keep b/db/changes/10350-august/deleteMe.keep deleted file mode 100644 index 603d82d74b..0000000000 --- a/db/changes/10350-august/deleteMe.keep +++ /dev/null @@ -1 +0,0 @@ -Delete me! \ No newline at end of file From d2280a783c59c17de20397fe3c6e00e8aeaa5366 Mon Sep 17 00:00:00 2001 From: joan Date: Tue, 31 Aug 2021 08:44:31 +0200 Subject: [PATCH 3/3] Changes --- .../{00-ticketTrigger.sql => 00-ticket_afterUpdate.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename db/changes/10350-august/{00-ticketTrigger.sql => 00-ticket_afterUpdate.sql} (100%) diff --git a/db/changes/10350-august/00-ticketTrigger.sql b/db/changes/10350-august/00-ticket_afterUpdate.sql similarity index 100% rename from db/changes/10350-august/00-ticketTrigger.sql rename to db/changes/10350-august/00-ticket_afterUpdate.sql