Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee

back/methods/dms/uploadFile.js

@@ -110,11 +110,10 @@ module.exports = Self => {
     async function createDms(ctx, file, myOptions) {
         const models = Self.app.models;
         const myUserId = ctx.req.accessToken.userId;
-        const myWorker = await models.Worker.findOne({where: {userFk: myUserId}}, myOptions);
         const args = ctx.args;
 
         const newDms = await Self.create({
-            workerFk: myWorker.id,
+            workerFk: myUserId,
             dmsTypeFk: args.dmsTypeId,
             companyFk: args.companyId,
             warehouseFk: args.warehouseId,

modules/client/back/methods/client/specs/createReceipt.spec.js

@@ -1,4 +1,5 @@
 const app = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
 
 describe('Client createReceipt', () => {
     const clientFk = 108;
@@ -6,18 +7,34 @@ describe('Client createReceipt', () => {
     const companyFk = 442;
     const amountPaid = 12.50;
     const description = 'Receipt description';
+    const activeCtx = {
+        accessToken: {userId: 5},
+        http: {
+            req: {
+                headers: {origin: 'http://localhost'}
+            }
+        }
+    };
+    const ctx = {req: activeCtx};
+    activeCtx.http.req.__ = value => {
+        return value;
+    };
+
+    beforeEach(() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
 
     it('should create a new receipt', async() => {
         const bankFk = 1;
-        let ctx = {
+        ctx.args = {
-            args: {
             clientFk: clientFk,
             payed: payed,
             companyFk: companyFk,
             bankFk: bankFk,
             amountPaid: amountPaid,
             description: description
-            }
         };
 
         const receipt = await app.models.Client.createReceipt(ctx);
@@ -40,15 +57,14 @@ describe('Client createReceipt', () => {
 
     it('should throw Compensation account is empty', async() => {
         const bankFk = 3;
-        let ctx = {
+
-            args: {
+        ctx.args = {
             clientFk: clientFk,
             payed: payed,
             companyFk: companyFk,
             bankFk: bankFk,
             amountPaid: amountPaid,
             description: description
-            }
         };
 
         try {
@@ -64,8 +80,7 @@ describe('Client createReceipt', () => {
     it('should throw Invalid account if compensationAccount does not belongs to a client nor a supplier', async() => {
         let error;
         const bankFk = 3;
-        const ctx = {
+        ctx.args = {
-            args: {
             clientFk: clientFk,
             payed: payed,
             companyFk: companyFk,
@@ -73,7 +88,6 @@ describe('Client createReceipt', () => {
             amountPaid: amountPaid,
             description: description,
             compensationAccount: 'non existing account'
-            }
         };
 
         try {
@@ -88,8 +102,8 @@ describe('Client createReceipt', () => {
 
     it('should create a new receipt with a compensation for a client', async() => {
         const bankFk = 3;
-        const ctx = {
+
-            args: {
+        ctx.args = {
             clientFk: clientFk,
             payed: payed,
             companyFk: companyFk,
@@ -97,7 +111,6 @@ describe('Client createReceipt', () => {
             amountPaid: amountPaid,
             description: description,
             compensationAccount: '4300000001'
-            }
         };
         const receipt = await app.models.Client.createReceipt(ctx);
         const receiptCompensated = await app.models.Receipt.findOne({
@@ -127,16 +140,16 @@ describe('Client createReceipt', () => {
     });
 
     it('should create a new receipt with a compensation for a supplier', async() => {
-        const ctx = {
+        const bankFk = 3;
-            args: {
+
+        ctx.args = {
             clientFk: clientFk,
             payed: payed,
             companyFk: companyFk,
-                bankFk: 3,
+            bankFk: bankFk,
             amountPaid: amountPaid,
             description: description,
             compensationAccount: '4100000001'
-            }
         };
         const receipt = await app.models.Client.createReceipt(ctx);
 

modules/client/back/models/receipt.js

@@ -1,3 +1,5 @@
+const LoopBackContext = require('loopback-context');
+
 module.exports = function(Self) {
     require('../methods/receipt/filter')(Self);
 
@@ -23,13 +25,10 @@ module.exports = function(Self) {
 
     Self.observe('before save', async function(ctx) {
         if (ctx.isNewInstance) {
-            let token = ctx.options.accessToken;
+            const loopBackContext = LoopBackContext.getCurrentContext();
-            let userId = token && token.userId;
+            ctx.instance.workerFk = loopBackContext.active.accessToken.userId;
-
-            ctx.instance.workerFk = userId;
-
             await Self.app.models.Till.create({
-                workerFk: userId,
+                workerFk: ctx.instance.workerFk,
                 bankFk: ctx.instance.bankFk,
                 in: ctx.instance.amountPaid,
                 concept: ctx.instance.description,