Merge branch '5858-zone_Collisions' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions

.vscode/settings.json

@@ -11,6 +11,9 @@
     "[javascript]": {
         "editor.defaultFormatter": "dbaeumer.vscode-eslint"
     },
+    "[json]": {
+        "editor.defaultFormatter": "vscode.json-language-features"
+    },
     "cSpell.words": [
         "salix",
         "fdescribe"

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2352.01] - 2023-12-28
+
+### Added
+### Changed
+### Fixed
+
 ## [2350.01] - 2023-12-14
 
 ### Added

back/methods/dms/removeFile.js

@@ -22,8 +22,8 @@ module.exports = Self => {
 
     Self.removeFile = async(ctx, id, options) => {
         const models = Self.app.models;
-        let tx;
         const myOptions = {};
+        let tx;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);

back/tests.js

@@ -7,6 +7,10 @@ process.on('warning', warning => {
     console.log(warning.stack);
 });
 
+process.on('SIGUSR2', async() => {
+    if (container) await container.rm();
+});
+
 process.on('exit', async function() {
     if (container) await container.rm();
 });

db/changes/235001/00-silexToSalix.sql

@@ -0,0 +1,46 @@
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`delivery_beforeInsert`
+	BEFORE INSERT ON `delivery`
+	FOR EACH ROW
+BEGIN
+
+	IF (NEW.longitude IS NOT NULL AND NEW.latitude IS NOT NULL AND NEW.ticketFK IS NOT NULL)
+	THEN
+		UPDATE address
+		SET longitude = NEW.longitude,
+			latitude = NEW.latitude
+		WHERE id IN (
+					SELECT addressFK
+						FROM ticket
+						WHERE id = NEW.ticketFk
+					);
+	END IF;
+
+END$$
+DELIMITER ;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`delivery_beforeUpdate`
+	BEFORE UPDATE ON `delivery`
+	FOR EACH ROW
+BEGIN
+
+IF (NEW.longitude IS NOT NULL AND NEW.latitude IS NOT NULL AND NEW.ticketFK IS NOT NULL)
+	THEN
+		UPDATE address
+		SET longitude = NEW.longitude,
+			latitude = NEW.latitude
+		WHERE id IN (
+					SELECT addressFK
+						FROM ticket
+						WHERE id = NEW.ticketFk
+					);
+	END IF;
+
+END$$
+DELIMITER ;
+
+
+ALTER TABLE `vn`.`address` MODIFY COLUMN longitude decimal(11,7) DEFAULT NULL NULL COMMENT 'Indica la última longitud proporcionada por tabla delivery';
+ALTER TABLE `vn`.`address` MODIFY COLUMN latitude decimal(11,7) DEFAULT NULL NULL COMMENT 'Indica la última latitud proporcionada por tabla delivery';

db/changes/235201/00-alterTable.sql

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

db/changes/235201/00-clientCreditLimitToRoleCreditLimit.sql

@@ -0,0 +1,4 @@
+RENAME TABLE `vn`.`clientCreditLimit` TO `vn`.`roleCreditLimit`;
+ALTER TABLE `vn`.`clientCreditLimit` DROP FOREIGN KEY `clientCreditLimit_FK`;
+ALTER TABLE `vn`.`roleCreditLimit` ADD CONSTRAINT `roleCreditLimit_FK` FOREIGN KEY (`roleFk`) REFERENCES `account`.`role`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
+

db/changes/235201/02-views.sql

@@ -0,0 +1,52 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn`.`ticketState`
+AS SELECT `tt`.`created` AS `updated`,
+	`tt`.`stateFk` AS `stateFk`,
+	`tt`.`userFk` AS `userFk`,
+	`tls`.`ticketFk` AS `ticketFk`,
+	`s`.`id` AS `state`,
+	`s`.`order` AS `productionOrder`,
+	`s`.`alertLevel` AS `alertLevel`,
+	`s`.`code` AS `code`,
+	`tls`.`ticketFk` AS `ticket`,
+	`tt`.`userFk` AS `worker`,
+	`s`.`isPreviousPreparable` AS `isPreviousPreparable`,
+	`s`.`isPicked` AS `isPicked`
+FROM (
+		(
+			`vn`.`ticketLastState` `tls`
+			JOIN `vn`.`ticketTracking` `tt` ON(`tt`.`id` = `tls`.`ticketTrackingFk`)
+		)
+		JOIN `vn`.`state` `s` ON(`s`.`id` = `tt`.`stateFk`)
+	);
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`v_inter`
+AS SELECT `tt`.`id` AS `inter_id`,
+	`tt`.`stateFk` AS `state_id`,
+	`tt`.`notes` AS `nota`,
+	`tt`.`created` AS `odbc_date`,
+	`tt`.`ticketFk` AS `Id_Ticket`,
+	`tt`.`userFk` AS `Id_Trabajador`,
+	`tt`.`supervisorFk` AS `Id_supervisor`
+FROM `vn`.`ticketTracking` `tt`;
+
+CREATE OR REPLACE
+ALGORITHM = UNDEFINED VIEW `ticketStateToday` AS
+SELECT
+    `ts`.`ticket` AS `ticket`,
+    `ts`.`state` AS `state`,
+    `ts`.`productionOrder` AS `productionOrder`,
+    `ts`.`alertLevel` AS `alertLevel`,
+    `ts`.`userFk` AS `userFk`,
+    `ts`.`code` AS `code`,
+    `ts`.`updated` AS `updated`,
+    `ts`.`isPicked` AS `isPicked`
+FROM
+    (`ticketState` `ts`
+JOIN `ticket` `t` ON
+    (`t`.`id` = `ts`.`ticket`))
+WHERE
+    `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`());

db/dump/fixtures.sql

@@ -5,10 +5,6 @@ SET DEFAULT ROLE 'salix' FOR 'root'@'%';
 CREATE SCHEMA IF NOT EXISTS `vn2008`;
 CREATE SCHEMA IF NOT EXISTS `tmp`;
 
-CREATE ROLE 'salix';
-GRANT 'salix' TO 'root'@'%';
-SET DEFAULT ROLE 'salix' FOR 'root'@'%';
-
 UPDATE `util`.`config`
     SET `environment`= 'development';
 
@@ -497,7 +493,7 @@ INSERT INTO `vn`.`clientCredit`(`clientFk`, `workerFk`, `amount`, `created`)
         (1104, 9, 90 , util.VN_CURDATE()),
         (1105, 9, 90 , util.VN_CURDATE());
 
-INSERT INTO `vn`.`clientCreditLimit`(`id`, `maxAmount`, `roleFk`)
+INSERT INTO `vn`.`roleCreditLimit`(`id`, `maxAmount`, `roleFk`)
     VALUES
         (1, 9999999,   20),
         (2, 10000,     21),
@@ -775,7 +771,7 @@ INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `des
 -- FIX for state hours on local, inter_afterInsert
 -- UPDATE vncontrol.inter SET odbc_date = DATE_ADD(util.VN_CURDATE(), INTERVAL -10 SECOND);
 
-INSERT INTO `vn`.`ticketTracking`(`ticketFk`, `stateFk`, `workerFk`, `created`)
+INSERT INTO `vn`.`ticketTracking`(`ticketFk`, `stateFk`, `userFk`, `created`)
     VALUES
         (1,  16, 5 , DATE_ADD(util.VN_NOW(), INTERVAL -1 MONTH)),
         (2,  16, 5 , DATE_ADD(util.VN_NOW(), INTERVAL -1 MONTH)),
@@ -819,6 +815,7 @@ INSERT INTO `vn`.`config`(`id`, `mdbServer`, `fakeEmail`, `defaultersMaxAmount`,
     VALUES
         (1, 'beta-server', 'nightmare@mydomain.com', '200', DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH));
 
+
 INSERT INTO `vn`.`greugeType`(`id`, `name`, `code`)
     VALUES
         (1, 'Diff',             'diff'),
@@ -2351,9 +2348,11 @@ INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `weekDays`)
         (8, 'indefinitely', 'mon,tue,wed,thu,fri,sat,sun'),
         (10, 'indefinitely', 'mon,tue,wed,thu,fri,sat,sun');
 
-INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `started`, `ended`)
+INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `started`, `ended`, `weekDays`)
     VALUES
-        (9, 'range', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR));
+        (9, 'range', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR),     DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR),      'mon'),
+        (9, 'range', util.VN_CURDATE(),                                 NULL,                                               'tue'),
+        (9, 'range', NULL,                                              util.VN_CURDATE(),                                  'wed');
 
 INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`, `isSendMail`)
     VALUES

e2e/paths/08-route/03_create_and_clone.spec.js

@@ -26,7 +26,7 @@ describe('Route create path', () => {
             await page.waitToClick(selectors.createRouteView.submitButton);
             const message = await page.waitForSnackbar();
 
-            expect(message.text).toContain('Access denied');
+            expect(message.text).toContain('Access Denied');
         });
     });
 

front/core/services/locale/en.yml

@@ -3,4 +3,4 @@ Could not contact the server: Could not contact the server, make sure you have a
 Please enter your username: Please enter your username
 It seems that the server has fall down: It seems that the server has fall down, wait a few minutes and try again
 Session has expired: Your session has expired, please login again
-Access denied: Access denied
+Access Denied: Access Denied

front/core/services/locale/es.yml

@@ -3,5 +3,5 @@ Could not contact the server: No se ha podido contactar con el servidor, asegura
 Please enter your username: Por favor introduce tu nombre de usuario
 It seems that the server has fall down: Parece que el servidor se ha caído, espera unos minutos e inténtalo de nuevo
 Session has expired: Tu sesión ha expirado, por favor vuelve a iniciar sesión
-Access denied: Acción no permitida
+Access Denied: Acción no permitida
 Direction not found: Dirección no encontrada

front/salix/locale/es.yml

@@ -18,6 +18,7 @@ Show summary: Mostrar vista previa
 What is new: Novedades de la versión
 Settings: Ajustes
 There is a new version, click here to reload: Hay una nueva versión, pulse aquí para recargar
+This ticket is locked.: Este ticket está bloqueado
 
 # Actions
 

front/salix/module.js

@@ -120,7 +120,7 @@ function $exceptionHandler(vnApp, $window, $state, $injector) {
                     messageT = 'Invalid login';
                 break;
             case 403:
-                messageT = 'Access denied';
+                messageT = exception.data?.error?.message || 'Access Denied';
                 break;
             case 502:
                 messageT = 'It seems that the server has fall down';

modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js

@@ -123,7 +123,7 @@ module.exports = Self => {
             await models.TicketTracking.create({
                 ticketFk: newRefundTicket.id,
                 stateFk: state.id,
-                workerFk: worker.id
+                userFk: worker.id
             }, myOptions);
 
             const salesToRefund = await models.ClaimBeginning.find(salesFilter, myOptions);

modules/claim/back/methods/claim-dms/removeFile.js

@@ -1,3 +1,5 @@
+const UserError = require('vn-loopback/util/user-error');
+
 module.exports = Self => {
     Self.remoteMethodCtx('removeFile', {
         description: 'Removes a claim document',
@@ -19,8 +21,8 @@ module.exports = Self => {
     });
 
     Self.removeFile = async(ctx, id, options) => {
-        let tx;
         const myOptions = {};
+        let tx;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -31,19 +33,18 @@ module.exports = Self => {
         }
 
         try {
-            const models = Self.app.models;
+            const claimDms = await Self.findById(id, null, myOptions);
-            const targetClaimDms = await models.ClaimDms.findById(id, null, myOptions);
-            const targetDms = await models.Dms.findById(targetClaimDms.dmsFk, null, myOptions);
-            const trashDmsType = await models.DmsType.findOne({where: {code: 'trash'}}, myOptions);
 
-            await models.Dms.removeFile(ctx, targetClaimDms.dmsFk, myOptions);
+            const targetDms = await Self.app.models.Dms.removeFile(ctx, claimDms.dmsFk, myOptions);
-            await targetClaimDms.destroy(myOptions);
 
-            await targetDms.updateAttribute('dmsTypeFk', trashDmsType.id, myOptions);
+            if (!targetDms || ! claimDms)
+                throw new UserError('Try again');
+
+            const claimDmsDestroyed = await claimDms.destroy(myOptions);
 
             if (tx) await tx.commit();
 
-            return targetDms;
+            return claimDmsDestroyed;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;

modules/claim/back/methods/claim/uploadFile.js

@@ -1,6 +1,3 @@
-const UserError = require('vn-loopback/util/user-error');
-const fs = require('fs-extra');
-const path = require('path');
 
 module.exports = Self => {
     Self.remoteMethodCtx('uploadFile', {
@@ -57,96 +54,33 @@ module.exports = Self => {
     });
 
     Self.uploadFile = async(ctx, id, options) => {
-        const tx = await Self.beginTransaction({});
+        const {Dms, ClaimDms} = Self.app.models;
         const myOptions = {};
+        let tx;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        if (!myOptions.transaction)
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
             myOptions.transaction = tx;
+        }
 
-        const models = Self.app.models;
-        const promises = [];
-        const TempContainer = models.TempContainer;
-        const ClaimContainer = models.ClaimContainer;
-        const fileOptions = {};
-        const args = ctx.args;
-
-        let srcFile;
         try {
-            const hasWriteRole = await models.DmsType.hasWriteRole(ctx, args.dmsTypeId, myOptions);
+            const uploadedFiles = await Dms.uploadFile(ctx, myOptions);
-            if (!hasWriteRole)
-                throw new UserError(`You don't have enough privileges`);
 
-            // Upload file to temporary path
+            const promises = uploadedFiles.map(dms => ClaimDms.create({
-            const tempContainer = await TempContainer.container('dms');
+                claimFk: id,
-            const uploaded = await TempContainer.upload(tempContainer.name, ctx.req, ctx.result, fileOptions);
+                dmsFk: dms.id
-            const files = Object.values(uploaded.files).map(file => {
+            }, myOptions));
-                return file[0];
+            await Promise.all(promises);
-            });
-
-            const addedDms = [];
-            for (const uploadedFile of files) {
-                const newDms = await createDms(ctx, uploadedFile, myOptions);
-                const pathHash = ClaimContainer.getHash(newDms.id);
-
-                const file = await TempContainer.getFile(tempContainer.name, uploadedFile.name);
-                srcFile = path.join(file.client.root, file.container, file.name);
-
-                const claimContainer = await ClaimContainer.container(pathHash);
-                const dstFile = path.join(claimContainer.client.root, pathHash, newDms.file);
-
-                await fs.move(srcFile, dstFile, {
-                    overwrite: true
-                });
-
-                addedDms.push(newDms);
-            }
-
-            addedDms.forEach(dms => {
-                const newClaimDms = models.ClaimDms.create({
-                    claimFk: id,
-                    dmsFk: dms.id
-                }, myOptions);
-
-                promises.push(newClaimDms);
-            });
-            const resolvedPromises = await Promise.all(promises);
 
             if (tx) await tx.commit();
 
-            return resolvedPromises;
+            return uploadedFiles;
         } catch (e) {
             if (tx) await tx.rollback();
-
-            if (fs.existsSync(srcFile))
-                await fs.unlink(srcFile);
-
             throw e;
         }
     };
-
-    async function createDms(ctx, file, myOptions) {
-        const models = Self.app.models;
-        const myUserId = ctx.req.accessToken.userId;
-        const args = ctx.args;
-
-        const newDms = await models.Dms.create({
-            workerFk: myUserId,
-            dmsTypeFk: args.dmsTypeId,
-            companyFk: args.companyId,
-            warehouseFk: args.warehouseId,
-            reference: args.reference,
-            description: args.description,
-            contentType: file.type,
-            hasFile: args.hasFile
-        }, myOptions);
-
-        let fileName = file.name;
-        const extension = models.DmsContainer.getFileExtension(fileName);
-        fileName = `${newDms.id}.${extension}`;
-
-        return newDms.updateAttribute('file', fileName, myOptions);
-    }
 };

modules/client/back/methods/client-dms/removeFile.js

@@ -19,9 +19,8 @@ module.exports = Self => {
     });
 
     Self.removeFile = async(ctx, id, options) => {
-        const models = Self.app.models;
-        let tx;
         const myOptions = {};
+        let tx;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -34,13 +33,16 @@ module.exports = Self => {
         try {
             const clientDms = await Self.findById(id, null, myOptions);
 
-            await models.Dms.removeFile(ctx, clientDms.dmsFk, myOptions);
+            const targetDms = await Self.app.models.Dms.removeFile(ctx, clientDms.dmsFk, myOptions);
 
-            const destroyedClient = await clientDms.destroy(myOptions);
+            if (!targetDms || !clientDms)
+                throw new UserError('Try again');
+
+            const clientDmsDestroyed = await clientDms.destroy(myOptions);
 
             if (tx) await tx.commit();
 
-            return destroyedClient;
+            return clientDmsDestroyed;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;

modules/client/back/methods/client/filter.js

@@ -107,17 +107,29 @@ module.exports = Self => {
                 return {or: [
                     {'c.phone': {like: `%${value}%`}},
                     {'c.mobile': {like: `%${value}%`}},
+                    {'a.phone': {like: `%${value}%`}},
                 ]};
             case 'zoneFk':
-                param = 'a.postalCode';
+                return {'a.postalCode': {inq: postalCode}};
-                return {[param]: {inq: postalCode}};
+            case 'city':
+                return {or: [
+                    {'c.city': {like: `%${value}%`}},
+                    {'a.city': {like: `%${value}%`}}
+                ]};
+            case 'postcode':
+                return {or: [
+                    {'c.postcode': value},
+                    {'a.postalCode': value}
+                ]};
+            case 'provinceFk':
+                return {or: [
+                    {'p.id': value},
+                    {'a.provinceFk': value}
+                ]};
             case 'name':
             case 'salesPersonFk':
             case 'fi':
             case 'socialName':
-            case 'city':
-            case 'postcode':
-            case 'provinceFk':
             case 'email':
                 param = `c.${param}`;
                 return {[param]: {like: `%${value}%`}};
@@ -134,24 +146,29 @@ module.exports = Self => {
                     c.fi,
                     c.socialName,
                     c.phone,
+                    a.phone,
                     c.mobile,
                     c.city,
+                    a.city,
                     c.postcode,
+                    a.postalCode,
                     c.email,
                     c.isActive,
                     c.isFreezed,
-                    p.id AS provinceFk,
+                    p.id AS provinceClientFk,
+                    a.provinceFk AS provinceAddressFk,
                     p.name AS province,
                     u.id AS salesPersonFk,
                     u.name AS salesPerson
                 FROM client c
                     LEFT JOIN account.user u ON u.id = c.salesPersonFk
                     LEFT JOIN province p ON p.id = c.provinceFk
-                    JOIN vn.address a ON a.clientFk = c.id
+                    JOIN address a ON a.clientFk = c.id
             `
         );
 
         stmt.merge(conn.makeWhere(filter.where));
+        stmt.merge('GROUP BY c.id');
         stmt.merge(conn.makePagination(filter));
 
         const clientsIndex = stmts.push(stmt) - 1;

modules/client/back/methods/client/uploadFile.js

@@ -55,9 +55,9 @@ module.exports = Self => {
     });
 
     Self.uploadFile = async(ctx, id, options) => {
-        const models = Self.app.models;
+        const {Dms, ClientDms} = Self.app.models;
-        let tx;
         const myOptions = {};
+        let tx;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -67,23 +67,20 @@ module.exports = Self => {
             myOptions.transaction = tx;
         }
 
-        const promises = [];
-
         try {
-            const uploadedFiles = await models.Dms.uploadFile(ctx, myOptions);
+            const uploadedFiles = await Dms.uploadFile(ctx, myOptions);
-            uploadedFiles.forEach(dms => {
+            const promises = uploadedFiles.map(dms =>
-                const newClientDms = models.ClientDms.create({
+                ClientDms.create({
                     clientFk: id,
                     dmsFk: dms.id
-                }, myOptions);
+                }, myOptions)
 
-                promises.push(newClientDms);
+            );
-            });
+            await Promise.all(promises);
-            const resolvedPromises = await Promise.all(promises);
 
             if (tx) await tx.commit();
 
-            return resolvedPromises;
+            return uploadedFiles;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;

modules/client/back/model-config.json

@@ -29,7 +29,7 @@
     "ClientCredit": {
         "dataSource": "vn"
     },
-    "ClientCreditLimit": {
+    "RoleCreditLimit": {
         "dataSource": "vn"
     },
     "ClientConsumptionQueue": {

modules/client/back/models/client.js

@@ -463,7 +463,7 @@ module.exports = Self => {
                     throw new UserError(`You can't change the credit set to zero from a financialBoss`);
             }
 
-            const creditLimits = await models.ClientCreditLimit.find({
+            const creditLimits = await models.RoleCreditLimit.find({
                 fields: ['roleFk'],
                 where: {
                     maxAmount: {gte: changes.credit}

modules/client/back/models/role-credit-limit.json

@@ -1,9 +1,9 @@
 {
-    "name": "ClientCreditLimit",
+    "name": "RoleCreditLimit",
     "base": "VnModel",
     "options": {
         "mysql": {
-            "table": "clientCreditLimit"
+            "table": "roleCreditLimit"
         }
     },
     "properties": {

modules/client/front/basic-data/index.html

@@ -62,7 +62,7 @@
             <vn-worker-autocomplete
                 vn-one
                 ng-model="$ctrl.client.salesPersonFk"
-                departments="['VT']"
+                departments="['VT', 'shopping']"
                 show-field="nickname"
                 label="Salesperson"
                 vn-acl="salesAssistant">

modules/route/back/methods/route/filter.js

@@ -130,13 +130,15 @@ module.exports = Self => {
                 am.name agencyName,
                 u.name AS workerUserName,
                 v.numberPlate AS vehiclePlateNumber,
-                Date_format(r.time, '%H:%i') hour
+                Date_format(r.time, '%H:%i') hour,
+                eu.email
             FROM route r
                 LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
                 LEFT JOIN agency a ON a.id = am.agencyFk
                 LEFT JOIN vehicle v ON v.id = r.vehicleFk
                 LEFT JOIN worker w ON w.id = r.workerFk
-                LEFT JOIN account.user u ON u.id = w.id`
+                LEFT JOIN account.user u ON u.id = w.id
+                LEFT JOIN account.emailUser eu ON eu.userFk = r.workerFk`
         );
 
         stmt.merge(conn.makeSuffix(filter));

modules/route/back/methods/route/getExpeditionSummary.js

@@ -0,0 +1,64 @@
+module.exports = Self => {
+    Self.remoteMethod('getExpeditionSummary', {
+        description: 'Get summary of expeditions for a given route',
+        accepts: [
+            {
+                arg: 'routeFk',
+                type: 'number',
+                required: true,
+                description: 'Foreign key for Route'
+            }
+        ],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: '/getExpeditionSummary',
+            verb: 'get'
+        }
+    });
+
+    Self.getExpeditionSummary = async(routeFk, options) => {
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const query = `
+            SELECT routeFk,
+                    addressFk,
+                    SUM(total) total,
+                    SUM(delivery) delivery,
+                    SUM(lost) lost,
+                    SUM(delivered) delivered,
+                    GROUP_CONCAT(totalPacking ORDER BY total DESC SEPARATOR ' ') itemPackingType
+                FROM (
+                    SELECT r.id AS routeFk,
+                                t.addressFk,
+                                CONCAT (IFNULL(e.itemPackingTypeFk,'-'), '', COUNT(*)) totalPacking,
+                                COUNT(*) total,
+                                SUM(est.code = 'ON DELIVERY') delivery,
+                                SUM(est.code = 'LOST') lost,
+                                SUM(est.code = 'DELIVERED') delivered,
+                                t.priority
+                        FROM vn.ticket t
+                            JOIN vn.route r ON r.id = t.routeFk
+                            JOIN vn.expedition e ON e.ticketFk = t.id
+                            LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk
+                            JOIN vn.agencyMode am ON am.id = r.agencyModeFk
+                            JOIN vn.agency ag ON ag.id = am.agencyFk
+                            LEFT JOIN vn.userConfig uc ON uc.userFk = account.myUser_getId()
+                        WHERE (r.created = util.VN_CURDATE() OR r.created = util.yesterday())
+                            AND t.routeFk = ?
+                        GROUP BY t.addressFk, e.itemPackingTypeFk
+                    ) sub
+                GROUP BY addressFk
+                ORDER BY priority DESC
+      `;
+
+        const results = await Self.rawSql(query, [routeFk], myOptions);
+        return results;
+    };
+};
+

modules/route/back/methods/route/getExternalCmrs.js

@@ -3,99 +3,101 @@ const buildFilter = require('vn-loopback/util/filter').buildFilter;
 const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
 
 module.exports = Self => {
-	Self.remoteMethod('getExternalCmrs', {
+    Self.remoteMethod('getExternalCmrs', {
-		description: 'Returns an array of external cmrs',
+        description: 'Returns an array of external cmrs',
-		accessType: 'READ',
+        accessType: 'READ',
-		accepts: [
+        accepts: [
-			{
+            {
-				arg: 'filter',
+                arg: 'filter',
-				type: 'object',
+                type: 'object',
-				description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
+                description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
-			},
+            },
-			{
+            {
-				arg: 'cmrFk',
+                arg: 'cmrFk',
-				type: 'integer',
+                type: 'integer',
-				description: 'Searchs the route by id',
+                description: 'Searchs the route by id',
-			},
+            },
-			{
+            {
-				arg: 'ticketFk',
+                arg: 'ticketFk',
-				type: 'integer',
+                type: 'integer',
-				description: 'The worker id',
+                description: 'The worker id',
-			},
+            },
-			{
+            {
-				arg: 'routeFk',
+                arg: 'routeFk',
-				type: 'integer',
+                type: 'integer',
-				description: 'The route id',
+                description: 'The route id',
-			},
+            },
-			{
+            {
-				arg: 'country',
+                arg: 'country',
-				type: 'string',
+                type: 'string',
-				description: 'The agencyMode id',
+                description: 'The agencyMode id',
-			},
+            },
-			{
+            {
-				arg: 'clientFk',
+                arg: 'clientFk',
-				type: 'integer',
+                type: 'integer',
-				description: 'The vehicle id',
+                description: 'The vehicle id',
-			},
+            },
-			{
+            {
-				arg: 'hasCmrDms',
+                arg: 'hasCmrDms',
-				type: 'boolean',
+                type: 'boolean',
-				description: 'The vehicle id',
+                description: 'The vehicle id',
-			},
+            },
-			{
+            {
-				arg: 'shipped',
+                arg: 'shipped',
-				type: 'date',
+                type: 'date',
-				description: 'The to date filter',
+                description: 'The to date filter',
-			},
+            },
-		],
+        ],
-		returns: {
+        returns: {
-			type: ['object'],
+            type: ['object'],
-			root: true
+            root: true
-		},
+        },
-		http: {
+        http: {
-			path: `/getExternalCmrs`,
+            path: `/getExternalCmrs`,
-			verb: 'GET'
+            verb: 'GET'
-		}
+        }
-	});
+    });
 
-	Self.getExternalCmrs = async(
+    Self.getExternalCmrs = async(
-		filter,
+        filter,
-		cmrFk,
+        cmrFk,
-		ticketFk,
+        ticketFk,
-		routeFk,
+        routeFk,
-		country,
+        country,
-		clientFk,
+        clientFk,
-		hasCmrDms,
+        hasCmrDms,
-		shipped,
+        shipped,
-		options
+        options
-	) => {
+    ) => {
-		const params = {
+        const params = {
-			cmrFk,
+            cmrFk,
-			ticketFk,
+            ticketFk,
-			routeFk,
+            routeFk,
-			country,
+            country,
-			clientFk,
+            clientFk,
-			hasCmrDms,
+            hasCmrDms,
-			shipped,
+            shipped,
-		};
+        };
-		const conn = Self.dataSource.connector;
+        const conn = Self.dataSource.connector;
 
-		let where = buildFilter(params, (param, value) => {return {[param]: value}});
+        let where = buildFilter(params, (param, value) => {
-		filter = mergeFilters(filter, {where});
+            return {[param]: value};
+        });
+        filter = mergeFilters(filter, {where});
 
-		if (!filter.where) {
+        if (!filter.where) {
-			const yesterday = new Date();
+            const yesterday = new Date();
-			yesterday.setDate(yesterday.getDate() - 1);
+            yesterday.setDate(yesterday.getDate() - 1);
-			filter.where = {'shipped': yesterday.toISOString().split('T')[0]}
+            filter.where = {'shipped': yesterday.toISOString().split('T')[0]};
-		}
+        }
 
-		const myOptions = {};
+        const myOptions = {};
 
-		if (typeof options == 'object')
+        if (typeof options == 'object')
-			Object.assign(myOptions, options);
+            Object.assign(myOptions, options);
 
-			let stmts = [];
+        let stmts = [];
-			const stmt = new ParameterizedSQL(`
+        const stmt = new ParameterizedSQL(`
 			SELECT *
 				FROM (
 					SELECT t.cmrFk,
@@ -129,13 +131,13 @@ module.exports = Self => {
 							AND dm.code = 'DELIVERY'
 							AND t.cmrFk
 				) sub
-			`);
+		`);
 
-			stmt.merge(conn.makeSuffix(filter));
+        stmt.merge(conn.makeSuffix(filter));
-			const itemsIndex = stmts.push(stmt) - 1;
+        const itemsIndex = stmts.push(stmt) - 1;
 
-			const sql = ParameterizedSQL.join(stmts, ';');
+        const sql = ParameterizedSQL.join(stmts, ';');
-			const result = await conn.executeStmt(sql);
+        const result = await conn.executeStmt(sql);
-			return itemsIndex === 0 ? result : result[itemsIndex];
+        return itemsIndex === 0 ? result : result[itemsIndex];
-	};
+    };
 };

modules/route/back/methods/route/getTickets.js

@@ -3,7 +3,7 @@ const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 
 module.exports = Self => {
     Self.remoteMethod('getTickets', {
-        description: 'Return the tickets information displayed on the route module',
+        description: 'Find all instances of the model matched by filter from the data source.',
         accessType: 'READ',
         accepts: [
             {
@@ -40,22 +40,32 @@ module.exports = Self => {
             t.clientFk,
             t.priority,
             t.addressFk,
-            st.code AS ticketStateCode,
+            st.code ticketStateCode,
-            st.name AS ticketStateName,
+            st.name ticketStateName,
-            wh.name AS warehouseName,
+            wh.name warehouseName,
-            tob.description AS ticketObservation,
+            tob.description ticketObservation,
             a.street,
             a.postalCode,
             a.city,
-            am.name AS agencyModeName,
+            am.name agencyModeName,
-            u.nickname AS userNickname,
+            u.nickname userNickname,
-            vn.ticketTotalVolume(t.id) AS volume,
+            vn.ticketTotalVolume(t.id) volume,
             tob.description,
-            GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt
+            GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt,
+            c.phone clientPhone,
+            c.mobile clientMobile,
+            a.phone addressPhone,
+            a.mobile addressMobile,
+            a.longitude,
+            a.latitude,
+            wm.mediaValue salePersonPhone,
+            t.cmrFk,
+            t.isSigned signed
         FROM vn.route r
             JOIN ticket t ON t.routeFk = r.id
-            JOIN vn.sale s ON s.ticketFk = t.id
+            JOIN client c ON t.clientFk = c.id
-            JOIN vn.item i ON i.id = s.itemFk
+            LEFT JOIN vn.sale s ON s.ticketFk = t.id
+            LEFT JOIN vn.item i ON i.id = s.itemFk
             LEFT JOIN ticketState ts ON ts.ticketFk = t.id
             LEFT JOIN state st ON st.id = ts.stateFk
             LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
@@ -65,7 +75,8 @@ module.exports = Self => {
             LEFT JOIN address a ON a.id = t.addressFk
             LEFT JOIN agencyMode  am ON am.id = t.agencyModeFk
             LEFT JOIN account.user u ON u.id = r.workerFk
-            LEFT JOIN vehicle v ON v.id = r.vehicleFk`
+            LEFT JOIN vehicle v ON v.id = r.vehicleFk
+            LEFT JOIN workerMedia wm ON wm.workerFk = c.salesPersonFk`
         );
 
         if (!filter.where) filter.where = {};

modules/route/back/methods/route/specs/getExpeditionSummary.spec.js

@@ -0,0 +1,10 @@
+const app = require('vn-loopback/server/server');
+
+describe('route getExpeditionSummary()', () => {
+    const routeId = 1;
+    it('should return a summary of expeditions for a route', async() => {
+        const result = await app.models.Route.getExpeditionSummary(routeId);
+
+        expect(result.every(route => route.id = routeId)).toBeTruthy();
+    });
+});

modules/route/back/models/route.js

@@ -17,6 +17,7 @@ module.exports = Self => {
     require('../methods/route/cmr')(Self);
     require('../methods/route/getExternalCmrs')(Self);
     require('../methods/route/downloadCmrsZip')(Self);
+    require('../methods/route/getExpeditionSummary')(Self);
     require('../methods/route/getByWorker')(Self);
 
     Self.validate('kmStart', validateDistance, {

modules/ticket/back/methods/ticket-dms/removeFile.js

@@ -19,7 +19,6 @@ module.exports = Self => {
     });
 
     Self.removeFile = async(ctx, id, options) => {
-        const models = Self.app.models;
         const myOptions = {};
         let tx;
 
@@ -32,18 +31,18 @@ module.exports = Self => {
         }
 
         try {
-            const targetTicketDms = await models.TicketDms.findById(id, null, myOptions);
+            const ticketDms = await Self.findById(id, null, myOptions);
-            const targetDms = await models.Dms.findById(targetTicketDms.dmsFk, null, myOptions);
-            const trashDmsType = await models.DmsType.findOne({where: {code: 'trash'}}, myOptions);
 
-            await models.Dms.removeFile(ctx, targetTicketDms.dmsFk, myOptions);
+            const targetDms = await Self.app.models.Dms.removeFile(ctx, ticketDms.dmsFk, myOptions);
-            await targetTicketDms.destroy(myOptions);
 
-            await targetDms.updateAttribute('dmsTypeFk', trashDmsType.id, myOptions);
+            if (!targetDms || !ticketDms)
+                throw new UserError('Try again');
+
+            const ticketDmsDestroyed = await ticketDms.destroy(myOptions);
 
             if (tx) await tx.commit();
 
-            return targetDms;
+            return ticketDmsDestroyed;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;

modules/ticket/back/methods/ticket-request/confirm.js

@@ -63,7 +63,7 @@ module.exports = Self => {
 
             const isAvailable = itemStock.available > 0;
 
-            if (!isAvailable)
+            if (!isAvailable || !ctx.args.quantity)
                 throw new UserError(`This item is not available`);
 
             if (request.saleFk)

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

@@ -141,7 +141,6 @@ describe('ticket filter()', () => {
     });
 
     it('should return the tickets that are not pending', async() => {
-        pending('#6010 test intermitente');
         const tx = await models.Ticket.beginTransaction({});
 
         try {

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

@@ -94,10 +94,10 @@ describe('ticket state()', () => {
 
             const ticketTracking = await models.Ticket.state(ctx, params, options);
 
-            expect(ticketTracking.__data.ticketFk).toBe(params.ticketFk);
+            expect(ticketTracking.ticketFk).toBe(params.ticketFk);
-            expect(ticketTracking.__data.stateFk).toBe(params.stateFk);
+            expect(ticketTracking.stateFk).toBe(params.stateFk);
-            expect(ticketTracking.__data.workerFk).toBe(49);
+            expect(ticketTracking.userFk).toBe(49);
-            expect(ticketTracking.__data.id).toBeDefined();
+            expect(ticketTracking.id).toBeDefined();
 
             await tx.rollback();
         } catch (e) {
@@ -116,14 +116,14 @@ describe('ticket state()', () => {
             const ticket = await models.Ticket.create(sampleTicket, options);
             const ctx = {req: {accessToken: {userId: 18}}};
             const assignedState = await models.State.findOne({where: {code: 'PICKER_DESIGNED'}}, options);
-            const params = {ticketFk: ticket.id, stateFk: assignedState.id, workerFk: 1};
+            const params = {ticketFk: ticket.id, stateFk: assignedState.id, userFk: 1};
             const res = await models.Ticket.state(ctx, params, options);
 
-            expect(res.__data.ticketFk).toBe(params.ticketFk);
+            expect(res.ticketFk).toBe(params.ticketFk);
-            expect(res.__data.stateFk).toBe(params.stateFk);
+            expect(res.stateFk).toBe(params.stateFk);
-            expect(res.__data.workerFk).toBe(params.workerFk);
+            expect(res.userFk).toBe(params.userFk);
-            expect(res.__data.workerFk).toBe(1);
+            expect(res.userFk).toBe(1);
-            expect(res.__data.id).toBeDefined();
+            expect(res.id).toBeDefined();
 
             await tx.rollback();
         } catch (e) {

modules/ticket/back/methods/ticket/state.js

@@ -51,12 +51,12 @@ module.exports = Self => {
                 params.stateFk = state.id;
             }
 
-            if (!params.workerFk) {
+            if (!params.userFk) {
                 const worker = await models.Worker.findOne({
                     where: {id: userId}
                 }, myOptions);
 
-                params.workerFk = worker.id;
+                params.userFk = worker.id;
             }
 
             const ticketState = await models.TicketState.findById(params.ticketFk, {

modules/ticket/back/methods/ticket/uploadFile.js

@@ -47,7 +47,7 @@ module.exports = Self => {
     });
 
     Self.uploadFile = async(ctx, id, options) => {
-        const models = Self.app.models;
+        const {Dms, TicketDms} = Self.app.models;
         const myOptions = {};
         let tx;
 
@@ -59,22 +59,19 @@ module.exports = Self => {
             myOptions.transaction = tx;
         }
 
-        const promises = [];
         try {
-            const uploadedFiles = await models.Dms.uploadFile(ctx, myOptions);
+            const uploadedFiles = await Dms.uploadFile(ctx, myOptions);
-            uploadedFiles.forEach(dms => {
-                const newTicketDms = models.TicketDms.create({
-                    ticketFk: id,
-                    dmsFk: dms.id
-                }, myOptions);
 
-                promises.push(newTicketDms);
+            const promises = uploadedFiles.map(dms => TicketDms.create({
-            });
+                ticketFk: id,
-            const resolvedPromises = await Promise.all(promises);
+                dmsFk: dms.id
+            }, myOptions));
+
+            await Promise.all(promises);
 
             if (tx) await tx.commit();
 
-            return resolvedPromises;
+            return uploadedFiles;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;

modules/ticket/back/models/expedition-state.json

@@ -24,5 +24,12 @@
         "userFk": {
             "type": "number"
         }
+    },
+    "relations": {
+      "expeditionStateType": {
+        "type": "belongsTo",
+        "model": "ExpeditionStateType",
+        "foreignKey": "typeFk"
+      }
     }
 }

modules/ticket/back/models/ticket-state.json

@@ -33,10 +33,10 @@
             "model": "State",
             "foreignKey": "stateFk"
         },
-        "worker": {
+        "user": {
-            "type": "belongsTo",
+			"type": "belongsTo",
-            "model": "Worker",
+			"model": "VnUser",
-            "foreignKey": "workerFk"
+			"foreignKey": "userFk"
-        }
+		}
     }
 }

modules/ticket/back/models/ticket-tracking.js

@@ -2,5 +2,5 @@ module.exports = function(Self) {
     require('../methods/ticket-tracking/setDelivered')(Self);
 
     Self.validatesPresenceOf('stateFk', {message: 'State cannot be blank'});
-    Self.validatesPresenceOf('workerFk', {message: 'Worker cannot be blank'});
+    Self.validatesPresenceOf('userFk', {message: 'Worker cannot be blank'});
 };

modules/ticket/back/models/ticket-tracking.json

@@ -8,21 +8,21 @@
     },
     "properties": {
         "id": {
-                "id": true,
+            "id": true,
-                "type": "number",
+            "type": "number",
-                "forceId": false
+            "forceId": false
         },
         "created": {
-                "type": "date"
+            "type": "date"
         },
         "ticketFk": {
-                "type": "number"
+            "type": "number"
         },
         "stateFk": {
-                "type": "number"
+            "type": "number"
         },
-        "workerFk": {
+        "userFk": {
-                "type": "number"
+            "type": "number"
         }
     },
     "relations": {
@@ -36,10 +36,10 @@
             "model": "State",
             "foreignKey": "stateFk"
         },
-        "worker": {
+        "user": {
-            "type": "belongsTo",
+			"type": "belongsTo",
-            "model": "Worker",
+			"model": "VnUser",
-            "foreignKey": "workerFk"
+			"foreignKey": "userFk"
-        }
+		}
     }
 }

modules/ticket/front/tracking/index/index.js

@@ -7,15 +7,9 @@ class Controller extends Section {
         this.filter = {
             include: [
                 {
-                    relation: 'worker',
+                    relation: 'user',
                     scope: {
-                        fields: ['id'],
+                        fields: ['name']
-                        include: {
-                            relation: 'user',
-                            scope: {
-                                fields: ['name']
-                            }
-                        }
                     }
                 }, {
                     relation: 'state',

modules/worker/back/methods/worker-dms/removeFile.js

@@ -18,13 +18,35 @@ module.exports = Self => {
         }
     });
 
-    Self.removeFile = async(ctx, id) => {
+    Self.removeFile = async(ctx, dmsFk, options) => {
-        const models = Self.app.models;
+        const myOptions = {};
-        const workerDms = await Self.findById(id);
+        let tx;
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
 
-        await models.Dms.removeFile(ctx, workerDms.dmsFk);
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
 
-        return workerDms.destroy();
+        try {
+            const WorkerDms = await Self.findOne({
+                where: {document: dmsFk}
+            }, myOptions);
+
+            const targetDms = await Self.app.models.Dms.removeFile(ctx, dmsFk, myOptions);
+
+            if (!targetDms || !WorkerDms)
+                throw new UserError('Try again');
+
+            const workerDmsDestroyed = await WorkerDms.destroy(myOptions);
+            if (tx) await tx.commit();
+
+            return workerDmsDestroyed;
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
     };
 };
 

modules/worker/back/methods/worker/uploadFile.js

@@ -47,30 +47,33 @@ module.exports = Self => {
     });
 
     Self.uploadFile = async(ctx, id) => {
-        const models = Self.app.models;
+        const {Dms, WorkerDms} = Self.app.models;
-        const promises = [];
+        const myOptions = {};
-        const tx = await Self.beginTransaction({});
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
 
         try {
-            const options = {transaction: tx};
+            const uploadedFiles = await Dms.uploadFile(ctx, myOptions);
-
+            const promises = uploadedFiles.map(dms =>
-            const uploadedFiles = await models.Dms.uploadFile(ctx, options);
+                WorkerDms.create({
-            uploadedFiles.forEach(dms => {
-                const newWorkerDms = models.WorkerDms.create({
                     workerFk: id,
                     dmsFk: dms.id
-                }, options);
+                }, myOptions));
+            await Promise.all(promises);
 
-                promises.push(newWorkerDms);
+            if (tx) await tx.commit();
-            });
-            const resolvedPromises = await Promise.all(promises);
 
-            await tx.commit();
+            return uploadedFiles;
-
+        } catch (e) {
-            return resolvedPromises;
+            if (tx) await tx.rollback();
-        } catch (err) {
+            throw e;
-            await tx.rollback();
-            throw err;
         }
     };
 };

modules/zone/back/methods/zone/deleteZone.js

@@ -64,7 +64,7 @@ module.exports = Self => {
                     promises.push(models.TicketTracking.create({
                         ticketFk: ticket.id,
                         stateFk: fixingState.id,
-                        workerFk: worker.id
+                        userFk: worker.id
                     }, myOptions));
                 }
             }

modules/zone/back/methods/zone/getEventsFiltered.js

@@ -35,44 +35,39 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        query = `
+        ended = simpleDate(ended);
-        SELECT *
+        started = simpleDate(started);
-            FROM vn.zoneEvent
-            WHERE zoneFk = ?
-                AND ((type = 'indefinitely')
-                    OR  (type = 'day' AND dated BETWEEN ? AND ?)
-                    OR (type = 'range' 
-                        AND (
-                            (started BETWEEN ? AND ?) 
-                            OR 
-                            (ended BETWEEN ? AND ?)
-                            OR
-                            (started <= ? AND ended >= ?)
-                        )
-                    )
-                )
-            ORDER BY type='indefinitely' DESC, type='range' DESC, type='day' DESC;`;
-        const events = await Self.rawSql(query,
-            [zoneFk, started, ended, started, ended, started, ended, started, ended], myOptions);
 
         query = `
-        SELECT e.*
+            SELECT *
-            FROM vn.zoneExclusion e
+                FROM vn.zoneEvent
-            LEFT JOIN vn.zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
+                WHERE zoneFk = ?
-            WHERE e.zoneFk = ?
+                    AND (IFNULL(started, ?) <= ? AND IFNULL(ended,?) >= ?)
-                AND e.dated BETWEEN ? AND ?
+                ORDER BY type='indefinitely' DESC, type='range' DESC, type='day' DESC;`;
-                AND eg.zoneExclusionFk IS NULL;`;
+        const events = await Self.rawSql(query,
+            [zoneFk, started, ended, ended, started], myOptions);
+
+        query = `
+            SELECT e.*
+                FROM vn.zoneExclusion e
+                LEFT JOIN vn.zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
+                WHERE e.zoneFk = ?
+                    AND e.dated BETWEEN ? AND ?
+                    AND eg.zoneExclusionFk IS NULL;`;
         const exclusions = await Self.rawSql(query, [zoneFk, started, ended], myOptions);
 
         query = `
-        SELECT eg.*, e.zoneFk, e.dated, e.created, e.userFk
+            SELECT eg.*, e.zoneFk, e.dated, e.created, e.userFk
-            FROM vn.zoneExclusion e
+                FROM vn.zoneExclusion e
-            LEFT JOIN vn.zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
+                LEFT JOIN vn.zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
-            WHERE e.zoneFk = ?
+                WHERE e.zoneFk = ?
-                AND e.dated BETWEEN ? AND ?
+                    AND e.dated BETWEEN ? AND ?
-                AND eg.zoneExclusionFk IS NOT NULL;`;
+                    AND eg.zoneExclusionFk IS NOT NULL;`;
         const geoExclusions = await Self.rawSql(query, [zoneFk, started, ended], myOptions);
 
         return {events, exclusions, geoExclusions};
     };
+    function simpleDate(date) {
+        return date.toISOString().split('T')[0];
+    }
 };

modules/zone/back/methods/zone/specs/getEventsFiltered.spec.js

@@ -30,7 +30,7 @@ describe('zone getEventsFiltered()', () => {
 
                 const result = await models.Zone.getEventsFiltered(9, today, today, options);
 
-                expect(result.events.length).toEqual(1);
+                expect(result.events.length).toEqual(3);
                 expect(result.exclusions.length).toEqual(0);
 
                 await tx.rollback();
@@ -47,11 +47,12 @@ describe('zone getEventsFiltered()', () => {
                 const options = {transaction: tx};
                 const date = Date.vnNew();
                 date.setFullYear(date.getFullYear() - 2);
-                const dateTomorrow = new Date(date.setDate(date.getDate() + 1));
+                const dateTomorrow = new Date(date);
+                dateTomorrow.setDate(dateTomorrow.getDate() + 1);
 
                 const result = await models.Zone.getEventsFiltered(9, date, dateTomorrow, options);
 
-                expect(result.events.length).toEqual(0);
+                expect(result.events.length).toEqual(1);
                 expect(result.exclusions.length).toEqual(0);
 
                 await tx.rollback();

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "23.50.01",
+    "version": "23.52.01",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",

print/templates/reports/driver-route/sql/tickets.sql

@@ -20,7 +20,7 @@ SELECT
     u.nickName salesPersonName,
     ipkg.itemPackingTypes
 FROM route r
-    LEFT JOIN ticket t ON t.routeFk = r.id
+    JOIN ticket t ON t.routeFk = r.id
     LEFT JOIN address a ON a.id = t.addressFk
     LEFT JOIN client c ON c.id = t.clientFk
     LEFT JOIN worker w ON w.id = client_getSalesPerson(t.clientFk, CURDATE())

print/templates/reports/invoice/invoice.html

@@ -16,6 +16,7 @@
                                 <tr>
                                     <td class="font gray uppercase">{{$t('clientId')}}</td>
                                     <th>{{client.id}}</th>
+
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('invoice')}}</td>
@@ -80,6 +81,9 @@
                             <span>{{formatDate(ticket.shipped, '%d-%m-%Y')}}</span>
                         </div>
                     </div>
+                    <span class="pull-right">
+                        <h2>{{ticket.street}}</h2>
+                    </span>
                     <span id="nickname" class="pull-right">
                         <h2>{{ticket.nickname}}</h2>
                     </span>

print/templates/reports/invoice/sql/tickets.sql

@@ -2,9 +2,12 @@ SELECT
     t.id,
     t.shipped,
     t.nickname,
-    tto.description
+    tto.description,
+    t.addressFk,
+    a.street
 FROM invoiceOut io
     JOIN ticket t ON t.refFk = io.REF
+    JOIN `address` a ON a.id = t.addressFk
     LEFT JOIN observationType ot ON ot.code = 'invoiceOut'
     LEFT JOIN ticketObservation tto ON tto.ticketFk = t.id
         AND tto.observationTypeFk = ot.id