#6889 drop addSaleByCode #2470

Merged
jorgep merged 27 commits from 6889-dropAddSaleByCode into dev 2024-06-03 10:09:07 +00:00
Member
No description provided.
jorgep added 1 commit 2024-05-17 12:20:38 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
1f1a49d0a5
refactor: refs #6889 use addSale
jorgep added 1 commit 2024-05-20 08:31:13 +00:00
jorgep added 1 commit 2024-05-20 10:34:45 +00:00
jorgep added 1 commit 2024-05-27 11:58:18 +00:00
jorgep added 1 commit 2024-05-28 11:22:40 +00:00
jorgep added 1 commit 2024-05-28 15:24:03 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
885aa5208a
feat : refs #6889 wip: check if is productionReviewer or owner
jorgep added 1 commit 2024-05-29 07:16:40 +00:00
jorgep added 1 commit 2024-05-29 08:22:57 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
fc606f7e36
fix: refs #6889 rollback
jorgep added 1 commit 2024-05-29 14:55:14 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
a32db7840e
feat: refs #6889 fixtures & models
jorgep added 1 commit 2024-05-29 14:59:24 +00:00
jorgep added 1 commit 2024-05-30 06:45:52 +00:00
jorgep added 1 commit 2024-05-30 08:04:38 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
05e6e10337
fix: refs #6889 fix back tests
jorgep reviewed 2024-05-30 09:37:23 +00:00
@ -764,2 +764,3 @@
(32, 1, 8, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY), 1103, 'Phone Box', 123, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL, NULL),
(33, 1, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1102, 'NY roofs', 122, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL, NULL);
(33, 1, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1102, 'NY roofs', 122, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL, NULL),
(34, 1, 1, 1, 3, util.VN_CURDATE(), util.VN_CURDATE(), 1103, 'BEJAR', 123, NULL, 0, 1, 16, 0, util.VN_CURDATE(), NULL, NULL),
Author
Member

Añado 3 tickets libres.

Añado 3 tickets libres.
jorgep reviewed 2024-05-30 09:37:43 +00:00
@ -810,2 +814,3 @@
(23, 16, 21, util.VN_NOW()),
(24, 16, 21, util.VN_NOW());
(24, 16, 21, util.VN_NOW()),
(34, 14, 49, util.VN_NOW()),
Author
Member

Y 1 línea por ticket.

Y 1 línea por ticket.
jorgep reviewed 2024-05-30 09:39:07 +00:00
@ -1255,3 +1267,3 @@
(2, 1, NULL),
(3, 2, NULL),
(23, 1, NULL);
(23, 1, NULL),
Author
Member

Colección para cada ticket

Colección para cada ticket
jorgep reviewed 2024-05-30 09:39:58 +00:00
@ -3707,2 +3721,3 @@
parkingFk = 9,
sectorFk = 9992;
sectorFk = 9992,
ticketFk = 36;
Author
Member

salegroup para un ticket. (para hacer los tests)

salegroup para un ticket. (para hacer los tests)
jorgep reviewed 2024-05-30 09:40:54 +00:00
@ -65,3 +65,3 @@
expect(firstItemBalance[9].claimFk).toEqual(null);
expect(secondItemBalance[4].claimFk).toEqual(2);
expect(secondItemBalance[7].claimFk).toEqual(2);
Author
Member

Está contando los 3 tickets que yo he añadido. No estaba seleccionando el mismo.

Está contando los 3 tickets que yo he añadido. No estaba seleccionando el mismo.
jorgep reviewed 2024-05-30 09:41:08 +00:00
@ -152,3 +152,3 @@
const firstRow = result[0];
expect(result.length).toEqual(12);
expect(result.length).toEqual(15);
Author
Member

Está contando los 3 tickets que yo he añadido.

Está contando los 3 tickets que yo he añadido.
jorgep reviewed 2024-05-30 09:42:25 +00:00
@ -12,3 +12,2 @@
{
arg: 'itemId',
type: 'number',
arg: 'barcode',
Author
Member

Sergio pasará el idem del item o un barcode.

Sergio pasará el idem del item o un barcode.
jorgep reviewed 2024-05-30 09:42:42 +00:00
@ -69,3 +69,3 @@
const result = await models.Ticket.filter(ctx, filter, options);
expect(result.length).toEqual(7);
expect(result.length).toEqual(10);
Author
Member

Está contando los 3 tickets que yo he añadido.

Está contando los 3 tickets que yo he añadido.
jorgep reviewed 2024-05-30 09:44:00 +00:00
@ -85,3 +85,3 @@
const {items} = await models.Ticket.priceDifference(ctx, options);
expect(items[0].movable).toEqual(410);
expect(items[0].movable).toEqual(386);
Author
Member

Está contando la cantidad exacta de las 3 sales que yo he añadido. Es

Está contando la cantidad exacta de las 3 sales que yo he añadido. Es
jorgep added 2 commits 2024-05-30 09:47:16 +00:00
jorgep reviewed 2024-05-30 09:52:30 +00:00
@ -43,3 +43,3 @@
const options = {transaction: tx};
const ctx = {req: {accessToken: {userId: 1106}}};
const ctx = {req: {accessToken: {userId: 1105}}};
Author
Member

Es el usuario que tiene el ticket, entonces no falla.

Es el usuario que tiene el ticket, entonces no falla.
jorgep added 3 commits 2024-05-31 06:37:35 +00:00
jorgep added 1 commit 2024-05-31 07:50:03 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
38bea60776
refactor: refs #6889 script sql
jorgep added 1 commit 2024-05-31 10:51:11 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
4772509b67
fix: refs #6889 e2e tests
jorgep added 1 commit 2024-05-31 10:56:28 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
ab9c11ef84
fix: refs #6889 modify fixtures
jorgep added 1 commit 2024-05-31 10:58:09 +00:00
jorgep added 1 commit 2024-05-31 11:05:16 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
ee09617b27
fix: refs #6889 e2e tests
jorgep reviewed 2024-05-31 11:06:03 +00:00
@ -225,7 +225,7 @@ describe('Ticket Edit sale path', () => {
});
it('should show error trying to delete a ticket with a refund', async() => {
await page.loginAndModule('production', 'ticket');
Author
Member

Production ya no puede borrar lineas.

Production ya no puede borrar lineas.
jorgep added 1 commit 2024-05-31 11:58:29 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
836cfcbd07
refactor: refs #6889 sale tests e2e
jorgep added 1 commit 2024-05-31 14:31:39 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
dc8696b422
feat: refs #6889 add back tests
jorgep changed title from WIP: #6889 drop addSaleByCode to #6889 drop addSaleByCode 2024-05-31 14:32:45 +00:00
jorgep added the
CR / Tests passed
label 2024-05-31 14:32:57 +00:00
jorgep requested review from jgallego 2024-05-31 17:04:09 +00:00
jorgep added 1 commit 2024-06-03 06:30:52 +00:00
jgallego requested changes 2024-06-03 08:09:16 +00:00
Dismissed
@ -32,0 +37,4 @@
workerId = sectorCollectionSaleGroup?.sectorCollection()?.userFk;
}
const isOwner = workerId === ctx.req.accessToken.userId;
Owner

aqui hay un caso no contemplado, si la coleccion la tiene otro, pero llega el que tiene el salegroup asociado sí debe poder editarlo, por tanto, no tienen que ser excluyentes esas dos opciones

aqui hay un caso no contemplado, si la coleccion la tiene otro, pero llega el que tiene el salegroup asociado sí debe poder editarlo, por tanto, no tienen que ser excluyentes esas dos opciones
jorgep marked this conversation as resolved
jorgep added 1 commit 2024-06-03 08:14:08 +00:00
jorgep added 1 commit 2024-06-03 08:30:24 +00:00
jorgep requested review from jgallego 2024-06-03 08:31:03 +00:00
jgallego approved these changes 2024-06-03 09:14:35 +00:00
jorgep merged commit 705a873d53 into dev 2024-06-03 10:09:07 +00:00
jorgep deleted branch 6889-dropAddSaleByCode 2024-06-03 10:09:07 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
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#2470
No description provided.