verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge pull request '1880-refactor_loggable' (#337) from 1880-refactor_loggable into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #337
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2020-07-16 12:12:05 +00:00
parent 0c17423370 0348b79f0d
commit 84c74744b4
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
db/changes/10190-PostErte/00-ACL.sql
View File

@ -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');

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

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

1
loopback/common/models/loggable.js
View File

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

10
modules/client/back/methods/client/getCard.js
View File

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

5
modules/client/back/models/client.json
View File

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