Merge branch 'dev' into 4074-download-user-ACL

.gitignore

@@ -2,10 +2,11 @@ coverage
 node_modules
 dist
 storage
+.idea
 npm-debug.log
 .eslintcache
 datasources.*.json
 print.*.json
 db.json
 junit.xml
-.DS_Store
+.DS_Store

.vscode/settings.json

@@ -1,8 +1,8 @@
-// Coloque su configuración en este archivo para sobrescribir la configuración predeterminada y de usuario.
-{
-    // Carácter predeterminado de final de línea.
-    "files.eol": "\n",
-    "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
-    }
-}
+// Coloque su configuración en este archivo para sobrescribir la configuración predeterminada y de usuario.
+{
+    // Carácter predeterminado de final de línea.
+    "files.eol": "\n",
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": true
+    }
+}

CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+
+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).
+
+## [2302.01] - 2023-01-12
+
+### Added
+
+- 
+
+### Changed
+
+- 

Dockerfile

@@ -1,32 +1,43 @@
-FROM debian:stretch-slim
+FROM debian:bullseye-slim
 ENV TZ Europe/Madrid
 
 ARG DEBIAN_FRONTEND=noninteractive
+
+# NodeJs
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         curl \
         ca-certificates \
         gnupg2 \
-        libfontconfig lftp \
-    && apt-get -y install xvfb gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 \
-      libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 \
-      libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 \
-      libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 \
-      libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget \
-    && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
+    && 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
+
+# Puppeteer
+
+RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        nodejs \
-    && apt-get purge -y --auto-remove \
-        gnupg2 \
+        libfontconfig lftp xvfb gconf-service libasound2 libatk1.0-0 libc6 \
+        libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 \
+        libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 \
+        libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 \
+        libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 \
+        libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
+        fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget \
     && rm -rf /var/lib/apt/lists/* \
     && npm -g install pm2
 
+# Salix
+
 WORKDIR /salix
+
+COPY print/package.json print/package-lock.json print/
+RUN npm --prefix ./print install --omit=dev ./print
+
 COPY package.json package-lock.json ./
 COPY loopback/package.json loopback/
-COPY print/package.json print/
-RUN npm install --only=prod
-RUN npm --prefix ./print install --only=prod ./print
+RUN npm install --omit=dev
 
 COPY loopback loopback
 COPY back back

Jenkinsfile

@@ -1,5 +1,4 @@
 #!/usr/bin/env groovy
-
 pipeline {
     agent any
     options {
@@ -62,13 +61,13 @@ pipeline {
                         }
                     }
                 }
-            //     stage('Backend') {
-            //         steps {
-            //             nodejs('node-v14') {
-            //                 sh 'npm run test:back:ci'
-            //             }
-            //         }
-            //     }
+                stage('Backend') {
+                    steps {
+                        nodejs('node-v14') {
+                            sh 'npm run test:back:ci'
+                        }
+                    }
+                }
             }
         }
         stage('Build') {

back/methods/account/recover-password.js

@@ -0,0 +1,30 @@
+module.exports = Self => {
+    Self.remoteMethod('recoverPassword', {
+        description: 'Send email to the user',
+        accepts: [
+            {
+                arg: 'email',
+                type: 'string',
+                description: 'The email of user',
+                required: true
+            }
+        ],
+        http: {
+            path: `/recoverPassword`,
+            verb: 'POST'
+        }
+    });
+
+    Self.recoverPassword = async function(email) {
+        const models = Self.app.models;
+
+        try {
+            await models.user.resetPassword({email, emailTemplate: 'recover-password'});
+        } catch (err) {
+            if (err.code === 'EMAIL_NOT_FOUND')
+                return;
+            else
+                throw err;
+        }
+    };
+};

back/methods/account/specs/set-password.spec.js

@@ -1,6 +1,6 @@
 const app = require('vn-loopback/server/server');
 
-describe('account changePassword()', () => {
+describe('account setPassword()', () => {
     it('should throw an error when password does not meet requirements', async() => {
         let req = app.models.Account.setPassword(1, 'insecurePass');
 

back/methods/chat/notifyIssues.js

@@ -32,7 +32,7 @@ module.exports = Self => {
         let message = $t(`There's a new urgent ticket:`);
         const ostUri = 'https://cau.verdnatura.es/scp/tickets.php?id=';
         tickets.forEach(ticket => {
-            message += `\r\n[ID: *${ticket.number}* - ${ticket.subject} (@${ticket.username})](${ostUri + ticket.id})`;
+            message += `\r\n[ID: ${ticket.number} - ${ticket.subject} @${ticket.username}](${ostUri + ticket.id})`;
         });
 
         const department = await models.Department.findOne({
@@ -42,7 +42,5 @@ module.exports = Self => {
 
         if (channelName)
             return Self.send(ctx, `#${channelName}`, `@all ➔ ${message}`);
-
-        return;
     };
 };

back/methods/chat/sendCheckingPresence.js

@@ -43,6 +43,9 @@ module.exports = Self => {
         if (!recipient)
             throw new Error(`Could not send message "${message}" to worker id ${recipientId} from user ${userId}`);
 
+        if (process.env.NODE_ENV == 'test')
+            message = `[Test:Environment to user ${userId}] ` + message;
+
         await models.Chat.create({
             senderFk: sender.id,
             recipient: `@${recipient.name}`,

back/methods/chat/spec/notifyIssue.spec.js

@@ -27,7 +27,7 @@ describe('Chat notifyIssue()', () => {
             subject: 'Issue title'}
         ]);
         // eslint-disable-next-line max-len
-        const expectedMessage = `@all ➔ There's a new urgent ticket:\r\n[ID: *00001* - Issue title (@batman)](https://cau.verdnatura.es/scp/tickets.php?id=1)`;
+        const expectedMessage = `@all ➔ There's a new urgent ticket:\r\n[ID: 00001 - Issue title @batman](https://cau.verdnatura.es/scp/tickets.php?id=1)`;
 
         const department = await app.models.Department.findById(departmentId);
         let orgChatName = department.chatName;

back/methods/collection/setSaleQuantity.js

@@ -26,11 +26,30 @@ module.exports = Self => {
 
     Self.setSaleQuantity = async(saleId, quantity) => {
         const models = Self.app.models;
+        const myOptions = {};
+        let tx;
 
-        const sale = await models.Sale.findById(saleId);
-        return await sale.updateAttributes({
-            originalQuantity: sale.quantity,
-            quantity: quantity
-        });
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            const sale = await models.Sale.findById(saleId, null, myOptions);
+            const saleUpdated = await sale.updateAttributes({
+                originalQuantity: sale.quantity,
+                quantity: quantity
+            }, myOptions);
+
+            if (tx) await tx.commit();
+
+            return saleUpdated;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
     };
 };

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

@@ -2,15 +2,26 @@ const models = require('vn-loopback/server/server').models;
 
 describe('setSaleQuantity()', () => {
     it('should change quantity sale', async() => {
-        const saleId = 30;
-        const newQuantity = 10;
+        const tx = await models.Ticket.beginTransaction({});
 
-        const originalSale = await models.Sale.findById(saleId);
+        try {
+            const options = {transaction: tx};
 
-        await models.Collection.setSaleQuantity(saleId, newQuantity);
-        const updateSale = await models.Sale.findById(saleId);
+            const saleId = 30;
+            const newQuantity = 10;
 
-        expect(updateSale.originalQuantity).toEqual(originalSale.quantity);
-        expect(updateSale.quantity).toEqual(newQuantity);
+            const originalSale = await models.Sale.findById(saleId, null, options);
+
+            await models.Collection.setSaleQuantity(saleId, newQuantity, options);
+            const updateSale = await models.Sale.findById(saleId, null, options);
+
+            expect(updateSale.originalQuantity).toEqual(originalSale.quantity);
+            expect(updateSale.quantity).toEqual(newQuantity);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     });
 });

back/methods/dms/deleteTrashFiles.js

@@ -47,20 +47,22 @@ module.exports = Self => {
         for (let dms of dmsToDelete) {
             const pathHash = DmsContainer.getHash(dms.id);
             const dmsContainer = await DmsContainer.container(pathHash);
-            const dstFile = path.join(dmsContainer.client.root, pathHash, dms.file);
             try {
+                const dstFile = path.join(dmsContainer.client.root, pathHash, dms.file);
                 await fs.unlink(dstFile);
             } catch (err) {
-                continue;
+                if (err.code != 'ENOENT' && dms.file)
+                    throw err;
             }
+
+            await dms.destroy(myOptions);
+
             const dstFolder = path.join(dmsContainer.client.root, pathHash);
             try {
                 await fs.rmdir(dstFolder);
             } catch (err) {
                 continue;
             }
-
-            await dms.destroy(myOptions);
         }
     };
 };

back/methods/dms/saveSign.js

@@ -0,0 +1,215 @@
+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 = new Date();
+
+                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/notification/clean.js

@@ -29,6 +29,9 @@ module.exports = Self => {
 
         try {
             const config = await models.NotificationConfig.findOne({}, myOptions);
+
+            if (!config.cleanDays) return;
+
             const cleanDate = new Date();
             cleanDate.setDate(cleanDate.getDate() - config.cleanDays);
 
@@ -36,11 +39,11 @@ module.exports = Self => {
                 where: {status: {inq: status}},
                 created: {lt: cleanDate}
             }, myOptions);
-
-            if (tx) await tx.commit();
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;
         }
+
+        if (tx) await tx.commit();
     };
 };

back/methods/notification/send.js

@@ -1,5 +1,4 @@
 const {Email} = require('vn-print');
-const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
     Self.remoteMethod('send', {
@@ -35,7 +34,10 @@ module.exports = Self => {
                                 include: {
                                     relation: 'user',
                                     scope: {
-                                        fields: ['name', 'email', 'lang']
+                                        fields: ['name', 'lang'],
+                                        include: {
+                                            relation: 'emailUser'
+                                        }
                                     }
                                 }
                             }
@@ -56,7 +58,7 @@ module.exports = Self => {
             for (const notificationUser of queue.notification().subscription()) {
                 try {
                     const sendParams = {
-                        recipient: notificationUser.user().email,
+                        recipient: notificationUser.user().emailUser().email,
                         lang: notificationUser.user().lang
                     };
 

back/methods/starred-module/specs/getStarredModules.spec.js

@@ -19,11 +19,11 @@ describe('getStarredModules()', () => {
     });
 
     it(`should return the starred modules for a given user`, async() => {
-        const newStarred = await app.models.StarredModule.create({workerFk: 9, moduleFk: 'Clients', position: 1});
+        const newStarred = await app.models.StarredModule.create({workerFk: 9, moduleFk: 'customer', position: 1});
         const starredModules = await app.models.StarredModule.getStarredModules(ctx);
 
         expect(starredModules.length).toEqual(1);
-        expect(starredModules[0].moduleFk).toEqual('Clients');
+        expect(starredModules[0].moduleFk).toEqual('customer');
 
         // restores
         await app.models.StarredModule.destroyById(newStarred.id);

back/methods/starred-module/specs/setPosition.spec.js

@@ -26,29 +26,29 @@ describe('setPosition()', () => {
         const filter = {
             where: {
                 workerFk: ctx.req.accessToken.userId,
-                moduleFk: 'Orders'
+                moduleFk: 'order'
             }
         };
 
         try {
             const options = {transaction: tx};
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Orders', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Clients', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'order', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'customer', options);
 
             let orders = await app.models.StarredModule.findOne(filter, options);
 
-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
             let clients = await app.models.StarredModule.findOne(filter, options);
 
             expect(orders.position).toEqual(1);
             expect(clients.position).toEqual(2);
 
-            await app.models.StarredModule.setPosition(ctx, 'Clients', 'left', options);
+            await app.models.StarredModule.setPosition(ctx, 'customer', 'left', options);
 
-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
             clients = await app.models.StarredModule.findOne(filter, options);
 
-            filter.where.moduleFk = 'Orders';
+            filter.where.moduleFk = 'order';
             orders = await app.models.StarredModule.findOne(filter, options);
 
             expect(clients.position).toEqual(1);
@@ -67,29 +67,29 @@ describe('setPosition()', () => {
         const filter = {
             where: {
                 workerFk: ctx.req.accessToken.userId,
-                moduleFk: 'Orders'
+                moduleFk: 'order'
             }
         };
 
         try {
             const options = {transaction: tx};
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Orders', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Clients', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'order', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'customer', options);
 
             let orders = await app.models.StarredModule.findOne(filter, options);
 
-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
             let clients = await app.models.StarredModule.findOne(filter, options);
 
             expect(orders.position).toEqual(1);
             expect(clients.position).toEqual(2);
 
-            await app.models.StarredModule.setPosition(ctx, 'Orders', 'right', options);
+            await app.models.StarredModule.setPosition(ctx, 'order', 'right', options);
 
-            filter.where.moduleFk = 'Orders';
+            filter.where.moduleFk = 'order';
             orders = await app.models.StarredModule.findOne(filter, options);
 
-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
             clients = await app.models.StarredModule.findOne(filter, options);
 
             expect(orders.position).toEqual(2);
@@ -108,35 +108,35 @@ describe('setPosition()', () => {
         const filter = {
             where: {
                 workerFk: ctx.req.accessToken.userId,
-                moduleFk: 'Items'
+                moduleFk: 'item'
             }
         };
 
         try {
             const options = {transaction: tx};
 
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Clients', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Orders', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Clients', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Orders', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Items', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Claims', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Clients', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Orders', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Zones', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'customer', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'order', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'customer', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'order', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'item', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'claim', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'customer', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'order', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'zone', options);
 
             const items = await app.models.StarredModule.findOne(filter, options);
 
-            filter.where.moduleFk = 'Claims';
+            filter.where.moduleFk = 'claim';
             const claims = await app.models.StarredModule.findOne(filter, options);
 
-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
             let clients = await app.models.StarredModule.findOne(filter, options);
 
-            filter.where.moduleFk = 'Orders';
+            filter.where.moduleFk = 'order';
             let orders = await app.models.StarredModule.findOne(filter, options);
 
-            filter.where.moduleFk = 'Zones';
+            filter.where.moduleFk = 'zone';
             const zones = await app.models.StarredModule.findOne(filter, options);
 
             expect(items.position).toEqual(1);
@@ -145,12 +145,12 @@ describe('setPosition()', () => {
             expect(orders.position).toEqual(4);
             expect(zones.position).toEqual(5);
 
-            await app.models.StarredModule.setPosition(ctx, 'Clients', 'right', options);
+            await app.models.StarredModule.setPosition(ctx, 'customer', 'right', options);
 
-            filter.where.moduleFk = 'Orders';
+            filter.where.moduleFk = 'order';
             orders = await app.models.StarredModule.findOne(filter, options);
 
-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
             clients = await app.models.StarredModule.findOne(filter, options);
 
             expect(orders.position).toEqual(3);
@@ -169,31 +169,31 @@ describe('setPosition()', () => {
         const filter = {
             where: {
                 workerFk: ctx.req.accessToken.userId,
-                moduleFk: 'Items'
+                moduleFk: 'item'
             }
         };
 
         try {
             const options = {transaction: tx};
 
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Items', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Clients', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Claims', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Orders', options);
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Zones', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'item', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'customer', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'claim', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'order', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'zone', options);
 
             const items = await app.models.StarredModule.findOne(filter, options);
 
-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
             let clients = await app.models.StarredModule.findOne(filter, options);
 
-            filter.where.moduleFk = 'Claims';
+            filter.where.moduleFk = 'claim';
             const claims = await app.models.StarredModule.findOne(filter, options);
 
-            filter.where.moduleFk = 'Orders';
+            filter.where.moduleFk = 'order';
             let orders = await app.models.StarredModule.findOne(filter, options);
 
-            filter.where.moduleFk = 'Zones';
+            filter.where.moduleFk = 'zone';
             const zones = await app.models.StarredModule.findOne(filter, options);
 
             expect(items.position).toEqual(1);
@@ -202,13 +202,13 @@ describe('setPosition()', () => {
             expect(orders.position).toEqual(4);
             expect(zones.position).toEqual(5);
 
-            await app.models.StarredModule.toggleStarredModule(ctx, 'Claims', options);
-            await app.models.StarredModule.setPosition(ctx, 'Clients', 'right', options);
+            await app.models.StarredModule.toggleStarredModule(ctx, 'claim', options);
+            await app.models.StarredModule.setPosition(ctx, 'customer', 'right', options);
 
-            filter.where.moduleFk = 'Clients';
+            filter.where.moduleFk = 'customer';
             clients = await app.models.StarredModule.findOne(filter, options);
 
-            filter.where.moduleFk = 'Orders';
+            filter.where.moduleFk = 'order';
             orders = await app.models.StarredModule.findOne(filter, options);
 
             expect(orders.position).toEqual(2);

back/methods/starred-module/specs/toggleStarredModule.spec.js

@@ -21,15 +21,15 @@ describe('toggleStarredModule()', () => {
     });
 
     it('should create a new starred module and then remove it by calling the method again with same args', async() => {
-        const starredModule = await app.models.StarredModule.toggleStarredModule(ctx, 'Orders');
+        const starredModule = await app.models.StarredModule.toggleStarredModule(ctx, 'order');
         let starredModules = await app.models.StarredModule.getStarredModules(ctx);
 
         expect(starredModules.length).toEqual(1);
-        expect(starredModule.moduleFk).toEqual('Orders');
+        expect(starredModule.moduleFk).toEqual('order');
         expect(starredModule.workerFk).toEqual(activeCtx.accessToken.userId);
         expect(starredModule.position).toEqual(starredModules.length);
 
-        await app.models.StarredModule.toggleStarredModule(ctx, 'Orders');
+        await app.models.StarredModule.toggleStarredModule(ctx, 'order');
         starredModules = await app.models.StarredModule.getStarredModules(ctx);
 
         expect(starredModules.length).toEqual(0);

back/models/account.js

@@ -1,4 +1,7 @@
+/* eslint max-len: ["error", { "code": 150 }]*/
 const md5 = require('md5');
+const LoopBackContext = require('loopback-context');
+const {Email} = require('vn-print');
 
 module.exports = Self => {
     require('../methods/account/login')(Self);
@@ -6,6 +9,7 @@ module.exports = Self => {
     require('../methods/account/acl')(Self);
     require('../methods/account/change-password')(Self);
     require('../methods/account/set-password')(Self);
+    require('../methods/account/recover-password')(Self);
     require('../methods/account/validate-token')(Self);
     require('../methods/account/privileges')(Self);
     require('../methods/account/getRoles')(Self);
@@ -28,17 +32,62 @@ module.exports = Self => {
             ctx.data.password = md5(ctx.data.password);
     });
 
+    Self.afterRemote('prototype.patchAttributes', async(ctx, instance) => {
+        if (!ctx.args || !ctx.args.data.email) return;
+        const models = Self.app.models;
+
+        const loopBackContext = LoopBackContext.getCurrentContext();
+        const httpCtx = {req: loopBackContext.active};
+        const httpRequest = httpCtx.req.http.req;
+        const headers = httpRequest.headers;
+        const origin = headers.origin;
+        const url = origin.split(':');
+
+        const userId = ctx.instance.id;
+        const user = await models.user.findById(userId);
+
+        class Mailer {
+            async send(verifyOptions, cb) {
+                const params = {
+                    url: verifyOptions.verifyHref,
+                    recipient: verifyOptions.to,
+                    lang: ctx.req.getLocale()
+                };
+
+                const email = new Email('email-verify', params);
+                email.send();
+
+                cb(null, verifyOptions.to);
+            }
+        }
+
+        const options = {
+            type: 'email',
+            to: instance.email,
+            from: {},
+            redirect: `${origin}/#!/account/${instance.id}/basic-data?emailConfirmed`,
+            template: false,
+            mailer: new Mailer,
+            host: url[1].split('/')[2],
+            port: url[2],
+            protocol: url[0],
+            user: Self
+        };
+
+        await user.verify(options);
+    });
+
     Self.remoteMethod('getCurrentUserData', {
         description: 'Gets the current user data',
         accepts: [
             {
                 arg: 'ctx',
-                type: 'Object',
+                type: 'object',
                 http: {source: 'context'}
             }
         ],
         returns: {
-            type: 'Object',
+            type: 'object',
             root: true
         },
         http: {
@@ -59,7 +108,7 @@ module.exports = Self => {
      *
      * @param {Integer} userId The user id
      * @param {String} name The role name
-     * @param {Object} options Options
+     * @param {object} options Options
      * @return {Boolean} %true if user has the role, %false otherwise
      */
     Self.hasRole = async function(userId, name, options) {
@@ -71,8 +120,8 @@ module.exports = Self => {
      * Get all user roles.
      *
      * @param {Integer} userId The user id
-     * @param {Object} options Options
-     * @return {Object} User role list
+     * @param {object} options Options
+     * @return {object} User role list
      */
     Self.getRoles = async(userId, options) => {
         let result = await Self.rawSql(

back/models/account.json

@@ -40,6 +40,9 @@
 		"email": {
 			"type": "string"
 		},
+        "emailVerified": {
+			"type": "boolean"
+		},
 		"created": {
 			"type": "date"
 		},
@@ -88,16 +91,23 @@
 			"principalType": "ROLE",
 			"principalId": "$everyone",
 			"permission": "ALLOW"
-		},
+        },
+        {
+            "property": "recoverPassword",
+            "accessType": "EXECUTE",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        },
 		{
-			"property": "logout",
+            "property": "logout",
 			"accessType": "EXECUTE",
 			"principalType": "ROLE",
 			"principalId": "$authenticated",
 			"permission": "ALLOW"
 		},
 		{
-			"property": "validateToken",
+            "property": "validateToken",
 			"accessType": "EXECUTE",
 			"principalType": "ROLE",
 			"principalId": "$authenticated",

back/models/chat.js

@@ -4,4 +4,23 @@ module.exports = Self => {
     require('../methods/chat/sendCheckingPresence')(Self);
     require('../methods/chat/notifyIssues')(Self);
     require('../methods/chat/sendQueued')(Self);
+
+    Self.observe('before save', async function(ctx) {
+        if (!ctx.isNewInstance) return;
+
+        let {message} = ctx.instance;
+        if (!message) return;
+
+        const parts = message.match(/(?<=\[)[a-zA-Z0-9_\-+!@#$%^&*()={};':"\\|,.<>/?\s]*(?=])/g);
+        if (!parts) return;
+
+        const replacedParts = parts.map(part => {
+            return part.replace(/[!$%^&*()={};':"\\,.<>/?]/g, '');
+        });
+
+        for (const [index, part] of parts.entries())
+            message = message.replace(part, replacedParts[index]);
+
+        ctx.instance.message = message;
+    });
 };

back/models/dms.js

@@ -6,6 +6,7 @@ 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/specs/account.spec.js

@@ -1,14 +1,14 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
 
 describe('loopback model Account', () => {
     it('should return true if the user has the given role', async() => {
-        let result = await app.models.Account.hasRole(1, 'employee');
+        let result = await models.Account.hasRole(1, 'employee');
 
         expect(result).toBeTruthy();
     });
 
     it('should return false if the user doesnt have the given role', async() => {
-        let result = await app.models.Account.hasRole(1, 'administrator');
+        let result = await models.Account.hasRole(1, 'administrator');
 
         expect(result).toBeFalsy();
     });

back/models/specs/user.spec.js

@@ -0,0 +1,32 @@
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('account recoverPassword()', () => {
+    const userId = 1107;
+
+    const activeCtx = {
+        accessToken: {userId: userId},
+        http: {
+            req: {
+                headers: {origin: 'http://localhost'}
+            }
+        }
+    };
+
+    beforeEach(() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
+    it('should send email with token', async() => {
+        const userId = 1107;
+        const user = await models.Account.findById(userId);
+
+        await models.Account.recoverPassword(user.email);
+
+        const result = await models.AccessToken.findOne({where: {userId: userId}});
+
+        expect(result).toBeDefined();
+    });
+});

back/models/user.js

@@ -0,0 +1,27 @@
+const LoopBackContext = require('loopback-context');
+const {Email} = require('vn-print');
+
+module.exports = function(Self) {
+    Self.on('resetPasswordRequest', async function(info) {
+        const loopBackContext = LoopBackContext.getCurrentContext();
+        const httpCtx = {req: loopBackContext.active};
+        const httpRequest = httpCtx.req.http.req;
+        const headers = httpRequest.headers;
+        const origin = headers.origin;
+
+        const user = await Self.app.models.Account.findById(info.user.id);
+        const params = {
+            recipient: info.email,
+            lang: user.lang,
+            url: `${origin}/#!/reset-password?access_token=${info.accessToken.id}`
+        };
+
+        const options = Object.assign({}, info.options);
+        for (const param in options)
+            params[param] = options[param];
+
+        const email = new Email(options.emailTemplate, params);
+
+        return email.send();
+    });
+};

db/changes/10470-family/00-accountingType.sql

@@ -1,3 +0,0 @@
-ALTER TABLE `vn`.`accountingType` ADD daysInFuture INT NULL;
-ALTER TABLE `vn`.`accountingType` MODIFY COLUMN daysInFuture int(11) DEFAULT 0 NULL;
-UPDATE `vn`.`accountingType` SET daysInFuture=1 WHERE id=8;

db/changes/10470-family/00-aclItemType.sql

@@ -1,4 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES
-        ('ItemType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
-        ('ItemType', '*', 'WRITE', 'ALLOW', 'ROLE', 'buyer');

db/changes/10470-family/00-aclMdb.sql

@@ -1,14 +0,0 @@
-CREATE TABLE IF NOT EXISTS `vn`.`mdbBranch` (
-	`name` VARCHAR(255),
-    PRIMARY KEY(`name`)
-);
-
-CREATE TABLE IF NOT EXISTS `vn`.`mdbVersion` (
-	`app` VARCHAR(255) NOT NULL,
-	`branchFk` VARCHAR(255) NOT NULL,
-	`version` INT,
-    CONSTRAINT `mdbVersion_branchFk` FOREIGN KEY (`branchFk`) REFERENCES `vn`.`mdbBranch` (`name`) ON DELETE CASCADE ON UPDATE CASCADE
-);
-
-INSERT IGNORE INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES(318, 'MdbVersion', '*', '*', 'ALLOW', 'ROLE', 'developer');

db/changes/10470-family/00-chat.sql

@@ -1,13 +0,0 @@
-CREATE TABLE `vn`.`chat` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `senderFk` int(10) unsigned DEFAULT NULL,
-  `recipient` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `dated` date DEFAULT NULL,
-  `checkUserStatus` tinyint(1) DEFAULT NULL,
-  `message` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `status` tinyint(1) DEFAULT NULL,
-  `attempts` int(1) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `chat_FK` (`senderFk`),
-  CONSTRAINT `chat_FK` FOREIGN KEY (`senderFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

db/changes/10470-family/00-creditInsurance.sql

@@ -1,8 +0,0 @@
-ALTER TABLE `vn`.`creditInsurance` ADD creditClassificationFk int(11) NULL;
-
-UPDATE `vn`.`creditInsurance` AS `destiny`
-   SET `destiny`.`creditClassificationFk`= (SELECT creditClassification FROM `vn`.`creditInsurance` AS `origin` WHERE `origin`.id = `destiny`.id);
-
-ALTER TABLE `vn`.`creditInsurance`
-   ADD CONSTRAINT `creditInsurance_creditClassificationFk` FOREIGN KEY (`creditClassificationFk`) 
-   REFERENCES `vn`.`creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;

db/changes/10470-family/00-defaultViewConfig.sql

@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`defaultViewConfig` (tableCode, columns)
-VALUES ('clientsDetail', '{"id":true,"phone":true,"city":true,"socialName":true,"salesPersonFk":true,"email":true,"name":false,"fi":false,"credit":false,"creditInsurance":false,"mobile":false,"street":false,"countryFk":false,"provinceFk":false,"postcode":false,"created":false,"businessTypeFk":false,"payMethodFk":false,"sageTaxTypeFk":false,"sageTransactionTypeFk":false,"isActive":false,"isVies":false,"isTaxDataChecked":false,"isEqualizated":false,"isFreezed":false,"hasToInvoice":false,"hasToInvoiceByAddress":false,"isToBeMailed":false,"hasLcr":false,"hasCoreVnl":false,"hasSepaVnl":false}');
-

db/changes/10470-family/00-ticket_doRefund.sql

@@ -1,127 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`ticket_doRefund`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_doRefund`(OUT vNewTicket INT)
-BEGIN
-/**
- * Crea un ticket de abono a partir de tmp.sale y/o tmp.ticketService
- * 
- * @return vNewTicket
- */  
-	DECLARE vDone BIT DEFAULT 0;
-	DECLARE vClientFk MEDIUMINT;
-	DECLARE vWarehouse TINYINT;
-	DECLARE vCompany MEDIUMINT;
-	DECLARE vAddress MEDIUMINT;
-	DECLARE vRefundAgencyMode INT;
-	DECLARE vItemFk INT;
-	DECLARE vQuantity DECIMAL (10,2);
-	DECLARE vConcept VARCHAR(50);
-	DECLARE vPrice DECIMAL (10,2);
-	DECLARE vDiscount TINYINT;
-	DECLARE vSaleNew INT;
-	DECLARE vSaleMain INT;
-	DECLARE vZoneFk INT;
-	DECLARE vDescription VARCHAR(50);
-	DECLARE vTaxClassFk INT;
-	DECLARE vTicketServiceTypeFk INT;
-	DECLARE vOriginTicket INT;
-
-	DECLARE cSales CURSOR FOR
-		SELECT s.id, s.itemFk, - s.quantity, s.concept, s.price, s.discount
-			FROM tmp.sale s;
-
-	DECLARE cTicketServices CURSOR FOR
-		SELECT ts.description, - ts.quantity, ts.price, ts.taxClassFk, ts.ticketServiceTypeFk
-			FROM tmp.ticketService ts;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
-	SELECT sub.ticketFk INTO vOriginTicket
-		FROM (
-			SELECT s.ticketFk
-				FROM tmp.sale s
-			UNION ALL
-			SELECT ts.ticketFk
-				FROM tmp.ticketService ts
-		) sub
-	LIMIT 1;
-
-	SELECT id INTO vRefundAgencyMode
-		FROM agencyMode WHERE `name` = 'ABONO';
-
-	SELECT clientFk, warehouseFk, companyFk, addressFk 
-			INTO vClientFk, vWarehouse, vCompany, vAddress
-		FROM ticket
-		WHERE id = vOriginTicket;
-
-	SELECT id INTO vZoneFk
-		FROM zone WHERE agencyModeFk = vRefundAgencyMode
-		LIMIT 1;
-
-	INSERT INTO vn.ticket (
-			clientFk,
-			shipped,
-			addressFk,
-			agencyModeFk,
-			nickname,
-			warehouseFk,
-			companyFk,
-			landed,
-			zoneFk
-		)
-		SELECT
-					vClientFk,
-					CURDATE(),
-					vAddress,
-					vRefundAgencyMode,
-					a.nickname,
-					vWarehouse,
-					vCompany,
-					CURDATE(),
-					vZoneFk
-			FROM address a
-			WHERE a.id = vAddress;
-
-	SET vNewTicket = LAST_INSERT_ID();
-
-	SET vDone := FALSE;
-	OPEN cSales;
-	FETCH cSales INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-
-	WHILE NOT vDone DO
-
-		INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount)
-			VALUES( vNewTicket, vItemFk, vQuantity, vConcept, vPrice, vDiscount );
-
-	SET vSaleNew = LAST_INSERT_ID();
-
-	INSERT INTO vn.saleComponent(saleFk,componentFk,`value`) 
-		SELECT vSaleNew,componentFk,`value`
-			FROM vn.saleComponent
-			WHERE saleFk = vSaleMain;
-
-		FETCH cSales INTO vSaleMain, vItemFk, vQuantity, vConcept, vPrice, vDiscount;
-
-	END WHILE;
-	CLOSE cSales;
-
-	SET vDone := FALSE;
-	OPEN cTicketServices;
-	FETCH cTicketServices INTO vDescription, vQuantity, vPrice, vTaxClassFk, vTicketServiceTypeFk;
-
-	WHILE NOT vDone DO
-
-		INSERT INTO vn.ticketService(description, quantity, price, taxClassFk, ticketFk, ticketServiceTypeFk)
-			VALUES(vDescription, vQuantity, vPrice, vTaxClassFk, vNewTicket, vTicketServiceTypeFk);
-
-		FETCH cTicketServices INTO vDescription, vQuantity, vPrice, vTaxClassFk, vTicketServiceTypeFk;
-
-	END WHILE;
-	CLOSE cTicketServices;
-
-	INSERT INTO vn.ticketRefund(refundTicketFk, originalTicketFk)
-		VALUES(vNewTicket, vOriginTicket);
-END$$
-DELIMITER ;

db/changes/10470-family/01-creditInsuranceTriggers.sql

@@ -1,11 +0,0 @@
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`creditInsurance_beforeInsert`
-	BEFORE INSERT ON `creditInsurance`
-	FOR EACH ROW
-BEGIN
-	IF NEW.creditClassificationFk THEN
-		SET NEW.creditClassification = NEW.creditClassificationFk;
-	END IF;
-END$$
-DELIMITER ;

db/changes/10470-family/01-tableConfig.sql

@@ -1 +0,0 @@
-RENAME TABLE `edi`.`fileConfig` to `edi`.`tableConfig`;

db/changes/10470-family/02-fileConfig.sql

@@ -1,22 +0,0 @@
-CREATE TABLE `edi`.`fileConfig`
-(
-    name     varchar(25)             NOT NULL,
-    checksum text                    NULL,
-    keyValue tinyint(1) default true NOT NULL,
-    constraint fileConfig_pk
-        primary key (name)
-);
-
-create unique index fileConfig_name_uindex
-    on  `edi`.`fileConfig` (name);
-
-
-INSERT INTO `edi`.`fileConfig` (name, checksum, keyValue)
-VALUES ('FEC010104', null, 0);
-
-INSERT INTO `edi`.`fileConfig` (name, checksum, keyValue)
-VALUES ('VBN020101', null, 1);
-
-INSERT INTO `edi`.`fileConfig` (name, checksum, keyValue)
-VALUES ('florecompc2', null, 1);
-

db/changes/10471-family/00-chat.sql

@@ -1,3 +0,0 @@
-ALTER TABLE `vn`.`chat` MODIFY COLUMN message TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
-ALTER TABLE `vn`.`chat` MODIFY COLUMN dated DATETIME DEFAULT NULL NULL;
-ALTER TABLE `vn`.`chat` ADD error TEXT NULL;

db/changes/10472-family/00-creditInsurance.sql

@@ -1,3 +0,0 @@
-ALTER TABLE `vn`.`creditInsurance`
-   ADD CONSTRAINT `creditInsurance_creditClassificationFk` FOREIGN KEY (`creditClassificationFk`) 
-   REFERENCES `vn`.`creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;

db/changes/10480-june/00-ACL.sql

@@ -1,21 +0,0 @@
-INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
-	VALUES 
-		('InvoiceOut','refund','WRITE','ALLOW','ROLE','invoicing'),
-		('InvoiceOut','refund','WRITE','ALLOW','ROLE','salesAssistant'),
-		('InvoiceOut','refund','WRITE','ALLOW','ROLE','claimManager'),
-		('Ticket','refund','WRITE','ALLOW','ROLE','invoicing'),
-		('Ticket','refund','WRITE','ALLOW','ROLE','salesAssistant'),
-		('Ticket','refund','WRITE','ALLOW','ROLE','claimManager'),
-		('Sale','refund','WRITE','ALLOW','ROLE','salesAssistant'),
-		('Sale','refund','WRITE','ALLOW','ROLE','claimManager'),
-		('TicketRefund','*','WRITE','ALLOW','ROLE','invoicing'),
-		('ClaimObservation','*','WRITE','ALLOW','ROLE','salesPerson'),
-		('ClaimObservation','*','READ','ALLOW','ROLE','salesPerson'),
-		('Client','setPassword','WRITE','ALLOW','ROLE','salesPerson'),
-		('Client','updateUser','WRITE','ALLOW','ROLE','salesPerson');
-
-DELETE FROM `salix`.`ACL` WHERE id=313;
-
-UPDATE `salix`.`ACL`
-	SET principalId='invoicing'
-	WHERE id=297;

db/changes/10480-june/00-aclZoneExclusionGeos.sql

@@ -1,4 +0,0 @@
-INSERT INTO `salix`.`ACL`(`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES
-        ('ZoneExclusionGeo', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
-        ('ZoneExclusionGeo', '*', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss');

db/changes/10480-june/00-albaran_gestdoc.sql

@@ -1,2 +0,0 @@
-ALTER TABLE `vn2008`.`albaran_gestdoc` DROP FOREIGN KEY fk_albaran_gestdoc_gestdoc1;
-ALTER TABLE `vn2008`.`albaran_gestdoc` ADD CONSTRAINT albaran_gestdoc_FK FOREIGN KEY (gestdoc_id) REFERENCES `vn`.`dms`(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/changes/10480-june/00-client.sql

@@ -1,3 +0,0 @@
-alter table `vn`.`client`
-    add hasIncoterms tinyint(1) default 0 not null comment 'Received incoterms authorization from client';
-

db/changes/10480-june/00-deprecations.sql

@@ -1,13 +0,0 @@
-DROP FUNCTION `account`.`userGetId`;
-DROP FUNCTION `account`.`myUserGetName`;
-DROP FUNCTION `account`.`myUserGetId`;
-DROP FUNCTION `account`.`myUserHasRole`;
-DROP FUNCTION `account`.`myUserHasRoleId`;
-DROP FUNCTION `account`.`userGetName`;
-DROP FUNCTION `account`.`userHasRole`;
-DROP FUNCTION `account`.`userHasRoleId`;
-DROP PROCEDURE `account`.`myUserLogout`;
-DROP PROCEDURE `account`.`userLogin`;
-DROP PROCEDURE `account`.`userLoginWithKey`;
-DROP PROCEDURE `account`.`userLoginWithName`;
-DROP PROCEDURE `account`.`userSetPassword`;

db/changes/10480-june/00-item.sql

@@ -1 +0,0 @@
-ALTER TABLE `vn`.`item` MODIFY COLUMN description TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;

db/changes/10480-june/00-route.sql

@@ -1,10 +0,0 @@
-UPDATE `vn`.`route` r
-      JOIN(SELECT r.id, wl.workcenterFk 
-            FROM `vn`.`route` r     
-              JOIN `vn`.`routeLog` rl ON rl.originFk = r.id
-              JOIN `vn`.`workerLabour` wl ON wl.workerFk = rl.userFk 
-                AND r.created BETWEEN wl.started AND IFNULL(wl.ended, r.created)
-            WHERE r.created BETWEEN '2021-12-01' AND CURDATE()     
-              AND rl.action = 'insert'
-          )sub ON sub.id = r.id 
-    SET r.commissionWorkCenterFk = sub.workcenterFk;

db/changes/10480-june/00-sample.sql

@@ -1,2 +0,0 @@
-INSERT INTO `vn`.`sample` (code, description, isVisible, hasCompany, hasPreview, datepickerEnabled)
-VALUES ('incoterms-authorization', 'Autorización de incoterms', 1, 1, 1, 0);

db/changes/10480-june/00-shelving.sql

@@ -1,18 +0,0 @@
-ALTER TABLE `vn`.`itemShelving` DROP FOREIGN KEY itemShelving_fk2;
-ALTER TABLE `vn`.`shelvingLog` DROP FOREIGN KEY shelvingLog_FK_ibfk_1;
-ALTER TABLE `vn`.`smartTag` DROP FOREIGN KEY smartTag_shelving_fk;
-ALTER TABLE `vn`.`workerShelving` DROP FOREIGN KEY workerShelving_shelving_fk;
-
-ALTER TABLE `vn`.`shelving` DROP PRIMARY KEY;
-ALTER TABLE `vn`.`shelving` ADD id INT auto_increment PRIMARY KEY NULL;
-ALTER TABLE `vn`.`shelving` CHANGE id id int(11) auto_increment NOT NULL FIRST;
-ALTER TABLE `vn`.`shelving` ADD CONSTRAINT shelving_UN UNIQUE KEY (code);
-
-ALTER TABLE `vn`.`itemShelving` ADD CONSTRAINT itemShelving_fk2 FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `vn`.`shelvingLog` ADD CONSTRAINT shelvingLog_FK_ibfk_1 FOREIGN KEY (originFk) REFERENCES `vn`.`shelving`(code) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `vn`.`smartTag` ADD CONSTRAINT smartTag_FK FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE RESTRICT ON UPDATE CASCADE;
-ALTER TABLE `vn`.`workerShelving` ADD CONSTRAINT workerShelving_FK_1 FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE RESTRICT ON UPDATE CASCADE;
-
-ALTER TABLE vn.shelvingLog DROP FOREIGN KEY shelvingLog_FK_ibfk_1;
-ALTER TABLE vn.shelvingLog MODIFY COLUMN originFk INT NOT NULL;
-ALTER TABLE vn.shelvingLog ADD CONSTRAINT shelvingLog_FK FOREIGN KEY (originFk) REFERENCES vn.shelving(id) ON DELETE CASCADE ON UPDATE CASCADE;

db/changes/10480-june/00-ticketRefund_beforeUpsert.sql

@@ -1,21 +0,0 @@
-DROP PROCEDURE IF EXISTS `vn`.`ticketRefund_beforeUpsert`;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketRefund_beforeUpsert`(vRefundTicketFk INT, vOriginalTicketFk INT)
-BEGIN
-	DECLARE vAlreadyExists BOOLEAN DEFAULT FALSE; 
-
-	IF vRefundTicketFk = vOriginalTicketFk THEN
-		CALL util.throw('Original ticket and refund ticket has same id');
-	END IF;
-
-    SELECT COUNT(*) INTO vAlreadyExists
-		FROM ticketRefund 
-		WHERE originalTicketFk = vOriginalTicketFk; 
-	
-	IF vAlreadyExists > 0 THEN
-		CALL util.throw('This ticket is already a refund');
-	END IF;
-END$$
-DELIMITER ;

db/changes/10480-june/01-claimObservation.sql

@@ -1,13 +0,0 @@
-CREATE TABLE `vn`.`claimObservation` (
-  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
-  `claimFk` int(10) unsigned NOT NULL,
-  `workerFk` int(10) unsigned DEFAULT NULL,
-  `text` text COLLATE utf8_unicode_ci NOT NULL,
-  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  KEY `worker_key` (`workerFk`),
-  KEY `claim_key` (`claimFk`),
-  KEY `claimObservation_created_IDX` (`created`) USING BTREE,
-  CONSTRAINT `claimObservation_ibfk_1` FOREIGN KEY (`claimFk`) REFERENCES `vn`.`claim` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `claimObservation_ibfk_2` FOREIGN KEY (`workerFk`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE
-) COMMENT='Todas las observaciones referentes a una reclamación'

db/changes/10480-june/02-claimTextMigration.sql

@@ -1,2 +0,0 @@
-INSERT INTO `vn`.`claimObservation` (`claimFk`, `text`, `created`)
-SELECT `id`, `observation`, `created` FROM `vn`.`claim`

db/changes/10480-june/04-aclParking.sql

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

db/changes/10480-june/04-aclShelving.sql

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

db/changes/10481-june/00-aclOsTicketConfig.sql

@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
-    VALUES
-        ('OsTicketConfig', '*', '*', 'ALLOW', 'ROLE', 'it');

db/changes/10481-june/00-osTicketConfig.sql

@@ -1,16 +0,0 @@
-CREATE TABLE `vn`.`osTicketConfig` (
-  `id` int(11) NOT NULL,
-  `host` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `user` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `password` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `oldStatus` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `newStatusId` int(11) DEFAULT NULL,
-  `action` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `day` int(11) DEFAULT NULL,
-  `comment` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `hostDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `userDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `passwordDb` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
-  `portDb` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;

db/changes/224702/00-invoiceInPdf.sql

@@ -1,4 +1,4 @@
 INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
     VALUES
         ('InvoiceIn', 'invoiceInPdf', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-        ('InvoiceIn', 'invoiceInEmail', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+        ('InvoiceIn', 'invoiceInEmail', 'WRITE', 'ALLOW', 'ROLE', 'administrative');

db/changes/224702/00-notificationProc.sql

@@ -12,14 +12,9 @@ BEGIN
  * @param vAuthorFk The notification author or %NULL if there is no author
  * @return The notification id
  */
-    DECLARE vNotificationFk INT;
-
-	SELECT id INTO vNotificationFk
-		FROM `notification`
-		WHERE `name` = vNotificationName;
 
 	INSERT INTO notificationQueue
-		SET notificationFk = vNotificationFk,
+		SET notificationFk = vNotificationName,
 			params = vParams,
 			authorFk = vAuthorFk;
 

db/changes/224902/00-aclUserPassword.sql

@@ -0,0 +1,2 @@
+DELETE FROM `salix`.`ACL`
+    WHERE model = 'UserPassword';

db/changes/224902/00-workerTimeControlMail.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`workerTimeControlMail` CHANGE emailResponse reason text CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;

db/changes/224903/00-ACL_notification_InvoiceE.sql

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

db/changes/224903/00-aclInvoiceOut.sql

@@ -0,0 +1,7 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('InvoiceOut', 'clientsToInvoice', 'WRITE', 'ALLOW', 'ROLE', 'invoicing');
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('InvoiceOut', 'invoiceClient', 'WRITE', 'ALLOW', 'ROLE', 'invoicing');        

db/changes/224903/00-alter_expedition_itemFk.sql

@@ -0,0 +1 @@
+Alter table `vn`.`expedition` RENAME COLUMN itemFk TO itemFk__;

db/changes/224903/00-clientHasInvoiceElectronic.sql

@@ -0,0 +1,8 @@
+ALTER TABLE
+    `vn`.`client`
+ADD
+    COLUMN `hasElectronicInvoice` TINYINT(1) NOT NULL DEFAULT 0 COMMENT 'Registro de facturas mediante FACe'
+AFTER
+    `hasInvoiceSimplified`;
+
+-- sería más correcto hasElectronicInvoice pero ya existe un campo hasInvoiceSimplified

db/changes/224903/00-collection_missingTrash.sql

@@ -0,0 +1 @@
+DROP PROCEDURE IF EXISTS `vn`.`collection_missingTrash`;

db/changes/224903/00-deleteInvoiceOutQueue.sql

@@ -0,0 +1 @@
+DROP TABLE `vn`.`invoiceOutQueue`;

db/changes/224903/00-editTrackedACL.sql

@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Sale', 'editTracked', 'WRITE', 'ALLOW', 'ROLE', 'production'),
+        ('Sale', 'editFloramondo', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant');

db/changes/224903/00-greuge.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`greuge` CHANGE `userFK` `userFk` int(10) unsigned DEFAULT NULL NULL;

db/changes/224903/00-insert_notification_invoiceE.sql

@@ -0,0 +1 @@
+insert into `util`.`notification` (`id`, `name`,`description`) values (2, 'invoiceElectronic', 'A electronic invoice has been generated');

db/changes/224903/00-isCompensationACL.sql

@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Receipt', 'balanceCompensationEmail', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Receipt', 'balanceCompensationPdf', 'READ', 'ALLOW', 'ROLE', 'employee');

db/changes/224903/00-ticket_canMerge.sql

@@ -0,0 +1,14 @@
+DROP PROCEDURE IF EXISTS `vn`.`ticket_canMerge`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canMerge`(vDated DATE, vScopeDays INT, vLitersMax INT, vLinesMax INT, vWarehouseFk INT)
+BEGIN
+ CALL vn.ticket_canbePostponed(vDated,TIMESTAMPADD(DAY, vScopeDays, vDated),vLitersMax,vLinesMax,vWarehouseFk);
+END  $$
+DELIMITER ;
+
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+VALUES
+    ('Ticket', 'getTicketsFuture', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('Ticket', 'merge', 'WRITE', 'ALLOW', 'ROLE', 'employee');