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

3756-client_address_isLogifloraAllowed #930

Merged
joan merged 6 commits from 3756-client_address_isLogifloraAllowed into dev 2022-04-08 07:49:46 +00:00
Conversation 0 Commits 6 Files Changed 7 +88 -23
alexm commented 2022-04-06 12:59:18 +00:00
Member
Copy Link
No description provided.
alexm added the
CR / Tests passed
 label 2022-04-06 12:59:18 +00:00
alexm added 3 commits 2022-04-06 12:59:20 +00:00
gitea/salix/pipeline/head This commit looks good Details
afc03fc60e feat(client_address): add LogifloraIsAllowed
gitea/salix/pipeline/head This commit looks good Details
bcbe264f0a refactor(client_updateAddress): refactor ctx variable
gitea/salix/pipeline/head This commit looks good Details
e44de0246d extract ids to variable
joan requested changes 2022-04-08 06:29:50 +00:00
modules/client/back/methods/client/updateAddress.js Outdated
@ -85,2 +89,4 @@
const args = ctx.args;
const userId = ctx.req.accessToken.userId;
const myOptions = {};
const isSalesAssistant = await Self.app.models.Account.hasRole(userId, 'salesAssistant', myOptions);
joan commented 2022-04-08 06:28:25 +00:00
Contributor
Copy Link

Make use of models property

Make use of models property
alexm marked this conversation as resolved
modules/client/back/methods/client/updateAddress.js Outdated
@ -88,3 +94,4 @@
if (typeof options == 'object')
Object.assign(myOptions, options);
if (ctx.args.isLogifloraAllowed && !isSalesAssistant)
joan commented 2022-04-08 06:28:33 +00:00
Contributor
Copy Link

Make use of args property

Make use of args property
alexm marked this conversation as resolved
alexm added 2 commits 2022-04-08 07:02:41 +00:00
gitea/salix/pipeline/head This commit looks good Details
90a19d52fb use variable
alexm requested review from joan 2022-04-08 07:03:03 +00:00
joan added 1 commit 2022-04-08 07:29:12 +00:00
joan approved these changes 2022-04-08 07:49:38 +00:00
joan merged commit 321d684f34 into dev 2022-04-08 07:49:46 +00:00
joan deleted branch 3756-client_address_isLogifloraAllowed 2022-04-08 07:49:46 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
joan
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#930
No description provided.
Delete Branch "3756-client_address_isLogifloraAllowed"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?