Commit Graph

972 Commits

Author SHA1 Message Date
Pablo Natek b7e84f43de feat: refs #6403 add delete
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 13:26:20 +02:00
Alex Moreno 4fa9f057de Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-16 07:41:21 +02:00
Pablo Natek 08ba1acc3c fix: refs #6403 fix delivery observation
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-15 13:35:24 +02:00
Sergio De la torre cb107215b6 feat itemShelvingSale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-12 13:14:00 +02:00
Pablo Natek 64bddd4f63 feat: refs #6403 add dynamic clientType
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-10 10:41:52 +02:00
Guillermo Bonet 46e8f5b811 feat: refs #7511 Rename to multiConfig tables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 07:46:18 +02:00
Alex Moreno 1866c16727 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-08 14:33:12 +02:00
Alex Moreno 30d118f9df Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-08 14:32:43 +02:00
Pablo Natek 62045756e6 fix: refs #6403 extend length to 6 digits for mrw clientType
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-08 10:50:15 +02:00
Pablo Natek 816b111f79 feat: refs #6403 add dynamic clientType
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-08 09:20:39 +02:00
Alex Moreno 706288f227 Merge pull request 'test' (!2687) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2687
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-05 08:59:39 +00:00
Sergio De la torre f3f450463b warmFix getSales refs #6861
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-05 10:47:26 +02:00
Jon Elias 0e84749c07 Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 10:22:11 +00:00
Guillermo Bonet df4e5deae6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-28 13:33:43 +02:00
Pablo Natek 94a73294cb fix: refs #6404 get label
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-28 09:11:20 +02:00
Pablo Natek 478a38b0ab Merge branch 'master' into 6404-sendMailOnDeadLine
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-26 05:14:37 +00:00
Alex Moreno 95a23ad9fc Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 11:43:42 +00:00
Carlos Andrés ff1918ef06 Merge pull request 'feat: previas con sitema de reservas refs #6861' (!2176) from 6861-Pasar-modo-trabajo-de-previa-a-reservas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2176
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-25 11:21:02 +00:00
Alex Moreno f2ee1df8ac Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-25 07:29:56 +02:00
Javier Segarra ba48d93c1e perf(salix): refs #6264 #6264 remove save token as debug row
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 23:28:11 +02:00
Javier Segarra bfb6689835 test: add CALL util.debugAdd
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 15:15:56 +02:00
Javier Segarra 31a75956c0 feat: add CALL util.debugAdd 2024-06-20 15:15:51 +02:00
Pablo Natek 25afa80bab fix: refs #6404 remove fixtures after test
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-17 09:09:45 +02:00
Pablo Natek c3d64b2358 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6404-sendMailOnDeadLine
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-17 08:49:26 +02:00
Pablo Natek a30ff44837 fix: refs #6404 fix notification
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-14 17:40:08 +02:00
Jon Elias ee75068e9c refactor: refs #6436 fixed test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-14 08:57:11 +02:00
Jon Elias 61a588b57c refactor: refs #6436 fixed test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 08:39:57 +02:00
Jon Elias 84a51d3e8d feat: refs #6436 changed tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 12:23:37 +02:00
Alex Moreno 671978ec02 Merge branch 'dev' into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 10:21:36 +00:00
Jon Elias 665d03f048 refactor: refs #6436 user-config and some sections tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 12:35:44 +02:00
Jon Elias b3fa869757 refactor: refs #6436 second wave
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 10:00:30 +02:00
Jon Elias 7df7382346 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 09:41:26 +02:00
Jon Elias f0ad012835 refactor: refs #6436 first wave 2024-06-11 09:39:06 +02:00
Jorge Penadés d30cd68417 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 09:11:56 +02:00
Pablo Natek d41f1ff561 fix: refs #6404 remove focus from test
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-10 12:36:15 +02:00
Pablo Natek c5227d6cf6 feat: refs #6404 add mail notification
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-10 12:24:23 +02:00
Alex Moreno 7a803cce37 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-04 09:38:50 +02:00
Pablo Natek b9b0651069 fix: refs #6404 fix agency service selection
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-03 12:38:57 +02:00
Pablo Natek b1a4b42028 fix: refs #6404 change db language on local
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-03 10:29:38 +02:00
Guillermo Bonet 7dc17cd4f6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-31 12:29:32 +02:00
Pablo Natek 988b3cbbee fix: refs #6404 ref #6404 remove console.log
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-31 11:53:55 +02:00
Pablo Natek 884b5f8475 feat: refs #6404 add cero filler to counter 2024-05-31 11:51:32 +02:00
Pablo Natek d901584c3f feat: refs #6404 add deadline field
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-05-30 18:39:06 +02:00
Guillermo Bonet f87ee5cb91 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-29 08:09:53 +02:00
Pablo Natek 33e823675e feat: refs #6404 default weight
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 10:08:15 +02:00
Sergio De la torre 2d876fa1a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 11:33:22 +02:00
Sergio De la torre 74b71079f2 refs #6861 feat: obsrevation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 11:33:04 +02:00
Sergio De la torre 2cd7133a8c refs #6861 feat: skipTest
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 08:15:57 +02:00
Sergio De la torre 64f71e0f9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 07:46:21 +02:00
Javier Segarra ab1797ebec Merge branch 'dev' into 7272_bug_redirectToLogin
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 11:59:30 +00:00
Alex Moreno 28279b0782 Merge branch 'dev' into 7421-fix_checking_NODE_ENV
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 13:12:30 +00:00
Alex Moreno ff33c926af fix: move to boot
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-21 15:11:32 +02:00
Alex Moreno d884192066 fix: checking process.env.NODE_ENV
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-21 13:52:50 +02:00
Alex Moreno 18bb8a4ea5 fix: checking process.env.NODE_ENV
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-21 13:50:45 +02:00
Javier Casado d0bb9d7690 Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 05:50:49 +00:00
Pablo Natek 3fa557f90d fix: refs #6404 create shipment
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 13:58:32 +02:00
Pablo Natek 143f9cf0bb fix: refs #6404 fix return
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 12:17:10 +02:00
Pablo Natek d51c9fc120 fix: refs #6404 fix cancel shipment
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 12:14:59 +02:00
Javier Casado 5ee550ebf7 Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 12:08:41 +00:00
Jorge Penadés 0e51fa861c fix: refs #6598 drop variables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 11:35:29 +02:00
Jorge Penadés 5abc95af51 feat: refs #6598 back test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 11:29:16 +02:00
Sergio De la torre 75bb08a0c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 07:08:47 +02:00
Jorge Penadés c6242cc2e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-15 16:41:15 +02:00
Javier Casado 03f0de489e Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 05:40:25 +00:00
Sergio De la torre e8a30c1df8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-06 10:30:19 +02:00
Jorge Penadés 411933a608 feat: refs #6598 acls back
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-03 12:17:51 +02:00
Javier Segarra ae91486641 test(salix): refs #7272 #7272 fix renew-token.spec 2024-05-02 10:36:18 +02:00
Javier Segarra be3ee43b06 fix(salix): refs #7272 #7272 Back validateToken endpoint 2024-04-30 11:35:30 +02:00
Robert Ferrús fd7dcf2781 fix: refs #7039 fixpr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 10:26:20 +02:00
Robert Ferrús 8153a526ce feat: refs #7039 country-name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:35:21 +02:00
Javier Segarra 83d89d13ad Merge branch 'dev' into 7190_renewTokenMultimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 08:26:23 +00:00
Javier Segarra d2aba88a34 feat(salix): refs #7190 minor change salix-back 2024-04-19 11:36:34 +02:00
Javier Segarra 30d0db163e feat(salix): refs #6930 minor updates 2024-04-19 10:50:14 +02:00
Javier Segarra 322d91d814 feat(salix): refs #6930 Add DEFAULT scope 2024-04-19 10:49:57 +02:00
Sergio De la torre ad13ad856b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 09:13:48 +02:00
Javier Segarra 6214da2c42 feat(salix): refs #6930 Undo rollback salix-back 2024-04-17 09:52:53 +02:00
Javier Segarra 6db0eba72c Merge branch 'dev' into 7190_renewTokenMultimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 06:51:03 +00:00
Javier Segarra 25b5c35dc6 refs #6835 fix: issue
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 08:47:49 +02:00
Javier Segarra 253465cf13 refs #7190 feat: renewToken for multimedia 2024-04-15 08:47:27 +02:00
Sergio De la torre 13415b1ef0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-12 09:49:18 +02:00
Pablo Natek 726b1ddc07 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-12 05:14:29 +00:00
Sergio De la torre 3a8dcbfd29 refs #6861 feat:reserve previos
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-11 13:45:43 +02:00
Sergio De la torre 9a98c872d4 Merge branch '5890-itemShelving_asignado' into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-11 12:34:49 +02:00
Sergio De la torre 68fa64a937 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-11 12:24:00 +02:00
Carlos Andrés 5967bd545c feat: previas con reserva refs #6861
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-11 12:16:00 +02:00
Sergio De la torre d998b650da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-11 07:06:40 +02:00
Pablo Natek c581deef66 refactor: refs #6005 refactor spec 2024-04-10 13:09:31 +02:00
Pablo Natek ed517399dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler 2024-04-09 15:04:04 +02:00
Ivan Mas f02c4354ba Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 14:45:29 +02:00
Guillermo Bonet 0e2e68488d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 13:08:54 +02:00
Guillermo Bonet 743dc2144e hotfix: refs #6276 Fix send chat msg getSales
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-09 13:05:01 +02:00
Pablo Natek 7cb40f5d89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 09:42:39 +02:00
Alex Moreno 9134216332 refactor(workerDms): adapat to lilium
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-08 14:46:35 +02:00
Sergio De la torre 2770919db9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-08 07:09:47 +02:00
Pablo Natek 4b4aaa9e10 feat: refs #6005 move logic from report to hook 2024-04-05 08:04:53 +02:00
Alex Moreno dd9c7283c3 hotFix: handle mail error
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-04 13:32:39 +02:00
Sergio De la torre b742f8a13c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-04 12:26:01 +02:00
Guillermo Bonet c685000b47 hotfix: refs #6930 Rollback tokenMultimedia
gitea/salix/pipeline/head This commit looks good Details
2024-04-04 10:13:56 +02:00
Javier Segarra 8ab9063b50 refs #6436 feat: use mocks
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-01 11:00:55 +02:00
Javier Segarra 48cc499f37 refs #6436 perf: example to use
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-29 22:19:36 +01:00