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

refactor: refs #6453 order_confirmWithUser #2694

Merged
guillermo merged 16 commits from 6453-orderConfirm into dev 2024-08-02 10:15:00 +00:00
Conversation 1 Commits 16 Files Changed 1 +162 -168
guillermo commented 2024-07-08 08:08:10 +00:00
Member
Copy Link
No description provided.
guillermo added 1 commit 2024-07-08 08:08:11 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
460723bd7a refactor: refs #6453 order_confirmWithUser
guillermo added 1 commit 2024-07-08 08:49:43 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
b068327352 refactor: refs #6453 order_confirmWithUser
guillermo added 1 commit 2024-07-10 06:10:36 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
b75bdc07c2 refactor: refs #6453 order_confirmWithUser
guillermo added 1 commit 2024-07-10 06:18:36 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
a8d0345073 refactor: refs #6453 order_confirmWithUser
guillermo added 1 commit 2024-07-10 06:23:47 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
0e760ba505 refactor: refs #6453 order_confirmWithUser
guillermo added 1 commit 2024-07-10 08:30:27 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
a1d3d2f2f8 refactor: refs #6453 Major changes
guillermo added 1 commit 2024-07-10 09:26:50 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
7e415181c2 refactor: refs #6453 Major changes
guillermo added 1 commit 2024-07-10 09:29:17 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
15f580508b refactor: refs #6453 Minor changes
guillermo added 1 commit 2024-07-11 05:14:05 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
6dc464d26b refactor: refs #6453 Minor changes
guillermo added 1 commit 2024-07-19 08:49:49 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
5f29384389 feat: #6453 Rollback always split by itemPackingType
guillermo added 1 commit 2024-07-19 08:54:44 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
578de51f7e feat: #6453 Refactor
guillermo added 1 commit 2024-07-29 09:47:02 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
4c602800ea feat: refs #6453 Added new ticket search
guillermo requested review from jgallego 2024-07-29 09:48:07 +00:00
guillermo added 1 commit 2024-07-29 10:31:46 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
e53b12d51b feat: refs #6453 Fixes
guillermo added 1 commit 2024-07-29 10:36:13 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
6ad3d5a5eb feat: refs #6453 Minor changes
guillermo commented 2024-07-29 10:36:41 +00:00
Author
Member
Copy Link

El cambio lo he hecho con Pako, por lo que no hace falta ponerlo como revisor. @jgallego

El cambio lo he hecho con Pako, por lo que no hace falta ponerlo como revisor. @jgallego
jgallego requested changes 2024-07-30 07:31:45 +00:00
Dismissed
db/routines/hedera/procedures/order_confirmWithUser.sql Outdated
@ -14,2 +16,3 @@
DECLARE vWarehouseFk INT;
DECLARE vShipment DATE;
DECLARE vTicket INT;
DECLARE vShipmentDayEnd DATE;
jgallego commented 2024-07-30 07:18:41 +00:00
Owner
Copy Link

si es dayend deu ser DATETIME

si es dayend deu ser DATETIME
guillermo marked this conversation as resolved
db/routines/hedera/procedures/order_confirmWithUser.sql Outdated
@ -89,171 +104,193 @@ BEGIN
CALL order_checkEditable(vSelf);
-- Check order is not empty
SELECT COUNT(*) > 0 INTO vIsOk
jgallego commented 2024-07-30 07:22:34 +00:00
Owner
Copy Link

el isOk es una cosa antiga d'un camp que ja no existeix.
Jo posaria vHasRows que es molt mes intuitiu per a qui vinga raere.

el isOk es una cosa antiga d'un camp que ja no existeix. Jo posaria vHasRows que es molt mes intuitiu per a qui vinga raere.
guillermo marked this conversation as resolved
db/routines/hedera/procedures/order_confirmWithUser.sql
@ -170,3 +211,2 @@
IF vNotes IS NOT NULL AND vNotes != ''
THEN
IF vNotes IS NOT NULL AND vNotes <> '' THEN
INSERT INTO vn.ticketObservation SET
jgallego commented 2024-07-30 07:30:02 +00:00
Owner
Copy Link

ticket_add que es crida dalt ja fa insert en la taula ticketObservation y es el que realment deuria fer-ho. Fes una proba per confirmar si este codi esta duplicant les observacions i si es així ho lleves.

ticket_add que es crida dalt ja fa insert en la taula ticketObservation y es el que realment deuria fer-ho. Fes una proba per confirmar si este codi esta duplicant les observacions i si es així ho lleves.
guillermo commented 2024-07-30 08:13:52 +00:00
Author
Member
Copy Link

He revisat el codi, i ahí soles se inserta la observació del order, per lo tant, es correcte, no es duplica res

He revisat el codi, i ahí soles se inserta la observació del order, per lo tant, es correcte, no es duplica res
guillermo marked this conversation as resolved
db/routines/hedera/procedures/order_confirmWithUser.sql Outdated
@ -241,3 +279,4 @@
WHERE id = vRowFk;
-- Inserta en putOrder si la compra es de Floramondo
IF vIsLogifloraItem THEN
jgallego commented 2024-07-30 07:31:28 +00:00
Owner
Copy Link

si ho feres amb Pako, confirma amb ell pero vIsLogifloraItem açò no es gasta i si ho vullguerem gastar no funcionaria tot el procés caldría refer-ho. Pregunta-li i lleves tot el codi del if

si ho feres amb Pako, confirma amb ell pero vIsLogifloraItem açò no es gasta i si ho vullguerem gastar no funcionaria tot el procés caldría refer-ho. Pregunta-li i lleves tot el codi del if
guillermo marked this conversation as resolved
guillermo added 1 commit 2024-07-30 08:14:30 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
b6abcbe090 feat: refs #6453 Requested changes
guillermo requested review from jgallego 2024-07-30 08:14:32 +00:00
jgallego requested changes 2024-08-01 07:28:39 +00:00
Dismissed
db/routines/hedera/procedures/order_confirmWithUser.sql Outdated
@ -138,0 +161,4 @@
SELECT t.id,
GROUP_CONCAT(DISTINCT i.itemPackingTypeFk) distinctItemPackingTypes
FROM vn.ticket t
JOIN vn.alertLevel al ON al.code = 'ON_PREVIOUS'
jgallego commented 2024-08-01 07:17:13 +00:00
Owner
Copy Link

esta linea no veig que es gaste

esta linea no veig que es gaste
guillermo commented 2024-08-02 05:51:32 +00:00
Author
Member
Copy Link

Wow, molt ben vist

Wow, molt ben vist
guillermo marked this conversation as resolved
db/routines/hedera/procedures/order_confirmWithUser.sql Outdated
@ -138,0 +174,4 @@
SELECT iptt.id INTO vTicketFk
FROM tItemPackingTypeTicket iptt
JOIN tItemPackingTypeOrder ipto
WHERE INSTR(iptt.distinctItemPackingTypes, ipto.distinctItemPackingTypes)
jgallego commented 2024-08-01 07:28:34 +00:00
Owner
Copy Link

Este enfoque te un problema:
si el confirma una order V,H
i ja existia un ticket H,V encara que es lo mateix, com l'ordre està canviat. No l'agafarà com a igual i crearà un altre,
Li he preguntat a Claude per si t'ajuda..https://claude.ai/chat/9e3efec7-761c-4482-a0df-e0e1fed1c7f2

Este enfoque te un problema: si el confirma una order V,H i ja existia un ticket H,V encara que es lo mateix, com l'ordre està canviat. No l'agafarà com a igual i crearà un altre, Li he preguntat a Claude per si t'ajuda..https://claude.ai/chat/9e3efec7-761c-4482-a0df-e0e1fed1c7f2
guillermo marked this conversation as resolved
guillermo added 1 commit 2024-08-02 05:58:48 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
b56260af36 feat: refs #6453 Requested changes
guillermo requested review from jgallego 2024-08-02 05:58:57 +00:00
jgallego approved these changes 2024-08-02 08:13:02 +00:00
guillermo merged commit ae9472e092 into dev 2024-08-02 10:15:00 +00:00
guillermo deleted branch 6453-orderConfirm 2024-08-02 10:15:00 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
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#2694
No description provided.
Delete Branch "6453-orderConfirm"

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?