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

refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState #1838

Merged
pablone merged 11 commits from 6366-unifyTicketChangeState into dev 2024-01-09 07:00:19 +00:00
Conversation 0 Commits 11 Files Changed 6 +34 -27
pablone commented 2023-11-14 14:02:20 +00:00
Member
Copy Link
No description provided.
pablone added 1 commit 2023-11-14 14:02:22 +00:00
pablone added 1 commit 2023-11-14 14:02:37 +00:00
gitea/salix/pipeline/head This commit looks good Details
2a57f7e98a Merge branch 'dev' into 6366-unifyTicketChangeState
pablone added 1 commit 2023-12-28 14:59:36 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
f7ec64f3c1 merge(dev): refs #6366 merge dev
pablone added 1 commit 2023-12-29 11:43:40 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
ccf5387e04 refactor(state): refs #6366 unifyTicketChangeState
pablone requested review from alexm 2023-12-29 12:21:33 +00:00
pablone changed title from WIP: refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState to refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState 2023-12-29 12:21:37 +00:00
alexm requested changes 2024-01-02 07:03:21 +00:00
modules/ticket/back/methods/ticket/saveSign.js
@ -134,0 +136,4 @@
code: 'DELIVERED'
}
}, options);
if (!deliveryState)
alexm commented 2024-01-02 06:42:40 +00:00
Member
Copy Link

Este if no el acabe de vore.

Este if no el acabe de vore.
pablone marked this conversation as resolved
modules/ticket/back/methods/ticket/state.js Outdated
@ -66,3 +61,1 @@
let oldStateAllowed;
if (ticketState)
oldStateAllowed = await models.State.isEditable(ctx, ticketState.stateFk, myOptions);
const oldStateAllowed = ticketState ?
alexm commented 2024-01-02 06:51:31 +00:00
Member
Copy Link

const oldStateAllowed = ticketState && await models.State.isEditable(ctx, ticketState.stateFk, myOptions);

const oldStateAllowed = ticketState && await models.State.isEditable(ctx, ticketState.stateFk, myOptions);
pablone marked this conversation as resolved
modules/ticket/back/methods/ticket/state.js
@ -71,3 +67,1 @@
const isAllowed = (!ticketState || oldStateAllowed == true) && newStateAllowed == true;
if (!isAllowed)
if (!((!ticketState || oldStateAllowed == true) && newStateAllowed == true))
alexm commented 2024-01-02 07:02:55 +00:00
Member
Copy Link

Crec que queda mes simple com:
if ((ticketState && !oldStateAllowed) || !newStateAllowed)

Crec que queda mes simple com: if ((ticketState && !oldStateAllowed) || !newStateAllowed)
pablone marked this conversation as resolved
pablone added 1 commit 2024-01-03 18:15:38 +00:00
gitea/salix/pipeline/head This commit looks good Details
b42aed13c4 Merge branch 'dev' into 6366-unifyTicketChangeState
pablone added 1 commit 2024-01-04 17:55:50 +00:00
gitea/salix/pipeline/head This commit looks good Details
e9773b3885 refactor(state): refs #6366 simplify if condition
pablone added 1 commit 2024-01-04 18:44:20 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
f48500f4b3 Merge branch 'dev' into 6366-unifyTicketChangeState
pablone requested review from alexm 2024-01-04 18:47:39 +00:00
alexm approved these changes 2024-01-08 06:30:14 +00:00
loopback/locale/es.json Outdated
@ -297,6 +297,7 @@
"Invalid NIF for VIES": "Invalid NIF for VIES",
"Ticket does not exist": "Este ticket no existe",
"Ticket is already signed": "Este ticket ya ha sido firmado",
"The DELIVERED state does not exist": "El estado DELIVERED no existe",
alexm commented 2024-01-08 06:12:04 +00:00
Member
Copy Link

Borrar

Borrar
pablone commented 2024-01-08 08:10:56 +00:00
Author
Member
Copy Link

borrado

borrado
alexm requested changes 2024-01-08 06:30:31 +00:00
alexm left a comment
Member
Copy Link

Falta quitar la traduccion, lo demas bien

Falta quitar la traduccion, lo demas bien
pablone added 1 commit 2024-01-08 08:11:11 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
9af27783ed Merge branch 'dev' into 6366-unifyTicketChangeState
pablone added 2 commits 2024-01-08 08:12:16 +00:00
pablone requested review from alexm 2024-01-08 08:13:45 +00:00
alexm approved these changes 2024-01-08 10:35:00 +00:00
pablone added 1 commit 2024-01-08 13:17:37 +00:00
gitea/salix/pipeline/head This commit looks good Details
0e29db3b1e Merge branch 'dev' into 6366-unifyTicketChangeState
pablone merged commit dffb212722 into dev 2024-01-09 07:00:19 +00:00
pablone deleted branch 6366-unifyTicketChangeState 2024-01-09 07:00:19 +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#1838
No description provided.
Delete Branch "6366-unifyTicketChangeState"

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?