Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4903-workerTimeControl_sendMail

CHANGELOG.md

@@ -9,9 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - [General](Inicio) Permite recuperar la contraseña
+- [Ticket](Opciones) Subir albarán a Docuware
+- [Ticket](Opciones) Enviar correo con PDF de Docuware
 - [Artículo](Datos Básicos) Añadido campo Unidades/Caja
 
 ### Changed
+- [Reclamaciones](Descriptor) Cambiado el campo Agencia por Zona
 - [Tickets](Líneas preparadas) Actualizada sección para que sea más visual
 
 ### Fixed

back/methods/collection/previousLabel.js

@@ -0,0 +1,49 @@
+const {Report} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('previousLabel', {
+        description: 'Returns the previa label pdf',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The item id',
+                http: {source: 'path'}
+            }],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: '/:id/previousLabel',
+            verb: 'GET'
+        }
+    });
+
+    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"`];
+    };
+};

back/methods/docuware/checkFile.js

@@ -1,4 +1,4 @@
-const got = require('got');
+const axios = require('axios');
 
 module.exports = Self => {
     Self.remoteMethodCtx('checkFile', {
@@ -8,7 +8,7 @@ module.exports = Self => {
             {
                 arg: 'id',
                 type: 'number',
-                description: 'The  id',
+                description: 'The id',
                 http: {source: 'path'}
             },
             {
@@ -18,14 +18,14 @@ module.exports = Self => {
                 description: 'The fileCabinet name'
             },
             {
-                arg: 'dialog',
-                type: 'string',
+                arg: 'signed',
+                type: 'boolean',
                 required: true,
-                description: 'The dialog name'
+                description: 'If pdf is necessary to be signed'
             }
         ],
         returns: {
-            type: 'boolean',
+            type: 'object',
             root: true
         },
         http: {
@@ -34,58 +34,51 @@ module.exports = Self => {
         }
     });
 
-    Self.checkFile = async function(ctx, id, fileCabinet, dialog) {
-        const myUserId = ctx.req.accessToken.userId;
-        if (!myUserId)
-            return false;
-
+    Self.checkFile = async function(ctx, id, fileCabinet, signed) {
         const models = Self.app.models;
-        const docuwareConfig = await models.DocuwareConfig.findOne();
+        const action = 'find';
+
         const docuwareInfo = await models.Docuware.findOne({
             where: {
                 code: fileCabinet,
-                dialogName: dialog
+                action: action
             }
         });
 
-        const docuwareUrl = docuwareConfig.url;
-        const cookie = docuwareConfig.token;
-        const fileCabinetName = docuwareInfo.fileCabinetName;
-        const find = docuwareInfo.find;
-        const options = {
-            'headers': {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-                'Cookie': cookie
-            }
-        };
         const searchFilter = {
             condition: [
                 {
-                    DBName: find,
+                    DBName: docuwareInfo.findById,
+
                     Value: [id]
                 }
+            ],
+            sortOrder: [
+                {
+                    Field: 'FILENAME',
+                    Direction: 'Desc'
+                }
             ]
         };
 
         try {
-            // get fileCabinetId
-            const fileCabinetResponse = await got.get(`${docuwareUrl}/FileCabinets`, options);
-            const fileCabinetJson = JSON.parse(fileCabinetResponse.body).FileCabinet;
-            const fileCabinetId = fileCabinetJson.find(dialogs => dialogs.Name === fileCabinetName).Id;
+            const options = await Self.getOptions();
 
-            // get dialog
-            const dialogResponse = await got.get(`${docuwareUrl}/FileCabinets/${fileCabinetId}/dialogs`, options);
-            const dialogJson = JSON.parse(dialogResponse.body).Dialog;
-            const dialogId = dialogJson.find(dialogs => dialogs.DisplayName === 'find').Id;
+            const fileCabinetId = await Self.getFileCabinet(fileCabinet);
+            const dialogId = await Self.getDialog(fileCabinet, action, fileCabinetId);
 
-            // get docuwareID
-            Object.assign(options, {'body': JSON.stringify(searchFilter)});
-            const response = await got.post(
-                `${docuwareUrl}/FileCabinets/${fileCabinetId}/Query/DialogExpression?dialogId=${dialogId}`, options);
-            JSON.parse(response.body).Items[0].Id;
+            const response = await axios.post(
+                `${options.url}/FileCabinets/${fileCabinetId}/Query/DialogExpression?dialogId=${dialogId}`,
+                searchFilter,
+                options.headers
+            );
+            const [documents] = response.data.Items;
+            if (!documents) return false;
 
-            return true;
+            const state = documents.Fields.find(field => field.FieldName == 'ESTADO');
+            if (signed && state.Item != 'Firmado') return false;
+
+            return {id: documents.Id};
         } catch (error) {
             return false;
         }

back/methods/docuware/core.js

@@ -0,0 +1,78 @@
+const axios = require('axios');
+
+module.exports = Self => {
+    /**
+     * Returns the dialog id
+     *
+     * @param {string} code - The fileCabinet name
+     * @param {string} action - The fileCabinet name
+     * @param {string} fileCabinetId - Optional The fileCabinet name
+     * @return {number} - The fileCabinet id
+     */
+    Self.getDialog = async(code, action, fileCabinetId) => {
+        const docuwareInfo = await Self.app.models.Docuware.findOne({
+            where: {
+                code: code,
+                action: action
+            }
+        });
+        if (!fileCabinetId) fileCabinetId = await Self.getFileCabinet(code);
+
+        const options = await Self.getOptions();
+
+        if (!process.env.NODE_ENV)
+            return Math.round();
+
+        const response = await axios.get(`${options.url}/FileCabinets/${fileCabinetId}/dialogs`, options.headers);
+        const dialogs = response.data.Dialog;
+        const dialogId = dialogs.find(dialogs => dialogs.DisplayName === docuwareInfo.dialogName).Id;
+
+        return dialogId;
+    };
+
+    /**
+     * Returns the fileCabinetId
+     *
+     * @param {string} code - The fileCabinet code
+     * @return {number} - The fileCabinet id
+     */
+    Self.getFileCabinet = async code => {
+        const options = await Self.getOptions();
+        const docuwareInfo = await Self.app.models.Docuware.findOne({
+            where: {
+                code: code
+            }
+        });
+
+        if (!process.env.NODE_ENV)
+            return Math.round();
+
+        const fileCabinetResponse = await axios.get(`${options.url}/FileCabinets`, options.headers);
+        const fileCabinets = fileCabinetResponse.data.FileCabinet;
+        const fileCabinetId = fileCabinets.find(fileCabinet => fileCabinet.Name === docuwareInfo.fileCabinetName).Id;
+
+        return fileCabinetId;
+    };
+
+    /**
+     * Returns basic headers
+     *
+     * @param {string} cookie - The docuware cookie
+     * @return {object} - The headers
+     */
+    Self.getOptions = async() => {
+        const docuwareConfig = await Self.app.models.DocuwareConfig.findOne();
+        const headers = {
+            headers: {
+                'Accept': 'application/json',
+                'Content-Type': 'application/json',
+                'Cookie': docuwareConfig.cookie
+            }
+        };
+
+        return {
+            url: docuwareConfig.url,
+            headers
+        };
+    };
+};

back/methods/docuware/deliveryNoteEmail.js

@@ -0,0 +1,72 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('deliveryNoteEmail', {
+        description: 'Sends the delivery note email with an docuware attached PDF',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'string',
+                required: true,
+                description: 'The ticket id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipient',
+                type: 'string',
+                description: 'The recipient email',
+                required: true,
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The client id',
+                required: false
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: '/:id/delivery-note-email',
+            verb: 'POST'
+        }
+    });
+
+    Self.deliveryNoteEmail = async(ctx, id) => {
+        const args = Object.assign({}, ctx.args);
+        const params = {
+            recipient: args.recipient,
+            lang: ctx.req.getLocale()
+        };
+
+        delete args.ctx;
+        for (const param in args)
+            params[param] = args[param];
+
+        const email = new Email('delivery-note', params);
+
+        const docuwareFile = await Self.app.models.Docuware.download(ctx, id, 'deliveryNote');
+
+        return email.send({
+            overrideAttachments: true,
+            attachments: [{
+                filename: `${id}.pdf`,
+                content: docuwareFile[0]
+            }]
+        });
+    };
+};

back/methods/docuware/download.js

@@ -1,5 +1,5 @@
 /* eslint max-len: ["error", { "code": 180 }]*/
-const got = require('got');
+const axios = require('axios');
 const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
@@ -10,19 +10,13 @@ module.exports = Self => {
             {
                 arg: 'id',
                 type: 'number',
-                description: 'The id',
+                description: 'The ticket id',
                 http: {source: 'path'}
             },
             {
                 arg: 'fileCabinet',
                 type: 'string',
-                description: 'The id',
-                http: {source: 'path'}
-            },
-            {
-                arg: 'dialog',
-                type: 'string',
-                description: 'The id',
+                description: 'The file cabinet',
                 http: {source: 'path'}
             }
         ],
@@ -42,79 +36,26 @@ module.exports = Self => {
             }
         ],
         http: {
-            path: `/:id/download/:fileCabinet/:dialog`,
+            path: `/:id/download/:fileCabinet`,
             verb: 'GET'
         }
     });
 
-    Self.download = async function(ctx, id, fileCabinet, dialog) {
-        const myUserId = ctx.req.accessToken.userId;
-        if (!myUserId)
-            throw new UserError(`You don't have enough privileges`);
-
+    Self.download = async function(ctx, id, fileCabinet) {
         const models = Self.app.models;
-        const docuwareConfig = await models.DocuwareConfig.findOne();
-        const docuwareInfo = await models.Docuware.findOne({
-            where: {
-                code: fileCabinet,
-                dialogName: dialog
-            }
-        });
+        const docuwareFile = await models.Docuware.checkFile(ctx, id, fileCabinet, true);
+        if (!docuwareFile) throw new UserError('The DOCUWARE PDF document does not exists');
 
-        const docuwareUrl = docuwareConfig.url;
-        const cookie = docuwareConfig.token;
-        const fileCabinetName = docuwareInfo.fileCabinetName;
-        const find = docuwareInfo.find;
-        const options = {
-            'headers': {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-                'Cookie': cookie
-            }
-        };
-        const searchFilter = {
-            condition: [
-                {
-                    DBName: find,
-                    Value: [id]
-                }
-            ]
-        };
+        const fileCabinetId = await Self.getFileCabinet(fileCabinet);
+        const options = await Self.getOptions();
+        options.headers.responseType = 'stream';
 
-        try {
-            // get fileCabinetId
-            const fileCabinetResponse = await got.get(`${docuwareUrl}/FileCabinets`, options);
-            const fileCabinetJson = JSON.parse(fileCabinetResponse.body).FileCabinet;
-            const fileCabinetId = fileCabinetJson.find(dialogs => dialogs.Name === fileCabinetName).Id;
+        const fileName = `filename="${id}.pdf"`;
+        const contentType = 'application/pdf';
+        const downloadUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents/${docuwareFile.id}/FileDownload?targetFileType=Auto&keepAnnotations=false`;
 
-            // get dialog
-            const dialogResponse = await got.get(`${docuwareUrl}/FileCabinets/${fileCabinetId}/dialogs`, options);
-            const dialogJson = JSON.parse(dialogResponse.body).Dialog;
-            const dialogId = dialogJson.find(dialogs => dialogs.DisplayName === 'find').Id;
+        const stream = await axios.get(downloadUri, options.headers);
 
-            // get docuwareID
-            Object.assign(options, {'body': JSON.stringify(searchFilter)});
-            const response = await got.post(`${docuwareUrl}/FileCabinets/${fileCabinetId}/Query/DialogExpression?dialogId=${dialogId}`, options);
-            const docuwareId = JSON.parse(response.body).Items[0].Id;
-
-            // download & save file
-            const fileName = `filename="${id}.pdf"`;
-            const contentType = 'application/pdf';
-            const downloadUri = `${docuwareUrl}/FileCabinets/${fileCabinetId}/Documents/${docuwareId}/FileDownload?targetFileType=Auto&keepAnnotations=false`;
-            const downloadOptions = {
-                'headers': {
-                    'Cookie': cookie
-                }
-            };
-
-            const stream = got.stream(downloadUri, downloadOptions);
-
-            return [stream, contentType, fileName];
-        } catch (error) {
-            if (error.code === 'ENOENT')
-                throw new UserError('The DOCUWARE PDF document does not exists');
-
-            throw error;
-        }
+        return [stream.data, contentType, fileName];
     };
 };

back/methods/docuware/specs/checkFile.spec.js

@@ -1,5 +1,5 @@
 const models = require('vn-loopback/server/server').models;
-const got = require('got');
+const axios = require('axios');
 
 describe('docuware download()', () => {
     const ticketId = 1;
@@ -12,53 +12,71 @@ describe('docuware download()', () => {
         }
     };
 
-    const fileCabinetName = 'deliveryClient';
-    const dialogDisplayName = 'find';
-    const dialogName = 'findTicket';
+    const docuwareModel = models.Docuware;
+    const fileCabinetName = 'deliveryNote';
 
-    const gotGetResponse = {
-        body: JSON.stringify(
-            {
-                FileCabinet: [
-                    {Id: 12, Name: fileCabinetName}
-                ],
-                Dialog: [
-                    {Id: 34, DisplayName: dialogDisplayName}
-                ]
-            })
-    };
-
-    it('should return exist file in docuware', async() => {
-        const gotPostResponse = {
-            body: JSON.stringify(
-                {
-                    Items: [
-                        {Id: 56}
-                    ],
-                })
-        };
-
-        spyOn(got, 'get').and.returnValue(new Promise(resolve => resolve(gotGetResponse)));
-        spyOn(got, 'post').and.returnValue(new Promise(resolve => resolve(gotPostResponse)));
-
-        const result = await models.Docuware.checkFile(ctx, ticketId, fileCabinetName, dialogName);
-
-        expect(result).toEqual(true);
+    beforeAll(() => {
+        spyOn(docuwareModel, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+        spyOn(docuwareModel, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
     });
 
-    it('should return not exist file in docuware', async() => {
-        const gotPostResponse = {
-            body: JSON.stringify(
-                {
-                    Items: [],
-                })
+    it('should return false if there are no documents', async() => {
+        const response = {
+            data: {
+                Items: []
+            }
         };
+        spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(response)));
 
-        spyOn(got, 'get').and.returnValue(new Promise(resolve => resolve(gotGetResponse)));
-        spyOn(got, 'post').and.returnValue(new Promise(resolve => resolve(gotPostResponse)));
-
-        const result = await models.Docuware.checkFile(ctx, ticketId, fileCabinetName, dialogName);
+        const result = await models.Docuware.checkFile(ctx, ticketId, fileCabinetName, true);
 
         expect(result).toEqual(false);
     });
+
+    it('should return false if the document is unsigned', async() => {
+        const response = {
+            data: {
+                Items: [
+                    {
+                        Id: 1,
+                        Fields: [
+                            {
+                                FieldName: 'ESTADO',
+                                Item: 'Unsigned'
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+        spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(response)));
+
+        const result = await models.Docuware.checkFile(ctx, ticketId, fileCabinetName, true);
+
+        expect(result).toEqual(false);
+    });
+
+    it('should return the document data', async() => {
+        const docuwareId = 1;
+        const response = {
+            data: {
+                Items: [
+                    {
+                        Id: docuwareId,
+                        Fields: [
+                            {
+                                FieldName: 'ESTADO',
+                                Item: 'Firmado'
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+        spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(response)));
+
+        const result = await models.Docuware.checkFile(ctx, ticketId, fileCabinetName, true);
+
+        expect(result.id).toEqual(docuwareId);
+    });
 });

back/methods/docuware/specs/download.spec.js

@@ -1,5 +1,5 @@
 const models = require('vn-loopback/server/server').models;
-const got = require('got');
+const axios = require('axios');
 const stream = require('stream');
 
 describe('docuware download()', () => {
@@ -13,36 +13,33 @@ describe('docuware download()', () => {
         }
     };
 
-    it('should return the downloaded file name', async() => {
-        const fileCabinetName = 'deliveryClient';
-        const dialogDisplayName = 'find';
-        const dialogName = 'findTicket';
-        const gotGetResponse = {
-            body: JSON.stringify(
-                {
-                    FileCabinet: [
-                        {Id: 12, Name: fileCabinetName}
-                    ],
-                    Dialog: [
-                        {Id: 34, DisplayName: dialogDisplayName}
-                    ]
-                })
-        };
+    const docuwareModel = models.Docuware;
+    const fileCabinetName = 'deliveryNote';
 
-        const gotPostResponse = {
-            body: JSON.stringify(
-                {
-                    Items: [
-                        {Id: 56}
-                    ],
-                })
-        };
+    beforeAll(() => {
+        spyOn(docuwareModel, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+        spyOn(docuwareModel, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+    });
 
-        spyOn(got, 'get').and.returnValue(new Promise(resolve => resolve(gotGetResponse)));
-        spyOn(got, 'post').and.returnValue(new Promise(resolve => resolve(gotPostResponse)));
-        spyOn(got, 'stream').and.returnValue(new stream.PassThrough({objectMode: true}));
+    it('should return error if file not exist', async() => {
+        spyOn(docuwareModel, 'checkFile').and.returnValue(false);
+        spyOn(axios, 'get').and.returnValue(new stream.PassThrough({objectMode: true}));
 
-        const result = await models.Docuware.download(ctx, ticketId, fileCabinetName, dialogName);
+        let error;
+        try {
+            await models.Docuware.download(ctx, ticketId, fileCabinetName);
+        } catch (e) {
+            error = e.message;
+        }
+
+        expect(error).toEqual('The DOCUWARE PDF document does not exists');
+    });
+
+    it('should return the downloaded file if exist file ', async() => {
+        spyOn(docuwareModel, 'checkFile').and.returnValue({});
+        spyOn(axios, 'get').and.returnValue(new stream.PassThrough({objectMode: true}));
+
+        const result = await models.Docuware.download(ctx, ticketId, fileCabinetName);
 
         expect(result[1]).toEqual('application/pdf');
         expect(result[2]).toEqual(`filename="${ticketId}.pdf"`);

back/methods/docuware/specs/upload.spec.js

@@ -0,0 +1,37 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('docuware upload()', () => {
+    const userId = 9;
+    const ticketId = 10;
+    const ctx = {
+        req: {
+            getLocale: () => {
+                return 'en';
+            },
+            accessToken: {userId: userId},
+            headers: {origin: 'http://localhost:5000'},
+        }
+    };
+
+    const docuwareModel = models.Docuware;
+    const ticketModel = models.Ticket;
+    const fileCabinetName = 'deliveryNote';
+
+    beforeAll(() => {
+        spyOn(docuwareModel, 'getFileCabinet').and.returnValue(new Promise(resolve => resolve(Math.random())));
+        spyOn(docuwareModel, 'getDialog').and.returnValue(new Promise(resolve => resolve(Math.random())));
+    });
+
+    it('should try upload file', async() => {
+        spyOn(ticketModel, 'deliveryNotePdf').and.returnValue(new Promise(resolve => resolve({})));
+
+        let error;
+        try {
+            await models.Docuware.upload(ctx, ticketId, fileCabinetName);
+        } catch (e) {
+            error = e.message;
+        }
+
+        expect(error).toEqual('Action not allowed on the test environment');
+    });
+});

back/methods/docuware/upload.js

@@ -0,0 +1,141 @@
+const UserError = require('vn-loopback/util/user-error');
+const axios = require('axios');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('upload', {
+        description: 'Upload an docuware PDF',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                description: 'The ticket id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'fileCabinet',
+                type: 'string',
+                description: 'The file cabinet'
+            },
+            {
+                arg: 'dialog',
+                type: 'string',
+                description: 'The dialog'
+            }
+        ],
+        returns: [],
+        http: {
+            path: `/:id/upload`,
+            verb: 'POST'
+        }
+    });
+
+    Self.upload = async function(ctx, id, fileCabinet) {
+        const models = Self.app.models;
+        const action = 'store';
+
+        const options = await Self.getOptions();
+        const fileCabinetId = await Self.getFileCabinet(fileCabinet);
+        const dialogId = await Self.getDialog(fileCabinet, action, fileCabinetId);
+
+        // get delivery note
+        const deliveryNote = await models.Ticket.deliveryNotePdf(ctx, {
+            id,
+            type: 'deliveryNote'
+        });
+
+        // get ticket data
+        const ticket = await models.Ticket.findById(id, {
+            include: [{
+                relation: 'client',
+                scope: {
+                    fields: ['id', 'socialName', 'fi']
+                }
+            }]
+        });
+
+        // upload file
+        const templateJson = {
+            'Fields': [
+                {
+                    'FieldName': 'N__ALBAR_N',
+                    'ItemElementName': 'string',
+                    'Item': id,
+                },
+                {
+                    'FieldName': 'CIF_PROVEEDOR',
+                    'ItemElementName': 'string',
+                    'Item': ticket.client().fi,
+                },
+                {
+                    'FieldName': 'CODIGO_PROVEEDOR',
+                    'ItemElementName': 'string',
+                    'Item': ticket.client().id,
+                },
+                {
+                    'FieldName': 'NOMBRE_PROVEEDOR',
+                    'ItemElementName': 'string',
+                    'Item': ticket.client().socialName,
+                },
+                {
+                    'FieldName': 'FECHA_FACTURA',
+                    'ItemElementName': 'date',
+                    'Item': ticket.shipped,
+                },
+                {
+                    'FieldName': 'TOTAL_FACTURA',
+                    'ItemElementName': 'Decimal',
+                    'Item': ticket.totalWithVat,
+                },
+                {
+                    'FieldName': 'ESTADO',
+                    'ItemElementName': 'string',
+                    'Item': 'Pendiente procesar',
+                },
+                {
+                    'FieldName': 'FIRMA_',
+                    'ItemElementName': 'string',
+                    'Item': 'Si',
+                },
+                {
+                    'FieldName': 'FILTRO_TABLET',
+                    'ItemElementName': 'string',
+                    'Item': 'Tablet1',
+                }
+            ]
+        };
+
+        if (process.env.NODE_ENV != 'production')
+            throw new UserError('Action not allowed on the test environment');
+
+        // delete old
+        const docuwareFile = await models.Docuware.checkFile(ctx, id, fileCabinet, false);
+        if (docuwareFile) {
+            const deleteJson = {
+                'Field': [{'FieldName': 'ESTADO', 'Item': 'Pendiente eliminar', 'ItemElementName': 'String'}]
+            };
+            const deleteUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents/${docuwareFile.id}/Fields`;
+            await axios.put(deleteUri, deleteJson, options.headers);
+        }
+
+        const uploadUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents?StoreDialogId=${dialogId}`;
+        const FormData = require('form-data');
+        const data = new FormData();
+
+        data.append('document', JSON.stringify(templateJson), 'schema.json');
+        data.append('file[]', deliveryNote[0], 'file.pdf');
+        const uploadOptions = {
+            headers: {
+                'Content-Type': 'multipart/form-data',
+                'X-File-ModifiedDate': new Date(),
+                'Cookie': options.headers.headers.Cookie,
+                ...data.getHeaders()
+            },
+        };
+
+        return await axios.post(uploadUri, data, uploadOptions)
+            .catch(() => {
+                throw new UserError('Failed to upload file');
+            });
+    };
+};

back/methods/osticket/closeTicket.js

@@ -25,10 +25,10 @@ module.exports = Self => {
             return false;
 
         const con = mysql.createConnection({
-            host: `${config.hostDb}`,
-            user: `${config.userDb}`,
-            password: `${config.passwordDb}`,
-            port: `${config.portDb}`
+            host: config.hostDb,
+            user: config.userDb,
+            password: config.passwordDb,
+            port: config.portDb
         });
 
         const sql = `SELECT ot.ticket_id, ot.number
@@ -38,23 +38,23 @@ module.exports = Self => {
                             JOIN (
                                 SELECT ote.thread_id, MAX(ote.created) created, MAX(ote.updated) updated
                                     FROM osticket.ost_thread_entry ote
-                                    WHERE ote.staff_id != 0 AND ote.type = 'R'
+                                    WHERE ote.staff_id AND ote.type = 'R'
                                     GROUP BY ote.thread_id
                             ) sub ON sub.thread_id = ot2.id
-                        WHERE ot.isanswered = 1
-                            AND ots.state = '${config.oldStatus}'
-                            AND IF(sub.updated > sub.created, sub.updated, sub.created) < DATE_SUB(CURDATE(), INTERVAL ${config.day} DAY)`;
+                        WHERE ot.isanswered
+                            AND ots.state = ?
+                            AND IF(sub.updated > sub.created, sub.updated, sub.created) < DATE_SUB(CURDATE(), INTERVAL ? DAY)`;
 
-        let ticketsId = [];
+        const ticketsId = [];
         con.connect(err => {
             if (err) throw err;
-            con.query(sql, (err, results) => {
-                if (err) throw err;
-                for (const result of results)
-                    ticketsId.push(result.ticket_id);
-            });
+            con.query(sql, [config.oldStatus, config.day],
+                (err, results) => {
+                    if (err) throw err;
+                    for (const result of results)
+                        ticketsId.push(result.ticket_id);
+                });
         });
-
         await getRequestToken();
 
         async function getRequestToken() {
@@ -94,6 +94,44 @@ module.exports = Self => {
             await close(token, secondCookie);
         }
 
+        async function close(token, secondCookie) {
+            for (const ticketId of ticketsId) {
+                try {
+                    const lock = await getLockCode(token, secondCookie, ticketId);
+                    if (!lock.code) {
+                        let error = `Can't get lock code`;
+                        if (lock.msg) error += `: ${lock.msg}`;
+                        throw new Error(error);
+                    }
+                    let form = new FormData();
+                    form.append('__CSRFToken__', token);
+                    form.append('id', ticketId);
+                    form.append('a', config.responseType);
+                    form.append('lockCode', lock.code);
+                    form.append('from_email_id', config.fromEmailId);
+                    form.append('reply-to', config.replyTo);
+                    form.append('cannedResp', 0);
+                    form.append('response', config.comment);
+                    form.append('signature', 'none');
+                    form.append('reply_status_id', config.newStatusId);
+
+                    const ostUri = `${config.host}/tickets.php?id=${ticketId}`;
+                    const params = {
+                        method: 'POST',
+                        body: form,
+                        headers: {
+                            'Cookie': secondCookie
+                        }
+                    };
+                    await fetch(ostUri, params);
+                } catch (e) {
+                    const err = new Error(`${ticketId} Ticket close failed: ${e.message}`);
+                    err.stack += e.stack;
+                    console.error(err);
+                }
+            }
+        }
+
         async function getLockCode(token, secondCookie, ticketId) {
             const ostUri = `${config.host}/ajax.php/lock/ticket/${ticketId}`;
             const params = {
@@ -107,34 +145,7 @@ module.exports = Self => {
             const body = await response.text();
             const json = JSON.parse(body);
 
-            return json.code;
-        }
-
-        async function close(token, secondCookie) {
-            for (const ticketId of ticketsId) {
-                const lockCode = await getLockCode(token, secondCookie, ticketId);
-                let form = new FormData();
-                form.append('__CSRFToken__', token);
-                form.append('id', ticketId);
-                form.append('a', config.responseType);
-                form.append('lockCode', lockCode);
-                form.append('from_email_id', config.fromEmailId);
-                form.append('reply-to', config.replyTo);
-                form.append('cannedResp', 0);
-                form.append('response', config.comment);
-                form.append('signature', 'none');
-                form.append('reply_status_id', config.newStatusId);
-
-                const ostUri = `${config.host}/tickets.php?id=${ticketId}`;
-                const params = {
-                    method: 'POST',
-                    body: form,
-                    headers: {
-                        'Cookie': secondCookie
-                    }
-                };
-                return fetch(ostUri, params);
-            }
+            return json;
         }
     };
 };

back/models/collection.js

@@ -3,4 +3,5 @@ module.exports = Self => {
     require('../methods/collection/newCollection')(Self);
     require('../methods/collection/getSectors')(Self);
     require('../methods/collection/setSaleQuantity')(Self);
+    require('../methods/collection/previousLabel')(Self);
 };

back/models/docuware-config.json

@@ -16,7 +16,7 @@
         "url": {
             "type": "string"
         },
-        "token": {
+        "cookie": {
             "type": "string"
         }
     },

back/models/docuware.js

@@ -1,4 +1,7 @@
 module.exports = Self => {
     require('../methods/docuware/download')(Self);
+    require('../methods/docuware/upload')(Self);
     require('../methods/docuware/checkFile')(Self);
+    require('../methods/docuware/deliveryNoteEmail')(Self);
+    require('../methods/docuware/core')(Self);
 };

back/models/docuware.json

@@ -19,20 +19,14 @@
         "fileCabinetName": {
             "type": "string"
         },
+        "action": {
+            "type": "string"
+        },
         "dialogName": {
             "type": "string"
         },
-        "find": {
+        "findById": {
             "type": "string"
         }
-    },
-    "acls": [
-        {
-            "property": "*",
-            "accessType": "*",
-            "principalType": "ROLE",
-            "principalId": "$everyone",
-            "permission": "ALLOW"
-	    }
-    ]
+    }
 }

db/changes/224903/00-insert_notification_invoiceE.sql

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

db/changes/225001/00-updateCollection.sql

@@ -0,0 +1,3 @@
+UPDATE `vn`.`collection`
+	SET sectorFk=1
+	WHERE id=1;

db/changes/225201/00-invoiceOut_new.sql

@@ -0,0 +1,225 @@
+DROP PROCEDURE IF EXISTS `vn`.`invoiceOut_new`;
+DELIMITER $$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceOut_new`(
+	vSerial VARCHAR(255),
+	vInvoiceDate DATETIME,
+	vTaxArea VARCHAR(25),
+	OUT vNewInvoiceId INT)
+BEGIN
+/**
+ * Creación de facturas emitidas.
+ * requiere previamente tabla ticketToInvoice(id).
+ *
+ * @param vSerial serie a la cual se hace la factura
+ * @param vInvoiceDate fecha de la factura
+ * @param vTaxArea tipo de iva en relacion a la empresa y al cliente
+ * @param vNewInvoiceId id de la factura que se acaba de generar
+ * @return vNewInvoiceId
+ */
+	DECLARE vSpainCountryCode INT DEFAULT 1;
+	DECLARE vIsAnySaleToInvoice BOOL;
+	DECLARE vIsAnyServiceToInvoice BOOL;
+	DECLARE vNewRef VARCHAR(255);
+	DECLARE vWorker INT DEFAULT account.myUser_getId();
+	DECLARE vCompany INT;
+	DECLARE vSupplier INT;
+	DECLARE vClient INT;
+	DECLARE vCplusStandardInvoiceTypeFk INT DEFAULT 1;
+	DECLARE vCplusCorrectingInvoiceTypeFk INT DEFAULT 6;
+	DECLARE vCplusSimplifiedInvoiceTypeFk INT DEFAULT 2;
+	DECLARE vCorrectingSerial VARCHAR(1) DEFAULT 'R';
+	DECLARE vSimplifiedSerial VARCHAR(1) DEFAULT 'S';
+	DECLARE vNewInvoiceInId INT;
+	DECLARE vIsInterCompany BOOL;
+
+	SET vInvoiceDate = IFNULL(vInvoiceDate,CURDATE());
+
+	SELECT t.clientFk, t.companyFk
+			INTO vClient, vCompany
+		FROM ticketToInvoice tt
+			JOIN ticket t ON t.id = tt.id
+		LIMIT 1;
+
+	-- Eliminem de ticketToInvoice els tickets que no han de ser facturats
+	DELETE ti.*
+		FROM ticketToInvoice ti
+			JOIN ticket t ON t.id = ti.id
+			JOIN sale s ON s.ticketFk = t.id
+			JOIN item i ON i.id = s.itemFk
+			JOIN supplier su ON su.id = t.companyFk
+			JOIN client c ON c.id = t.clientFk
+			LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id AND itc.countryFk = su.countryFk
+		WHERE YEAR(t.shipped) < 2001
+			OR c.isTaxDataChecked = FALSE
+			OR t.isDeleted
+			OR c.hasToInvoice = FALSE
+			OR itc.id IS NULL;
+
+	SELECT SUM(s.quantity * s.price * (100 - s.discount)/100), ts.id
+			INTO vIsAnySaleToInvoice, vIsAnyServiceToInvoice
+		FROM ticketToInvoice t
+			LEFT JOIN sale s ON s.ticketFk = t.id
+			LEFT JOIN ticketService ts ON ts.ticketFk = t.id;
+
+	IF (vIsAnySaleToInvoice OR vIsAnyServiceToInvoice)
+		AND (vCorrectingSerial = vSerial OR NOT hasAnyNegativeBase())
+	THEN
+
+		-- el trigger añade el siguiente Id_Factura correspondiente a la vSerial
+		INSERT INTO invoiceOut
+		(
+			ref,
+			serial,
+			issued,
+			clientFk,
+			dued,
+			companyFk,
+			cplusInvoiceType477Fk
+		)
+		SELECT
+				1,
+				vSerial,
+				vInvoiceDate,
+				vClient,
+				getDueDate(vInvoiceDate, dueDay),
+				vCompany,
+				IF(vSerial = vCorrectingSerial,
+					vCplusCorrectingInvoiceTypeFk,
+					IF(vSerial = vSimplifiedSerial,
+						vCplusSimplifiedInvoiceTypeFk,
+						vCplusStandardInvoiceTypeFk))
+			FROM client
+			WHERE id = vClient;
+
+
+		SET vNewInvoiceId = LAST_INSERT_ID();
+
+		SELECT `ref`
+				INTO vNewRef
+			FROM invoiceOut
+			WHERE id = vNewInvoiceId;
+
+		UPDATE ticket t
+				JOIN ticketToInvoice ti ON ti.id = t.id
+			SET t.refFk = vNewRef;
+
+		DROP TEMPORARY TABLE IF EXISTS tmp.updateInter;
+		CREATE TEMPORARY TABLE tmp.updateInter ENGINE = MEMORY
+			SELECT s.id,ti.id ticket_id,vWorker Id_Trabajador
+				FROM ticketToInvoice ti
+					LEFT JOIN ticketState ts ON ti.id = ts.ticket
+					JOIN state s
+				WHERE IFNULL(ts.alertLevel,0) < 3 and s.`code` = getAlert3State(ti.id);
+
+		INSERT INTO vncontrol.inter(state_id,Id_Ticket,Id_Trabajador)
+			SELECT * FROM tmp.updateInter;
+
+		INSERT INTO ticketLog (action, userFk, originFk, description)
+			SELECT 'UPDATE', account.myUser_getId(), ti.id, CONCAT('Crea factura ', vNewRef)
+				FROM ticketToInvoice ti;
+
+		CALL invoiceExpenceMake(vNewInvoiceId);
+		CALL invoiceTaxMake(vNewInvoiceId,vTaxArea);
+
+		UPDATE invoiceOut io
+				JOIN (
+					SELECT SUM(amount) AS total
+						FROM invoiceOutExpence
+						WHERE invoiceOutFk = vNewInvoiceId
+					) base
+				JOIN (
+					SELECT SUM(vat) AS total
+						FROM invoiceOutTax
+						WHERE invoiceOutFk = vNewInvoiceId
+					) vat
+			SET io.amount = base.total + vat.total
+			WHERE io.id = vNewInvoiceId;
+
+		DROP TEMPORARY TABLE tmp.updateInter;
+
+		SELECT ios.isCEE INTO vIsInterCompany
+			FROM vn.ticket t
+				JOIN vn.invoiceOut io ON io.`ref` = t.refFk
+				JOIN vn.invoiceOutSerial ios ON ios.code = io.serial
+			WHERE t.refFk = vNewRef
+            LIMIT 1;
+
+		IF (vIsInterCompany) THEN
+
+			SELECT vCompany INTO vSupplier;
+			SELECT id INTO vCompany FROM company WHERE clientFk = vClient;
+
+			INSERT INTO invoiceIn(supplierFk, supplierRef, issued, companyFk)
+				SELECT vSupplier, vNewRef, vInvoiceDate, vCompany;
+
+			SET vNewInvoiceInId = LAST_INSERT_ID();
+
+			DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+			CREATE TEMPORARY TABLE tmp.ticket
+				(KEY (ticketFk))
+				ENGINE = MEMORY
+				SELECT id ticketFk
+					FROM ticketToInvoice;
+
+			CALL `ticket_getTax`('NATIONAL');
+
+			SET @vTaxableBaseServices := 0.00;
+			SET @vTaxCodeGeneral := NULL;
+
+			INSERT INTO vn.invoiceInTax(invoiceInFk, taxableBase, expenceFk, taxTypeSageFk, transactionTypeSageFk)
+				SELECT vNewInvoiceInId, @vTaxableBaseServices, sub.expenceFk, sub.taxTypeSageFk , sub.transactionTypeSageFk
+					FROM (
+						SELECT @vTaxableBaseServices := SUM(tst.taxableBase) taxableBase, i.expenceFk, i.taxTypeSageFk , i.transactionTypeSageFk, @vTaxCodeGeneral := i.taxClassCodeFk
+							FROM tmp.ticketServiceTax tst
+								JOIN vn.invoiceOutTaxConfig i ON i.taxClassCodeFk = tst.code
+							WHERE i.isService
+							HAVING taxableBase
+						) sub;
+
+			INSERT INTO vn.invoiceInTax(invoiceInFk, taxableBase, expenceFk, taxTypeSageFk, transactionTypeSageFk)
+				SELECT  vNewInvoiceInId, SUM(tt.taxableBase) - IF(tt.code = @vTaxCodeGeneral, @vTaxableBaseServices, 0) taxableBase, i.expenceFk, i.taxTypeSageFk , i.transactionTypeSageFk
+					FROM tmp.ticketTax tt
+						JOIN vn.invoiceOutTaxConfig i ON i.taxClassCodeFk = tt.code
+					WHERE !i.isService
+					GROUP BY tt.pgcFk
+					HAVING taxableBase
+					ORDER BY tt.priority;
+
+			CALL invoiceInDueDay_calculate(vNewInvoiceInId);
+
+			INSERT INTO invoiceInIntrastat (
+					invoiceInFk,
+					intrastatFk,
+					amount,
+					stems,
+					countryFk,
+					net)
+				SELECT
+					vNewInvoiceInId invoiceInFk,
+					i.intrastatFk,
+					CAST(SUM((s.quantity * s.price * (100 - s.discount) / 100 )) AS DECIMAL(10,2)) subtotal,
+					CAST(SUM(IFNULL(i.stems, 1) * s.quantity) AS DECIMAL(10,2)) stems,
+					su.countryFk,
+					CAST(SUM(IFNULL(i.stems, 1)
+							* s.quantity
+							* IF(ic.grams, ic.grams, i.weightByPiece) / 1000) AS DECIMAL(10,2)) netKg
+				FROM sale s
+					JOIN ticket t ON s.ticketFk = t.id
+					JOIN supplier su ON su.id = t.companyFk
+					JOIN item i ON i.id = s.itemFk
+					JOIN vn.itemCost ic ON ic.itemFk = i.id AND ic.warehouseFk = t.warehouseFk
+					JOIN intrastat ir ON ir.id = i.intrastatFk
+				WHERE t.refFk = vNewRef;
+
+			DROP TEMPORARY TABLE tmp.ticket;
+			DROP TEMPORARY TABLE tmp.ticketAmount;
+			DROP TEMPORARY TABLE tmp.ticketTax;
+			DROP TEMPORARY TABLE tmp.ticketServiceTax;
+
+		END IF;
+
+	END IF;
+
+	DROP TEMPORARY TABLE `ticketToInvoice`;
+END$$
+DELIMITER ;

db/changes/225201/01-modules.sql

@@ -43,7 +43,7 @@ SET t.code = 'claim'
 WHERE t.code LIKE 'Claims' ESCAPE '#';
 
 UPDATE salix.module t
-SET t.code = 'user'
+SET t.code = 'account'
 WHERE t.code LIKE 'Users' ESCAPE '#';
 
 UPDATE salix.module t

db/changes/225202/00-mdbApp.sql

@@ -0,0 +1,28 @@
+ALTER TABLE `vn`.`mdbApp` DROP PRIMARY KEY;
+ALTER TABLE `vn`.`mdbApp` ADD CONSTRAINT mdbApp_PK PRIMARY KEY (app,baselineBranchFk);
+
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('com','master');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('enc','master');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('ent','master');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('eti','master');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('lab','master');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('tpv','master');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('com','dev');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('enc','dev');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('ent','dev');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('eti','dev');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('lab','dev');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('tpv','dev');
+

db/changes/230201/00-borradoLogicoIPT.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`itemPackingType` ADD isActive BOOLEAN NOT NULL;
+UPDATE `vn`.`itemPackingType` SET isActive = 0 WHERE code IN ('P', 'F');
+UPDATE `vn`.`itemPackingType` SET isActive = 1 WHERE code IN ('V', 'H');

db/changes/230201/00-docuwareStore.sql

@@ -0,0 +1,23 @@
+CREATE OR REPLACE TABLE `vn`.`docuware` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `fileCabinetName` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `action` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `dialogName` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `findById` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO `vn`.`docuware` (`code`, `fileCabinetName`, `action`, `dialogName`, `findById`)
+    VALUES
+        ('deliveryNote', 'Albaranes cliente', 'find', 'find', 'N__ALBAR_N'),
+        ('deliveryNote', 'Albaranes cliente', 'store', 'Archivar', 'N__ALBAR_N');
+
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalId`)
+    VALUES
+        ('Docuware','checkFile','READ','ALLOW','employee'),
+        ('Docuware','download','READ','ALLOW','salesPerson'),
+        ('Docuware','upload','WRITE','ALLOW','productionAssi'),
+        ('Docuware','deliveryNoteEmail','WRITE','ALLOW','salesPerson');
+
+ALTER TABLE `vn`.`docuwareConfig` CHANGE token cookie varchar(1000) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;

db/changes/230201/00-priceFixed_getRate2.sql

@@ -0,0 +1,23 @@
+DROP FUNCTION IF EXISTS `vn`.`priceFixed_getRate2`;
+
+DELIMITER $$
+$$
+CREATE FUNCTION `vn`.`priceFixed_getRate2`(vFixedPriceFk INT, vRate3 DOUBLE)
+RETURNS DOUBLE
+BEGIN
+
+	DECLARE vWarehouse INT;
+	DECLARE vRate2 DOUBLE;
+
+	SELECT round(vRate3 * (1 + ((r.rate2 - r.rate3)/100)), 2) INTO vRate2
+		FROM vn.rate r
+			JOIN vn.priceFixed p ON p.id = vFixedPriceFk
+		WHERE r.dated <= p.started
+			AND r.warehouseFk = p.warehouseFk
+		ORDER BY r.dated DESC
+		LIMIT 1;
+
+	RETURN vRate2;
+
+END$$
+DELIMITER ;

db/changes/230201/00-triggersXDiario.sql

@@ -0,0 +1,73 @@
+DROP TRIGGER IF EXISTS vn.XDiario_beforeUpdate;
+USE vn;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`XDiario_beforeUpdate`
+	BEFORE UPDATE ON `XDiario`
+	FOR EACH ROW
+BEGIN
+    IF NOT NEW.SUBCTA <=> OLD.SUBCTA THEN
+        IF NEW.SUBCTA <=> '' THEN
+            SET NEW.SUBCTA = NULL;
+        END IF;
+        IF NEW.SUBCTA IS NOT NULL AND NOT LENGTH(NEW.SUBCTA) <=> 10 THEN
+            CALL util.throw('INVALID_STRING_LENGTH');
+        END IF;
+    END IF;
+    IF NOT NEW.CONTRA <=> OLD.CONTRA THEN
+        IF NEW.CONTRA <=> '' THEN
+            SET NEW.CONTRA = NULL;
+        END IF;
+        IF NEW.CONTRA IS NOT NULL AND NOT LENGTH(NEW.CONTRA) <=> 10 THEN
+            CALL util.throw('INVALID_STRING_LENGTH');
+        END IF;
+    END IF;
+    IF NOT NEW.FECHA <=> OLD.FECHA THEN
+        CALL XDiario_checkDate(NEW.FECHA);
+    END IF;
+    IF NOT NEW.FECHA_EX <=> OLD.FECHA_EX THEN
+        CALL XDiario_checkDate(NEW.FECHA_EX);
+    END IF;
+    IF NOT NEW.FECHA_OP <=> OLD.FECHA_OP THEN
+        CALL XDiario_checkDate(NEW.FECHA_OP);
+    END IF;
+    IF NOT NEW.FECHA_RT <=> OLD.FECHA_RT THEN
+        CALL XDiario_checkDate(NEW.FECHA_RT);
+    END IF;
+    IF NOT NEW.FECREGCON <=> OLD.FECREGCON THEN
+        CALL XDiario_checkDate(NEW.FECREGCON);
+    END IF;
+END$$
+DELIMITER ;
+
+
+DROP TRIGGER IF EXISTS vn.XDiario_beforeInsert;
+USE vn;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`XDiario_beforeInsert`
+	BEFORE INSERT ON `XDiario`
+	FOR EACH ROW
+BEGIN
+    IF NEW.SUBCTA <=> '' THEN
+        SET NEW.SUBCTA = NULL;
+    END IF;
+    IF NEW.SUBCTA IS NOT NULL AND NOT LENGTH(NEW.SUBCTA) <=> 10 THEN
+        CALL util.throw('INVALID_STRING_LENGTH');
+    END IF;
+    IF NEW.CONTRA <=> '' THEN
+        SET NEW.CONTRA = NULL;
+    END IF;
+    IF NEW.CONTRA IS NOT NULL AND NOT LENGTH(NEW.CONTRA) <=> 10 THEN
+        CALL util.throw('INVALID_STRING_LENGTH');
+    END IF;
+    CALL XDiario_checkDate(NEW.FECHA);
+    CALL XDiario_checkDate(NEW.FECHA_EX);
+    CALL XDiario_checkDate(NEW.FECHA_OP);
+    CALL XDiario_checkDate(NEW.FECHA_RT);
+    CALL XDiario_checkDate(NEW.FECREGCON);
+END$$
+DELIMITER ;
+

db/dump/fixtures.sql

@@ -1215,7 +1215,7 @@ INSERT INTO `vn`.`tag`(`id`, `code`, `name`, `isFree`, `isQuantitatif`, `sourceT
     (7,     NULL,       'Ancho de la base', 1, 1, NULL,     'mm',NULL,  NULL),
     (23,    'stems',    'Tallos',           1, 1, NULL,     NULL, NULL, 'stems'),
     (27,    NULL,       'Longitud(cm)',     1, 1, NULL,     'cm', NULL, NULL),
-    (36,    NULL,       'Proveedor',        1, 0, NULL,     NULL, NULL, NULL),
+    (36,    'producer',       'Proveedor',        1, 0, NULL,     NULL, NULL, 'producer'),
     (56,    NULL,       'Genero',           1, 0, NULL,     NULL, NULL, NULL),
     (58,    NULL,       'Variedad',         1, 0, NULL,     NULL, NULL, NULL),
     (67,    'category', 'Categoria',        1, 0, NULL,     NULL, NULL, NULL),
@@ -2580,13 +2580,9 @@ INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`,  `typeFk`, `clientFk`)
         (4,     33.8,      util.VN_CURDATE(),    1,  1101),
         (30,    34.4,      util.VN_CURDATE(),    1,  1108);
 
-INSERT INTO `vn`.`docuware` (`code`, `fileCabinetName`, `dialogName` , `find`)
-    VALUES
-        ('deliveryClient', 'deliveryClient', 'findTicket', 'word');
-
 INSERT INTO `vn`.`docuwareConfig` (`url`)
     VALUES
-        ('https://verdnatura.docuware.cloud/docuware/platform');
+        ('http://docuware.url/');
 
 INSERT INTO `vn`.`calendarHolidaysName` (`id`, `name`)
     VALUES
@@ -2692,6 +2688,7 @@ INSERT INTO `util`.`notificationConfig`
 INSERT INTO `util`.`notification` (`id`, `name`, `description`)
     VALUES
         (1, 'print-email', 'notification fixture one'),
+        (2, 'invoice-electronic', 'A electronic invoice has been generated'),
         (4, 'supplier-pay-method-update', 'A supplier pay method has been updated');
 
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)

db/dump/structure.sql

@@ -80202,3 +80202,5 @@ USE `vncontrol`;
 
 -- Dump completed on 2022-11-21  7:57:28
 
+
+

db/export-data.sh

@@ -59,6 +59,7 @@ TABLES=(
     componentType
     continent
     department
+    docuware
     itemPackingType
     pgc
     sample

e2e/helpers/selectors.js

@@ -417,8 +417,8 @@ export default {
         fourthFixedPrice: 'vn-fixed-price tr:nth-child(5)',
         fourthItemID: 'vn-fixed-price tr:nth-child(5) vn-autocomplete[ng-model="price.itemFk"]',
         fourthWarehouse: 'vn-fixed-price tr:nth-child(5) vn-autocomplete[ng-model="price.warehouseFk"]',
-        fourthPPU: 'vn-fixed-price tr:nth-child(5) > td:nth-child(4)',
-        fourthPPP: 'vn-fixed-price tr:nth-child(5) > td:nth-child(5)',
+        fourthGroupingPrice: 'vn-fixed-price tr:nth-child(5) >  td:nth-child(4)',
+        fourthPackingPrice: 'vn-fixed-price tr:nth-child(5) > td:nth-child(5)',
         fourthHasMinPrice: 'vn-fixed-price tr:nth-child(5) > td:nth-child(6) > vn-check[ng-model="price.hasMinPrice"]',
         fourthMinPrice: 'vn-fixed-price tr:nth-child(5) >  td:nth-child(6) > vn-input-number[ng-model="price.minPrice"]',
         fourthStarted: 'vn-fixed-price tr:nth-child(5) vn-date-picker[ng-model="price.started"]',
@@ -679,7 +679,10 @@ export default {
         moveToTicketButton: '.vn-popover.shown vn-icon[icon="arrow_forward_ios"]',
         moveToNewTicketButton: '.vn-popover.shown vn-button[label="New ticket"]',
         stateMenuButton: 'vn-ticket-sale vn-tool-bar > vn-button-menu[label="State"]',
-        moreMenuState: 'body > div > div > div.content > div.filter.ng-scope > vn-textfield'
+        moreMenuState: 'body > div > div > div.content > div.filter.ng-scope > vn-textfield',
+        firstSaleHistoryButton: 'vn-ticket-sale vn-tr:nth-child(1) vn-icon-button[icon="history"]',
+        firstSaleHistory: 'form vn-table div > vn-tbody > vn-tr',
+        closeHistory: 'div.window vn-button[icon="clear"]'
     },
     ticketTracking: {
         createStateButton: 'vn-float-button'

e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js

@@ -15,7 +15,7 @@ describe('SmartTable SearchBar integration', () => {
         await browser.close();
     });
 
-    describe('as filters', () => {
+    describe('as filters in smart-table section', () => {
         it('should search by type in searchBar', async() => {
             await page.waitToClick(selectors.itemsIndex.openAdvancedSearchButton);
             await page.autocompleteSearch(selectors.itemsIndex.advancedSearchItemType, 'Anthurium');
@@ -47,6 +47,34 @@ describe('SmartTable SearchBar integration', () => {
         });
     });
 
+    describe('as filters in section without smart-table', () => {
+        it('go to zone section', async() => {
+            await page.loginAndModule('salesPerson', 'zone');
+            await page.waitToClick(selectors.globalItems.searchButton);
+        });
+
+        it('should search in searchBar first time', async() => {
+            await page.doSearch('A');
+            const count = await page.countElement(selectors.zoneIndex.searchResult);
+
+            expect(count).toEqual(7);
+        });
+
+        it('should search in searchBar second time', async() => {
+            await page.doSearch('A');
+            const count = await page.countElement(selectors.zoneIndex.searchResult);
+
+            expect(count).toEqual(7);
+        });
+
+        it('should search in searchBar third time', async() => {
+            await page.doSearch('A');
+            const count = await page.countElement(selectors.zoneIndex.searchResult);
+
+            expect(count).toEqual(7);
+        });
+    });
+
     describe('as orders', () => {
         it('should order by first id', async() => {
             await page.loginAndModule('developer', 'item');

e2e/paths/04-item/13_fixedPrice.spec.js

@@ -24,8 +24,8 @@ describe('Item fixed prices path', () => {
     it('should fill the fixed price data', async() => {
         const now = new Date();
         await page.autocompleteSearch(selectors.itemFixedPrice.fourthWarehouse, 'Warehouse one');
-        await page.write(selectors.itemFixedPrice.fourthPPU, '1');
-        await page.write(selectors.itemFixedPrice.fourthPPP, '1');
+        await page.writeOnEditableTD(selectors.itemFixedPrice.fourthGroupingPrice, '1');
+        await page.writeOnEditableTD(selectors.itemFixedPrice.fourthPackingPrice, '1');
         await page.write(selectors.itemFixedPrice.fourthMinPrice, '1');
         await page.pickDate(selectors.itemFixedPrice.fourthStarted, now);
         await page.pickDate(selectors.itemFixedPrice.fourthEnded, now);

e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js

@@ -196,6 +196,15 @@ describe('Ticket Edit sale path', () => {
         expect(result).toContain('22.50');
     });
 
+    it('should check in the history that logs has been added', async() => {
+        await page.waitToClick(selectors.ticketSales.firstSaleHistoryButton);
+        await page.waitForSelector(selectors.ticketSales.firstSaleHistory);
+        const result = await page.countElement(selectors.ticketSales.firstSaleHistory);
+
+        expect(result).toBeGreaterThan(0);
+        await page.waitToClick(selectors.ticketSales.closeHistory);
+    });
+
     it('should recalculate price of sales', async() => {
         await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
         await page.waitToClick(selectors.ticketSales.secondSaleCheckbox);

e2e/paths/05-ticket/21_future.spec.js

@@ -55,7 +55,7 @@ describe('Ticket Future path', () => {
 
         await page.autocompleteSearch(selectors.ticketFuture.ipt, 'Horizontal');
         await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 0);
+        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
     });
 
     it('should search with the destination IPT', async() => {
@@ -68,7 +68,7 @@ describe('Ticket Future path', () => {
 
         await page.autocompleteSearch(selectors.ticketFuture.futureIpt, 'Horizontal');
         await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 0);
+        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
     });
 
     it('should search with the origin grouped state', async() => {
@@ -152,50 +152,6 @@ describe('Ticket Future path', () => {
         await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
     });
 
-    it('should search in smart-table with especified Lines', async() => {
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.write(selectors.ticketFuture.tableLines, '0');
-        await page.keyboard.press('Enter');
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 1);
-
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-        await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
-
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.write(selectors.ticketFuture.tableLines, '1');
-        await page.keyboard.press('Enter');
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 5);
-
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-        await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
-    });
-
-    it('should search in smart-table with especified Liters', async() => {
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.write(selectors.ticketFuture.tableLiters, '0');
-        await page.keyboard.press('Enter');
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 1);
-
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-        await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
-
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.write(selectors.ticketFuture.tableLiters, '28');
-        await page.keyboard.press('Enter');
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 5);
-
-        await page.waitToClick(selectors.ticketFuture.tableButtonSearch);
-        await page.waitToClick(selectors.ticketFuture.openAdvancedSearchButton);
-        await page.waitToClick(selectors.ticketFuture.submit);
-        await page.waitForNumberOfElements(selectors.ticketFuture.table, 4);
-    });
-
     it('should check the three last tickets and move to the future', async() => {
         await page.waitToClick(selectors.ticketFuture.multiCheck);
         await page.waitToClick(selectors.ticketFuture.firstCheck);

front/core/components/searchbar/searchbar.js

@@ -308,7 +308,7 @@ export default class Searchbar extends Component {
 
         this.tableQ = null;
 
-        const hasParams = this.$params.q && Object.keys(JSON.parse(this.$params.q)).length;
+        const hasParams = this.$params.q && JSON.parse(this.$params.q).tableQ;
         if (hasParams) {
             const stateFilter = JSON.parse(this.$params.q);
             for (let param in stateFilter) {
@@ -325,8 +325,8 @@ export default class Searchbar extends Component {
             for (let param in stateFilter.tableQ)
                 params[param] = stateFilter.tableQ[param];
 
-            Object.assign(stateFilter, params);
-            return this.model.applyParams(params)
+            const newParams = Object.assign(stateFilter, params);
+            return this.model.applyParams(newParams)
                 .then(() => this.model.data);
         }
 

front/core/components/searchbar/searchbar.spec.js

@@ -174,14 +174,12 @@ describe('Component vnSearchbar', () => {
             jest.spyOn(controller, 'doSearch');
             controller.model = {
                 refresh: jest.fn(),
+                applyFilter: jest.fn().mockReturnValue(Promise.resolve()),
                 userParams: {
                     id: 1
                 }
             };
 
-            controller.model.applyParams = jest.fn().mockReturnValue(Promise.resolve());
-            jest.spyOn(controller.model, 'applyParams');
-
             controller.filter = filter;
             controller.removeParam(0);
 

front/salix/components/index.js

@@ -19,4 +19,5 @@ import './user-popover';
 import './upload-photo';
 import './bank-entity';
 import './log';
+import './instance-log';
 import './sendSms';

front/salix/components/instance-log/index.html

@@ -0,0 +1,12 @@
+
+<vn-dialog
+    vn-id="instanceLog">
+    <tpl-body>
+        <vn-log
+            url="{{$ctrl.url}}"
+            origin-id="$ctrl.originId"
+            changed-model="$ctrl.changedModel"
+            changed-model-id="$ctrl.changedModelId">
+        </vn-log>
+    </tpl-body>
+</vn-dialog>

front/salix/components/instance-log/index.js

@@ -0,0 +1,21 @@
+import ngModule from '../../module';
+import Section from '../section';
+import './style.scss';
+
+export default class Controller extends Section {
+    open() {
+        this.$.instanceLog.show();
+    }
+}
+
+ngModule.vnComponent('vnInstanceLog', {
+    controller: Controller,
+    template: require('./index.html'),
+    bindings: {
+        model: '<',
+        originId: '<',
+        changedModelId: '<',
+        changedModel: '@',
+        url: '@'
+    }
+});

front/salix/components/instance-log/style.scss

@@ -0,0 +1,13 @@
+.vn-dialog {
+    & > .window:not(:has(.empty-rows)) {
+        width:60%;
+        vn-log {
+            vn-card {
+                visibility: hidden;
+                & > * {
+                    visibility: visible;
+                }
+            }
+        }
+    }
+}

front/salix/components/sendSms/locale/es.yml

@@ -1,7 +1,7 @@
 Send SMS: Enviar SMS
 Destination: Destinatario
 Message: Mensaje
-SMS sent!: ¡SMS enviado!
+SMS sent: ¡SMS enviado!
 Characters remaining: Carácteres restantes
 The destination can't be empty: El destinatario no puede estar vacio
 The message can't be empty: El mensaje no puede estar vacio

loopback/locale/es.json

@@ -135,7 +135,7 @@
 	"Changed client paymethod": "He cambiado la forma de pago del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
 	"Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} ({{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [{{ticketId}}]({{{ticketUrl}}})",
 	"Change quantity": "{{concept}} cambia de {{oldQuantity}} a {{newQuantity}}",
-    "Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*",
+	"Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*",
 	"Claim state has changed to incomplete": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *incompleta*",
 	"Claim state has changed to canceled": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *anulado*",
 	"Client checked as validated despite of duplication": "Cliente comprobado a pesar de que existe el cliente id {{clientId}}",
@@ -252,5 +252,9 @@
 	"Receipt's bank was not found": "No se encontró el banco del recibo",
 	"This receipt was not compensated": "Este recibo no ha sido compensado",
 	"Client's email was not found": "No se encontró el email del cliente",
-	"Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9"
+	"App name does not exist": "El nombre de aplicación no es válido",
+	"Try again": "Vuelve a intentarlo",
+	"Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
+	"Failed to upload file": "Error al subir archivo",
+	"The DOCUWARE PDF document does not exists": "The DOCUWARE PDF document does not exists"
 }

modules/claim/front/card/index.js

@@ -19,9 +19,9 @@ class Controller extends ModuleCard {
                 }, {
                     relation: 'ticket',
                     scope: {
-                        fields: ['agencyModeFk'],
+                        fields: ['zoneFk'],
                         include: {
-                            relation: 'agencyMode'
+                            relation: 'zone'
                         }
                     }
                 }, {

modules/claim/front/descriptor/index.html

@@ -51,8 +51,12 @@
                 </span>
             </vn-label-value>
             <vn-label-value
-                label="Agency"
-                value="{{$ctrl.claim.ticket.agencyMode.name}}">
+                label="Zone">
+                <span
+                    ng-click="zoneDescriptor.show($event, $ctrl.claim.ticket.zoneFk)"
+                    class="link">
+                    {{$ctrl.claim.ticket.zoneFk}}
+                </span>
             </vn-label-value>
             <vn-label-value
                 label="Ticket">
@@ -103,3 +107,6 @@
 <vn-popup vn-id="summary">
     <vn-claim-summary claim="$ctrl.claim"></vn-claim-summary>
 </vn-popup>
+<vn-zone-descriptor-popover
+    vn-id="zoneDescriptor">
+</vn-zone-descriptor-popover>

modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js

@@ -11,6 +11,7 @@ describe('InvoiceOut createPdf()', () => {
     const ctx = {req: activeCtx};
 
     it('should create a new PDF file and set true the hasPdf property', async() => {
+        pending('https://redmine.verdnatura.es/issues/5035');
         const invoiceId = 1;
         spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
             active: activeCtx

modules/item/back/methods/fixed-price/getRate2.js

@@ -0,0 +1,39 @@
+module.exports = Self => {
+    Self.remoteMethod('getRate2', {
+        description: 'Return the rate2',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'fixedPriceId',
+                type: 'integer',
+                description: 'The fixedPrice Id',
+                required: true
+            },
+            {
+                arg: 'rate3',
+                type: 'number',
+                description: `The price rate 3`,
+                required: true
+            }
+        ],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/getRate2`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getRate2 = async(fixedPriceId, rate3, options) => {
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const [result] = await Self.rawSql(`SELECT vn.priceFixed_getRate2(?, ?) as rate2`,
+            [fixedPriceId, rate3], myOptions);
+        return result;
+    };
+};

modules/item/back/methods/fixed-price/specs/getRate2.spec.js

@@ -0,0 +1,39 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('getRate2()', () => {
+    it(`should return new rate2 if exists rate`, async() => {
+        const tx = await models.FixedPrice.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const fixedPriceId = 1;
+            const rate3 = 2;
+            const result = await models.FixedPrice.getRate2(fixedPriceId, rate3, options);
+
+            expect(result.rate2).toEqual(1.9);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it(`should return null if not exists rate`, async() => {
+        const tx = await models.FixedPrice.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const fixedPriceId = 13;
+            const rate3 = 2;
+            const result = await models.FixedPrice.getRate2(fixedPriceId, rate3, options);
+
+            expect(result.rate2).toEqual(null);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

modules/item/back/models/fixed-price.js

@@ -1,4 +1,5 @@
 module.exports = Self => {
     require('../methods/fixed-price/filter')(Self);
     require('../methods/fixed-price/upsertFixedPrice')(Self);
+    require('../methods/fixed-price/getRate2')(Self);
 };

modules/item/back/models/item-packing-type.json

@@ -13,6 +13,9 @@
         },
         "description": {
             "type": "string"
+        },
+        "isActive":{
+            "type": "boolean"
         }
     },
     "acls": [

modules/item/front/fixed-price/index.html

@@ -41,14 +41,12 @@
                                 <span translate>Warehouse</span>
                             </th>
                             <th
-                                field="rate2"
-                                vn-tooltip="Price By Unit">
-                                <span translate>P.P.U.</span>
+                                field="rate2">
+                                <span translate>Grouping price</span>
                             </th>
                             <th
-                                field="rate3"
-                                vn-tooltip="Price By Package">
-                                <span translate>P.P.P.</span>
+                                field="rate3">
+                                <span translate>Packing price</span>
                             </th>
                             <th field="minPrice">
                                 <span translate>Min price</span>
@@ -72,7 +70,7 @@
                                     show-field="name"
                                     value-field="id"
                                     search-function="$ctrl.itemSearchFunc($search)"
-                                    on-change="$ctrl.upsertPrice(price)"
+                                    on-change="$ctrl.upsertPrice(price, true)"
                                     order="id DESC"
                                     tabindex="1">
                                     <tpl-item>
@@ -112,18 +110,32 @@
                                 </vn-autocomplete>
                             </td>
                             <td shrink-field>
-                                <vn-input-number
-                                    ng-model="price.rate2"
-                                    on-change="$ctrl.upsertPrice(price)"
-                                    step="0.01">
-                                </vn-input-number>
+                                <vn-td-editable number>
+                                    <text>{{price.rate2 | currency: 'EUR':2}}</text>
+                                    <field>
+                                        <vn-input-number
+                                            class="dense"
+                                            vn-focus
+                                            ng-model="price.rate2"
+                                            on-change="$ctrl.upsertPrice(price)"
+                                            step="0.01">
+                                        </vn-input-number>
+                                    </field>
+                                </vn-td-editable>
                             </td>
                             <td shrink-field>
-                                <vn-input-number
-                                    ng-model="price.rate3"
-                                    on-change="$ctrl.upsertPrice(price)"
-                                    step="0.01">
-                                </vn-input-number>
+                                <vn-td-editable number>
+                                    <text>{{price.rate3 | currency: 'EUR':2}}</text>
+                                    <field>
+                                        <vn-input-number
+                                            class="dense"
+                                            vn-focus
+                                            ng-model="price.rate3"
+                                            on-change="$ctrl.upsertPrice(price); $ctrl.recalculateRate2(price)"
+                                            step="0.01"s>
+                                        </vn-input-number>
+                                    </field>
+                                </vn-td-editable>
                             </td>
                             <td shrink-field-expand class="minPrice">
                                 <vn-check

modules/item/front/fixed-price/index.js

@@ -62,7 +62,10 @@ export default class Controller extends Section {
         });
     }
 
-    upsertPrice(price) {
+    upsertPrice(price, resetMinPrice) {
+        if (resetMinPrice)
+            delete price['minPrice'];
+
         price.hasMinPrice = price.minPrice ? true : false;
 
         let requiredFields = ['itemFk', 'started', 'ended', 'rate2', 'rate3'];
@@ -110,6 +113,24 @@ export default class Controller extends Section {
             return {[param]: value};
         }
     }
+
+    recalculateRate2(price) {
+        if (!price.id || !price.rate3) return;
+
+        const query = 'FixedPrices/getRate2';
+        const params = {
+            fixedPriceId: price.id,
+            rate3: price.rate3
+        };
+        this.$http.get(query, {params})
+            .then(res => {
+                const rate2 = res.data.rate2;
+                if (rate2) {
+                    price.rate2 = rate2;
+                    this.upsertPrice(price);
+                }
+            });
+    }
 }
 
 ngModule.vnComponent('vnFixedPrice', {

modules/item/front/fixed-price/index.spec.js

@@ -85,5 +85,25 @@ describe('fixed price', () => {
                 expect(controller.$.model.remove).toHaveBeenCalled();
             });
         });
+
+        describe('recalculateRate2()', () => {
+            it(`should rate2 recalculate`, () => {
+                jest.spyOn(controller.vnApp, 'showSuccess');
+                const price = {
+                    id: 1,
+                    itemFk: 1,
+                    rate2: 2,
+                    rate3: 2
+                };
+                const response = {rate2: 1};
+                controller.recalculateRate2(price);
+
+                const query = `FixedPrices/getRate2?fixedPriceId=${price.id}&rate3=${price.rate3}`;
+                $httpBackend.expectGET(query).respond(response);
+                $httpBackend.flush();
+
+                expect(price.rate2).toEqual(response.rate2);
+            });
+        });
     });
 });

modules/item/front/fixed-price/locale/es.yml

@@ -3,5 +3,3 @@ Search prices by item ID or code: Buscar por ID de artículo o código
 Search fixed prices: Buscar precios fijados
 Add fixed price: Añadir precio fijado
 This row will be removed: Esta linea se eliminará
-Price By Unit: Precio Por Unidad
-Price By Package: Precio Por Paquete

modules/mdb/back/methods/mdbVersion/last.js

@@ -0,0 +1,46 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('last', {
+        description: 'Gets the latest version of a access file',
+        accepts: [
+            {
+                arg: 'appName',
+                type: 'string',
+                required: true,
+                description: 'The app name'
+            }
+        ],
+        returns: {
+            type: 'number',
+            root: true
+        },
+        http: {
+            path: `/:appName/last`,
+            verb: 'GET'
+        }
+    });
+
+    Self.last = async(ctx, appName) => {
+        const models = Self.app.models;
+        const versions = await models.MdbVersion.find({
+            where: {app: appName},
+            fields: ['version']
+        });
+
+        if (!versions.length)
+            throw new UserError('App name does not exist');
+
+        let maxNumber = 0;
+        for (let mdb of versions) {
+            if (mdb.version > maxNumber)
+                maxNumber = mdb.version;
+        }
+
+        let response = {
+            version: maxNumber
+        };
+
+        return response;
+    };
+};

modules/mdb/back/methods/mdbVersion/upload.js

@@ -11,20 +11,22 @@ module.exports = Self => {
                 type: 'string',
                 required: true,
                 description: 'The app name'
-            },
-            {
-                arg: 'newVersion',
+            }, {
+                arg: 'toVersion',
                 type: 'number',
                 required: true,
                 description: `The new version number`
-            },
-            {
+            }, {
                 arg: 'branch',
                 type: 'string',
                 required: true,
                 description: `The branch name`
-            },
-            {
+            }, {
+                arg: 'fromVersion',
+                type: 'string',
+                required: true,
+                description: `The old version number`
+            }, {
                 arg: 'unlock',
                 type: 'boolean',
                 required: false,
@@ -41,16 +43,13 @@ module.exports = Self => {
         }
     });
 
-    Self.upload = async(ctx, appName, newVersion, branch, unlock, options) => {
+    Self.upload = async(ctx, appName, toVersion, branch, fromVersion, unlock, options) => {
         const models = Self.app.models;
-        const userId = ctx.req.accessToken.userId;
         const myOptions = {};
         const $t = ctx.req.__; // $translate
-
         const TempContainer = models.TempContainer;
         const AccessContainer = models.AccessContainer;
         const fileOptions = {};
-
         let tx;
 
         if (typeof options == 'object')
@@ -63,14 +62,28 @@ module.exports = Self => {
 
         let srcFile;
         try {
+            const userId = ctx.req.accessToken.userId;
             const mdbApp = await models.MdbApp.findById(appName, null, myOptions);
 
-            if (mdbApp.locked && mdbApp.userFk != userId) {
+            if (mdbApp && mdbApp.locked && mdbApp.userFk != userId) {
                 throw new UserError($t('App locked', {
                     userId: mdbApp.userFk
                 }));
             }
 
+            const existBranch = await models.MdbBranch.findOne({
+                where: {name: branch}
+            }, myOptions);
+
+            if (!existBranch)
+                throw new UserError('Not exist this branch');
+
+            let lastMethod = await Self.last(ctx, appName, myOptions);
+            lastMethod.version++;
+
+            if (lastMethod.version != toVersion)
+                throw new UserError('Try again');
+
             const tempContainer = await TempContainer.container('access');
             const uploaded = await TempContainer.upload(tempContainer.name, ctx.req, ctx.result, fileOptions);
             const files = Object.values(uploaded.files).map(file => {
@@ -83,7 +96,7 @@ module.exports = Self => {
 
             const accessContainer = await AccessContainer.container('.archive');
             const destinationFile = path.join(
-                accessContainer.client.root, accessContainer.name, appName, `${newVersion}.7z`);
+                accessContainer.client.root, accessContainer.name, appName, `${toVersion}.7z`);
 
             if (process.env.NODE_ENV == 'test')
                 await fs.unlink(srcFile);
@@ -104,7 +117,7 @@ module.exports = Self => {
                 await fs.mkdir(branchPath, {recursive: true});
 
                 const destinationBranch = path.join(branchPath, `${appName}.7z`);
-                const destinationRelative = `../../.archive/${appName}/${newVersion}.7z`;
+                const destinationRelative = `../../.archive/${appName}/${toVersion}.7z`;
                 try {
                     await fs.unlink(destinationBranch);
                 } catch (e) {}
@@ -112,7 +125,7 @@ module.exports = Self => {
 
                 if (branch == 'master') {
                     const destinationRoot = path.join(accessContainer.client.root, `${appName}.7z`);
-                    const rootRelative = `./.archive/${appName}/${newVersion}.7z`;
+                    const rootRelative = `./.archive/${appName}/${toVersion}.7z`;
                     try {
                         await fs.unlink(destinationRoot);
                     } catch (e) {}
@@ -120,10 +133,18 @@ module.exports = Self => {
                 }
             }
 
+            await models.MdbVersionTree.create({
+                app: appName,
+                version: toVersion,
+                branchFk: branch,
+                fromVersion,
+                userFk: userId
+            }, myOptions);
+
             await models.MdbVersion.upsert({
                 app: appName,
                 branchFk: branch,
-                version: newVersion
+                version: toVersion
             }, myOptions);
 
             if (unlock) await models.MdbApp.unlock(ctx, appName, myOptions);
@@ -133,7 +154,7 @@ module.exports = Self => {
             if (tx) await tx.rollback();
 
             if (fs.existsSync(srcFile))
-                await fs.unlink(srcFile);
+                fs.unlink(srcFile);
 
             throw e;
         }

modules/mdb/back/model-config.json

@@ -8,6 +8,9 @@
     "MdbVersion": {
         "dataSource": "vn"
     },
+    "MdbVersionTree": {
+        "dataSource": "vn"
+    },
     "AccessContainer": {
         "dataSource": "accessStorage"
     }

modules/mdb/back/models/mdbVersion.js

@@ -1,3 +1,4 @@
 module.exports = Self => {
     require('../methods/mdbVersion/upload')(Self);
+    require('../methods/mdbVersion/last')(Self);
 };

modules/mdb/back/models/mdbVersionTree.json

@@ -0,0 +1,35 @@
+{
+    "name": "MdbVersionTree",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "mdbVersionTree"
+        }
+    },
+    "properties": {
+        "app": {
+            "type": "string",
+            "description": "The app name",
+            "id": true
+        },
+        "version": {
+            "type": "number"
+        },
+        "branchFk": {
+            "type": "string"
+        },
+        "fromVersion": {
+            "type": "number"
+        },
+        "userFk": {
+            "type": "number"
+        }
+    },
+    "relations": {
+		"branch": {
+			"type": "belongsTo",
+			"model": "MdbBranch",
+			"foreignKey": "branchFk"
+		}
+    }
+}

modules/monitor/front/index/tickets/index.html

@@ -79,51 +79,51 @@
                 </thead>
                 <tbody>
                     <tr ng-repeat="ticket in model.data track by ticket.id"
-                        vn-anchor="::{
+                        vn-anchor="{
                             state: 'ticket.card.summary', 
                             params: {id: ticket.id},
                             target: '_blank'
                         }">
                         <td>
                             <vn-icon
-                                ng-show="::ticket.isTaxDataChecked === 0"
+                                ng-show="ticket.isTaxDataChecked === 0"
                                 translate-attr="{title: 'No verified data'}"
                                 class="bright"
                                 icon="icon-no036">
                             </vn-icon>
                             <vn-icon
-                                ng-show="::ticket.hasTicketRequest"
+                                ng-show="ticket.hasTicketRequest"
                                 translate-attr="{title: 'Purchase request'}"
                                 class="bright"
                                 icon="icon-buyrequest">
                             </vn-icon>
                             <vn-icon
-                                ng-show="::ticket.itemShortage"
+                                ng-show="ticket.itemShortage"
                                 translate-attr="{title: 'Not visible'}"
                                 class="bright"
                                 icon="icon-unavailable">
                             </vn-icon>
                             <vn-icon
-                                ng-show="::ticket.isFreezed"
+                                ng-show="ticket.isFreezed"
                                 translate-attr="{title: 'Client frozen'}"
                                 class="bright"
                                 icon="icon-frozen">
                             </vn-icon>
                             <vn-icon
-                                ng-show="::ticket.risk"
-                                ng-class="::{'highRisk': ticket.hasHighRisk}"
-                                title="{{::$ctrl.$t('Risk')}}: {{ticket.risk}}"
+                                ng-show="ticket.risk"
+                                ng-class="{'highRisk': ticket.hasHighRisk}"
+                                title="{{$ctrl.$t('Risk')}}: {{ticket.risk}}"
                                 class="bright"
                                 icon="icon-risk">
                             </vn-icon>
                             <vn-icon
-                                ng-show="::ticket.hasComponentLack"
+                                ng-show="ticket.hasComponentLack"
                                 translate-attr="{title: 'Component lack'}"
                                 class="bright"
                                 icon="icon-components">
                             </vn-icon>
                             <vn-icon
-                                ng-show="::ticket.isTooLittle"
+                                ng-show="ticket.isTooLittle"
                                 translate-attr="{title: 'Ticket too little'}"
                                 class="bright"
                                 icon="icon-isTooLittle">
@@ -133,64 +133,64 @@
                             <span
                                 vn-click-stop="ticketDescriptor.show($event, ticket.id)"
                                 class="link">
-                                {{::ticket.id}}
+                                {{ticket.id}}
                             </span>
                         </td>
                         <td name="nickname">
                             <span
-                                title="{{::ticket.nickname}}"
+                                title="{{ticket.nickname}}"
                                 vn-click-stop="clientDescriptor.show($event, ticket.clientFk)"
                                 class="link">
-                                {{::ticket.nickname}}
+                                {{ticket.nickname}}
                             </span>
                         </td>
                         <td>
                             <span
-                                title="{{::ticket.userName}}"
+                                title="{{ticket.userName}}"
                                 vn-click-stop="workerDescriptor.show($event, ticket.salesPersonFk)"
                                 class="link">
-                                {{::ticket.userName | dashIfEmpty}}
+                                {{ticket.userName | dashIfEmpty}}
                             </span>
                         </td>
                         <td>
-                            <span class="chip {{::$ctrl.compareDate(ticket.shippedDate)}}">
-                                {{::ticket.shippedDate | date: 'dd/MM/yyyy'}}
+                            <span class="chip {{$ctrl.compareDate(ticket.shippedDate)}}">
+                                {{ticket.shippedDate | date: 'dd/MM/yyyy'}}
                             </span>
                         </td>
-                        <td>{{::ticket.zoneLanding | date: 'HH:mm'}}</td>
-                        <td>{{::ticket.practicalHour | date: 'HH:mm'}}</td>
-                        <td>{{::ticket.shipped | date: 'HH:mm'}}</td>
-                        <td>{{::ticket.province}}</td>
+                        <td>{{ticket.zoneLanding | date: 'HH:mm'}}</td>
+                        <td>{{ticket.practicalHour | date: 'HH:mm'}}</td>
+                        <td>{{ticket.shipped | date: 'HH:mm'}}</td>
+                        <td>{{ticket.province}}</td>
                         <td>
                             <span
-                                ng-show="::ticket.refFk"
-                                title="{{::ticket.refFk}}"
+                                ng-show="ticket.refFk"
+                                title="{{ticket.refFk}}"
                                 vn-click-stop="invoiceOutDescriptor.show($event, ticket.invoiceOutId)"
                                 class="link">
-                                {{::ticket.refFk}}
+                                {{ticket.refFk}}
                             </span>
                             <span 
-                                ng-show="::!ticket.refFk"
-                                class="chip {{::ticket.classColor}}">
-                                {{::ticket.state}}
+                                ng-show="!ticket.refFk"
+                                class="chip {{ticket.classColor}}">
+                                {{ticket.state}}
                             </span>
                         </td>
                         <td name="zone">
                             <span
-                                title="{{::ticket.zoneName}}"
+                                title="{{ticket.zoneName}}"
                                 vn-click-stop="zoneDescriptor.show($event, ticket.zoneFk)"
                                 class="link">
-                                {{::ticket.zoneName | dashIfEmpty}}
+                                {{ticket.zoneName | dashIfEmpty}}
                             </span>
                         </td>
                         <td number>
-                            <span class="chip {{::$ctrl.totalPriceColor(ticket)}}">
-                                {{::(ticket.totalWithVat ? ticket.totalWithVat : 0) | currency: 'EUR': 2}}
+                            <span class="chip {{$ctrl.totalPriceColor(ticket)}}">
+                                {{(ticket.totalWithVat ? ticket.totalWithVat : 0) | currency: 'EUR': 2}}
                             </span>
                         </td>
                         <td actions>
                             <vn-icon-button
-                                vn-anchor="::{
+                                vn-anchor="{
                                     state: 'ticket.card.sale', 
                                     params: {id: ticket.id}, 
                                     target: '_blank'

modules/route/front/sms/index.js

@@ -26,7 +26,7 @@ class Controller extends Component {
                 throw new Error(`The message it's too long`);
 
             this.$http.post(`Routes/sendSms`, this.sms).then(res => {
-                this.vnApp.showMessage(this.$t('SMS sent!'));
+                this.vnApp.showMessage(this.$t('SMS sent'));
 
                 if (res.data) this.emit('send', {response: res.data});
             });

modules/route/front/sms/index.spec.js

@@ -30,7 +30,7 @@ describe('Route', () => {
                 controller.onResponse();
                 $httpBackend.flush();
 
-                expect(controller.vnApp.showMessage).toHaveBeenCalledWith('SMS sent!');
+                expect(controller.vnApp.showMessage).toHaveBeenCalledWith('SMS sent');
             });
 
             it('should call onResponse without the destination and show an error snackbar', () => {

modules/ticket/back/methods/sale/usesMana.js

@@ -24,6 +24,8 @@ module.exports = Self => {
         const salesDepartment = await models.Department.findOne({where: {code: 'VT'}, fields: 'id'}, myOptions);
         const departments = await models.Department.getLeaves(salesDepartment.id, null, myOptions);
         const workerDepartment = await models.WorkerDepartment.findById(userId, null, myOptions);
+        if (!workerDepartment) return false;
+
         const usesMana = departments.find(department => department.id == workerDepartment.departmentFk);
 
         return usesMana ? true : false;

modules/ticket/back/methods/ticket/getTicketsFuture.js

@@ -108,16 +108,26 @@ module.exports = Self => {
             switch (param) {
             case 'id':
                 return {'f.id': value};
-            case 'lines':
+            case 'linesMax':
                 return {'f.lines': {lte: value}};
-            case 'liters':
+            case 'litersMax':
                 return {'f.liters': {lte: value}};
             case 'futureId':
                 return {'f.futureId': value};
             case 'ipt':
-                return {'f.ipt': value};
+                return {or:
+                        [
+                            {'f.ipt': {like: `%${value}%`}},
+                            {'f.ipt': null}
+                        ]
+                };
             case 'futureIpt':
-                return {'f.futureIpt': value};
+                return {or:
+                        [
+                            {'f.futureIpt': {like: `%${value}%`}},
+                            {'f.futureIpt': null}
+                        ]
+                };
             case 'state':
                 return {'f.stateCode': {like: `%${value}%`}};
             case 'futureState':
@@ -203,7 +213,6 @@ module.exports = Self => {
                 tmp.ticket_problems`);
 
         const sql = ParameterizedSQL.join(stmts, ';');
-
         const result = await conn.executeStmt(sql, myOptions);
 
         return result[ticketsIndex];

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

@@ -19,7 +19,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toBeGreaterThan(0);
             await tx.rollback();
         } catch (e) {
             await tx.rollback();
@@ -43,7 +43,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -93,7 +93,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -118,7 +118,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(1);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -143,7 +143,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -168,7 +168,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -187,13 +187,13 @@ describe('ticket getTicketsFuture()', () => {
                 originDated: today,
                 futureDated: today,
                 warehouseFk: 1,
-                ipt: 0
+                ipt: 'H'
             };
 
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(0);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -218,7 +218,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -237,13 +237,13 @@ describe('ticket getTicketsFuture()', () => {
                 originDated: today,
                 futureDated: today,
                 warehouseFk: 1,
-                futureIpt: 0
+                futureIpt: 'H'
             };
 
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(0);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -268,7 +268,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(1);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {
@@ -293,7 +293,7 @@ describe('ticket getTicketsFuture()', () => {
             const ctx = {req: {accessToken: {userId: 9}}, args};
             const result = await models.Ticket.getTicketsFuture(ctx, options);
 
-            expect(result.length).toEqual(4);
+            expect(result.length).toBeGreaterThan(0);
 
             await tx.rollback();
         } catch (e) {

modules/ticket/back/model-config.json

@@ -26,6 +26,9 @@
     "PackingSiteConfig": {
         "dataSource": "vn"
     },
+    "ExpeditionMistake": {
+        "dataSource": "vn"
+    },
     "PrintServerQueue": {
         "dataSource": "vn"
     },

modules/ticket/back/models/expeditionMistake.json

@@ -0,0 +1,33 @@
+{
+    "name": "ExpeditionMistake",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "expeditionMistake"
+        }
+    },
+    "properties": {
+      "created": {
+        "type": "date"
+      }
+    },
+    "relations": {
+      "expedition": {
+        "type": "belongsTo",
+        "model": "Expedition",
+        "foreignKey": "expeditionFk"
+      },
+      "worker": {
+        "type": "belongsTo",
+        "model": "Worker",
+        "foreignKey": "workerFk"
+      },
+      "type": {
+        "type": "belongsTo",
+        "model": "MistakeType",
+        "foreignKey": "typeFk"
+      }
+    }
+
+  }
+  

modules/ticket/front/advance-search-panel/index.js

@@ -25,7 +25,10 @@ class Controller extends SearchPanel {
 
     getItemPackingTypes() {
         let itemPackingTypes = [];
-        this.$http.get('ItemPackingTypes').then(res => {
+        const filter = {
+            where: {isActive: true}
+        };
+        this.$http.get('ItemPackingTypes', {filter}).then(res => {
             for (let ipt of res.data) {
                 itemPackingTypes.push({
                     code: ipt.code,

modules/ticket/front/advance/index.js

@@ -39,6 +39,7 @@ export default class Controller extends Section {
                     field: 'ipt',
                     autocomplete: {
                         url: 'ItemPackingTypes',
+                        where: `{isActive: true}`,
                         showField: 'description',
                         valueField: 'code'
                     }
@@ -47,6 +48,7 @@ export default class Controller extends Section {
                     field: 'futureIpt',
                     autocomplete: {
                         url: 'ItemPackingTypes',
+                        where: `{isActive: true}`,
                         showField: 'description',
                         valueField: 'code'
                     }

modules/ticket/front/descriptor-menu/index.html

@@ -21,30 +21,28 @@
             Add turn
         </vn-item>
         <vn-item class="dropdown"
-            vn-click-stop="showDeliveryNoteMenu.show($event, 'left')"
+            vn-click-stop="showDeliveryNoteMenu.show($event, 'left'); $ctrl.hasDocuware()"
             translate>
             Show Delivery Note...
             <vn-menu vn-id="showDeliveryNoteMenu">
                 <vn-list>
                     <vn-item
-                        ng-if="!$ctrl.hasDocuwareFile"
                         ng-click="$ctrl.showPdfDeliveryNote('deliveryNote')"
                         translate>
                         as PDF
                     </vn-item>
-                    <a class="vn-item"
-                        ng-if="$ctrl.hasDocuwareFile"
-                        href='api/Docuwares/{{$ctrl.ticket.id}}/download/deliveryClient/findTicket?access_token={{$ctrl.vnToken.token}}'
-                        target="_blank"
-                        translate>
-                        as PDF
-                    </a>
                     <vn-item
-                        ng-if="!$ctrl.hasDocuwareFile"
                         ng-click="$ctrl.showPdfDeliveryNote('withoutPrices')"
                         translate>
                         as PDF without prices
                     </vn-item>
+                    <a class="vn-item"
+                        ng-if="$ctrl.hasDocuwareFile"
+                        href='api/Docuwares/{{$ctrl.ticket.id}}/download/deliveryNote?access_token={{$ctrl.vnToken.token}}'
+                        target="_blank"
+                        translate>
+                        as PDF signed
+                    </a>
                     <vn-item
                         ng-click="$ctrl.showCsvDeliveryNote()"
                         translate>
@@ -54,7 +52,7 @@
             </vn-menu>
         </vn-item>
         <vn-item class="dropdown"
-            vn-click-stop="sendDeliveryNoteMenu.show($event, 'left')"
+            vn-click-stop="sendDeliveryNoteMenu.show($event, 'left'); $ctrl.hasDocuware()"
             translate>
             Send Delivery Note...
             <vn-menu vn-id="sendDeliveryNoteMenu">
@@ -64,6 +62,11 @@
                         translate>
                         Send PDF
                     </vn-item>
+                    <vn-item
+                        ng-click="$ctrl.uploadDocuware(!$ctrl.hasDocuwareFile)"
+                        translate>
+                        Send PDF to tablet
+                    </vn-item>
                     <vn-item
                         ng-click="sendCsvConfirmation.show({email: $ctrl.ticket.client.email})"
                         translate>
@@ -323,3 +326,18 @@
     question="Are you sure you want to refund all?"
     message="Refund all">
 </vn-confirm>
+
+<!-- Client balance popup-->
+<vn-client-balance-create
+    vn-id="balance-create"
+    company-fk="$ctrl.vnConfig.companyFk"
+    client-fk="$ctrl.ticket.client.id">
+</vn-client-balance-create>
+
+<!-- Send pdf to tablet -->
+<vn-confirm
+    vn-id="pdfToTablet"
+    on-accept="$ctrl.uploadDocuware(true)"
+    question="Are you sure you want to replace this delivery note?"
+    message="Already exist signed delivery note">
+</vn-confirm>

modules/ticket/front/descriptor-menu/index.js

@@ -85,7 +85,6 @@ class Controller extends Section {
             .then(res => this.ticket = res.data)
             .then(() => {
                 this.isTicketEditable();
-                this.hasDocuware();
             });
     }
 
@@ -134,15 +133,6 @@ class Controller extends Section {
             });
     }
 
-    hasDocuware() {
-        const params = {
-            fileCabinet: 'deliveryClient',
-            dialog: 'findTicket'
-        };
-        this.$http.post(`Docuwares/${this.id}/checkFile`, params)
-            .then(res => this.hasDocuwareFile = res.data);
-    }
-
     showPdfDeliveryNote(type) {
         this.vnReport.show(`tickets/${this.id}/delivery-note-pdf`, {
             recipientId: this.ticket.client.id,
@@ -151,7 +141,10 @@ class Controller extends Section {
     }
 
     sendPdfDeliveryNote($data) {
-        return this.vnEmail.send(`tickets/${this.id}/delivery-note-email`, {
+        let query = `tickets/${this.id}/delivery-note-email`;
+        if (this.hasDocuwareFile) query = `docuwares/${this.id}/delivery-note-email`;
+
+        return this.vnEmail.send(query, {
             recipientId: this.ticket.client.id,
             recipient: $data.email
         });
@@ -267,8 +260,15 @@ class Controller extends Section {
 
         if (client.hasElectronicInvoice) {
             this.$http.post(`NotificationQueues`, {
-                notificationFk: 'invoiceElectronic',
+                notificationFk: 'invoice-electronic',
                 authorFk: client.id,
+                params: JSON.stringify(
+                    {
+                        'name': client.name,
+                        'email': client.email,
+                        'ticketId': this.id,
+                        'url': window.location.href
+                    })
             }).then(() => {
                 this.vnApp.showSuccess(this.$t('Invoice sent'));
             });
@@ -312,6 +312,24 @@ class Controller extends Section {
         return this.$http.post(`Tickets/${this.id}/sendSms`, sms)
             .then(() => this.vnApp.showSuccess(this.$t('SMS sent')));
     }
+
+    hasDocuware() {
+        this.$http.post(`Docuwares/${this.id}/checkFile`, {fileCabinet: 'deliveryNote', signed: true})
+            .then(res => {
+                this.hasDocuwareFile = res.data;
+            });
+    }
+
+    uploadDocuware(force) {
+        if (!force)
+            return this.$.pdfToTablet.show();
+
+        return this.$http.post(`Docuwares/${this.id}/upload`, {fileCabinet: 'deliveryNote'})
+            .then(() => {
+                this.vnApp.showSuccess(this.$t('PDF sent!'));
+                this.$.balanceCreate.show();
+            });
+    }
 }
 
 Controller.$inject = ['$element', '$scope', 'vnReport', 'vnEmail'];

modules/ticket/front/descriptor-menu/index.spec.js

@@ -286,9 +286,34 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
 
     describe('hasDocuware()', () => {
         it('should call hasDocuware method', () => {
-            $httpBackend.whenPOST(`Docuwares/${ticket.id}/checkFile`).respond();
+            $httpBackend.whenPOST(`Docuwares/${ticket.id}/checkFile`).respond(true);
             controller.hasDocuware();
             $httpBackend.flush();
+
+            expect(controller.hasDocuwareFile).toBe(true);
+        });
+    });
+
+    describe('uploadDocuware()', () => {
+        it('should open dialog if not force', () => {
+            controller.$.pdfToTablet = {show: () => {}};
+            jest.spyOn(controller.$.pdfToTablet, 'show');
+            controller.uploadDocuware(false);
+
+            expect(controller.$.pdfToTablet.show).toHaveBeenCalled();
+        });
+
+        it('should make a query and show balance create', () => {
+            controller.$.balanceCreate = {show: () => {}};
+            jest.spyOn(controller.$.balanceCreate, 'show');
+            jest.spyOn(controller.vnApp, 'showSuccess');
+
+            $httpBackend.whenPOST(`Docuwares/${ticket.id}/upload`).respond(true);
+            controller.uploadDocuware(true);
+            $httpBackend.flush();
+
+            expect(controller.vnApp.showSuccess).toHaveBeenCalled();
+            expect(controller.$.balanceCreate.show).toHaveBeenCalled();
         });
     });
 

modules/ticket/front/descriptor-menu/locale/es.yml

@@ -1,9 +1,11 @@
 Show Delivery Note...: Ver albarán...
 Send Delivery Note...: Enviar albarán...
 as PDF: como PDF
+as PDF signed: como PDF firmado
 as CSV: como CSV
 as PDF without prices: como PDF sin precios
 Send PDF: Enviar PDF
+Send PDF to tablet: Enviar PDF a tablet
 Send CSV: Enviar CSV
 Send CSV Delivery Note: Enviar albarán en CSV
 Send PDF Delivery Note: Enviar albarán en PDF
@@ -13,3 +15,6 @@ Invoice sent: Factura enviada
 The following refund ticket have been created: "Se ha creado siguiente ticket de abono: {{ticketId}}"
 Transfer client: Transferir cliente
 SMS Notify changes: SMS Notificar cambios
+PDF sent!: ¡PDF enviado!
+Already exist signed delivery note: Ya existe albarán de entrega firmado
+Are you sure you want to replace this delivery note?: ¿Seguro que quieres reemplazar este albarán de entrega?

modules/ticket/front/future-search-panel/index.js

@@ -25,7 +25,10 @@ class Controller extends SearchPanel {
 
     getItemPackingTypes() {
         let itemPackingTypes = [];
-        this.$http.get('ItemPackingTypes').then(res => {
+        const filter = {
+            where: {isActive: true}
+        };
+        this.$http.get('ItemPackingTypes', {filter}).then(res => {
             for (let ipt of res.data) {
                 itemPackingTypes.push({
                     description: this.$t(ipt.description),

modules/ticket/front/future/index.html

@@ -129,12 +129,12 @@
                             class="link">
                             {{::ticket.id}}
                         </span></td>
-                        <td shrink-date>
+                        <td>
                             <span class="chip {{$ctrl.compareDate(ticket.shipped)}}">
-                                {{::ticket.shipped | date: 'dd/MM/yyyy'}}
+                                {{::ticket.shipped | date: 'dd/MM/yyyy HH:mm'}}
                             </span>
                         </td>
-                        <td>{{::ticket.ipt}}</td>
+                        <td>{{::ticket.ipt | dashIfEmpty}}</td>
                         <td>
                             <span
                             class="chip {{$ctrl.stateColor(ticket.state)}}">
@@ -150,12 +150,12 @@
                                 {{::ticket.futureId}}
                             </span>
                         </td>
-                        <td shrink-date>
+                        <td>
                             <span class="chip {{$ctrl.compareDate(ticket.futureShipped)}}">
-                                {{::ticket.futureShipped | date: 'dd/MM/yyyy'}}
+                                {{::ticket.futureShipped | date: 'dd/MM/yyyy HH:mm'}}
                             </span>
                         </td>
-                        <td>{{::ticket.futureIpt}}</td>
+                        <td>{{::ticket.futureIpt | dashIfEmpty}}</td>
                         <td>
                             <span
                             class="chip {{$ctrl.stateColor(ticket.futureState)}}">

modules/ticket/front/future/index.js

@@ -34,6 +34,7 @@ export default class Controller extends Section {
                 field: 'ipt',
                 autocomplete: {
                     url: 'ItemPackingTypes',
+                    where: `{isActive: true}`,
                     showField: 'description',
                     valueField: 'code'
                 }
@@ -42,6 +43,7 @@ export default class Controller extends Section {
                 field: 'futureIpt',
                 autocomplete: {
                     url: 'ItemPackingTypes',
+                    where: `{isActive: true}`,
                     showField: 'description',
                     valueField: 'code'
                 }

modules/ticket/front/sale/index.html

@@ -68,6 +68,7 @@
                     <vn-th number>Disc</vn-th>
                     <vn-th number>Amount</vn-th>
                     <vn-th shrink>Packaging</vn-th>
+                    <vn-th shrink></vn-th>
                 </vn-tr>
             </vn-thead>
             <vn-tbody>
@@ -204,6 +205,22 @@
                     <vn-td shrink>
                         {{::sale.item.itemPackingTypeFk | dashIfEmpty}}
                     </vn-td>
+                    <vn-td shrink>
+                        <vn-icon-button
+                            vn-none
+                            vn-tooltip="History"
+                            icon="history"
+                            ng-click="log.open()">
+                        </vn-icon-button>
+                        <vn-instance-log
+                            vn-id="log"
+                            url="TicketLogs"
+                            origin-id="$ctrl.$params.id"
+                            changed-model="Sale"
+                            changed-model-id="sale.id">
+                        </vn-instance-log>
+                    </vn-td>
+
                 </vn-tr>
             </vn-tbody>
         </vn-table>
@@ -441,10 +458,11 @@
 </vn-popover>
 
 <!-- SMS Dialog -->
-<vn-ticket-sms
+<vn-sms-dialog
     vn-id="sms"
-    sms="$ctrl.newSMS">
-</vn-ticket-sms>
+    sms="$ctrl.newSMS"
+    on-send="$ctrl.onSmsSend($sms)">
+</vn-sms-dialog>
 
 <vn-confirm
     vn-id="delete-lines"

modules/ticket/front/sale/index.js

@@ -389,6 +389,11 @@ class Controller extends Section {
         this.$.sms.open();
     }
 
+    onSmsSend(sms) {
+        return this.$http.post(`Tickets/${this.ticket.id}/sendSms`, sms)
+            .then(() => this.vnApp.showSuccess(this.$t('SMS sent')));
+    }
+
     /**
      * Inserts a new instance
      */

modules/ticket/front/sale/locale/es.yml

@@ -39,3 +39,4 @@ Packaging: Encajado
 Refund: Abono
 Promotion mana: Maná promoción
 Claim mana: Maná reclamación
+History: Historial

modules/travel/front/extra-community/index.html

@@ -27,7 +27,7 @@
             <section>
                 <vn-tool-bar class="vn-mb-md">
                     <vn-button
-                        disabled="!$ctrl.hasDateRange"
+                        disabled="!travels.length"
                         icon="picture_as_pdf"
                         ng-click="$ctrl.showReport()"
                         vn-tooltip="Open as PDF">

modules/travel/front/extra-community/index.js

@@ -43,16 +43,6 @@ class Controller extends Section {
         this.smartTableOptions = {};
     }
 
-    get hasDateRange() {
-        const userParams = this.$.model.userParams;
-        const hasLanded = userParams.landedTo;
-        const hasShipped = userParams.shippedFrom;
-        const hasContinent = userParams.continent;
-        const hasWarehouseOut = userParams.warehouseOutFk;
-
-        return hasLanded || hasShipped || hasContinent || hasWarehouseOut;
-    }
-
     onDragInterval() {
         if (this.dragClientY > 0 && this.dragClientY < 75)
             this.$window.scrollTo(0, this.$window.scrollY - 10);

modules/travel/front/extra-community/index.spec.js

@@ -14,17 +14,6 @@ describe('Travel Component vnTravelExtraCommunity', () => {
         controller.$.model.refresh = jest.fn();
     }));
 
-    describe('hasDateRange()', () => {
-        it('should return truthy when shippedFrom or landedTo are set as userParams', () => {
-            const now = new Date();
-            controller.$.model.userParams = {shippedFrom: now, landedTo: now};
-
-            const result = controller.hasDateRange;
-
-            expect(result).toBeTruthy();
-        });
-    });
-
     describe('findDraggable()', () => {
         it('should find the draggable element', () => {
             const draggable = document.createElement('tr');

package-lock.json

@@ -9,7 +9,7 @@
             "version": "9.0.0",
             "license": "GPL-3.0",
             "dependencies": {
-                "axios": "^0.25.0",
+                "axios": "^1.2.2",
                 "bcrypt": "^5.0.1",
                 "bmp-js": "^0.1.0",
                 "compression": "^1.7.3",
@@ -3893,10 +3893,13 @@
             "license": "MIT"
         },
         "node_modules/axios": {
-            "version": "0.25.0",
-            "license": "MIT",
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz",
+            "integrity": "sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==",
             "dependencies": {
-                "follow-redirects": "^1.14.7"
+                "follow-redirects": "^1.15.0",
+                "form-data": "^4.0.0",
+                "proxy-from-env": "^1.1.0"
             }
         },
         "node_modules/babel-jest": {
@@ -8401,14 +8404,15 @@
             }
         },
         "node_modules/follow-redirects": {
-            "version": "1.14.9",
+            "version": "1.15.2",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+            "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
             "funding": [
                 {
                     "type": "individual",
                     "url": "https://github.com/sponsors/RubenVerborgh"
                 }
             ],
-            "license": "MIT",
             "engines": {
                 "node": ">=4.0"
             },
@@ -28842,9 +28846,13 @@
             "version": "1.11.0"
         },
         "axios": {
-            "version": "0.25.0",
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz",
+            "integrity": "sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==",
             "requires": {
-                "follow-redirects": "^1.14.7"
+                "follow-redirects": "^1.15.0",
+                "form-data": "^4.0.0",
+                "proxy-from-env": "^1.1.0"
             }
         },
         "babel-jest": {
@@ -31964,7 +31972,9 @@
             }
         },
         "follow-redirects": {
-            "version": "1.14.9"
+            "version": "1.15.2",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+            "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
         },
         "for-in": {
             "version": "1.0.2",

package.json

@@ -12,7 +12,7 @@
         "node": ">=14"
     },
     "dependencies": {
-        "axios": "^0.25.0",
+        "axios": "^1.2.2",
         "bcrypt": "^5.0.1",
         "bmp-js": "^0.1.0",
         "compression": "^1.7.3",

print/templates/email/invoice-electronic/invoice-electronic.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html v-bind="$props">
+    <head>
+        <meta name="viewport" content="width=device-width">
+        <meta name="format-detection" content="telephone=no">
+        <title>{{ $t('subject') }}</title>
+    </head>
+    <body>
+        <h1>{{ $t('title') }} {{name}}</h1>
+        <p>{{ $t('clientMail') }} {{email}}</p>
+        <p>{{ $t('ticketId') }} <a :href='url'>{{ticketId}}</a>
+    </body>
+</html>

print/templates/email/invoice-electronic/invoice-electronic.js

@@ -0,0 +1,21 @@
+module.exports = {
+    name: 'invoice-electronic',
+    props: {
+        name: {
+            type: [String],
+            required: true
+        },
+        email: {
+            type: [String],
+            required: true
+        },
+        ticketId: {
+            type: [Number],
+            required: true
+        },
+        url: {
+            type: [String],
+            required: true
+        }
+    },
+};

print/templates/email/invoice-electronic/locale/en.yml

@@ -0,0 +1,4 @@
+subject: A electronic invoice has been created
+title: A new electronic invoice has been created for the client
+clientMail: The client's email is
+ticketId: The invoice's ticket is

print/templates/email/invoice-electronic/locale/es.yml

@@ -0,0 +1,4 @@
+subject: Se ha creado una factura electrónica
+title: Se ha creado una nueva factura electrónica para el cliente
+clientMail: El correo del cliente es
+ticketId: El ticket de la factura es

print/templates/reports/invoice/invoice.js

@@ -82,7 +82,7 @@ module.exports = {
             return this.rawSqlFromDef(`taxes`, [reference]);
         },
         fetchIntrastat(reference) {
-            return this.rawSqlFromDef(`intrastat`, [reference, reference, reference, reference, reference]);
+            return this.rawSqlFromDef(`intrastat`, [reference, reference, reference]);
         },
         fetchRectified(reference) {
             return this.rawSqlFromDef(`rectified`, [reference]);

print/templates/reports/invoice/sql/intrastat.sql

@@ -1,39 +1,26 @@
 SELECT *
 	FROM invoiceOut io
 		JOIN invoiceOutSerial ios ON io.serial = ios.code
-		JOIN
-		(SELECT
-			t.refFk,
-		    ir.id code,
-		    ir.description description,
-		    CAST(SUM(IFNULL(i.stems, 1) * s.quantity) AS DECIMAL(10,2)) stems,
-		    CAST(SUM(CAST(IFNULL(i.stems, 1) * s.quantity * IF(ic.grams, ic.grams, i.density * ic.cm3delivery / 1000) / 1000 AS DECIMAL(10,2)) *
-		    IF(sub.weight, sub.weight / vn.invoiceOut_getWeight(?), 1)) AS DECIMAL(10,2)) netKg,
-		    CAST(SUM((s.quantity * s.price * (100 - s.discount) / 100 )) AS DECIMAL(10,2)) subtotal
-		        FROM vn.ticket t
-		            JOIN vn.sale s ON s.ticketFk = t.id
-		            JOIN vn.item i ON i.id = s.itemFk
-		            JOIN vn.itemCost ic ON ic.itemFk = i.id AND ic.warehouseFk = t.warehouseFk
-		            JOIN vn.intrastat ir ON ir.id = i.intrastatFk
-		            LEFT JOIN (
-		                SELECT t2.weight
-		                    FROM vn.ticket t2
-		                    WHERE refFk = ? AND weight
-		                    LIMIT 1
-		            ) sub ON TRUE
-		        WHERE t.refFk = ?
-		            AND i.intrastatFk
-		        GROUP BY i.intrastatFk
-		UNION ALL
-		SELECT
-			NULL AS refFk,
-		    NULL AS code,
-		    NULL AS description,
-		    0 AS stems,
-		    0 AS netKg,
-		    IF(CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), 0) AS subtotal
-		    FROM vn.ticketService ts
-		        JOIN vn.ticket t ON ts.ticketFk = t.id
-		    WHERE t.refFk = ?) sub
-	WHERE io.`ref` = ? AND ios.isCEE
-	ORDER BY sub.code;
+		JOIN(
+            SELECT  ir.id code,
+                    ir.description,
+                    iii.stems,
+                    iii.net netKg,
+                    iii.amount subtotal
+                FROM vn.invoiceInIntrastat iii
+                    LEFT JOIN vn.invoiceIn ii ON ii.id = iii.invoiceInFk
+                    LEFT JOIN vn.invoiceOut io ON io.ref = ii.supplierRef
+                    LEFT JOIN vn.intrastat ir ON ir.id = iii.intrastatFk
+                WHERE io.`ref` = ?
+            UNION ALL
+            SELECT  NULL code,
+                    'Servicios' description,
+                    0 stems,
+                    0 netKg,
+                    IF(CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), 0) subtotal
+                FROM vn.ticketService ts
+                    JOIN vn.ticket t ON ts.ticketFk = t.id
+                WHERE t.refFk =  ?
+        ) sub
+    WHERE io.ref = ? AND ios.isCEE
+    ORDER BY sub.code;

print/templates/reports/item-label/sql/item.sql

@@ -3,9 +3,12 @@ SELECT
     i.name,
     i.stems, 
     i.size,
-    b.packing
+    b.packing,
+    p.name as 'producer'
 FROM vn.item i
     JOIN cache.last_buy clb ON clb.item_id = i.id
     JOIN vn.buy b ON b.id = clb.buy_id
     JOIN vn.entry e ON e.id = b.entryFk
+    JOIN vn.producer p ON p.id = i.producerFk
+
 WHERE i.id = ? AND clb.warehouse_id = ?

print/templates/reports/previa-label/assets/css/import.js

@@ -0,0 +1,12 @@
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
+
+module.exports = new Stylesheet([
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/report.css`,
+    `${__dirname}/style.css`])
+    .mergeStyles();

print/templates/reports/previa-label/assets/css/style.css

@@ -0,0 +1,85 @@
+* {
+    box-sizing: border-box;
+    padding-right: 1%;
+}
+.label {
+    font-size: 1.2em;
+    font-family: Arial, Helvetica, sans-serif;
+}
+.barcode {
+    float: left;
+    width: 40%;
+}
+.barcode h1 {
+    text-align: center;
+    font-size: 1.8em;
+    margin: 0 0 10px 0
+}
+.barcode .image {
+    text-align: center
+}
+.barcode .image img {
+    width: 170px
+}
+.data {
+    float: left;
+    width: 60%;
+}
+.data .header {
+    background-color: #000;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    margin-bottom: 25px;
+    text-align: right;
+    font-size: 1.2em;
+    padding: 0.2em;
+    color: #FFF
+}
+.data .sector,
+.data .producer {
+    text-transform: uppercase;
+    text-align: right;
+    font-size: 1.5em;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
+.data .sector-sm {
+    text-transform: uppercase;
+    text-align: right;
+    font-size: 1.2em;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
+.data .producer {
+    text-justify: inter-character;
+}
+.data .details {
+    border-top: 4px solid #000;
+    padding-top: 2px;
+}
+.data .details .package {
+    padding-right: 5px;
+    float: left;
+    width: 50%;
+}
+.package .packing,
+.package .dated,
+.package .labelNumber {
+    text-align: right
+}
+.package .packing {
+    font-size: 1.8em;
+    font-weight: 400
+}
+.data .details .size {
+    background-color: #000;
+    text-align: center;
+    font-size: 3em;
+    padding: 0.2em 0;
+    float: left;
+    width: 50%;
+    color: #FFF
+}

print/templates/reports/previa-label/locale/en.yml

@@ -0,0 +1,2 @@
+previous: PREVIOUS
+report: Report

print/templates/reports/previa-label/locale/es.yml

@@ -0,0 +1,2 @@
+previous: PREVIA
+report: Ticket

print/templates/reports/previa-label/options.json

@@ -0,0 +1,11 @@
+{
+    "width": "10.4cm",
+    "height": "4.8cm",
+    "margin": {
+        "top": "0cm",
+        "right": "0cm",
+        "bottom": "0cm",
+        "left": "0cm"
+    },
+    "printBackground": true
+}

print/templates/reports/previa-label/previa-label.html

@@ -0,0 +1,26 @@
+<DOCTYPE html>
+    <body>
+    <div class="label">
+        <div class="barcode">
+            <h1>{{previa.saleGroupFk}}</h1>
+            <div class="image">
+                <img v-bind:src="barcode" />
+            </div>
+        </div>
+        <div class="data">
+            <div class="header">{{ $t('previous') }}</div>
+            <div v-if="sector.description.length > 16" class="sector-sm">
+                {{sector.description}}
+            </div>
+            <div v-else class="sector">{{sector.description}}</div>
+            <div class="producer">{{ $t('report') }}#{{previa.ticketFk}}</div>
+            <div class="details">
+                <div class="package">
+                    <div class="packing">{{previa.itemPackingTypeFk}}</div>
+                    <div class="dated">{{previa.shippingHour}}:{{previa.shippingMinute}}</div>
+                </div>
+                <div class="size">{{previa.items}}</div>
+            </div>
+        </div>
+    </div>
+</body>

print/templates/reports/previa-label/previa-label.js

@@ -0,0 +1,42 @@
+const Component = require(`vn-print/core/component`);
+const reportBody = new Component('report-body');
+const qrcode = require('qrcode');
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = {
+    name: 'previa-label',
+    async serverPrefetch() {
+        this.previa = await this.fetchPrevia(this.id);
+        this.sector = await this.fetchSector(this.id);
+        this.barcode = await this.getBarcodeBase64(this.id);
+
+        if (this.previa)
+            this.previa = this.previa[0];
+
+        if (!this.sector)
+            throw new UserError('Something went wrong - no sector found');
+    },
+    methods: {
+        fetchPrevia(id) {
+            return this.findOneFromDef('previa', [id]);
+        },
+        getBarcodeBase64(id) {
+            const data = String(id);
+
+            return qrcode.toDataURL(data, {margin: 0});
+        },
+        fetchSector(id) {
+            return this.findOneFromDef('sector', [id]);
+        }
+    },
+    components: {
+        'report-body': reportBody.build()
+    },
+    props: {
+        id: {
+            type: Number,
+            required: true,
+            description: 'The saleGroupFk id'
+        },
+    }
+};

print/templates/reports/previa-label/sql/previa.sql

@@ -0,0 +1 @@
+CALL vn.previousSticker_get(?)

print/templates/reports/previa-label/sql/sector.sql

@@ -0,0 +1,4 @@
+SELECT s.description
+FROM vn.saleGroup sg
+    JOIN vn.sector s ON sg.sectorFk = s.id
+WHERE sg.id = ?