Merge branch 'dev' into 5075-client_balance

.vscode/settings.json

@@ -4,5 +4,7 @@
     "files.eol": "\n",
     "editor.codeActionsOnSave": {
         "source.fixAll.eslint": true
-    }
+    },
+    "search.useIgnoreFiles": false,
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
 }

CHANGELOG.md

@@ -5,10 +5,42 @@ All notable changes to this project will be documented in this file.
 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).
 
+## [2312.01] - 2023-04-06
+
+### Added
+- (Monitor tickets) Muestra un icono al lado de la zona, si el ticket es frágil y se envía por agencia
+
+### Changed
+- (Envíos -> Extra comunitarios) Se agrupan las entradas del mismo travel. Añadidos campos Referencia y Importe.
+
+### Fixed
+-
+
+## [2310.01] - 2023-03-23
+
+### Added
+- (Trabajadores -> Control de horario) Ahora se puede confirmar/no confirmar el registro horario de cada semana desde esta sección
+
+### Fixed
+- (Clientes -> Listado extendido) Resuelto error al filtrar por clientes inactivos desde la columna "Activo"
+- (General) Al pasar el ratón por encima del icono de "Borrar" en un campo, se hacía más grande afectando a la interfaz
+
+## [2308.01] - 2023-03-09
+
+### Added
+- (Proveedores -> Datos fiscales) Añadido checkbox 'Vies'
+- (Client -> Descriptor) Nuevo icono $ con barrotes para los clientes con impago
+- (Trabajador -> Datos Básicos) Añadido nuevo campo Taquilla
+- (Trabajador -> PDA) Nueva sección
+
+### Changed
+- (Ticket -> Borrar ticket) Restringido el borrado de tickets con abono
+
 ## [2306.01] - 2023-02-23
 
 ### Added
--
+- (Tickets -> Datos Básicos) Mensaje de confirmación al intentar generar tickets con negativos
+- (Artículos) El visible y disponible se calcula a partir de un almacén diferente dependiendo de la sección en la que te encuentres. Se ha añadido un icono que informa sobre a partir de que almacén se esta calculando.
 
 ### Changed
 - (General -> Inicio) Ahora permite recuperar la contraseña tanto con el correo de recuperación como el usuario
@@ -16,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - (Monitor de tickets) Cuando ordenas por columna, ya no se queda deshabilitado el botón de 'Actualizar'
 - (Zone -> Días de entrega) Al hacer click en un día, muestra correctamente las zonas
+- (Artículos) El disponible en la vista previa se muestra correctamente
 
 ## [2304.01] - 2023-02-09
 

Dockerfile

@@ -10,6 +10,7 @@ RUN apt-get update \
         curl \
         ca-certificates \
         gnupg2 \
+        graphicsmagick \
     && curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
     && apt-get install -y --no-install-recommends nodejs \
     && npm install -g npm@8.19.2

back/methods/chat/send.js

@@ -30,16 +30,23 @@ module.exports = Self => {
         const recipient = to.replace('@', '');
 
         if (sender.name != recipient) {
-            await models.Chat.create({
+            const chat = await models.Chat.create({
                 senderFk: sender.id,
                 recipient: to,
                 dated: Date.vnNew(),
                 checkUserStatus: 0,
                 message: message,
-                status: 0,
+                status: 'sending',
                 attempts: 0
             });
 
+            try {
+                await Self.sendMessage(chat.senderFk, chat.recipient, chat.message);
+                await Self.updateChat(chat, 'sent');
+            } catch (error) {
+                await Self.updateChat(chat, 'error', error);
+            }
+
             return true;
         }
 

back/methods/chat/sendCheckingPresence.js

@@ -24,18 +24,13 @@ module.exports = Self => {
         }
     });
 
-    Self.sendCheckingPresence = async(ctx, recipientId, message, options) => {
+    Self.sendCheckingPresence = async(ctx, recipientId, message) => {
         if (!recipientId) return false;
 
-        const myOptions = {};
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
         const models = Self.app.models;
         const userId = ctx.req.accessToken.userId;
-        const sender = await models.Account.findById(userId);
-        const recipient = await models.Account.findById(recipientId, null, myOptions);
+        const sender = await models.Account.findById(userId, {fields: ['id']});
+        const recipient = await models.Account.findById(recipientId, null);
 
         // Prevent sending messages to yourself
         if (recipientId == userId) return false;
@@ -46,16 +41,23 @@ module.exports = Self => {
         if (process.env.NODE_ENV == 'test')
             message = `[Test:Environment to user ${userId}] ` + message;
 
-        await models.Chat.create({
+        const chat = await models.Chat.create({
             senderFk: sender.id,
             recipient: `@${recipient.name}`,
             dated: Date.vnNew(),
             checkUserStatus: 1,
             message: message,
-            status: 0,
+            status: 'sending',
             attempts: 0
         });
 
+        try {
+            await Self.sendCheckingUserStatus(chat);
+            await Self.updateChat(chat, 'sent');
+        } catch (error) {
+            await Self.updateChat(chat, 'error', error);
+        }
+
         return true;
     };
 };

back/methods/chat/sendQueued.js

@@ -3,7 +3,6 @@ module.exports = Self => {
     Self.remoteMethodCtx('sendQueued', {
         description: 'Send a RocketChat message',
         accessType: 'WRITE',
-        accepts: [],
         returns: {
             type: 'object',
             root: true
@@ -16,14 +15,17 @@ module.exports = Self => {
 
     Self.sendQueued = async() => {
         const models = Self.app.models;
-        const maxAttempts = 3;
-        const sentStatus = 1;
-        const errorStatus = 2;
 
         const chats = await models.Chat.find({
             where: {
-                status: {neq: sentStatus},
-                attempts: {lt: maxAttempts}
+                status: {
+                    nin: [
+                        'sent',
+                        'sending'
+                    ]
+
+                },
+                attempts: {lt: 3}
             }
         });
 
@@ -31,16 +33,16 @@ module.exports = Self => {
             if (chat.checkUserStatus) {
                 try {
                     await Self.sendCheckingUserStatus(chat);
-                    await updateChat(chat, sentStatus);
+                    await Self.updateChat(chat, 'sent');
                 } catch (error) {
-                    await updateChat(chat, errorStatus, error);
+                    await Self.updateChat(chat, 'error', error);
                 }
             } else {
                 try {
                     await Self.sendMessage(chat.senderFk, chat.recipient, chat.message);
-                    await updateChat(chat, sentStatus);
+                    await Self.updateChat(chat, 'sent');
                 } catch (error) {
-                    await updateChat(chat, errorStatus, error);
+                    await Self.updateChat(chat, 'error', error);
                 }
             }
         }
@@ -128,15 +130,17 @@ module.exports = Self => {
      * @param {object} chat - The chat
      * @param {string} status - The new status
      * @param {string} error - The error
+     * @param {object} options - Query options
      * @return {Promise} - The request promise
-     */
-    async function updateChat(chat, status, error) {
+    */
+
+    Self.updateChat = async(chat, status, error) => {
         return chat.updateAttributes({
             status: status,
             attempts: ++chat.attempts,
             error: error
         });
-    }
+    };
 
     /**
      * Returns the current user status on Rocketchat

back/methods/chat/spec/sendQueued.spec.js

@@ -10,7 +10,7 @@ describe('Chat sendCheckingPresence()', () => {
 
         const chat = {
             checkUserStatus: 1,
-            status: 0,
+            status: 'pending',
             attempts: 0
         };
 
@@ -27,7 +27,7 @@ describe('Chat sendCheckingPresence()', () => {
 
         const chat = {
             checkUserStatus: 0,
-            status: 0,
+            status: 'pending',
             attempts: 0
         };
 

back/methods/collection/previousLabel.js

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('previousLabel', {
         description: 'Returns the previa label pdf',
@@ -33,17 +31,5 @@ module.exports = Self => {
         }
     });
 
-    Self.previousLabel = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('previa-label', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="previa-${id}.pdf"`];
-    };
+    Self.previousLabel = (ctx, id) => Self.printReport(ctx, id, 'previa-label');
 };

back/methods/collection/spec/setSaleQuantity.spec.js

@@ -1,6 +1,21 @@
 const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
 
 describe('setSaleQuantity()', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
     it('should change quantity sale', async() => {
         const tx = await models.Ticket.beginTransaction({});
 

back/methods/dms/saveSign.js

@@ -1,215 +0,0 @@
-const md5 = require('md5');
-const fs = require('fs-extra');
-
-module.exports = Self => {
-    Self.remoteMethodCtx('saveSign', {
-        description: 'Save sign',
-        accessType: 'WRITE',
-        accepts:
-        [
-            {
-                arg: 'signContent',
-                type: 'string',
-                required: true,
-                description: 'The sign content'
-            }, {
-                arg: 'tickets',
-                type: ['number'],
-                required: true,
-                description: 'The tickets'
-            }, {
-                arg: 'signedTime',
-                type: 'date',
-                description: 'The signed time'
-            }, {
-                arg: 'addressFk',
-                type: 'number',
-                required: true,
-                description: 'The address fk'
-            }
-        ],
-        returns: {
-            type: 'Object',
-            root: true
-        },
-        http: {
-            path: `/saveSign`,
-            verb: 'POST'
-        }
-    });
-
-    async function createGestDoc(ticketId, userFk) {
-        const models = Self.app.models;
-        if (!await gestDocExists(ticketId)) {
-            const result = await models.Ticket.findOne({
-                where: {
-                    id: ticketId
-                },
-                include: [
-                    {
-                        relation: 'warehouse',
-                        scope: {
-                            fields: ['id']
-                        }
-                    }, {
-                        relation: 'client',
-                        scope: {
-                            fields: ['name']
-                        }
-                    }, {
-                        relation: 'route',
-                        scope: {
-                            fields: ['id']
-                        }
-                    }
-                ]
-            });
-
-            const warehouseFk = result.warehouseFk;
-            const companyFk = result.companyFk;
-            const client = result.client.name;
-            const route = result.route.id;
-
-            const resultDmsType = await models.DmsType.findOne({
-                where: {
-                    code: 'Ticket'
-                }
-            });
-
-            const resultDms = await models.Dms.create({
-                dmsTypeFk: resultDmsType.id,
-                reference: ticketId,
-                description: `Ticket ${ticketId} Cliente ${client} Ruta ${route}`,
-                companyFk: companyFk,
-                warehouseFk: warehouseFk,
-                workerFk: userFk
-            });
-
-            return resultDms.insertId;
-        }
-    }
-
-    async function gestDocExists(ticket) {
-        const models = Self.app.models;
-        const result = await models.TicketDms.findOne({
-            where: {
-                ticketFk: ticket
-            },
-            fields: ['dmsFk']
-        });
-
-        if (result == null)
-            return false;
-
-        const isSigned = await models.Ticket.findOne({
-            where: {
-                id: ticket
-            },
-            fields: ['isSigned']
-        });
-
-        if (isSigned)
-            return true;
-        else
-            await models.Dms.destroyById(ticket);
-    }
-
-    async function dmsRecover(ticket, signContent) {
-        const models = Self.app.models;
-        await models.DmsRecover.create({
-            ticketFk: ticket,
-            sign: signContent
-        });
-    }
-
-    async function ticketGestdoc(ticket, dmsFk) {
-        const models = Self.app.models;
-        models.TicketDms.replaceOrCreate({
-            ticketFk: ticket,
-            dmsFk: dmsFk
-        });
-
-        const queryVnTicketSetState = `CALL vn.ticket_setState(?, ?)`;
-
-        await Self.rawSql(queryVnTicketSetState, [ticket, 'DELIVERED']);
-    }
-
-    async function updateGestdoc(file, ticket) {
-        const models = Self.app.models;
-        models.Dms.updateOne({
-            where: {
-                id: ticket
-            },
-            file: file,
-            contentType: 'image/png'
-        });
-    }
-
-    Self.saveSign = async(ctx, signContent, tickets, signedTime) => {
-        const models = Self.app.models;
-        let tx = await Self.beginTransaction({});
-        try {
-            const userId = ctx.req.accessToken.userId;
-
-            const dmsDir = `storage/dms`;
-
-            let image = null;
-
-            for (let i = 0; i < tickets.length; i++) {
-                const alertLevel = await models.TicketState.findOne({
-                    where: {
-                        ticketFk: tickets[i]
-                    },
-                    fields: ['alertLevel']
-                });
-
-                signedTime ? signedTime != undefined : signedTime = Date.vnNew();
-
-                if (alertLevel >= 2) {
-                    let dir;
-                    let id = null;
-                    let fileName = null;
-
-                    if (!await gestDocExists(tickets[i])) {
-                        id = await createGestDoc(tickets[i], userId);
-
-                        const hashDir = md5(id).substring(0, 3);
-                        dir = `${dmsDir}/${hashDir}`;
-
-                        if (!fs.existsSync(dir))
-                            fs.mkdirSync(dir);
-
-                        fileName = `${id}.png`;
-                        image = `${dir}/${fileName}`;
-                    } else
-
-                    if (image != null) {
-                        if (!fs.existsSync(dir))
-                            dmsRecover(tickets[i], signContent);
-                        else {
-                            fs.writeFile(image, signContent, 'base64', async function(err) {
-                                if (err) {
-                                    await tx.rollback();
-                                    return err.message;
-                                }
-                            });
-                        }
-                    } else
-                        dmsRecover(tickets[i], signContent);
-
-                    if (id != null && fileName.length > 0) {
-                        ticketGestdoc(tickets[i], id);
-                        updateGestdoc(id, fileName);
-                    }
-                }
-            }
-
-            if (tx) await tx.commit();
-
-            return 'OK';
-        } catch (err) {
-            await tx.rollback();
-            throw err.message;
-        }
-    };
-};

back/methods/image/download.js

@@ -74,10 +74,13 @@ module.exports = Self => {
         const container = await models.ImageContainer.getContainer(collection);
         const rootPath = container.client.root;
         const fileSrc = path.join(rootPath, collection, size);
+
+        const ext = image.name.substring((image.name.length - 4));
+        const fileName = ext !== '.png' ? `${image.name}.png` : image.name;
         const file = {
-            path: `${fileSrc}/${image.name}.png`,
+            path: `${fileSrc}/${fileName}`,
             contentType: 'image/png',
-            name: `${image.name}.png`
+            name: image.name
         };
 
         if (!fs.existsSync(file.path)) return [];

back/methods/image/upload.js

@@ -1,6 +1,7 @@
 const UserError = require('vn-loopback/util/user-error');
 const fs = require('fs-extra');
 const path = require('path');
+const uuid = require('uuid');
 
 module.exports = Self => {
     Self.remoteMethodCtx('upload', {
@@ -18,12 +19,6 @@ module.exports = Self => {
                 type: 'string',
                 description: 'The collection name',
                 required: true
-            },
-            {
-                arg: 'fileName',
-                type: 'string',
-                description: 'The file name',
-                required: true
             }],
         returns: {
             type: 'Object',
@@ -56,10 +51,12 @@ module.exports = Self => {
             const [uploadedFile] = Object.values(uploaded.files).map(file => {
                 return file[0];
             });
+
             const file = await TempContainer.getFile(tempContainer.name, uploadedFile.name);
             srcFile = path.join(file.client.root, file.container, file.name);
 
-            await models.Image.registerImage(args.collection, srcFile, args.fileName, args.id);
+            const fileName = `${uuid.v4()}.png`;
+            await models.Image.registerImage(args.collection, srcFile, fileName, args.id);
         } catch (e) {
             if (fs.existsSync(srcFile))
                 await fs.unlink(srcFile);

back/models/account.js

@@ -131,7 +131,7 @@ module.exports = Self => {
                 WHERE u.id = ?`, [userId], options);
 
         let roles = [];
-        for (role of result)
+        for (const role of result)
             roles.push(role.name);
 
         return roles;

back/models/company.json

@@ -20,10 +20,9 @@
             "type": "date"
         }
     },
-
     "scope": {
         "where" :{
             "expired": null
         }
     }
-}
+}

back/models/delivery.json

@@ -9,17 +9,29 @@
   "properties": {
     "id": {
       "id": true,
-      "type": "number",
-      "forceId": false
+      "type": "number"
     },
-    "date": {
+    "created": {
       "type": "date"
     },
-    "m3":{
+    "longitude":{
       "type": "number"
     },
-    "warehouseFk":{
+    "latitude":{
+      "type": "number"
+    },
+    "dated":{
+      "type": "date"
+    },
+    "ticketFk":{
       "type": "number"
     }
-  }
+  },
+  "relations": {
+        "ticket": {
+            "type": "belongsTo",
+            "model": "Ticket",
+            "foreignKey": "ticketFk"
+        }
+    }
 }

back/models/dms.js

@@ -6,7 +6,6 @@ module.exports = Self => {
     require('../methods/dms/removeFile')(Self);
     require('../methods/dms/updateFile')(Self);
     require('../methods/dms/deleteTrashFiles')(Self);
-    require('../methods/dms/saveSign')(Self);
 
     Self.checkRole = async function(ctx, id) {
         const models = Self.app.models;

back/models/image.js

@@ -84,9 +84,8 @@ module.exports = Self => {
             const container = await models.ImageContainer.container(collectionName);
             const rootPath = container.client.root;
             const collectionDir = path.join(rootPath, collectionName);
-            const file = `${fileName}.png`;
             const dstDir = path.join(collectionDir, 'full');
-            const dstFile = path.join(dstDir, file);
+            const dstFile = path.join(dstDir, fileName);
 
             const buffer = readChunk.sync(srcFilePath, 0, 12);
             const type = imageType(buffer);
@@ -102,7 +101,8 @@ module.exports = Self => {
                         width: bmpData.width,
                         height: bmpData.height,
                         channels: 4
-                    }
+                    },
+                    failOn: 'none'
                 };
             }
 
@@ -120,7 +120,7 @@ module.exports = Self => {
             const sizes = collection.sizes();
             for (let size of sizes) {
                 const dstDir = path.join(collectionDir, `${size.width}x${size.height}`);
-                const dstFile = path.join(dstDir, file);
+                const dstFile = path.join(dstDir, fileName);
                 const resizeOpts = {
                     withoutEnlargement: true,
                     fit: size.crop ? 'cover' : 'inside'

back/tests.js

@@ -30,7 +30,10 @@ async function test() {
 
     const bootOptions = {dataSources};
     const app = require('vn-loopback/server/server');
-    app.boot(bootOptions);
+    await new Promise((resolve, reject) => {
+        app.boot(bootOptions,
+            err => err ? reject(err) : resolve());
+    });
 
     const Jasmine = require('jasmine');
     const jasmine = new Jasmine();

db/.archive/230201/00-kkearSaleChecked.sql

@@ -0,0 +1,173 @@
+DELETE FROM `salix`.`ACL` WHERE model="SaleChecked";
+DROP TABLE IF EXISTS `vn`.`saleChecked`;
+DROP PROCEDURE IF EXISTS `vn`.`clean`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`clean`()
+BEGIN
+	DECLARE vDateShort DATETIME;
+	DECLARE vOneYearAgo DATE;
+	DECLARE vFourYearsAgo DATE;
+	DECLARE v18Month DATE;
+	DECLARE v26Month DATE;
+	DECLARE v3Month DATE;
+	DECLARE vTrashId VARCHAR(15);
+
+	SET vDateShort = util.VN_CURDATE() - INTERVAL 2 MONTH;
+	SET vOneYearAgo = util.VN_CURDATE() - INTERVAL 1 YEAR;
+	SET vFourYearsAgo = util.VN_CURDATE() - INTERVAL 4 YEAR;
+	SET v18Month = util.VN_CURDATE() - INTERVAL 18 MONTH;
+	SET v26Month = util.VN_CURDATE() - INTERVAL 26 MONTH;
+	SET v3Month = util.VN_CURDATE() - INTERVAL 3 MONTH;
+
+	DELETE FROM ticketParking WHERE created < vDateShort;
+	DELETE FROM routesMonitor WHERE dated < vDateShort;
+	DELETE FROM workerTimeControlLog WHERE created < vDateShort;
+	DELETE FROM `message` WHERE sendDate < vDateShort;
+	DELETE FROM messageInbox WHERE sendDate < vDateShort;
+	DELETE FROM messageInbox WHERE sendDate < vDateShort;
+	DELETE FROM workerTimeControl WHERE timed < vFourYearsAgo;
+	DELETE FROM itemShelving WHERE created < util.VN_CURDATE() AND visible = 0;
+	DELETE FROM ticketDown WHERE created < TIMESTAMPADD(DAY,-1,util.VN_CURDATE());
+	DELETE FROM entryLog WHERE creationDate < vDateShort;
+	DELETE IGNORE FROM expedition WHERE created < v26Month;
+	DELETE FROM sms WHERE created < v18Month;
+	DELETE FROM saleTracking WHERE created < vOneYearAgo;
+	DELETE FROM ticketTracking WHERE created < v18Month;
+	DELETE tobs FROM ticketObservation tobs
+		JOIN ticket t ON tobs.ticketFk = t.id WHERE t.shipped < TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
+	DELETE sc.* FROM saleCloned sc JOIN sale s ON s.id = sc.saleClonedFk JOIN ticket t ON t.id = s.ticketFk WHERE t.shipped < vOneYearAgo;
+	DELETE FROM sharingCart where ended < vDateShort;
+	DELETE FROM sharingClient where ended < vDateShort;
+	DELETE tw.* FROM ticketWeekly tw
+		LEFT JOIN sale s ON s.ticketFk = tw.ticketFk WHERE s.itemFk IS NULL;
+	DELETE FROM claim WHERE ticketCreated < vFourYearsAgo;
+	DELETE FROM message WHERE sendDate < vDateShort;
+	-- Robert ubicacion anterior de trevelLog comentario para debug
+	DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Month;
+	DELETE bm
+		FROM buyMark bm
+			JOIN buy b ON b.id = bm.id
+			JOIN entry e ON e.id = b.entryFk
+			JOIN travel t ON t.id = e.travelFk
+		WHERE t.landed <= vDateShort;
+	DELETE FROM vn.buy WHERE created < vDateShort AND entryFk = 9200;
+	DELETE FROM vn.itemShelvingLog WHERE created < vDateShort;
+	DELETE FROM vn.stockBuyed WHERE creationDate < vDateShort;
+	DELETE FROM vn.itemCleanLog WHERE created < util.VN_NOW() - INTERVAL 1 YEAR;
+	DELETE FROM printQueue WHERE statusCode = 'printed' AND created < vDateShort;
+
+	-- Equipos duplicados
+	DELETE w.*
+		FROM workerTeam w
+		JOIN (SELECT id, team, workerFk, COUNT(*) - 1 as duplicated
+				FROM workerTeam
+				GROUP BY team,workerFk
+				HAVING duplicated
+			 ) d ON d.team = w.team AND d.workerFk = w.workerFk AND d.id != w.id;
+
+	DELETE sc
+		FROM  saleComponent sc
+			JOIN sale s ON s.id=  sc.saleFk
+			JOIN ticket t ON t.id= s.ticketFk
+		WHERE t.shipped < v18Month;
+
+	DELETE c
+		FROM vn.claim c
+			JOIN vn.claimState cs ON cs.id = c.claimStateFk
+		WHERE cs.description = "Anulado" AND
+			c.created < vDateShort;
+	DELETE
+		FROM vn.expeditionTruck
+		WHERE ETD < v3Month;
+
+	-- borrar travels sin entradas
+	DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
+	CREATE TEMPORARY TABLE tmp.thermographToDelete
+		SELECT th.id,th.dmsFk
+		FROM vn.travel t
+			LEFT JOIN vn.entry e ON e.travelFk = t.id
+			JOIN vn.travelThermograph th ON th.travelFk = t.id
+		WHERE t.shipped < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND e.travelFk IS NULL;
+
+	SELECT dt.id INTO vTrashId
+		FROM vn.dmsType dt
+		WHERE dt.code = 'trash';
+
+	UPDATE tmp.thermographToDelete th
+		JOIN vn.dms d ON d.id = th.dmsFk
+		SET d.dmsTypeFk = vTrashId;
+
+	DELETE th
+		FROM tmp.thermographToDelete tmp
+		JOIN vn.travelThermograph th ON th.id = tmp.id;
+
+	DELETE t
+		FROM vn.travel t
+		LEFT JOIN vn.entry e ON e.travelFk = t.id
+		WHERE t.shipped < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND e.travelFk IS NULL;
+
+	UPDATE dms d
+			JOIN dmsType dt ON dt.id = d.dmsTypeFk
+		SET d.dmsTypeFk = vTrashId
+		WHERE created < TIMESTAMPADD(MONTH, -dt.monthToDelete, util.VN_CURDATE());
+
+	-- borrar entradas sin compras
+	DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
+	CREATE TEMPORARY TABLE tmp.entryToDelete
+		SELECT e.*
+			FROM vn.entry e
+			LEFT JOIN vn.buy b ON b.entryFk = e.id
+			JOIN vn.entryConfig  ec ON e.id != ec.defaultEntry
+		WHERE e.dated < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND b.entryFK IS NULL;
+
+	DELETE e
+		FROM vn.entry e
+		JOIN tmp.entryToDelete tmp ON tmp.id = e.id;
+
+	-- borrar de route registros menores a 4 años
+	DROP TEMPORARY TABLE IF EXISTS tmp.routeToDelete;
+	CREATE TEMPORARY TABLE tmp.routeToDelete
+		SELECT *
+		FROM vn.route r
+		WHERE created < TIMESTAMPADD(YEAR,-4,util.VN_CURDATE());
+
+	UPDATE  tmp.routeToDelete tmp
+		JOIN vn.dms d ON d.id = tmp.gestdocFk
+		SET d.dmsTypeFk = vTrashId;
+
+	DELETE r
+		FROM tmp.routeToDelete tmp
+		JOIN vn.route r ON  r.id = tmp.id;
+
+	-- borrar registros de dua y awb menores a 2 años
+	DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
+	CREATE TEMPORARY TABLE tmp.duaToDelete
+		SELECT *
+			FROM vn.dua
+			WHERE operated < TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
+
+	UPDATE  tmp.duaToDelete tm
+		JOIN vn.dms d ON d.id = tm.gestdocFk
+		SET d.dmsTypeFk = vTrashId;
+
+	DELETE d
+		FROM tmp.duaToDelete tmp
+		JOIN vn.dua d ON d.id = tmp.id;
+
+	DELETE FROM vn.awb WHERE created < TIMESTAMPADD(YEAR,-2,util.VN_CURDATE());
+
+	-- Borra los registros de collection y ticketcollection
+	DELETE FROM vn.collection  WHERE created < vDateShort;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
+	DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
+	DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
+
+	DELETE FROM travelLog WHERE creationDate < v3Month;
+
+	CALL shelving_clean;
+
+END$$
+DELIMITER ;

db/.archive/230201/00-validPriorities_ItemConfig.sql

@@ -3,7 +3,3 @@ ALTER TABLE `vn`.`itemConfig` ADD CONSTRAINT itemConfig_FK FOREIGN KEY (defaultT
 ALTER TABLE `vn`.`itemConfig` ADD validPriorities varchar(50) DEFAULT '[1,2,3]' NOT NULL;
 ALTER TABLE `vn`.`itemConfig` ADD defaultPriority INT DEFAULT 2 NOT NULL;
 ALTER TABLE `vn`.`item` MODIFY COLUMN relevancy tinyint(1) DEFAULT 0 NOT NULL COMMENT 'La web ordena de forma descendiente por este campo para mostrar los artículos';
-
-INSERT INTO `salix`.`ACL`
-(model, property, accessType, permission, principalType, principalId)
-VALUES('ItemConfig', '*', 'READ', 'ALLOW', 'ROLE', 'buyer');

db/changes/230201/00-kkearSaleChecked.sql

@@ -1,2 +0,0 @@
-DELETE FROM `salix`.`ACL` WHERE model="SaleChecked";
-DROP TABLE IF EXISTS `vn`.`saleChecked`;

db/changes/230202/00-itemConfig.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `vn`.`itemConfig` ADD defaultTag INT DEFAULT 56 NOT NULL;
+ALTER TABLE `vn`.`itemConfig` ADD CONSTRAINT itemConfig_FK FOREIGN KEY (defaultTag) REFERENCES vn.tag(id);
+ALTER TABLE `vn`.`itemConfig` ADD validPriorities varchar(50) DEFAULT '[1,2,3]' NOT NULL;
+ALTER TABLE `vn`.`itemConfig` ADD defaultPriority INT DEFAULT 2 NOT NULL;
+ALTER TABLE `vn`.`item` MODIFY COLUMN relevancy tinyint(1) DEFAULT 0 NOT NULL COMMENT 'La web ordena de forma descendiente por este campo para mostrar los artículos';