Commit Graph

13347 Commits

Author SHA1 Message Date
Alex Moreno 9225e8f176 fix tests
gitea/salix/pipeline/head This commit looks good Details
2022-10-27 15:11:57 +02:00
Pau ce8463712a Merge branch 'dev' into 1885-delete-orderConfirmUser.spec.js
gitea/salix/pipeline/head This commit looks good Details
2022-10-27 08:13:04 +00:00
Alex Moreno 9d85389691 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order 2022-10-27 09:35:16 +02:00
Alex Moreno da78b39874 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
2022-10-27 07:29:39 +00:00
Alex Moreno 5c65314162 use findById
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 09:27:50 +02:00
Joan Sanchez 1da7ff4f06 Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-10-27 07:27:38 +00:00
Joan Sanchez 714fe32552 Fix error
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 09:26:02 +02:00
Joan Sanchez 7188b8498b Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 07:24:09 +00:00
Joan Sanchez 51f95f0261 Fixed error
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 09:23:08 +02:00
Joan Sanchez d610c6dff3 Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 07:19:33 +00:00
Joan Sanchez 6a2bc5b593 Disabled back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 09:18:32 +02:00
Pau 736de00e77 deleted the test as requested on #1885
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 09:18:00 +02:00
Pau 00061caa65 Merge branch '4490-transfer-tickets-between-clients' of https://gitea.verdnatura.es/verdnatura/salix into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-27 09:05:06 +02:00
Alex Moreno 926ab0e35c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order 2022-10-27 09:05:05 +02:00
Pau c576e503cf fix httpBack.flush error 2022-10-27 09:05:05 +02:00
Alex Moreno 3ffc098b56 feat(privileges): check if user has role from userToUpdate
gitea/salix/pipeline/head This commit looks good Details
2022-10-27 09:01:09 +02:00
Pau d64f0e4b34 Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 06:52:08 +00:00
Pau 04514804b7 fix tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 08:51:22 +02:00
Pau bfb9484e02 Merge branch '4490-transfer-tickets-between-clients' of https://gitea.verdnatura.es/verdnatura/salix into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 08:46:24 +02:00
Pau d4a22f7962 Apply requested changes 2022-10-27 08:46:22 +02:00
Alex Moreno 99fca9834f Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 06:10:14 +00:00
Vicent Llopis 1d908002e2 feat: add backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 14:25:27 +02:00
Vicent Llopis c0b95564c3 refactor: borrado codigo sql innecesario 2022-10-26 14:25:17 +02:00
Alexandre Riera bc6e639746 refs #4644 cambio en un test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 13:23:54 +02:00
Vicent Llopis fa89d1f944 fix: comentario corregido
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 13:10:50 +02:00
Vicent Llopis b39b28e43d refactor: añadido salto de lineas
gitea/salix/pipeline/head This commit looks good Details
2022-10-26 13:10:17 +02:00
Alexandre Riera 405bc8765a refs #4645 valores ref cambiados
gitea/salix/pipeline/head This commit looks good Details
2022-10-26 12:48:48 +02:00
Vicent Llopis 65e32f5e7f feat: client search panel add find by zone
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 12:40:13 +02:00
Vicent Llopis 350c516bb1 feat: cancelar petición cuando esta calculando el packaging
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 10:36:41 +02:00
Alexandre Riera d243f9a87d refs #4644 checkbox añadido
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 10:03:13 +02:00
Vicent Llopis e0e015c268 fix: backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 09:49:58 +02:00
Vicent Llopis ec81b12239 refactor: el UserError se lanza en back
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 09:33:03 +02:00
Vicent Llopis 21e2945d4f refactor: delete destroyAll
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 09:30:17 +02:00
Vicent Llopis c671540a7f refactor: renombrada variable
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 09:04:53 +02:00
Vicent Llopis d1e2b1f7d5 refactor: tranducciones 2022-10-26 09:02:54 +02:00
Vicent Llopis 3110172c54 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3811-ticket.sale_updatePrice 2022-10-26 08:39:58 +02:00
Vicent Llopis d4e2783630 refactor: corregidas traducciones, eliminado destroyAll y añadida transacción
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:39:07 +02:00
Alex Moreno f65d06fc7d fixes #4073
gitea/salix/pipeline/head This commit looks good Details
2022-10-26 08:27:28 +02:00
Vicent Llopis 1e1d4f00f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition 2022-10-26 08:26:23 +02:00
Vicent Llopis 5e0f976ad2 Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 06:25:18 +00:00
Vicent Llopis 925565d3d2 refator: borrada variable global y añadida Promesa al array
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:23:36 +02:00
Vicent Llopis a8dfc9d06f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:11:15 +02:00
Vicent Llopis 07a18dc736 delete sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:05:11 +02:00
Alex Moreno f07f0679d8 fix fixture
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 15:03:20 +02:00
Alexandre Riera 7948523685 refs #4650 cambios en la query
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 15:03:09 +02:00
Alex Moreno 342832c475 try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 15:02:22 +02:00
Alex Moreno 607e9010e6 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 12:36:35 +00:00
Joan Sanchez 4334907d91 fix(database): updated sql files
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 14:09:21 +02:00
Pau d83972d3fa Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 12:07:32 +00:00
Alexandre Riera 67402dfe5e refs #4650 observaciones añadidas
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 13:27:04 +02:00