wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
11,281 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

11281 Commits

Author SHA1 Message Date
Javi Gallego f3026141a8 Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-03-04 12:55:25 +01:00
Javi Gallego bccda8fba6 refactor: refs #6802 replace salesPerson references with department in claims and tickets 2025-03-04 11:47:07 +01:00
Alex Moreno fd75613b52 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-04 09:36:15 +01:00
Alex Moreno 8faf1aa97c fix(VnNotes): simplify attribute handling by removing unnecessary computed property 2025-03-04 09:29:50 +01:00
Alex Moreno f5204ed2fa fix(TicketProblems): update risk condition to use hasRisk property 2025-03-04 09:11:21 +01:00
Alex Moreno 71dd5fc73d fix(TicketProblems): handle null credit value in risk calculation 2025-03-04 09:05:59 +01:00
Alex Moreno 7d07256591 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-04 08:48:33 +01:00
Alex Moreno 6270653589 fix(TicketExpedition): add filter 2025-03-04 08:48:09 +01:00
Alex Moreno 6b414d04f0 fix: unnecessary function 2025-03-04 08:29:36 +01:00
Alex Moreno 09c80bda41 fix(VnSelect): event.preventDefault(); (git revert) 2025-03-04 08:19:53 +01:00
Alex Moreno 61b2dbee17 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-04 08:16:02 +01:00
Alex Moreno d13fb26b1a fix(TicketProblems): isTaxDataChecked 2025-03-04 08:07:38 +01:00
Alex Moreno 73b9fff836 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-04 08:02:10 +01:00
Alex Moreno 43775d6c2e Merge pull request '8713-testToMaster' (!1539) from 8713-testToMaster into master 
Reviewed-on: verdnatura/salix-front#1539
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2025-03-04 06:57:12 +00:00
Alex Moreno ed6d906a4e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 8713-testToMaster 2025-03-04 07:23:53 +01:00
Alex Moreno c05e1ae602 Merge pull request 'fix_ticket_e2e' (!1540) from fix_ticket_e2e into test 
Reviewed-on: verdnatura/salix-front#1540
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-04 06:23:45 +00:00
Javier Segarra 73eab5baa4 refactor: remove default browser setting and update test case to run normally 2025-03-03 23:35:29 +01:00
Javier Segarra 399437d334 feat: add reserved icon to TicketProblems and update Cypress tests for ticket sale functionality 2025-03-03 22:47:47 +01:00
Javier Segarra 6fb160ec8d feat: update Cypress configuration and improve ticket components with new features 2025-03-03 22:01:30 +01:00
Alex Moreno b84eb9c23c fix: cy.domContentLoad(); not exist 2025-03-03 15:55:31 +01:00
Alex Moreno 9b8eb74b17 build: refs #8713 add changelog 2025-03-03 15:53:17 +01:00
Alex Moreno 6c67a315dc Merge pull request 'refactor: refs #8708 improve note components and update filter handling' (!1537) from 8581-warmfix-filterVnNotes into test 
Reviewed-on: verdnatura/salix-front#1537
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-03 14:52:33 +00:00
Jorge Penadés d2ccc232ef refactor: refs #8581 improve note components and update filter handling 2025-03-03 15:11:47 +01:00
Alex Moreno 82942c37c7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-03 14:42:52 +01:00
Javier Segarra ea50caff3f Merge pull request '#7356 - Ticket module improves' (!1405) from warmfix_ticketList into test 
Reviewed-on: verdnatura/salix-front#1405
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-03 13:37:01 +00:00
Alex Moreno b325ce191d Merge branch 'test' into warmfix_ticketList 2025-03-03 13:10:43 +00:00
Alex Moreno 557927a673 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-03 13:59:31 +01:00
Carlos Satorres b976f61eeb Merge pull request 'fix: workerBasicData' (!1535) from warmFix-nextTick into test 
Reviewed-on: verdnatura/salix-front#1535
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-03-03 12:17:35 +00:00
Carlos Satorres a71a039bfa Merge branch 'test' into warmFix-nextTick 2025-03-03 12:11:54 +00:00
Carlos Satorres 5e6ce6efda fix: workerBasicData 2025-03-03 13:06:50 +01:00
Javier Segarra c4dd24b394 Merge pull request '#7356 - TicketServices and CrudModel updates' (!1479) from 7356_ticketService into test 
Reviewed-on: verdnatura/salix-front#1479
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-03 12:06:22 +00:00
Pablo Natek f189a9912c Merge pull request 'refactor: refs #8697 simplify date handling in ItemDiary component' (!1532) from 8697-fixScrollToView into test 
Reviewed-on: verdnatura/salix-front#1532
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-03 11:49:45 +00:00
Javier Segarra a7af697947 style: refs #7356 eslint format 2025-03-03 10:22:07 +01:00
Javier Segarra 967848c790 fix: refs #7356 chaining params 2025-03-03 10:19:19 +01:00
Pablo Natek e30811e927 Merge branch 'test' into 8697-fixScrollToView 2025-03-03 09:16:00 +00:00
Alex Moreno f0e00e1721 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-03 10:11:30 +01:00
Alex Moreno ff1967b72b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-03 10:11:21 +01:00
Alex Moreno 2ea949e4d8 Merge branch 'test' into 8697-fixScrollToView 2025-03-03 08:59:56 +00:00
Javier Segarra d041bf6dc1 Merge branch 'test' into warmfix_ticketList 2025-03-03 08:55:00 +00:00
Javier Segarra 4c0e89c3ff Merge pull request 'WARMFIX: #8242 - leftMenu_responsive' (!1504) from 8242_leftMenu_responsive into test 
Reviewed-on: verdnatura/salix-front#1504
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-03 08:51:28 +00:00
Jose Antonio Tubau 6e838133e2 Merge pull request 'test: refs #8594 add vehicle summary component and integration tests for vehicle list functionality' (!1464) from 8594---createTestE2eVehicleList into dev 
Reviewed-on: verdnatura/salix-front#1464
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-03 08:30:17 +00:00
Pablo Natek f9b410405d refactor: refs #8697 simplify date handling in ItemDiary component 2025-03-03 09:13:38 +01:00
Carlos Satorres 86454b60e9 Merge pull request 'hotfix-workerCalendar' (!1527) from hotfix-workerCalendar into master 
Reviewed-on: verdnatura/salix-front#1527
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-03-03 07:27:09 +00:00
Carlos Satorres afda990fd2 Merge branch 'master' into hotfix-workerCalendar 2025-03-03 07:19:26 +00:00
Alex Moreno 581e4abec5 Merge pull request 'hotFix(orderCatalog): load when reload section' (!1524) from hotFix_orderCatalog_reload into master 
Reviewed-on: verdnatura/salix-front#1524
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-03 07:13:01 +00:00
Jose Antonio Tubau 3cbca6ca26 Merge branch 'dev' into 8594---createTestE2eVehicleList 2025-03-03 07:11:02 +00:00
Pablo Natek 2b557148ec Merge pull request 'feat: refs #8697 enable data-cy attribute for VnTable, update test cases to remove skips and adjust selectors' (!1529) from 8697-fixSkipedE2e into dev 
Reviewed-on: verdnatura/salix-front#1529
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-03 06:24:06 +00:00
Javier Segarra 947024ef56 perf: refs #7356 minor changes 2025-03-02 23:50:23 +01:00
Javier Segarra 8df6c95640 Merge branch 'test' into warmfix_ticketList 2025-03-02 23:22:18 +01:00
Javier Segarra b4dad7a29b revert: filter logic moved to other branch 2025-03-02 23:22:01 +01:00