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

fix: refs #7028 fix confirm deny #3290

Merged
carlossa merged 23 commits from 7028-itemRequestConfDeny into dev 2024-12-16 10:59:56 +00:00
Conversation 0 Commits 23 Files Changed 2 +65 -40
carlossa commented 2024-12-10 11:05:48 +00:00
Member
Copy Link
No description provided.
carlossa added 1 commit 2024-12-10 11:05:48 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
391f1d8c97 fix: refs #7028 fix confirm deny
carlossa requested review from alexm 2024-12-10 11:48:02 +00:00
alexm requested changes 2024-12-12 06:02:59 +00:00
Dismissed
modules/ticket/back/methods/ticket-request/deny.js Outdated
@ -40,3 +43,3 @@
try {
const userId = ctx.req.accessToken.userId;
const worker = await Self.app.models.Worker.findOne({where: {id: userId}}, myOptions);
const worker = await models.Worker.findOne({where: {id: userId}}, myOptions);
alexm commented 2024-12-12 06:01:41 +00:00
Member
Copy Link

findById

findById
carlossa marked this conversation as resolved
modules/ticket/back/methods/ticket-request/deny.js Outdated
@ -41,2 +44,3 @@
const userId = ctx.req.accessToken.userId;
const worker = await Self.app.models.Worker.findOne({where: {id: userId}}, myOptions);
const worker = await models.Worker.findOne({where: {id: userId}}, myOptions);
if (!worker) throw new Error('Worker not found');
alexm commented 2024-12-12 06:01:29 +00:00
Member
Copy Link

Traducir

Traducir
carlossa marked this conversation as resolved
modules/ticket/back/methods/ticket-request/deny.js Outdated
@ -60,3 +77,3 @@
});
await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions);
await models.Chat.sendCheckingPresence(ctx, requesterId, message);
alexm commented 2024-12-12 06:02:15 +00:00
Member
Copy Link

, myOptions);

, myOptions);
carlossa marked this conversation as resolved
carlossa added 1 commit 2024-12-12 08:27:37 +00:00
carlossa added 1 commit 2024-12-12 08:30:31 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
efcf4d225b fix: refs #7028 fix pr
carlossa requested review from alexm 2024-12-12 08:31:10 +00:00
carlossa added 1 commit 2024-12-12 08:45:20 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
b3eb8334ca Merge branch 'dev' into 7028-itemRequestConfDeny
carlossa added 1 commit 2024-12-12 08:49:09 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
9c53fe9f60 Merge branch 'dev' into 7028-itemRequestConfDeny
carlossa added 3 commits 2024-12-12 09:04:42 +00:00
carlossa added 1 commit 2024-12-12 10:04:06 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
d35e785bee Merge branch 'dev' into 7028-itemRequestConfDeny
carlossa added 2 commits 2024-12-12 10:11:30 +00:00
carlossa added 1 commit 2024-12-12 10:11:45 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
f66b3f1cbd Merge branch 'dev' into 7028-itemRequestConfDeny
carlossa added 1 commit 2024-12-16 06:03:43 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
09e7ee4e43 Merge branch 'dev' into 7028-itemRequestConfDeny
carlossa added 2 commits 2024-12-16 08:14:17 +00:00
carlossa added 2 commits 2024-12-16 09:02:20 +00:00
carlossa added 1 commit 2024-12-16 09:25:41 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
1e471ac20f fix: refs #7028 requesterId fix
carlossa added 1 commit 2024-12-16 10:35:49 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
692b1070e8 Merge branch 'dev' into 7028-itemRequestConfDeny
alexm requested changes 2024-12-16 10:40:29 +00:00
Dismissed
modules/ticket/back/methods/ticket-request/confirm.js Outdated
@ -102,3 +100,1 @@
});
await models.Chat.sendCheckingPresence(ctx, requesterId, message, myOptions);
const requesterId = request.ticket().client().salesPersonFk;
alexm commented 2024-12-16 10:39:51 +00:00
Member
Copy Link

const salesPerson

const salesPerson
modules/ticket/back/methods/ticket-request/deny.js Outdated
@ -40,3 +44,3 @@
try {
const userId = ctx.req.accessToken.userId;
const worker = await Self.app.models.Worker.findOne({where: {id: userId}}, myOptions);
const worker = await models.Worker.findById(userId, myOptions);
alexm commented 2024-12-16 10:40:28 +00:00
Member
Copy Link

(userId, {fields: ...}, myOptions);

`(userId, {fields: ...}, myOptions);`
modules/ticket/back/methods/ticket-request/deny.js Outdated
@ -52,3 +67,2 @@
const url = await Self.app.models.Url.getUrl();
const requesterId = request.requesterFk;
const requesterId = request.ticket().client().salesPersonFk;
alexm commented 2024-12-16 10:39:58 +00:00
Member
Copy Link

const salesPerson

const salesPerson
carlossa added 2 commits 2024-12-16 10:54:19 +00:00
carlossa added 1 commit 2024-12-16 10:55:11 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
576641d09d fix: refs #7028 requesterId fix
carlossa requested review from alexm 2024-12-16 10:55:20 +00:00
alexm approved these changes 2024-12-16 10:57:52 +00:00
Dismissed
alexm approved these changes 2024-12-16 10:58:13 +00:00
Dismissed
carlossa added 1 commit 2024-12-16 10:58:32 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
5f43c0440c fix: refs #7028 requesterId fix salesPerson
alexm approved these changes 2024-12-16 10:58:47 +00:00
carlossa merged commit f9434871d8 into dev 2024-12-16 10:59:56 +00:00
carlossa deleted branch 7028-itemRequestConfDeny 2024-12-16 10:59:56 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
alexm
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#3290
No description provided.
Delete Branch "7028-itemRequestConfDeny"

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?