db/changes/10190-PostErte/00-ACL.sql

@@ -1,5 +0,0 @@
-UPDATE `salix`.`ACL` SET `accessType`='WRITE' WHERE `id`='213';
-UPDATE `salix`.`ACL` SET `property` = 'deleteSales' WHERE (`id` = '80');
-
-INSERT IGNORE INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('CustomsAgent', '*', '*', 'ALLOW', 'ROLE', 'employee');
-

e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js

@@ -211,12 +211,16 @@ describe('Ticket Edit sale path', () => {
     it('should search for a ticket then access to the sales section', async() => {
         await page.accessToSearchResult('16');
         await page.accessToSection('ticket.card.sale');
+        await page.wait(2000);
     });
 
     it('should select the third sale and delete it', async() => {
         await page.waitToClick(selectors.ticketSales.thirdSaleCheckbox);
+        await page.wait(2000);
         await page.waitToClick(selectors.ticketSales.deleteSaleButton);
+        await page.wait(2000);
         await page.waitToClick(selectors.ticketSales.acceptDeleteLineButton);
+        await page.wait(2000);
         await page.waitForSpinnerLoad();
         const message = await page.waitForSnackbar();
 

loopback/common/models/loggable.js

@@ -249,7 +249,6 @@ module.exports = function(Self) {
         let newInstance = {};
         if (ctx.hookState.newInstance)
             Object.assign(newInstance, ctx.hookState.newInstance);
-
         let userFk;
         if (loopBackContext)
             userFk = loopBackContext.active.accessToken.userId;

modules/client/back/methods/client/getCard.js

@@ -27,11 +27,11 @@ module.exports = function(Self) {
                 {
                     relation: 'salesPerson',
                     scope: {
-                        fields: ['userFk'],
+                        fields: ['userFk', 'firstName'],
                         include: {
                             relation: 'user',
                             scope: {
-                                fields: ['nickname']
+                                fields: ['name', 'nickname']
                             }
                         }
                     }
@@ -45,6 +45,12 @@ module.exports = function(Self) {
                     scope: {
                         fields: ['id', 'name']
                     }
+                }, {
+                }, {
+                    relation: 'salesPersonUser',
+                    scope: {
+                        fields: ['id', 'name']
+                    }
                 }, {
                     relation: 'country',
                     scope: {

modules/client/back/models/client.json

@@ -136,6 +136,11 @@
 			"model": "Worker",
 			"foreignKey": "salesPersonFk"
 		},
+		"salesPersonUser": {
+			"type": "belongsTo",
+			"model": "Account",
+			"foreignKey": "salesPersonFk"
+		},
 		"province": {
 			"type": "belongsTo",
 			"model": "Province",