Commit Graph

1468 Commits

Author SHA1 Message Date
Alex Moreno dbe0f4497c fix(postcode_filter): add limit
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-30 08:59:03 +02:00
Alex Moreno 434dfe4ae4 fix: refs #7679 postcode filter 2024-07-29 15:03:40 +02:00
Jorge Penadés 254cced550 chore: refs #6989 add config model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 13:40:30 +02:00
Alex Moreno 5264d6c973 feat(postcode_town): refs #7679 add requireds 2024-07-29 10:35:01 +02:00
Guillermo Bonet 95b61ae86a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 13:29:42 +02:00
Guillermo Bonet 9e18a208b2 fix: refs #7662 get value for proc with select for updates
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 13:26:45 +02:00
Pablo Natek 81120df4e4 feat: refs #6403 default mobile
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-25 09:57:56 +02:00
Alex Moreno 808c09643f remove console.log
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 12:05:26 +02:00
Alex Moreno ebac416034 remove console.log
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 12:03:47 +02:00
Guillermo Bonet fdef84f78d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-24 07:11:56 +02:00
Pablo Natek bdfaf02c95 fix: refs #6403 fix delivery observation
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-23 13:36:52 +02:00
Pablo Natek 80b338228e fix: refs #6403 take observation from ticket
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-23 12:29:08 +02:00
Alex Moreno 1c45aef883 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 11:46:19 +02:00
Alex Moreno eb413af275 hotFix: collection assign 2024-07-23 10:48:12 +02:00
Guillermo Bonet bc49600e21 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 10:24:47 +02:00
Guillermo Bonet fa10376bea fix: refs #7662 assign
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 10:21:09 +02:00
Sergio De la torre c777b8dbf1 Merge pull request 'feat checkExpeditionPrintOut refs #7751' (!2762) from 7751_boxPicking_check into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2762
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-22 20:33:47 +00:00
Guillermo Bonet 169534568e Merge branch 'test' into dev 2024-07-22 12:36:27 +02:00
Alex Moreno b8244b48e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 09:08:47 +02:00
Guillermo Bonet 69a8b8ef49 fix: refs #7511 Minor change
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 08:34:25 +02:00
Sergio De la torre f19f107971 feat checkExpeditionPrintOut refs #7751
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 08:27:22 +02:00
Guillermo Bonet 3525c878b6 Merge pull request 'feat: refs #7511 Rename to multiConfig tables' (!2711) from 7511-multiConfig into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2711
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-19 05:46:42 +00:00
Guillermo Bonet 3449aeb673 refactor: refs #7511 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 07:45:17 +02:00
Javier Segarra 304405a8a3 Merge branch 'dev' into 7671_dense_itemFixedPrices
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-18 15:21:12 +02:00
Guillermo Bonet f18b165e4a Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-18 13:45:23 +02:00
Pablo Natek 409daaf584 feat: refs #6403 add address mobile
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-18 10:13:21 +02:00
Alex Moreno ae2ddcb8c7 add console.log
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 12:20:58 +02:00
Alex Moreno e5bfb4af23 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 12:20:22 +02:00
Alex Moreno 563c70c65d fix(cancelShipment): fix
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 11:18:12 +02:00
Pablo Natek 0ea69427ec feat: refs #6403 add cancelShipment on deleteExpeditions
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-17 08:16:01 +02:00
Pablo Natek d2f022ab64 Merge branch 'dev' into 6403-feat-add-mrw-delete-on-salix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 11:44:54 +00:00
Pablo Natek 9e007bfb8a fix: refs #6403 fix mrw cancel shipment return type
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 13:43:36 +02:00
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
Javier Segarra c5cb4d84f1 Merge branch 'dev' into 7671_dense_itemFixedPrices
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-16 09:23:30 +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 d660043df2 feat: refs #7511 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 07:48:42 +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
Javier Segarra 1be04babe4 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-07-09 12:18:55 +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
Javier Segarra 2064107897 feat(salix): #7671 define isDestiny field in model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-04 15:25:21 +00:00
Alex Moreno 4535795515 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-03 10:08:15 +02:00
Sergio De la torre 1561e15d5e feat roadmap refs #7195
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-03 09:21:58 +02:00
Jon Elias 4bdbb3b08e Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 07:13:21 +00: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
Sergio De la torre 22959db0ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmap2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-01 11:28:14 +02: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
Jon Elias 0917fc318a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-28 13:19:38 +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
Javier Segarra b4afb883fc feat(salix): refs #6436 #6436 remove unnecessary object.assign
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-26 09:35:18 +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 0284f3b1ce Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 07:30:20 +02: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
Alex Moreno 7f278269a5 feat(AccessToken&ACL): refs #7547 upgrade security
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 14:28:55 +02:00
Sergio De la torre da40b705c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7357_dipole_review
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 07:20:00 +02:00
Sergio De la torre 13952f60e1 feat boxPicking refs #7357
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 07:18:10 +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
Jon Elias 419de69690 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-20 12:24:06 +02:00
Alex Moreno f99b1beb86 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-20 09:48:57 +02:00
Sergio De la torre c87f060d51 feat boxPicking refs #7357 2024-06-20 09:21:27 +02:00
Sergio De la torre 239814e6b4 feat hasItemOlder refs#6964
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-06-18 10:08:40 +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 711fad6b72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity 2024-06-14 08:50:32 +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 324d7ef7ae refactor: refs #6436 changed test config
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 14:54:43 +02:00
Carlos Satorres ba67acb72b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-12 14:33:11 +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
Carlos Satorres 5d7a570c3f refs #6897 fix redirection
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:28:49 +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
Carlos Satorres 48550bd986 refs #6897 fix remove
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 11:35:03 +02:00
Sergio De la torre f70605e565 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-04 16:03:37 +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
Sergio De la torre 94aef434a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-04 07:17:37 +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
Jon Elias cf5b8a27a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity 2024-06-03 10:04:38 +02:00
Sergio De la torre b9a9f52514 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-03 07:56:43 +02:00
Sergio De la torre 2985e1c9e8 feat: roadMap refs #7195 2024-05-31 13:08:48 +02:00
Jorge Penadés 9578c506b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 12:58:05 +02:00