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

Merge pull request '2511-claim_claimManager' (#426) from 2511-claim_claimManager into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #426
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
This commit is contained in:
Joan Sanchez 2020-10-27 13:57:14 +00:00
parent faea343e41 4a8eadfc6a
commit 8faf7d97fd
21 changed files with 51 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
db/changes/10240-allSaints/00-ACL.sql
View File

@ -1,3 +1,8 @@
UPDATE `salix`.`ACL` SET `principalId` = 'deliveryBoss' WHERE (`id` = '194'); UPDATE `salix`.`ACL` SET `principalId` = 'deliveryBoss' WHERE (`id` = '194');
UPDATE `salix`.`ACL` SET `principalId` = 'claimManager' WHERE (`id` = '97');
UPDATE `salix`.`ACL` SET `principalId` = 'claimManager' WHERE (`id` = '100');
UPDATE `salix`.`ACL` SET `principalId` = 'claimManager' WHERE (`id` = '103');
UPDATE `salix`.`ACL` SET `principalId` = 'claimManager' WHERE (`id` = '202');
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Town', '*', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss'); INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Town', '*', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss');
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Province', '*', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss'); INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('Province', '*', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss');

3
db/changes/10240-allSaints/00-claimState.sql Normal file
View File

@ -0,0 +1,3 @@
UPDATE `vn`.`claimState` SET `roleFk` = '72' WHERE (`id` = '3');
UPDATE `vn`.`claimState` SET `roleFk` = '72' WHERE (`id` = '4');
UPDATE `vn`.`claimState` SET `roleFk` = '72' WHERE (`id` = '5');

2
db/dump/dumpedFixtures.sql
View File

File diff suppressed because one or more lines are too long

6
db/dump/fixtures.sql
View File

@ -1534,9 +1534,9 @@ INSERT INTO `vn`.`claimState`(`id`, `code`, `description`, `roleFk`, `priority`)
VALUES VALUES
( 1, 'pending', 'Pendiente', 1, 1), ( 1, 'pending', 'Pendiente', 1, 1),
( 2, 'managed', 'Gestionado', 1, 5), ( 2, 'managed', 'Gestionado', 1, 5),
( 3, 'resolved', 'Resuelto', 21, 7), ( 3, 'resolved', 'Resuelto', 72, 7),
( 4, 'canceled', 'Anulado', 1, 6), ( 4, 'canceled', 'Anulado', 72, 6),
( 5, 'disputed', 'Cuestionado', 21, 3), ( 5, 'disputed', 'Cuestionado', 72, 3),
( 6, 'mana', 'Mana', 1, 4), ( 6, 'mana', 'Mana', 1, 4),
( 7, 'inProgress', 'En Curso', 1, 2); ( 7, 'inProgress', 'En Curso', 1, 2);

6
e2e/paths/06-claim/01_basic_data.spec.js
View File

@ -14,8 +14,8 @@ describe('Claim edit basic data path', () => {
await browser.close(); await browser.close();
}); });
it(`should log in as salesAssistant then reach basic data of the target claim`, async() => { it(`should log in as claimManager then reach basic data of the target claim`, async() => {
await page.loginAndModule('salesAssistant', 'claim'); await page.loginAndModule('claimManager', 'claim');
await page.accessToSearchResult('1'); await page.accessToSearchResult('1');
await page.accessToSection('claim.card.basicData'); await page.accessToSection('claim.card.basicData');
}); });
@ -30,7 +30,7 @@ describe('Claim edit basic data path', () => {
expect(message.type).toBe('success'); expect(message.type).toBe('success');
}); });
it(`should have been redirected to the next section of claims as the role is salesAssistant`, async() => { it(`should have been redirected to the next section of claims as the role is claimManager`, async() => {
await page.waitForState('claim.card.detail'); await page.waitForState('claim.card.detail');
}); });

4
e2e/paths/06-claim/02_development.spec.js
View File

@ -8,7 +8,7 @@ describe('Claim development', () => {
beforeAll(async() => { beforeAll(async() => {
browser = await getBrowser(); browser = await getBrowser();
page = browser.page; page = browser.page;
await page.loginAndModule('salesAssistant', 'claim'); await page.loginAndModule('claimManager', 'claim');
await page.accessToSearchResult('1'); await page.accessToSearchResult('1');
await page.accessToSection('claim.card.development'); await page.accessToSection('claim.card.development');
}); });
@ -31,7 +31,7 @@ describe('Claim development', () => {
expect(message.type).toBe('success'); expect(message.type).toBe('success');
}); });
it(`should redirect to the next section of claims as the role is salesAssistant`, async() => { it(`should redirect to the next section of claims as the role is claimManager`, async() => {
await page.waitForState('claim.card.action'); await page.waitForState('claim.card.action');
}); });

2
e2e/paths/06-claim/04_claim_action.spec.js
View File

@ -8,7 +8,7 @@ describe('Claim action path', () => {
beforeAll(async() => { beforeAll(async() => {
browser = await getBrowser(); browser = await getBrowser();
page = browser.page; page = browser.page;
await page.loginAndModule('administrative', 'claim'); await page.loginAndModule('claimManager', 'claim');
await page.accessToSearchResult('2'); await page.accessToSearchResult('2');
await page.accessToSection('claim.card.action'); await page.accessToSection('claim.card.action');
}); });

4
e2e/paths/06-claim/06_descriptor.spec.js
View File

@ -26,8 +26,8 @@ describe('claim Descriptor path', () => {
await page.waitForSelector(selectors.claimDescriptor.moreMenuDeleteClaim, {hidden: true}); await page.waitForSelector(selectors.claimDescriptor.moreMenuDeleteClaim, {hidden: true});
}); });
it(`should log in as salesAssistant and navigate to the target claim`, async() => { it(`should log in as claimManager and navigate to the target claim`, async() => {
await page.loginAndModule('salesAssistant', 'claim'); await page.loginAndModule('claimManager', 'claim');
await page.accessToSearchResult(claimId); await page.accessToSearchResult(claimId);
await page.waitForState('claim.card.summary'); await page.waitForState('claim.card.summary');
}); });

4
modules/claim/back/methods/claim-beginning/importToNewRefundTicket.spec.js
View File

@ -2,13 +2,13 @@ const app = require('vn-loopback/server/server');
const LoopBackContext = require('loopback-context'); const LoopBackContext = require('loopback-context');
describe('claimBeginning', () => { describe('claimBeginning', () => {
const salesAssistantId = 21; const claimManagerId = 72;
let ticket; let ticket;
let refundTicketSales; let refundTicketSales;
let salesInsertedInClaimEnd; let salesInsertedInClaimEnd;
const activeCtx = { const activeCtx = {
accessToken: {userId: salesAssistantId}, accessToken: {userId: claimManagerId},
}; };
const ctx = {req: activeCtx}; const ctx = {req: activeCtx};

8
modules/claim/back/methods/claim/isEditable.js
View File

@ -21,10 +21,8 @@ module.exports = Self => {
Self.isEditable = async(ctx, id) => { Self.isEditable = async(ctx, id) => {
const userId = ctx.req.accessToken.userId; const userId = ctx.req.accessToken.userId;
const isClaimManager = await Self.app.models.Account.hasRole(userId, 'claimManager');
const isSalesAssistant = await Self.app.models.Account.hasRole(userId, 'salesAssistant'); const claim = await Self.app.models.Claim.findById(id, {
let claim = await Self.app.models.Claim.findById(id, {
fields: ['claimStateFk'], fields: ['claimStateFk'],
include: [{ include: [{
relation: 'claimState' relation: 'claimState'
@ -33,7 +31,7 @@ module.exports = Self => {
const isClaimResolved = claim && claim.claimState().code == 'resolved'; const isClaimResolved = claim && claim.claimState().code == 'resolved';
if (!claim || (isClaimResolved && !isSalesAssistant)) if (!claim || (isClaimResolved && !isClaimManager))
return false; return false;
return true; return true;

10
modules/claim/back/methods/claim/specs/isEditable.spec.js
View File

@ -2,9 +2,9 @@ const app = require('vn-loopback/server/server');
describe('claim isEditable()', () => { describe('claim isEditable()', () => {
const salesPerdonId = 18; const salesPerdonId = 18;
const salesAssistantId = 21; const claimManagerId = 72;
it('should return false if the given claim does not exist', async() => { it('should return false if the given claim does not exist', async() => {
let ctx = {req: {accessToken: {userId: salesAssistantId}}}; let ctx = {req: {accessToken: {userId: claimManagerId}}};
let result = await app.models.Claim.isEditable(ctx, 99999); let result = await app.models.Claim.isEditable(ctx, 99999);
expect(result).toEqual(false); expect(result).toEqual(false);
@ -17,14 +17,14 @@ describe('claim isEditable()', () => {
expect(result).toEqual(false); expect(result).toEqual(false);
}); });
it('should be able to edit a resolved claim for a salesAssistant', async() => { it('should be able to edit a resolved claim for a claimManager', async() => {
let ctx = {req: {accessToken: {userId: salesAssistantId}}}; let ctx = {req: {accessToken: {userId: claimManagerId}}};
let result = await app.models.Claim.isEditable(ctx, 4); let result = await app.models.Claim.isEditable(ctx, 4);
expect(result).toEqual(true); expect(result).toEqual(true);
}); });
it('should be able to edit a claim for a salesAssistant', async() => { it('should be able to edit a claim for a claimManager', async() => {
let ctx = {req: {accessToken: {userId: salesPerdonId}}}; let ctx = {req: {accessToken: {userId: salesPerdonId}}};
let result = await app.models.Claim.isEditable(ctx, 1); let result = await app.models.Claim.isEditable(ctx, 1);

14
modules/claim/back/methods/claim/specs/updateClaim.spec.js
View File

@ -42,17 +42,17 @@ describe('Update Claim', () => {
it(`should success to update the claim within privileges `, async() => { it(`should success to update the claim within privileges `, async() => {
let newClaim = await app.models.Claim.create(originalData); let newClaim = await app.models.Claim.create(originalData);
const correctState = 4; const canceledState = 4;
const salesPersonId = 18; const claimManagerId = 72;
const ctx = { const ctx = {
req: { req: {
accessToken: { accessToken: {
userId: salesPersonId userId: claimManagerId
} }
}, },
args: { args: {
observation: 'valid observation', observation: 'valid observation',
claimStateFk: correctState, claimStateFk: canceledState,
hasToPickUp: false hasToPickUp: false
} }
}; };
@ -66,15 +66,15 @@ describe('Update Claim', () => {
await app.models.Claim.destroyById(newClaim.id); await app.models.Claim.destroyById(newClaim.id);
}); });
it('should change some sensible fields as salesAssistant', async() => { it('should change some sensible fields as claimManager', async() => {
let newClaim = await app.models.Claim.create(originalData); let newClaim = await app.models.Claim.create(originalData);
const chatModel = app.models.Chat; const chatModel = app.models.Chat;
spyOn(chatModel, 'sendCheckingPresence').and.callThrough(); spyOn(chatModel, 'sendCheckingPresence').and.callThrough();
const salesAssistantId = 21; const claimManagerId = 72;
const ctx = { const ctx = {
req: { req: {
accessToken: {userId: salesAssistantId}, accessToken: {userId: claimManagerId},
headers: {origin: 'http://localhost'} headers: {origin: 'http://localhost'}
}, },
args: { args: {

4
modules/claim/back/methods/claim/updateClaim.js
View File

@ -60,9 +60,9 @@ module.exports = Self => {
if (args.claimStateFk) { if (args.claimStateFk) {
const canUpdate = await canChangeState(ctx, claim.claimStateFk); const canUpdate = await canChangeState(ctx, claim.claimStateFk);
const hasRights = await canChangeState(ctx, args.claimStateFk); const hasRights = await canChangeState(ctx, args.claimStateFk);
const isSalesAssistant = await models.Account.hasRole(userId, 'salesAssistant'); const isClaimManager = await models.Account.hasRole(userId, 'claimManager');
if (!canUpdate || !hasRights || changedHasToPickUp && !isSalesAssistant) if (!canUpdate || !hasRights || changedHasToPickUp && !isClaimManager)
throw new UserError(`You don't have enough privileges to change that field`); throw new UserError(`You don't have enough privileges to change that field`);
} }
delete args.ctx; delete args.ctx;

3
modules/claim/front/basic-data/index.html
View File

@ -56,7 +56,8 @@
class="vn-mr-md" class="vn-mr-md"
label="Pick up" label="Pick up"
ng-model="$ctrl.claim.hasToPickUp" ng-model="$ctrl.claim.hasToPickUp"
vn-acl="salesAssistant"> vn-acl="claimManager"
info="When checked will notify to the salesPerson">
</vn-check> </vn-check>
</vn-horizontal> </vn-horizontal>
</vn-card> </vn-card>

2
modules/claim/front/basic-data/index.js
View File

@ -5,7 +5,7 @@ import './style.scss';
class Controller extends Section { class Controller extends Section {
onSubmit() { onSubmit() {
this.$.watcher.submit().then(() => { this.$.watcher.submit().then(() => {
if (this.aclService.hasAny(['salesAssistant'])) if (this.aclService.hasAny(['claimManager']))
this.$state.go('claim.card.detail'); this.$state.go('claim.card.detail');
}); });
} }

3
modules/claim/front/basic-data/locale/es.yml
View File

@ -4,4 +4,5 @@ Is paid with mana: Cargado al maná
Responsability: Responsabilidad Responsability: Responsabilidad
Company: Empresa Company: Empresa
Sales/Client: Comercial/Cliente Sales/Client: Comercial/Cliente
Pick up: Recoger Pick up: Recoger
When checked will notify a pickup to the salesPerson: Cuando se marque enviará una notificación de recogida al comercial

2
modules/claim/front/descriptor/index.html
View File

@ -13,7 +13,7 @@
Send Pickup order Send Pickup order
</vn-item> </vn-item>
<vn-item <vn-item
vn-acl="salesAssistant" vn-acl="claimManager"
vn-acl-action="remove" vn-acl-action="remove"
ng-click="confirmDeleteClaim.show()" ng-click="confirmDeleteClaim.show()"
name="deleteClaim" name="deleteClaim"

4
modules/claim/front/detail/index.js
View File

@ -77,7 +77,7 @@ class Controller extends Section {
this.$.model.refresh(); this.$.model.refresh();
this.vnApp.showSuccess(this.$t('Data saved!')); this.vnApp.showSuccess(this.$t('Data saved!'));
if (this.aclService.hasAny(['salesAssistant'])) if (this.aclService.hasAny(['claimManager']))
this.$state.go('claim.card.development'); this.$state.go('claim.card.development');
}); });
} }
@ -133,7 +133,7 @@ class Controller extends Section {
showEditPopover(event, saleClaimed) { showEditPopover(event, saleClaimed) {
if (this.isEditable) { if (this.isEditable) {
if (!this.aclService.hasAny(['salesAssistant'])) if (!this.aclService.hasAny(['claimManager']))
return this.vnApp.showError(this.$t('Insuficient permisos')); return this.vnApp.showError(this.$t('Insuficient permisos'));
this.saleClaimed = saleClaimed; this.saleClaimed = saleClaimed;

2
modules/claim/front/development/index.js
View File

@ -9,7 +9,7 @@ class Controller extends Section {
this.$.watcher.notifySaved(); this.$.watcher.notifySaved();
this.$.watcher.updateOriginalData(); this.$.watcher.updateOriginalData();
if (this.aclService.hasAny(['salesAssistant'])) if (this.aclService.hasAny(['claimManager']))
this.$state.go('claim.card.action'); this.$state.go('claim.card.action');
}); });
} }

4
modules/claim/front/routes.json
View File

@ -70,7 +70,7 @@
"params": { "params": {
"claim": "$ctrl.claim" "claim": "$ctrl.claim"
}, },
"acl": ["salesAssistant"] "acl": ["claimManager"]
}, { }, {
"url": "/action", "url": "/action",
"state": "claim.card.action", "state": "claim.card.action",
@ -79,7 +79,7 @@
"params": { "params": {
"claim": "$ctrl.claim" "claim": "$ctrl.claim"
}, },
"acl": ["salesAssistant"] "acl": ["claimManager"]
}, { }, {
"url": "/photos", "url": "/photos",
"state": "claim.card.photos", "state": "claim.card.photos",

2
modules/claim/front/summary/index.html
View File

@ -42,7 +42,7 @@
max="5" max="5"
min="1" min="1"
step="1" step="1"
vn-acl="salesAssistant"> vn-acl="claimManager">
</vn-range> </vn-range>
</vn-one> </vn-one>
<vn-auto> <vn-auto>