Merge branch '2088-ticket_datosBasicos' of verdnatura/salix into dev

modules/ticket/back/methods/ticket/componentUpdate.js

@@ -1,4 +1,5 @@
 const UserError = require('vn-loopback/util/user-error');
+const diff = require('object-diff');
 
 module.exports = Self => {
     Self.remoteMethodCtx('componentUpdate', {
@@ -11,32 +12,32 @@ module.exports = Self => {
             description: 'The ticket id',
             http: {source: 'path'}
         }, {
-            arg: 'clientId',
+            arg: 'clientFk',
             type: 'Number',
             description: 'The client id',
             required: true
         }, {
-            arg: 'agencyModeId',
+            arg: 'agencyModeFk',
             type: 'Number',
             description: 'The agencyMode id',
             required: true
         }, {
-            arg: 'addressId',
+            arg: 'addressFk',
             type: 'Number',
             description: 'The address id',
             required: true
         }, {
-            arg: 'zoneId',
+            arg: 'zoneFk',
             type: 'Number',
             description: 'The zone id',
             required: true
         }, {
-            arg: 'warehouseId',
+            arg: 'warehouseFk',
             type: 'Number',
             description: 'The warehouse id',
             required: true
         }, {
-            arg: 'companyId',
+            arg: 'companyFk',
             type: 'Number',
             description: 'The company id',
             required: true
@@ -71,8 +72,8 @@ module.exports = Self => {
         }
     });
 
-    Self.componentUpdate = async(ctx, id, clientId, agencyModeId, addressId, zoneId, warehouseId,
+    Self.componentUpdate = async(ctx, id, clientFk, agencyModeFk, addressFk, zoneFk, warehouseFk,
-        companyId, shipped, landed, isDeleted, option) => {
+        companyFk, shipped, landed, isDeleted, option) => {
         const userId = ctx.req.accessToken.userId;
         const models = Self.app.models;
         const isEditable = await models.Ticket.isEditable(ctx, id);
@@ -82,29 +83,49 @@ module.exports = Self => {
 
         const isProductionBoss = await models.Account.hasRole(userId, 'productionBoss');
         if (!isProductionBoss) {
-            const zoneShipped = await models.Agency.getShipped(landed, addressId, agencyModeId, warehouseId);
+            const zoneShipped = await models.Agency.getShipped(landed, addressFk, agencyModeFk, warehouseFk);
 
-            if (!zoneShipped || zoneShipped.zoneFk != zoneId)
+            if (!zoneShipped || zoneShipped.zoneFk != zoneFk)
                 throw new UserError(`You don't have privileges to change the zone`);
         }
-
+        const originalTicket = await models.Ticket.findById(id, {fields:
+            ['id', 'clientFk', 'agencyModeFk', 'addressFk', 'zoneFk',
+                'warehouseFk', 'companyFk', 'shipped', 'landed', 'isDeleted']
+        });
+        const updatedTicket = Object.assign({}, ctx.args);
+        delete updatedTicket.ctx;
+        delete updatedTicket.option;
         // Force unroute
         const hasToBeUnrouted = true;
+        const propertiesChange = diff(originalTicket, updatedTicket);
+
+        let logRecord = {
+            originFk: id,
+            userFk: userId,
+            action: 'update',
+            changedModel: 'Ticket',
+            changedModelId: id,
+            oldInstance: originalTicket,
+            newInstance: propertiesChange
+        };
+
         let query = 'CALL vn.ticket_componentMakeUpdate(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
         let res = await Self.rawSql(query, [
             id,
-            clientId,
+            clientFk,
-            agencyModeId,
+            agencyModeFk,
-            addressId,
+            addressFk,
-            zoneId,
+            zoneFk,
-            warehouseId,
+            warehouseFk,
-            companyId,
+            companyFk,
             shipped,
             landed,
             isDeleted,
             hasToBeUnrouted,
             option
         ]);
+
+        await models.TicketLog.create(logRecord);
         return res;
     };
 };

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

@@ -39,7 +39,10 @@ describe('ticket componentUpdate()', () => {
         const landed = tomorrow;
         const option = 1;
 
-        let ctx = {req: {accessToken: {userId: 101}}};
+        let ctx = {
+            args: {clientFk: 102,
+                agencyModeFk: 8},
+            req: {accessToken: {userId: 101}}};
 
         await app.models.Ticket.componentUpdate(ctx, ticketId, clientId, agencyModeId, addressId,
             zoneId, warehouseId, companyId, shipped, landed, isDeleted, option);
@@ -66,7 +69,11 @@ describe('ticket componentUpdate()', () => {
         const landed = tomorrow;
         const option = 1;
 
-        let ctx = {req: {accessToken: {userId: 101}}};
+        let ctx = {
+            args: {clientFk: 102,
+                agencyModeFk: 7},
+            req: {accessToken: {userId: 101}}};
+
         await app.models.Ticket.componentUpdate(ctx, ticketId, clientId, agencyModeId, addressId,
             zoneId, warehouseId, companyId, shipped, landed, isDeleted, option);
 

modules/ticket/front/basic-data/step-two/index.js

@@ -75,12 +75,12 @@ class Controller {
 
         let query = `tickets/${this.ticket.id}/componentUpdate`;
         let params = {
-            clientId: this.ticket.clientFk,
+            clientFk: this.ticket.clientFk,
-            agencyModeId: this.ticket.agencyModeFk,
+            agencyModeFk: this.ticket.agencyModeFk,
-            addressId: this.ticket.addressFk,
+            addressFk: this.ticket.addressFk,
-            zoneId: this.ticket.zoneFk,
+            zoneFk: this.ticket.zoneFk,
-            warehouseId: this.ticket.warehouseFk,
+            warehouseFk: this.ticket.warehouseFk,
-            companyId: this.ticket.companyFk,
+            companyFk: this.ticket.companyFk,
             shipped: this.ticket.shipped,
             landed: this.ticket.landed,
             isDeleted: this.ticket.isDeleted,