Merge branch 'dev' into 6693-revisarTriggersPendientes

Reviewed-on: #2026
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>

back/tests.js

@@ -17,7 +17,8 @@ const opts = getopts(process.argv.slice(2), {
 
 let server;
 const PARALLEL = false;
-const TIMEOUT = 900000;
+const SETUP_TIMEOUT = 15 * 60 * 1000;
+const SPEC_TIMEOUT = 30 * 1000;
 
 process.on('exit', teardown);
 process.on('uncaughtException', onError);
@@ -74,9 +75,9 @@ async function test() {
     let runner;
     const config = {
         globalSetup: setup,
-        globalSetupTimeout: TIMEOUT,
+        globalSetupTimeout: SETUP_TIMEOUT,
         globalTeardown: teardown,
-        globalTeardownTimeout: TIMEOUT,
+        globalTeardownTimeout: SETUP_TIMEOUT,
         spec_dir: '.',
         spec_files: [
             'back/**/*[sS]pec.js',
@@ -111,7 +112,7 @@ async function test() {
         runner.addReporter(new JunitReporter.JUnitXmlReporter());
     }
     if (opts.ci)
-        runner.jasmine.DEFAULT_TIMEOUT_INTERVAL = TIMEOUT;
+        runner.jasmine.DEFAULT_TIMEOUT_INTERVAL = SPEC_TIMEOUT;
 
     // runner.loadConfigFile('back/jasmine.json');
     runner.loadConfig(config);

db/routines/vn2008/procedures/recobro_credito.sql

@@ -8,12 +8,6 @@ BEGIN
 	END;
 
 	START TRANSACTION;
-	INSERT INTO vn.clientCredit(clientFk, amount)
-		SELECT c.id, 0
-			FROM vn.`client` c
-				JOIN vn.payMethod pm ON pm.id = c.payMethodFk
-			WHERE c.credit <> 0 AND pm.`code` = 'card'; 
-
 	UPDATE vn.`client` c
 			JOIN vn.payMethod pm ON pm.id = c.payMethodFk
 		SET credit = 0
@@ -45,10 +39,6 @@ BEGIN
 		JOIN clientes_credit USING(Id_Cliente)
 			SET Clientes.Credito = newCredit;
 	
-	INSERT INTO credit(Id_Cliente, amount, Id_Trabajador)
-		SELECT Id_Cliente, newCredit, NULL
-			FROM clientes_credit;
-	
 	DROP TEMPORARY TABLE clientes_credit;
 	COMMIT;
 END$$

db/routines/vn2008/views/credit.sql

@@ -0,0 +1,9 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`credit`
+AS SELECT `c`.`id` AS `id`,
+	`c`.`clientFk` AS `Id_Cliente`,
+	`c`.`workerFk` AS `Id_Trabajador`,
+	`c`.`amount` AS `amount`,
+	`c`.`created` AS `odbc_date`
+FROM `vn`.`clientCredit` `c`

db/versions/10883-azureRuscus/00-firstScript.sql

@@ -0,0 +1,6 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`credit`AS
+SELECT 1; 
+
+GRANT SELECT ON TABLE vn2008.credit TO financialBoss;

db/versions/10884-maroonGerbera/00-firstScript.sql

@@ -0,0 +1 @@
+DROP TABLE vn.timeControlDevice;

loopback/locale/es.json

@@ -342,5 +342,6 @@
 	"Bank entity must be specified": "La entidad bancaria es obligatoria",
 	"An email is necessary": "Es necesario un email",
 	"You cannot update these fields": "No puedes actualizar estos campos",
-	"CountryFK cannot be empty": "El país no puede estar vacío"
+	"CountryFK cannot be empty": "El país no puede estar vacío",
+	"Cmr file does not exist": "El archivo del cmr no existe"
 }

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

@@ -1,5 +1,5 @@
 
-const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const {ParameterizedSQL} = require('loopback-connector');
 
 module.exports = Self => {
     Self.remoteMethod('getTickets', {
@@ -83,13 +83,15 @@ module.exports = Self => {
 
         const where = filter.where;
         where['r.id'] = filter.id;
+        where.and = [{or: [
+            {'t.packages': {gt: 0}},
+            {and: [{'ot.code': 'delivery'}, {'tob.observationTypeFk': {neq: null}}]}
+        ]}];
 
         stmt.merge(conn.makeWhere(filter.where));
         stmt.merge(conn.makeGroupBy('t.id'));
         stmt.merge(conn.makeOrderBy(filter.order));
 
-        const tickets = await conn.executeStmt(stmt, myOptions);
-
-        return tickets;
+        return conn.executeStmt(stmt, myOptions);
     };
 };

modules/ticket/back/methods/ticket/saveSign.js

@@ -34,8 +34,7 @@ module.exports = Self => {
         const myOptions = {userId: ctx.req.accessToken.userId};
         let tx;
         let ticket;
-        let dms;
-        let gestDocCreated;
+        let externalTickets = [];
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -86,12 +85,11 @@ module.exports = Self => {
                 contentType: 'image/png',
                 hasFile: true
             };
-            dms = await models.Dms.uploadFile(ctxUploadFile, myOptions);
-            gestDocCreated = true;
+            const dms = await models.Dms.uploadFile(ctxUploadFile, myOptions);
+            await models.TicketDms.create({ticketFk: ticket.id, dmsFk: dms[0].id}, myOptions);
         }
 
         try {
-            let externalTickets = [];
             for (const ticketId of tickets) {
                 ticket = await models.Ticket.findById(ticketId, {
                     include: [{
@@ -137,9 +135,8 @@ module.exports = Self => {
                     throw new UserError('Ticket is already signed');
 
                 if (location) await setLocation(ticketId);
-                if (!await hasSignDms(ticketId) && !gestDocCreated)
+                if (!await hasSignDms(ticketId))
                     await createGestDoc(ticketId);
-                await models.TicketDms.create({ticketFk: ticketId, dmsFk: dms[0].id}, myOptions);
                 await ticket.updateAttribute('isSigned', true, myOptions);
 
                 const deliveryState = await models.State.findOne({
@@ -157,11 +154,10 @@ module.exports = Self => {
                 }
             }
             if (tx) await tx.commit();
-            await models.Route.cmrEmail(ctx, externalTickets);
-            return;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;
         }
+        await models.Route.cmrEmail(ctx, externalTickets);
     };
 };