db/routines/vn/functions/entry_getCommission.sql

@@ -11,6 +11,7 @@ BEGIN
 	DECLARE vCurrentCommission INT;
 	DECLARE vIsNotEUR INT;
 	DECLARE vLastEntryFk INT;
+	DECLARE vLanded INT;
 
 	SELECT count(*) INTO vIsNotEUR
 			FROM currency c
@@ -26,23 +27,25 @@ BEGIN
 
 		RETURN IFNULL(vCommission, 0);
 	ELSE
+		SELECT landed INTO vLanded
+			FROM travel
+			WHERE id = vTravelFk;
+
 		SELECT e.id INTO vLastEntryFk
 			FROM `entry` e
 				JOIN travel tr ON tr.id = e.travelFk
 			WHERE e.supplierFk = vSupplierFk
-				ORDER BY tr.landed DESC
+			ORDER BY (vLanded <= tr.landed), tr.landed DESC
 			LIMIT 1;
 
 		IF vLastEntryFk THEN
 			SELECT commission INTO vCurrentCommission
 				FROM `entry`
 				WHERE id = vLastEntryFk;
-
 		ELSE
 			SELECT commission INTO vCurrentCommission
 				FROM supplier s
 				WHERE s.id = vSupplierFk;
-
 		END IF;
 
 		RETURN vCurrentCommission;

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

@@ -54,9 +54,17 @@ module.exports = Self => {
                 throw new UserError(`That item doesn't exists`);
 
             const request = await models.TicketRequest.findById(ctx.args.id, {
-                include: {relation: 'ticket'}
+                include: {
+                    relation: 'ticket',
+                    scope: {
+                        include: {
+                            relation: 'client',
+                            scope: {
+                                fields: ['id', 'name', 'salesPersonFk']
+                            }
+                        }
+                    }}
             }, myOptions);
-
             const itemStock = await models.Item.getVisibleAvailable(
                 ctx.args.itemFk,
                 request.ticket().warehouseFk,
@@ -89,9 +97,9 @@ module.exports = Self => {
             const query = `CALL vn.sale_calculateComponent(?, NULL)`;
             await Self.rawSql(query, [sale.id], myOptions);
 
+            const salesPerson = request.ticket().client().salesPersonFk;
+            if (salesPerson) {
                 const url = await Self.app.models.Url.getUrl();
-            const requesterId = request.requesterFk;
-
                 const message = $t('Bought units from buy request', {
                     quantity: sale.quantity,
                     concept: sale.concept,
@@ -100,8 +108,8 @@ module.exports = Self => {
                     url: `${url}ticket/${sale.ticketFk}/summary`,
                     urlItem: `${url}item/${sale.itemFk}/summary`
                 });
-            await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions);
+                await models.Chat.sendCheckingPresence(ctx, salesPerson, message, myOptions);
-
+            }
             if (tx) await tx.commit();
 
             return sale;

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

@@ -1,18 +1,22 @@
+const UserError = require('vn-loopback/util/user-error');
 module.exports = Self => {
     Self.remoteMethodCtx('deny', {
-        description: 'sets a ticket request to denied and returns the changes',
+        description: 'Sets a ticket request to denied and returns the changes',
         accessType: 'WRITE',
-        accepts: [{
+        accepts: [
+            {
                 arg: 'id',
                 type: 'number',
                 required: true,
                 description: 'The request ID',
-        }, {
+            },
+            {
                 arg: 'observation',
-            type: 'String',
+                type: 'string',
                 required: true,
                 description: 'The request observation',
-        }],
+            }
+        ],
         returns: {
             type: 'number',
             root: true
@@ -29,7 +33,7 @@ module.exports = Self => {
         const myOptions = {};
         let tx;
 
-        if (typeof options == 'object')
+        if (typeof options === 'object')
             Object.assign(myOptions, options);
 
         if (!myOptions.transaction) {
@@ -39,7 +43,7 @@ module.exports = Self => {
 
         try {
             const userId = ctx.req.accessToken.userId;
-            const worker = await Self.app.models.Worker.findOne({where: {id: userId}}, myOptions);
+            const worker = await models.Worker.findById(userId, {fields: ['id']}, myOptions);
 
             const params = {
                 isOk: false,
@@ -47,19 +51,32 @@ module.exports = Self => {
                 response: ctx.args.observation,
             };
 
-            const request = await Self.app.models.TicketRequest.findById(ctx.args.id, null, myOptions);
+            const request = await models.TicketRequest.findById(ctx.args.id, {
-            await request.updateAttributes(params, myOptions);
+                include: {
-
+                    relation: 'ticket',
-            const url = await Self.app.models.Url.getUrl();
+                    scope: {
-            const requesterId = request.requesterFk;
+                        include: {
+                            relation: 'client',
+                            scope: {
+                                fields: ['id', 'name', 'salesPersonFk']
+                            }
+                        }
+                    }
+                }
+            }, myOptions);
 
+            const salesPerson = request.ticket().client().salesPersonFk;
+            if (salesPerson) {
+                const url = await models.Url.getUrl();
                 const message = $t('Deny buy request', {
                     ticketId: request.ticketFk,
                     url: `${url}ticket/${request.ticketFk}/request/index`,
                     observation: params.response
                 });
 
-            await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions);
+                await models.Chat.sendCheckingPresence(ctx, salesPerson, message, myOptions);
+                await request.updateAttributes(params, myOptions);
+            }
 
             if (tx) await tx.commit();
 

modules/worker/back/models/device-production-user.json

@@ -25,7 +25,7 @@
         "userFk": {
             "type": "number"
         },
-        "simSerialNumber": {
+        "simFk": {
             "type": "string"
         },
         "created": {