Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler

db/dump/fixtures.before.sql

@@ -3733,3 +3733,6 @@ UPDATE vn.buy SET itemOriginalFk = 1 WHERE id = 1;
 UPDATE vn.saleTracking SET stateFk = 26 WHERE id = 5;
 
 INSERT INTO vn.report (name) VALUES ('LabelCollection');
+
+INSERT INTO vn.parkingLog(originFk, userFk, `action`, creationDate, description, changedModel,oldInstance, newInstance, changedModelId, changedModelValue)
+	VALUES(1, 18, 'update', util.VN_CURDATE(), NULL, 'SaleGroup', '{"parkingFk":null}', '{"parkingFk":1}', 1, NULL);

db/routines/vn/procedures/clean.sql

@@ -197,6 +197,12 @@ BEGIN
 		FROM ticket t
 			JOIN tTicketDelete tmp ON tmp.ticketFk = t.id;
 
+	DELETE sl
+		FROM saleLabel sl
+			JOIN sale s ON s.id = sl.saleFk
+			JOIN ticket t ON t.id = s.ticketFk
+		WHERE t.shipped < v2Months;
+
 	-- Tickets Nulos PAK 11/10/2016
 	SELECT id INTO vCompanyBlk FROM company WHERE code = 'BLK';
 	UPDATE ticket

db/routines/vn/procedures/ticket_closeByTicket.sql

@@ -18,7 +18,8 @@ BEGIN
 		WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
 			AND t.id = vTicketFk
 			AND t.refFk IS NULL
-		GROUP BY t.id);
+		GROUP BY t.id
+    );
 
 	CALL ticket_close();
 

db/routines/vn/triggers/parking_afterDelete.sql

@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`parking_afterDelete`
+	AFTER DELETE ON `parking`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO parkingLog 
+		SET `action` = 'delete',
+			`changedModel` = 'Parking',
+			`changedModelId` = OLD.id,
+			`userFk` = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/parking_beforeInsert.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`parking_beforeInsert`
 	BEFORE INSERT ON `parking`
 	FOR EACH ROW
 BEGIN
-
+	SET NEW.editorFk = account.myUser_getId();
 	-- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ;
 
 END$$

db/routines/vn/triggers/parking_beforeUpdate.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`parking_beforeUpdate`
 	BEFORE UPDATE ON `parking`
 	FOR EACH ROW
 BEGIN
-
+	SET NEW.editorFk = account.myUser_getId();
 	-- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ;
     
 END$$

db/versions/10923-pinkOak/00-createParkingLog.sql

@@ -0,0 +1,60 @@
+CREATE OR REPLACE TABLE vn.parkingLog (
+
+	`id` int(11) NOT NULL AUTO_INCREMENT,
+
+	`originFk` int(11) DEFAULT NULL,
+
+	`userFk` int(10) unsigned DEFAULT NULL,
+
+	`action` set('insert','update','delete','select') NOT NULL,
+
+	`creationDate` timestamp NULL DEFAULT current_timestamp(),
+
+	`description` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+
+	`changedModel` enum('Parking','SaleGroup','SaleGroupDetail') NOT NULL DEFAULT 'Parking',
+
+	`oldInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`oldInstance`)),
+
+	`newInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`newInstance`)),
+
+	`changedModelId` int(11) NOT NULL,
+
+	`changedModelValue` varchar(45) DEFAULT NULL,
+
+	PRIMARY KEY (`id`),
+
+	KEY `logParkinguserFk` (`userFk`),
+
+	KEY `parkingLog_changedModel` (`changedModel`,`changedModelId`,`creationDate`),
+
+	KEY `parkingLog_originFk` (`originFk`,`creationDate`),
+
+	CONSTRAINT `parkingOriginFk` FOREIGN KEY (`originFk`) REFERENCES `parking` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+
+	CONSTRAINT `parkingUserFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE vn.parking DROP COLUMN IF EXISTS editorFk;
+ALTER TABLE IF EXISTS vn.parking ADD COLUMN editorFk INT;
+
+ALTER TABLE vn.saleGroupDetail DROP COLUMN IF EXISTS editorFk;
+ALTER TABLE IF EXISTS vn.saleGroupDetail ADD COLUMN editorFk INT;
+
+
+ALTER TABLE vn.ticketLog 
+	MODIFY COLUMN changedModel ENUM(
+		'Ticket',
+		'Sale',
+		'TicketWeekly',
+		'TicketTracking',
+		'TicketService',
+		'TicketRequest',
+		'TicketRefund',
+		'TicketPackaging',
+		'TicketObservation',
+		'TicketDms',
+		'Expedition',
+		'Sms'
+	) NOT NULL DEFAULT 'Ticket';

db/versions/10923-pinkOak/01-aclParkingLog.sql

@@ -0,0 +1,2 @@
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
+    VALUES ('ParkingLog', '*', 'READ', 'ALLOW', 'ROLE', 'employee');

loopback/locale/es.json

@@ -324,7 +324,6 @@
     "The response is not a PDF": "La respuesta no es un PDF",
     "Booking completed": "Reserva completada",
     "The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
-    "Incoterms data for consignee is missing": "Faltan los datos de los Incoterms para el consignatario",
     "The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
     "User disabled": "Usuario desactivado",
     "The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",

modules/invoiceOut/back/models/invoice-out.js

@@ -1,5 +1,6 @@
 const print = require('vn-print');
 const path = require('path');
+const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
     require('../methods/invoiceOut/filter')(Self);
@@ -66,4 +67,24 @@ module.exports = Self => {
             });
         }
     };
+
+    Self.getSerial = async function(clientId, companyId, addressId, type, myOptions) {
+        const [{serial}] = await Self.rawSql(
+            `SELECT vn.invoiceSerial(?, ?, ?) AS serial`,
+            [
+                clientId,
+                companyId,
+                type
+            ],
+            myOptions);
+
+        const invoiceOutSerial = await Self.app.models.InvoiceOutSerial.findById(serial);
+        if (invoiceOutSerial?.taxAreaFk == 'WORLD') {
+            const address = await Self.app.models.Address.findById(addressId);
+            if (!address || !address.customsAgentFk || !address.incotermsFk)
+                throw new UserError('The address of the customer must have information about Incoterms and Customs Agent');
+        }
+
+        return serial;
+    };
 };

modules/parking/back/model-config.json

@@ -0,0 +1,5 @@
+{
+    "ParkingLog": {
+        "dataSource": "vn"
+    }
+}

modules/parking/back/models/parking-log.json

@@ -0,0 +1,9 @@
+{
+	"name": "ParkingLog",
+	"base": "Log",
+	"options": {
+		"mysql": {
+			"table": "parkingLog"
+		}
+	}
+}

modules/shelving/back/locale/parking/en.yml

@@ -0,0 +1,9 @@
+name: parking
+columns:
+  id: id
+  column: column
+  row: row
+  sectorFk: sector
+  code: code
+  pickingOrder: picking order
+  editorFk: editor

modules/shelving/back/locale/parking/es.yml

@@ -0,0 +1,10 @@
+name: parking
+columns:
+  id: id
+  column: columna
+  row: fila
+  sectorFk: sector
+  code: código
+  pickingOrder: orden de recogida
+  editorFk: editor
+  

modules/shelving/back/models/parking.json

@@ -20,9 +20,6 @@
             "type": "string",
             "required": true
         },
-        "sectorFk": {
-            "type": "number"
-        },
         "code": {
             "type": "string"
         },
@@ -35,6 +32,11 @@
             "type": "hasMany",
             "model": "saleGroup",
             "foreignKey": "parkingFk"
+        },
+        "sector": {
+            "type": "belongsTo",
+            "model": "Sector",
+            "foreignKey": "sectorFk"
         }
     }
 }

modules/ticket/back/methods/ticket/closeAll.js

@@ -35,6 +35,7 @@ module.exports = Self => {
             SELECT t.id,
                     t.clientFk,
                     t.companyFk,
+                    c.id clientFk,
                     c.name clientName,
                     c.email recipient,
                     c.salesPersonFk,

modules/ticket/back/methods/ticket/closure.js

@@ -1,3 +1,5 @@
+/* eslint max-len: ["error", { "code": 150 }]*/
+
 const Report = require('vn-print/core/report');
 const Email = require('vn-print/core/email');
 const smtp = require('vn-print/core/smtp');
@@ -11,19 +13,27 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
     const failedtickets = [];
     for (const ticket of tickets) {
         try {
-            await Self.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id], {userId});
+            await Self.app.models.InvoiceOut.getSerial(ticket.clientFk, ticket.companyFk, ticket.addressFk, 'M');
+            await Self.rawSql(
+                `CALL vn.ticket_closeByTicket(?)`,
+                [ticket.id],
+                {userId}
+            );
 
-            const [invoiceOut] = await Self.rawSql(`
+            const [invoiceOut] = await Self.rawSql(
+                `
                 SELECT io.id, io.ref, io.serial, cny.code companyCode, io.issued
                     FROM ticket t
                         JOIN invoiceOut io ON io.ref = t.refFk
                         JOIN company cny ON cny.id = io.companyFk
                     WHERE t.id = ?
-            `, [ticket.id]);
+                `,
+                [ticket.id],
+            );
 
             const mailOptions = {
                 overrideAttachments: true,
-                attachments: []
+                attachments: [],
             };
 
             const isToBeMailed = ticket.recipient && ticket.salesPersonFk && ticket.isToBeMailed;
@@ -33,7 +43,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
                     reference: invoiceOut.ref,
                     recipientId: ticket.clientFk,
                     recipient: ticket.recipient,
-                    replyTo: ticket.salesPersonEmail
+                    replyTo: ticket.salesPersonEmail,
                 };
 
                 const invoiceReport = new Report('invoice', args);
@@ -50,15 +60,19 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
                 await storage.write(stream, {
                     type: 'invoice',
                     path: `${year}/${month}/${day}`,
-                    fileName: fileName
+                    fileName: fileName,
                 });
 
-                await Self.rawSql('UPDATE invoiceOut SET hasPdf = true WHERE id = ?', [invoiceOut.id], {userId});
+                await Self.rawSql(
+                    'UPDATE invoiceOut SET hasPdf = true WHERE id = ?',
+                    [invoiceOut.id],
+                    {userId},
+                );
 
                 if (isToBeMailed) {
                     const invoiceAttachment = {
                         filename: fileName,
-                        content: stream
+                        content: stream,
                     };
 
                     if (invoiceOut.serial == 'E' && invoiceOut.companyCode == 'VNL') {
@@ -68,7 +82,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
 
                         mailOptions.attachments.push({
                             filename: fileName,
-                            content: stream
+                            content: stream,
                         });
                     }
 
@@ -82,7 +96,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
                     id: ticket.id,
                     recipientId: ticket.clientFk,
                     recipient: ticket.recipient,
-                    replyTo: ticket.salesPersonEmail
+                    replyTo: ticket.salesPersonEmail,
                 };
 
                 const email = new Email('delivery-note-link', args);
@@ -90,14 +104,17 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
             }
 
             // Incoterms authorization
-            const [{firstOrder}] = await Self.rawSql(`
+            const [{firstOrder}] = await Self.rawSql(
+                `
                         SELECT COUNT(*) as firstOrder
                             FROM ticket t
                                 JOIN client c ON c.id = t.clientFk
                             WHERE t.clientFk = ?
                                 AND NOT t.isDeleted
                                 AND c.isVies
-                    `, [ticket.clientFk]);
+                    `,
+                [ticket.clientFk],
+            );
 
             if (firstOrder == 1) {
                 const args = {
@@ -106,7 +123,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
                     recipientId: ticket.clientFk,
                     recipient: ticket.recipient,
                     replyTo: ticket.salesPersonEmail,
-                    addressId: ticket.addressFk
+                    addressId: ticket.addressFk,
                 };
 
                 const email = new Email('incoterms-authorization', args);
@@ -116,21 +133,25 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
                     `SELECT id
                         FROM sample
                     WHERE code = 'incoterms-authorization'
-                `);
+                `,
+                );
 
-                await Self.rawSql(`
+                await Self.rawSql(
+                    `
                     INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
-                `, [ticket.clientFk, sample.id, ticket.companyFk], {userId});
+                `,
+                    [ticket.clientFk, sample.id, ticket.companyFk],
+                    {userId},
+                );
             }
         } catch (error) {
             // Domain not found
-            if (error.responseCode == 450)
+            if (error.responseCode == 450) return invalidEmail(ticket);
-                return invalidEmail(ticket);
 
             // Save tickets on a list of failed ids
             failedtickets.push({
                 id: ticket.id,
-                stacktrace: error
+                stacktrace: error,
             });
         }
     }
@@ -147,24 +168,26 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
         smtp.send({
             to: config.app.reportEmail,
             subject: '[API] Nightly ticket closure report',
-            html: body
+            html: body,
         });
     }
 
     async function invalidEmail(ticket) {
-        await Self.rawSql(`UPDATE client SET email = NULL WHERE id = ?`, [
+        await Self.rawSql(
-            ticket.clientFk
+            `UPDATE client SET email = NULL WHERE id = ?`,
-        ], {userId});
+            [ticket.clientFk],
+            {userId},
+        );
 
         const oldInstance = `{"email": "${ticket.recipient}"}`;
         const newInstance = `{"email": ""}`;
-        await Self.rawSql(`
+        await Self.rawSql(
+            `
             INSERT INTO clientLog (originFk, userFk, action, changedModel, oldInstance, newInstance)
-                VALUES (?, NULL, 'UPDATE', 'Client', ?, ?)`, [
+                VALUES (?, NULL, 'UPDATE', 'Client', ?, ?)`,
-            ticket.clientFk,
+            [ticket.clientFk, oldInstance, newInstance],
-            oldInstance,
+            {userId},
-            newInstance
+        );
-        ], {userId});
 
         const body = `No se ha podido enviar el albarán <strong>${ticket.id}</strong>
         al cliente <strong>${ticket.clientFk} - ${ticket.clientName}</strong>
@@ -176,7 +199,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
         smtp.send({
             to: ticket.salesPersonEmail,
             subject: 'No se ha podido enviar el albarán',
-            html: body
+            html: body,
         });
     }
 };

modules/ticket/back/methods/ticket/makeInvoice.js

@@ -77,22 +77,10 @@ module.exports = function(Self) {
             if (!clientCanBeInvoiced)
                 throw new UserError(`This client can't be invoiced`);
 
-            const [{serial}] = invoiceCorrection ? [{serial: 'R'}] : await Self.rawSql(
+            const serial = !invoiceCorrection
-                `SELECT vn.invoiceSerial(?, ?, ?) AS serial`,
+                ? await models.InvoiceOut.getSerial(clientId, companyFk, firstTicket.addressFk, invoiceType, myOptions)
-                [
+                : 'R';
-                    clientId,
-                    companyFk,
-                    invoiceType
-                ],
-                myOptions);
 
-            const invoiceOutSerial = await models.InvoiceOutSerial.findById(serial);
-            if (invoiceOutSerial?.taxAreaFk == 'WORLD') {
-                const address = await models.Address.findById(firstTicket.addressFk);
-
-                if (!address || !address.customsAgentFk || !address.incotermsFk)
-                    throw new UserError('Incoterms data for consignee is missing');
-            }
             await Self.rawSql('CALL invoiceOut_new(?, ?, null, @invoiceId)', [serial, invoiceDate], myOptions);
 
             const [resultInvoice] = await Self.rawSql('SELECT @invoiceId id', [], myOptions);

modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js

@@ -77,6 +77,6 @@ describe('ticket makeInvoice()', () => {
             await tx.rollback();
         }
 
-        expect(error.message).toEqual(`Incoterms data for consignee is missing`);
+        expect(error.message).toEqual(`The address of the customer must have information about Incoterms and Customs Agent`);
     });
 });