Merge branch 'dev' into 6921_addFromDelivery

Jenkinsfile

@@ -71,6 +71,7 @@ pipeline {
                 stage('Back') {
                     steps {
                         sh 'pnpm install --prefer-offline'
+                        sh 'node node_modules/puppeteer/install.mjs'
                     }
                 }
                 stage('Print') {

back/methods/dms/downloadFile.js

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: `/:id/downloadFile`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.downloadFile = async function(ctx, id) {

back/methods/docuware/download.js

@@ -43,7 +43,7 @@ module.exports = Self => {
             path: `/:id/download`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.download = async function(id, fileCabinet, filter) {

back/methods/image/download.js

@@ -48,7 +48,7 @@ module.exports = Self => {
             path: `/:collection/:size/:id/download`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.download = async function(ctx, collection, size, id) {

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

@@ -28,6 +28,9 @@ describe('Renew Token', () => {
     });
 
     it('should renew token', async() => {
+        const {courtesyTime} = await models.AccessTokenConfig.findOne({
+            fields: ['courtesyTime']
+        });
         const mockDate = new Date(startingTime + 26600000);
         jasmine.clock().mockDate(mockDate);
         const {id} = await models.VnUser.renewToken(ctx);
@@ -35,7 +38,7 @@ describe('Renew Token', () => {
         expect(id).not.toEqual(ctx.req.accessToken.id);
 
         await models.VnUser.logout(ctx.req.accessToken.id);
-        jasmine.clock().tick(70 * 1000);
+        jasmine.clock().tick((courtesyTime + 10) * 1000);
         let tokenNotExists;
         try {
             tokenNotExists = await models.AccessToken.findById(ctx.req.accessToken.id);

db/routines/vn/procedures/collection_assign.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_assign`(
 	vUserFk INT,
 	OUT vCollectionFk INT
 )
-proc:BEGIN   
+BEGIN   
 /**
  * Comprueba si existen colecciones libres que se ajustan
  * al perfil del usuario y le asigna la más antigua.
@@ -16,7 +16,7 @@ proc:BEGIN
 	DECLARE vItemPackingTypeFk VARCHAR(1);
 	DECLARE vWarehouseFk INT;
 	DECLARE vLockName VARCHAR(215);
-	DECLARE vLockTime INT DEFAULT 15;
+	DECLARE vLockTime INT DEFAULT 30;
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
@@ -39,7 +39,6 @@ proc:BEGIN
 
 	IF vHasTooMuchCollections THEN
 		CALL util.throw('Hay colecciones pendientes');
-		LEAVE proc;
 	END IF;
 
 	SELECT warehouseFk, itemPackingTypeFk
@@ -54,7 +53,7 @@ proc:BEGIN
 	);
 
 	IF NOT GET_LOCK(vLockName, vLockTime) THEN
-		LEAVE proc;
+		CALL util.throw(CONCAT('Cannot get lock: ', vLockName));
 	END IF;
 
 	-- Se eliminan las colecciones sin asignar que estan obsoletas

db/routines/vn/procedures/collection_new.sql

@@ -1,6 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_new`(vUserFk INT, OUT vCollectionFk INT)
-proc:BEGIN
+BEGIN
 /**
  * Genera colecciones de tickets sin asignar trabajador.
  *
@@ -26,7 +26,7 @@ proc:BEGIN
 	DECLARE vHasUniqueCollectionTime BOOL;
 	DECLARE vDone INT DEFAULT FALSE;
 	DECLARE vLockName VARCHAR(215);
-	DECLARE vLockTime INT DEFAULT 15;
+	DECLARE vLockTime INT DEFAULT 30;
 	DECLARE vFreeWagonFk INT;
 
 	DECLARE c1 CURSOR FOR
@@ -86,7 +86,7 @@ proc:BEGIN
 	);
 
 	IF NOT GET_LOCK(vLockName, vLockTime) THEN
-		LEAVE proc;
+		CALL util.throw(CONCAT('Cannot get lock: ', vLockName));
 	END IF;
 
 	-- Se prepara el tren, con tantos vagones como sea necesario.

db/routines/vn/procedures/company_getSuppliersDebt.sql

@@ -188,7 +188,7 @@ BEGIN
 		FROM tPendingDuedates vp
 			LEFT JOIN supplier s ON s.id = vp.supplierFk
 			LEFT JOIN client c ON c.fi = s.nif
-			JOIN clientRisk cr ON cr.clientFk = c.id 
+			LEFT JOIN clientRisk cr ON cr.clientFk = c.id 
 				AND cr.companyFk = vp.companyFk
 			LEFT JOIN supplierAccount sa ON sa.supplierFk = s.id
 			LEFT JOIN bankEntity be ON be.id = sa.bankEntityFk

db/routines/vn2008/views/payrollWorker.sql

@@ -1,6 +1,9 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
-	VIEW `vn2008`.`payroll_employee`
+	VIEW `vn2008`.`payroll_employee` AS
-AS SELECT `pw`.`workerFkA3` AS `CodTrabajador`,
+SELECT
-	`pw`.`companyFkA3` AS `codempresa`
+    `pw`.`workerFkA3` AS `CodTrabajador`,
-FROM `vn`.`payrollWorker` `pw`
+    `pw`.`companyFkA3` AS `codempresa`,
+    `pw`.`workerFk` AS `workerFk`
+FROM
+    `vn`.`payrollWorker` `pw`;

front/salix/components/change-password/index.js

@@ -1,5 +1,5 @@
 import ngModule from '../../module';
-const UserError = require('vn-loopback/util/user-error');
+import UserError from 'core/lib/user-error';
 
 export default class Controller {
     constructor($scope, $element, $http, vnApp, $translate, $state, $location) {

front/salix/components/reset-password/index.js

@@ -1,5 +1,5 @@
 import ngModule from '../../module';
-const UserError = require('vn-loopback/util/user-error');
+import UserError from 'core/lib/user-error';
 
 export default class Controller {
     constructor($scope, $element, $http, vnApp, $translate, $state, $location) {

loopback/locale/en.json

@@ -224,5 +224,6 @@
 	"There are not picking tickets": "There are not picking tickets",
 	"ticketCommercial": "The ticket {{ ticket }} for the salesperson {{ salesMan }} is in preparation. (automatically generated message)",
 	"This password can only be changed by the user themselves": "This password can only be changed by the user themselves",
-    "They're not your subordinate": "They're not your subordinate"
+	"They're not your subordinate": "They're not your subordinate",
+	"InvoiceIn is already booked": "InvoiceIn is already booked"
 }

modules/claim/back/methods/claim/claimPickupPdf.js

@@ -35,7 +35,7 @@ module.exports = Self => {
             path: '/:id/claim-pickup-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.claimPickupPdf = (ctx, id) => Self.printReport(ctx, id, 'claim-pickup-order');

modules/claim/back/methods/claim/downloadFile.js

@@ -33,7 +33,7 @@ module.exports = Self => {
             path: `/:id/downloadFile`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.downloadFile = async function(ctx, id) {

modules/client/back/methods/client/campaignMetricsPdf.js

@@ -46,7 +46,7 @@ module.exports = Self => {
             path: '/:id/campaign-metrics-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'campaign-metrics');

modules/entry/back/methods/entry/entryOrderPdf.js

@@ -34,7 +34,7 @@ module.exports = Self => {
             path: '/:id/entry-order-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.entryOrderPdf = (ctx, id) => Self.printReport(ctx, id, 'entry-order');

modules/invoiceOut/back/methods/invoiceOut/download.js

@@ -32,7 +32,7 @@ module.exports = Self => {
             path: '/:id/download',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.download = async function(ctx, id, options) {

modules/invoiceOut/back/methods/invoiceOut/downloadZip.js

@@ -32,7 +32,7 @@ module.exports = Self => {
             path: '/downloadZip',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.downloadZip = async function(ctx, ids, options) {

modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js

@@ -35,7 +35,7 @@ module.exports = Self => {
             path: '/:reference/exportation-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.exportationPdf = (ctx, reference) => Self.printReport(ctx, reference, 'exportation');

modules/invoiceOut/back/methods/invoiceOut/invoiceCsv.js

@@ -38,7 +38,7 @@ module.exports = Self => {
             path: '/:reference/invoice-csv',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.invoiceCsv = async reference => {

modules/invoiceOut/back/methods/invoiceOut/negativeBasesCsv.js

@@ -40,7 +40,7 @@ module.exports = Self => {
             path: '/negativeBasesCsv',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.negativeBasesCsv = async(ctx, options) => {

modules/item/back/methods/item-image-queue/download.js

@@ -11,7 +11,7 @@ module.exports = Self => {
             path: `/download`,
             verb: 'POST',
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.download = async() => {

modules/route/back/methods/route/cmr.js

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: '/:id/cmr',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.cmr = (ctx, id) => Self.printReport(ctx, id, 'cmr');

modules/route/back/methods/route/downloadCmrsZip.js

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: '/downloadCmrsZip',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.downloadCmrsZip = async function(ctx, ids, options) {

modules/route/back/methods/route/downloadZip.js

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: '/downloadZip',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.downloadZip = async function(ctx, id, options) {

modules/route/back/methods/route/driverRoutePdf.js

@@ -35,7 +35,7 @@ module.exports = Self => {
             path: '/:id/driver-route-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
 
     });
 

modules/supplier/back/methods/supplier/campaignMetricsPdf.js

@@ -45,7 +45,7 @@ module.exports = Self => {
             path: '/:id/campaign-metrics-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'supplier-campaign-metrics');

modules/ticket/back/methods/ticket/deliveryNoteCsv.js

@@ -38,7 +38,7 @@ module.exports = Self => {
             path: '/:id/delivery-note-csv',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.deliveryNoteCsv = async id => {

modules/ticket/back/methods/ticket/deliveryNotePdf.js

@@ -42,7 +42,7 @@ module.exports = Self => {
             path: '/:id/delivery-note-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.deliveryNotePdf = (ctx, id) => Self.printReport(ctx, id, 'delivery-note');

modules/ticket/front/main/index.js

@@ -1,6 +1,6 @@
 import ngModule from '../module';
 import ModuleMain from 'salix/components/module-main';
-const UserError = require('vn-loopback/util/user-error');
+import UserError from 'core/lib/user-error';
 
 export default class Ticket extends ModuleMain {
     fetchParams($params) {

modules/travel/back/methods/travel/extraCommunityPdf.js

@@ -79,7 +79,7 @@ module.exports = Self => {
             path: '/extra-community-pdf',
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.extraCommunityPdf = ctx => Self.printReport(ctx, null, 'extra-community');

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

@@ -30,7 +30,7 @@ module.exports = Self => {
             path: `/:id/downloadFile`,
             verb: 'GET'
         },
-        accessScopes: ['read:multimedia']
+        accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
     Self.downloadFile = async function(ctx, id) {

modules/worker/back/models/worker.json

@@ -99,7 +99,7 @@
                 {
                     "relation": "user",
                     "scope": {
-                        "fields": ["email", "name", "nickname", "roleFk"],
+                        "fields": ["email", "name", "nickname", "roleFk", "emailVerified"],
                         "include": [
                             {
                                 "relation": "role",

modules/worker/front/descriptor/index.js

@@ -1,6 +1,6 @@
 import ngModule from '../module';
 import Descriptor from 'salix/components/descriptor';
-const UserError = require('vn-loopback/util/user-error');
+import UserError from 'core/lib/user-error';
 class Controller extends Descriptor {
     constructor($element, $, $rootScope) {
         super($element, $);