Merge branch 'dev' into 6451_insomnia

.vscode/settings.json

@@ -3,7 +3,7 @@
     // Carácter predeterminado de final de línea.
     "files.eol": "\n",
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+        "source.fixAll.eslint": "explicit"
     },
     "search.useIgnoreFiles": false,
     "editor.defaultFormatter": "dbaeumer.vscode-eslint",
@@ -11,6 +11,9 @@
     "[javascript]": {
         "editor.defaultFormatter": "dbaeumer.vscode-eslint"
     },
+    "[json]": {
+        "editor.defaultFormatter": "vscode.json-language-features"
+    },
     "cSpell.words": [
         "salix",
         "fdescribe"

CHANGELOG.md

@@ -5,7 +5,13 @@ 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
+## [2402.01] - 2024-01-11
+
+### Added
+### Changed
+### Fixed
+
+## [2400.01] - 2024-01-04
 
 ### Added
 ### Changed
@@ -13,9 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [2350.01] - 2023-12-14
 
-### Added
+### Características Añadidas 🆕
-### Changed
+- **Tickets → Expediciones:** Añadido soporte para Viaexpress
-### Fixed
 
 
 ## [2348.01] - 2023-11-30

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/methods/docuware/specs/upload.spec.js

@@ -24,15 +24,40 @@ describe('docuware upload()', () => {
     });
 
     it('should try upload file', async() => {
+        const tx = await models.Docuware.beginTransaction({});
         spyOn(ticketModel, 'deliveryNotePdf').and.returnValue(new Promise(resolve => resolve({})));
 
         let error;
         try {
-            await models.Docuware.upload(ctx, ticketIds, fileCabinetName);
+            const options = {transaction: tx};
+            const user = await models.UserConfig.findById(userId, null, options);
+            await user.updateAttribute('tabletFk', 'Tablet1');
+            await models.Docuware.upload(ctx, ticketIds, fileCabinetName, options);
+
+            await tx.rollback();
         } catch (e) {
-            error = e.message;
+            error = e;
+            await tx.rollback();
         }
 
-        expect(error).toEqual('Action not allowed on the test environment');
+        expect(error.message).toEqual('Action not allowed on the test environment');
+    });
+
+    it('should throw error when not have tablet assigned', async() => {
+        const tx = await models.Docuware.beginTransaction({});
+        spyOn(ticketModel, 'deliveryNotePdf').and.returnValue(new Promise(resolve => resolve({})));
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            await models.Docuware.upload(ctx, ticketIds, fileCabinetName, options);
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error.message).toEqual('This user does not have an assigned tablet');
     });
 });

back/methods/docuware/upload.js

@@ -29,12 +29,24 @@ module.exports = Self => {
         }
     });
 
-    Self.upload = async function(ctx, ticketIds, fileCabinet) {
+    Self.upload = async function(ctx, ticketIds, fileCabinet, options) {
         delete ctx.args.ticketIds;
         const models = Self.app.models;
         const action = 'store';
 
-        const options = await Self.getOptions();
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const userConfig = await models.UserConfig.findById(ctx.req.accessToken.userId, {
+            fields: ['tabletFk']
+        }, myOptions);
+
+        if (!userConfig?.tabletFk)
+            throw new UserError('This user does not have an assigned tablet');
+
+        const docuwareOptions = await Self.getOptions();
         const fileCabinetId = await Self.getFileCabinet(fileCabinet);
         const dialogId = await Self.getDialog(fileCabinet, action, fileCabinetId);
 
@@ -45,7 +57,7 @@ module.exports = Self => {
             const deliveryNote = await models.Ticket.deliveryNotePdf(ctx, {
                 id,
                 type: 'deliveryNote'
-            });
+            }, myOptions);
             // get ticket data
             const ticket = await models.Ticket.findById(id, {
                 include: [{
@@ -54,7 +66,7 @@ module.exports = Self => {
                         fields: ['id', 'name', 'fi']
                     }
                 }]
-            });
+            }, myOptions);
 
             // upload file
             const templateJson = {
@@ -102,7 +114,7 @@ module.exports = Self => {
                     {
                         'FieldName': 'FILTRO_TABLET',
                         'ItemElementName': 'string',
-                        'Item': 'Tablet1',
+                        'Item': userConfig.tabletFk,
                     }
                 ]
             };
@@ -116,11 +128,11 @@ module.exports = Self => {
                 const deleteJson = {
                     'Field': [{'FieldName': 'ESTADO', 'Item': 'Pendiente eliminar', 'ItemElementName': 'String'}]
                 };
-                const deleteUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents/${docuwareFile.id}/Fields`;
+                const deleteUri = `${docuwareOptions.url}/FileCabinets/${fileCabinetId}/Documents/${docuwareFile.id}/Fields`;
-                await axios.put(deleteUri, deleteJson, options.headers);
+                await axios.put(deleteUri, deleteJson, docuwareOptions.headers);
             }
 
-            const uploadUri = `${options.url}/FileCabinets/${fileCabinetId}/Documents?StoreDialogId=${dialogId}`;
+            const uploadUri = `${docuwareOptions.url}/FileCabinets/${fileCabinetId}/Documents?StoreDialogId=${dialogId}`;
             const FormData = require('form-data');
             const data = new FormData();
 
@@ -130,7 +142,7 @@ module.exports = Self => {
                 headers: {
                     'Content-Type': 'multipart/form-data',
                     'X-File-ModifiedDate': Date.vnNew(),
-                    'Cookie': options.headers.headers.Cookie,
+                    'Cookie': docuwareOptions.headers.headers.Cookie,
                     ...data.getHeaders()
                 },
             };
@@ -141,11 +153,11 @@ module.exports = Self => {
                 const $t = ctx.req.__;
                 const message = $t('Failed to upload delivery note', {id});
                 if (uploaded.length)
-                    await models.TicketTracking.setDelivered(ctx, uploaded);
+                    await models.TicketTracking.setDelivered(ctx, uploaded, myOptions);
                 throw new UserError(message);
             }
             uploaded.push(id);
         }
-        return models.TicketTracking.setDelivered(ctx, ticketIds);
+        return models.TicketTracking.setDelivered(ctx, ticketIds, myOptions);
     };
 };

back/methods/vn-user/renew-token.js

@@ -1,5 +1,14 @@
 const UserError = require('vn-loopback/util/user-error');
+const {models} = require('vn-loopback/server/server');
 
+const handlePromiseLogout = (Self, {id}, courtesyTime) => {
+    new Promise(res => {
+        setTimeout(() => {
+            res(Self.logout(id));
+        }
+        , courtesyTime * 1000);
+    });
+};
 module.exports = Self => {
     Self.remoteMethodCtx('renewToken', {
         description: 'Checks if the token has more than renewPeriod seconds to live and if so, renews it',
@@ -16,23 +25,32 @@ module.exports = Self => {
     });
 
     Self.renewToken = async function(ctx) {
-        const models = Self.app.models;
+        const {accessToken: token} = ctx.req;
-        const token = ctx.req.accessToken;
 
-        const now = new Date();
+        // Check if current token is valid
-        const differenceMilliseconds = now - token.created;
+        const isValid = await validateToken(token);
-        const differenceSeconds = Math.floor(differenceMilliseconds / 1000);
+        if (isValid)
+            return token;
 
-        const fields = ['renewPeriod', 'courtesyTime'];
+        const {courtesyTime} = await models.AccessTokenConfig.findOne({fields: ['courtesyTime']});
-        const accessTokenConfig = await models.AccessTokenConfig.findOne({fields});
 
-        if (differenceSeconds < accessTokenConfig.renewPeriod - accessTokenConfig.courtesyTime)
+        // Schedule to remove current token
-            throw new UserError(`The renew period has not been exceeded`, 'periodNotExceeded');
+        handlePromiseLogout(Self, token, courtesyTime);
 
-        await Self.logout(token.id);
+        // Create new accessToken
         const user = await Self.findById(token.userId);
         const accessToken = await user.createAccessToken();
 
         return {id: accessToken.id, ttl: accessToken.ttl};
     };
+
+    async function validateToken(token) {
+        const accessTokenConfig = await models.AccessTokenConfig.findOne({fields: ['renewPeriod', 'courtesyTime']});
+        const now = Date.now();
+        const differenceMilliseconds = now - token.created;
+        const differenceSeconds = Math.floor(differenceMilliseconds / 1000);
+        const isValid = differenceSeconds < accessTokenConfig.renewPeriod - accessTokenConfig.courtesyTime;
+
+        return isValid;
+    }
 };

back/methods/vn-user/specs/renew-token.spec.js

@@ -0,0 +1,51 @@
+const {models} = require('vn-loopback/server/server');
+describe('Renew Token', () => {
+    const startingTime = Date.now();
+    let ctx = null;
+    beforeAll(async() => {
+        const unAuthCtx = {
+            req: {
+                headers: {},
+                connection: {
+                    remoteAddress: '127.0.0.1'
+                },
+                getLocale: () => 'en'
+            },
+            args: {}
+        };
+        let login = await models.VnUser.signIn(unAuthCtx, 'salesAssistant', 'nightmare');
+        let accessToken = await models.AccessToken.findById(login.token);
+        ctx = {req: {accessToken: accessToken}};
+    });
+
+    beforeEach(() => {
+        jasmine.clock().install();
+        jasmine.clock().mockDate(new Date(startingTime));
+    });
+
+    afterEach(() => {
+        jasmine.clock().uninstall();
+    });
+
+    it('should renew token', async() => {
+        const mockDate = new Date(startingTime + 26600000);
+        jasmine.clock().mockDate(mockDate);
+        console.log(startingTime, mockDate)
+        const {id} = await models.VnUser.renewToken(ctx);
+
+        expect(id).not.toEqual(ctx.req.accessToken.id);
+    });
+
+    it('NOT should renew', async() => {
+        let error;
+        let response;
+        try {
+            response = await models.VnUser.renewToken(ctx);
+        } catch (e) {
+            error = e;
+        }
+
+        expect(error).toBeUndefined();
+        expect(response.id).toEqual(ctx.req.accessToken.id);
+    });
+});

back/methods/vn-user/specs/sign-in.spec.js

@@ -20,10 +20,7 @@ describe('VnUser Sign-in()', () => {
             let ctx = {req: {accessToken: accessToken}};
             let signInLog = await SignInLog.find({where: {token: accessToken.id}});
 
-            expect(signInLog.length).toEqual(1);
+            expect(signInLog.length).toEqual(0);
-            expect(signInLog[0].userFk).toEqual(accessToken.userId);
-            expect(signInLog[0].owner).toEqual(true);
-            expect(login.token).toBeDefined();
 
             await VnUser.logout(ctx.req.accessToken.id);
         });

back/methods/vn-user/validate-token.js

@@ -1,17 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethod('validateToken', {
-        description: 'Validates the current logged user token',
-        returns: {
-            type: 'Boolean',
-            root: true
-        },
-        http: {
-            path: `/validateToken`,
-            verb: 'GET'
-        }
-    });
-
-    Self.validateToken = async function() {
-        return true;
-    };
-};

back/models/docuwareTablet.json

@@ -0,0 +1,17 @@
+{
+	"name": "docuwareTablet",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "docuwareTablet"
+		}
+	},
+	"properties": {
+        "tablet": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        }
+    }
+}

back/models/user-config.json

@@ -26,6 +26,9 @@
         },
         "darkMode": {
             "type": "boolean"
+        },
+        "tabletFk": {
+            "type": "string"
         }
     },
     "relations": {
@@ -43,6 +46,11 @@
             "type": "belongsTo",
             "model": "VnUser",
             "foreignKey": "userFk"
+        },
+        "Tablet": {
+            "type": "belongsTo",
+            "model": "docuwareTablet",
+            "foreignKey": "tabletFk"
         }
     }
 }

back/models/vn-user.js

@@ -10,7 +10,6 @@ module.exports = function(Self) {
     require('../methods/vn-user/sign-in')(Self);
     require('../methods/vn-user/acl')(Self);
     require('../methods/vn-user/recover-password')(Self);
-    require('../methods/vn-user/validate-token')(Self);
     require('../methods/vn-user/privileges')(Self);
     require('../methods/vn-user/validate-auth')(Self);
     require('../methods/vn-user/renew-token')(Self);
@@ -135,6 +134,7 @@ module.exports = function(Self) {
     Self.signInValidate = async(user, userToken, token, ctx) => {
         const [[key, value]] = Object.entries(Self.userUses(user));
         const isOwner = Self.rawSql(`SELECT ? = ? `, [userToken[key], value]);
+        if (!isOwner) {
             await Self.app.models.SignInLog.create({
                 userName: user,
                 token: token.id,
@@ -142,8 +142,8 @@ module.exports = function(Self) {
                 ip: ctx.req.ip,
                 owner: isOwner
             });
-        if (!isOwner)
         throw new UserError('Try again');
+        }
     };
 
     /**

back/models/vn-user.json

@@ -102,13 +102,6 @@
             "principalType": "ROLE",
             "principalId": "$everyone",
             "permission": "ALLOW"
-        },
-		{
-            "property": "validateToken",
-			"accessType": "EXECUTE",
-			"principalType": "ROLE",
-			"principalId": "$authenticated",
-			"permission": "ALLOW"
         },
 		{
             "property": "validateAuth",

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/234601/00-updateCourtesyTime.sql

@@ -0,0 +1,4 @@
+--  Auto-generated SQL script #202311061003
+UPDATE salix.accessTokenConfig
+	SET courtesyTime=60
+	WHERE id=1;

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/240001/00-alterTable.sql

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

db/changes/240001/00-clientCreditLimitToRoleCreditLimit.sql

@@ -0,0 +1,4 @@
+RENAME TABLE `vn`.`clientCreditLimit` TO `vn`.`roleCreditLimit`;
+ALTER TABLE `vn`.`roleCreditLimit` 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/240001/00-truncate-where-signInLog.sql

@@ -0,0 +1 @@
+DELETE FROM `account`.`signInLog` where owner <> FALSE

db/changes/240001/02-views.sql

@@ -0,0 +1,56 @@
+CREATE SCHEMA IF NOT EXISTS `vn2008`;
+USE `vn`;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `ticketState`
+AS SELECT `tt`.`created` AS `updated`,
+	`tt`.`stateFk` AS `stateFk`,
+	`tt`.`userFk` AS `workerFk`,
+	`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 (
+		(
+			`ticketLastState` `tls`
+			JOIN `ticketTracking` `tt` ON(`tt`.`id` = `tls`.`ticketTrackingFk`)
+		)
+		JOIN `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 DEFINER=`root`@`localhost`
+    SQL SECURITY DEFINER
+    VIEW `ticketStateToday`
+AS SELECT
+    `ts`.`ticket` AS `ticket`,
+    `ts`.`state` AS `state`,
+    `ts`.`productionOrder` AS `productionOrder`,
+    `ts`.`alertLevel` AS `alertLevel`,
+    `ts`.`worker` AS `worker`,
+    `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/changes/240201/00-tabletDocuware.sql

@@ -0,0 +1,10 @@
+-- vn.docuwareTablet definition
+
+CREATE TABLE `vn`.`docuwareTablet` (
+  `tablet` varchar(100) NOT NULL PRIMARY KEY,
+  `description` varchar(255) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE `vn`.`userConfig`
+ADD COLUMN tabletFk varchar(100) DEFAULT NULL,
+ADD FOREIGN KEY (tabletFk) REFERENCES `vn`.`docuwareTablet`(tablet);

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'),
@@ -2970,9 +2967,9 @@ INSERT INTO `vn`.`wagonTypeTray` (`id`, `typeFk`, `height`, `colorFk`)
         (2, 1, 50, 2),
         (3, 1, 0, 3);
 
-INSERT INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `renewInterval`)
+INSERT INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `courtesyTime`, `renewInterval`)
     VALUES
-        (1, 21600, 300);
+        (1, 21600, 60, 300);
 
 INSERT INTO `vn`.`travelConfig` (`id`, `warehouseInFk`, `warehouseOutFk`, `agencyFk`, `companyFk`)
     VALUES
@@ -3012,3 +3009,8 @@ INSERT INTO `vn`.`invoiceCorrectionType` (`id`, `description`)
         (1, 'Error in VAT calculation'),
         (2, 'Error in sales details'),
         (3, 'Error in customer data');
+
+INSERT INTO `vn`.`docuwareTablet` (`tablet`,`description`)
+	VALUES
+        ('Tablet1','Jarvis tablet'),
+	    ('Tablet2','Avengers tablet');

db/dump/structure.sql

@@ -26391,6 +26391,7 @@ CREATE TABLE `cplusCorrectingType` (
 ) ENGINE=InnoDBDEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+
 --
 -- Table structure for table `cplusRectificationType`
 --

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/core/services/token.js

@@ -82,7 +82,7 @@ export default class Token {
             if (!data) return;
             this.renewPeriod = data.renewPeriod;
             this.stopRenewer();
-            this.inservalId = setInterval(() => this.checkValidity(), data.renewInterval * 1000);
+            this.intervalId = setInterval(() => this.checkValidity(), data.renewInterval * 1000);
         });
     }
 
@@ -103,17 +103,13 @@ export default class Token {
                 const token = res.data;
                 this.set(token.id, now, token.ttl, this.remember);
             })
-            .catch(res => {
-                if (res.data?.error?.code !== 'periodNotExceeded')
-                    throw res;
-            })
             .finally(() => {
                 this.checking = false;
             });
     }
 
     stopRenewer() {
-        clearInterval(this.inservalId);
+        clearInterval(this.intervalId);
     }
 }
 Token.$inject = ['vnInterceptor', '$http', '$rootScope'];

front/salix/locale/es.yml

@@ -18,7 +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
+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 = exception.data?.error?.message || 'Access denied';
+                messageT = exception.data?.error?.message || 'Access Denied';
                 break;
             case 502:
                 messageT = 'It seems that the server has fall down';

loopback/locale/en.json

@@ -183,7 +183,7 @@
 	"Social name should be uppercase": "Social name should be uppercase",
 	"Street should be uppercase": "Street should be uppercase",
 	"You don't have enough privileges.": "You don't have enough privileges.",
-	"This ticket is locked.": "This ticket is locked.",
+	"This ticket is locked": "This ticket is locked",
 	"This ticket is not editable.": "This ticket is not editable.",
 	"The ticket doesn't exist.": "The ticket doesn't exist.",
 	"The sales do not exists": "The sales do not exists",

loopback/locale/es.json

@@ -312,7 +312,7 @@
 	"You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
 	"This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",
 	"You don't have enough privileges.": "No tienes suficientes permisos.",
-	"This ticket is locked.": "Este ticket está bloqueado.",
+	"This ticket is locked": "Este ticket está bloqueado.",
 	"This ticket is not editable.": "Este ticket no es editable.",
 	"The ticket doesn't exist.": "No existe el ticket.",
 	"Social name should be uppercase": "La razón social debe ir en mayúscula",
@@ -329,5 +329,6 @@
 	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
 	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
 	"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
-	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}"
+	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
+    "This user does not have an assigned tablet": "Este usuario no tiene tablet asignada"
 }

loopback/server/boot/date.js

@@ -1,6 +1,5 @@
 module.exports = () => {
-    Date.vnUTC = () => {
+    Date.vnUTC = (env = process.env.NODE_ENV) => {
-        const env = process.env.NODE_ENV;
         if (!env || env === 'development')
             return new Date(Date.UTC(2001, 0, 1, 11));
 

modules/account/back/methods/account/specs/change-password.spec.js

@@ -2,7 +2,7 @@ const {models} = require('vn-loopback/server/server');
 
 describe('account changePassword()', () => {
     const userId = 70;
-    const unauthCtx = {
+    const unAuthCtx = {
         req: {
             headers: {},
             connection: {
@@ -79,7 +79,7 @@ describe('account changePassword()', () => {
                         passExpired: yesterday
                     }
                     , options);
-                await models.VnUser.signIn(unauthCtx, 'trainee', 'nightmare', options);
+                await models.VnUser.signIn(unAuthCtx, 'trainee', 'nightmare', options);
             } catch (e) {
                 if (e.message != 'Pass expired')
                     throw e;

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);
-            if (!hasWriteRole)
-                throw new UserError(`You don't have enough privileges`);
-
-            // Upload file to temporary path
-            const tempContainer = await TempContainer.container('dms');
-            const uploaded = await TempContainer.upload(tempContainer.name, ctx.req, ctx.result, fileOptions);
-            const files = Object.values(uploaded.files).map(file => {
-                return file[0];
-            });
-
-            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 => {
+        try {
-                const newClaimDms = models.ClaimDms.create({
+            const uploadedFiles = await Dms.uploadFile(ctx, myOptions);
+
+            const promises = uploadedFiles.map(dms => ClaimDms.create({
                 claimFk: id,
                 dmsFk: dms.id
-                }, myOptions);
+            }, myOptions));
-
+            await Promise.all(promises);
-                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/locale/route/en.yml

@@ -17,3 +17,18 @@ columns:
     agencyModeFk: agency
     routeFk: route
     zoneFk: zone
+    name: name
+    beachFk: beach
+    ticketPacked: tickets packed
+    ticketFree: tickets free
+    ticketProduction: tickets production
+    packages: packages
+    note: note
+    dated: dated
+    dockFk: dock
+    priority: priority
+    etd: etd
+    expeditionTruckFk: truck
+    m3boxes: m3 boxes
+    bufferFk: buffer
+    isPickingAllowed: is picking allowed

modules/route/back/locale/route/es.yml

@@ -17,3 +17,18 @@ columns:
     agencyModeFk: agencia
     routeFk: ruta
     zoneFk: zona
+    name: nombre
+    beachFk: playa
+    ticketPacked: tickets encajados
+    ticketFree: tickets libres
+    ticketProduction: tickets producción
+    packages: paquetes
+    note: nota
+    dated: fecha
+    dockFk: muelle
+    priority: prioridad
+    etd: etd
+    expeditionTruckFk: camión
+    m3boxes: m3 cajas
+    bufferFk: buffer
+    isPickingAllowed: está permitido recoger

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/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/isEditableOrThrow.js

@@ -41,7 +41,7 @@ module.exports = Self => {
             throw new ForbiddenError(`This ticket is not editable.`);
 
         if (isLocked && !isWeekly)
-            throw new ForbiddenError(`This ticket is locked.`);
+            throw new ForbiddenError(`This ticket is locked`);
 
         if (isWeekly && !canEditWeeklyTicket)
             throw new ForbiddenError(`You don't have enough privileges.`);

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

@@ -89,6 +89,6 @@ describe('ticket addSale()', () => {
             error = e;
         }
 
-        expect(error.message).toEqual(`This ticket is locked.`);
+        expect(error.message).toEqual(`This ticket is locked`);
     });
 });

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

@@ -40,7 +40,7 @@ describe('ticket isEditableOrThrow()', () => {
         expect(error.message).toEqual(`This ticket is not editable.`);
     });
 
-    it('should throw an error  as this ticket is locked.', async() => {
+    it('should throw an error  as This ticket is locked', async() => {
         const tx = await models.Ticket.beginTransaction({});
         let error;
         try {
@@ -57,7 +57,7 @@ describe('ticket isEditableOrThrow()', () => {
             await tx.rollback();
         }
 
-        expect(error.message).toEqual(`This ticket is locked.`);
+        expect(error.message).toEqual(`This ticket is locked`);
     });
 
     it('should throw an error as you do not have enough privileges.', async() => {

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

@@ -39,6 +39,6 @@ describe('ticket recalculateComponents()', () => {
             error = e;
         }
 
-        expect(error).toEqual(new ForbiddenError(`This ticket is locked.`));
+        expect(error).toEqual(new ForbiddenError(`This ticket is locked`));
     });
 });

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/specs/transferClient.spec.js

@@ -23,7 +23,7 @@ describe('Ticket transferClient()', () => {
             error = e;
         }
 
-        expect(error.message).toEqual(`This ticket is locked.`);
+        expect(error.message).toEqual(`This ticket is locked`);
     });
 
     it('should be assigned a different clientFk', async() => {

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({
+            const promises = uploadedFiles.map(dms => TicketDms.create({
                 ticketFk: id,
                 dmsFk: dms.id
-                }, myOptions);
+            }, myOptions));
 
-                promises.push(newTicketDms);
+            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/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,9 +33,9 @@
             "model": "State",
             "foreignKey": "stateFk"
         },
-        "worker": {
+        "user": {
             "type": "belongsTo",
-            "model": "Worker",
+            "model": "VnUser",
             "foreignKey": "workerFk"
         }
     }

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

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

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

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

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));
                 }
             }

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "salix-back",
-    "version": "23.50.01",
+    "version": "24.02.01",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "salix-back",
-            "version": "23.50.01",
+            "version": "24.02.01",
             "license": "GPL-3.0",
             "dependencies": {
                 "axios": "^1.2.2",

package.json

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

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