Commit Graph

2041 Commits

Author SHA1 Message Date
Javier Segarra 0111373471 Merge branch 'dev' of https: refs #6321//gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-04 14:00:00 +01:00
Javier Segarra 550b0871f0 feat: refs #6321 changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-04 13:45:59 +01:00
Alex Moreno fe7a1c60cc 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
2025-02-04 13:03:17 +01:00
Javier Segarra 410f3e73dc Merge branch 'dev' of https: refs #6321//gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-04 09:54:41 +01:00
Javi Gallego 55ec4aaba1 Merge pull request 'feat: refs #7686 Added new alertLevel ON_PREVIOUS and changes in vn.state.alertLevel' (!2890) from 7686-onPrevious into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2890
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2025-02-03 08:12:36 +00:00
Javi Gallego adba4765ed refactor: refs #7686 update alert level conditions to only check for 'FREE'
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-03 09:07:08 +01:00
Javier Segarra 767c891317 perf: refs #6321 remove comments
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-31 01:17:23 +01:00
Javier Segarra 7fdd3d1eb8 feat: refs #6321 fix methods 2025-01-31 01:07:28 +01:00
Javier Segarra 75b4202a7b feat: refs #6321 remove origin 2025-01-31 01:04:14 +01:00
Javier Segarra dc6f93c241 Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-30 08:54:04 +01:00
Javier Segarra 811feb9fee feat: refs #6321 tour 2025-01-29 23:46:19 +01:00
Jose Antonio Tubau ad29b26553 refactor: refs #7414 update Spanish translation for 'total' to 'importe'
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 12:43:03 +01:00
Javier Segarra ac053814e6 test: refs #6321 fixing test 2025-01-29 12:26:42 +01:00
Sergio De la torre 1575c509d1 fix: refs #7569 saveSign use lastState
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-28 11:19:45 +01:00
Sergio De la torre 3f0f155113 fix: refs #7569 saveSign use lastState
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-28 11:15:29 +01:00
Sergio De la torre 79ea19a360 fix: refs #7569 saveSign use lastState 2025-01-28 11:14:08 +01:00
Sergio De la torre a29de13ab3 fix: refs #7569 saveSign use smtp.send and fix link
gitea/salix/pipeline/head This commit looks good Details
2025-01-28 09:54:26 +01:00
Javi Gallego 08d2414363 refactor: refs #7686 update editableStates tests to check for 'OK' and 'Bloqueado' states
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-28 09:16:19 +01:00
Javier Segarra 10eef6d1b6 feat: refs #6321 updates
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-28 08:45:00 +01:00
Javi Gallego 0def25ad15 Merge branch 'dev' into 7686-onPrevious 2025-01-28 08:28:16 +01:00
Javier Segarra 198ae9a83b Merge branch 'master' into Hotfix-PriceDifferenceShipped
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-28 07:19:37 +00:00
Jon Elias e85b68650d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into Fix-TicketSummaryAddress 2025-01-28 07:33:03 +01:00
Javi Gallego 857874c4c6 refactor: refs #7686 remove obsolete alert level updates and adjust state alert level logic
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-27 15:43:26 +01:00
Javier Segarra 1a0992da78 feat: refs #6321 changes 2025-01-27 12:04:18 +01:00
Jose Antonio Tubau 29af7cfcbc test: refs #7322 added test error for case when expected error is not thrown
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-27 08:23:30 +01:00
Jose Antonio Tubau 4fd58e24c5 Merge branch 'dev' into 7322-addSelectAddressOnTicketTransfer
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-27 07:07:28 +00:00
Javier Segarra bd54eacda1 feat: refs #6321 alternative alertLevel 2025-01-26 02:36:39 +01:00
Javier Segarra 36192c14ec Merge branch 'dev' into 6321_negative_tickets 2025-01-25 09:10:45 +01:00
Jon Elias 034df6e8ea feat: added nickname in address
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-24 13:48:35 +01:00
Jon Elias 6da004e7cf fix: fixed shipped date when it is null
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-24 09:29:58 +01:00
Jon Elias 603e3e32c4 fix: shipped field
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-24 07:39:18 +01:00
Javier Segarra c3361fd49b Merge branch 'dev' into 6321_negative_tickets 2025-01-23 14:48:28 +01:00
Jose Antonio Tubau 95329b7ddb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7322-addSelectAddressOnTicketTransfer
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-23 14:43:17 +01:00
Jose Antonio Tubau f165d17869 feat: refs #7322 add addressFk parameter to transferClient method and update tests
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-23 14:26:02 +01:00
Robert Ferrús 14e69c1c64 Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-23 08:21:32 +00:00
Jon Elias 602e822599 refactor: refs #7184 deleted .value
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-23 08:21:19 +01:00
Jon Elias 0eff155daf refactor: refs #7184 created myteam filter and modified filters where it is used
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-22 16:34:14 +01:00
Javier Segarra 2a4bad5034 Merge branch 'dev' into 6321_negative_tickets 2025-01-21 23:43:07 +01:00
Sergio De la torre 7f17cd59e7 Merge branch 'dev' of https: refs #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket 2025-01-21 06:58:15 +01:00
Sergio De la torre ef68884fe0 feat: refs #7569 refs#7569 sendEmailNotification
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-20 16:27:35 +01:00
Javier Segarra 1560c48af2 feat: refs #6321 improve query 2025-01-20 14:32:26 +01:00
Sergio De la torre b5e27707a7 feat: refs #7569 refs#7569 sendEmailNotification
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-20 12:36:31 +01:00
Sergio De la torre 0340612645 feat: refs #7569 refs#7569 sendEmailNotification
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-20 12:35:55 +01:00
Robert Ferrús 4853e45051 feat: refs #8398 change merge.spec
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-16 07:29:40 +01:00
Jose Antonio Tubau b78603275f fix: refs #7322 reorder parameters in transferClient method for consistency
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-15 14:13:00 +01:00
Jose Antonio Tubau ec14281a82 feat: refs #7322 add optional addressFk parameter to transferClient method 2025-01-15 13:37:57 +01:00
Robert Ferrús 6ab0515f8e feat: refs #8398 sendCheckingPresence
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-15 12:31:28 +01:00
Javier Segarra 84dfdcb79a Merge branch 'dev' into 6321_negative_tickets 2025-01-14 12:43:25 +01:00
Jose Antonio Tubau 1cd7eda4ac Merge pull request 'feat: refs #8117 add worker first and last name to item type query' (!3330) from 8117-filtersAndValuesReviewed into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3330
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-13 06:13:31 +00:00
Guillermo Bonet 886383b82d Merge branch 'dev' into 7686-onPrevious
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-10 10:01:40 +01:00