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

10618 Commits

Author SHA1 Message Date
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
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
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
Javier Segarra ba98816f93 Merge branch 'test' into 7356_ticketService 2025-03-01 01:41:22 +00:00
Javier Segarra f472c9355c Merge branch 'test' into 8242_leftMenu_responsive 2025-03-01 01:40:27 +00:00
Javier Segarra 3b88f5e5cf Merge pull request '#8681 - (Mejoras) TicketAdvance' (!1513) from 8681_ticketAdvance_updates into test 
Reviewed-on: verdnatura/salix-front#1513
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-28 21:26:41 +00:00
Javier Segarra 358c9fa81a Merge branch 'test' into 8681_ticketAdvance_updates 2025-02-28 18:29:22 +00:00
Javier Segarra 2272cbd712 Merge branch 'master' into hotFix_orderCatalog_reload 2025-02-28 17:52:12 +00:00
Javier Segarra 4e02783f54 Merge pull request 'HOTFIX: customer table ticket list' (!1526) from hotfix_customerTable_tickets into master 
Reviewed-on: verdnatura/salix-front#1526
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-28 17:50:25 +00:00
Carlos Satorres 65ed302594 fix: hotfix calendar error400 2025-02-28 15:32:02 +01:00
Carlos Satorres 910e726879 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front 2025-02-28 15:31:06 +01:00
Carlos Satorres 38658b6df9 fix: error 400 2025-02-28 15:31:01 +01:00
Javier Segarra 824ed0b8d6 fix: customer table ticket list 2025-02-28 14:59:06 +01:00
Alex Moreno 8643733850 feat(orderCatalog): load when reload section 2025-02-28 14:28:09 +01:00
Pablo Natek ae72027f97 Merge pull request 'refactor: refs #6897 update component props and improve UI handling in Entry pages' (!1520) from 6897-fixSomeCaus into test 
Reviewed-on: verdnatura/salix-front#1520
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-28 12:29:16 +00:00
Pablo Natek 61aa750ae0 refactor: refs #6897 remove debug logs and unused style 2025-02-28 13:00:15 +01:00
Pablo Natek 1aa2cb7316 Merge branch 'test' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix-front into 6897-fixSomeCaus 2025-02-28 12:56:47 +01:00
Pablo Natek 8cf4d36f47 refactor: refs #6897 update component props and improve UI handling in Entry pages 2025-02-28 12:55:15 +01:00
Carlos Satorres cf23d7a1d7 Merge pull request 'fix: refs #6553 workerBusiness v3' (!1516) from 6553-workerBusinessV3 into test 
Reviewed-on: verdnatura/salix-front#1516
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-28 10:10:13 +00:00
Alex Moreno edd20c26c4 Merge branch 'test' into 6553-workerBusinessV3 2025-02-28 09:34:29 +00:00
Carlos Satorres 518ec2f49b fix: refs #6553 workerBusiness v3 2025-02-28 10:32:09 +01:00
Alex Moreno e29d03d244 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-28 10:21:18 +01:00
Jose Antonio Tubau c450a6825c Merge pull request 'fix: refs: #8625 fixed agency and vehicle Fk and add select fields on create form' (!1503) from hotfix_8625_fixCreateNewRoute into master 
Reviewed-on: verdnatura/salix-front#1503
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-28 09:09:55 +00:00
Jose Antonio Tubau 38769d8b0a Merge branch 'master' into hotfix_8625_fixCreateNewRoute 2025-02-28 08:35:01 +00:00
Jose Antonio Tubau e9660b2687 refactor: rename agencyModeFk to agencyName and vehicleFk to vehiclePlateNumber in RouteList.vue 2025-02-28 09:00:23 +01:00
Pablo Natek 0d090b0c08 Merge pull request 'refactor: refs #6897 update component props and attributes for consistency and improved functionality' (!1508) from 6897-fixMinorIssues into test 
Reviewed-on: verdnatura/salix-front#1508
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-28 06:02:13 +00:00
Pablo Natek 773caeee6d Merge branch 'test' into 6897-fixMinorIssues 2025-02-28 05:06:46 +00:00
Javier Segarra 321e99f501 feat: add order for table 2025-02-27 19:14:21 +00:00
Jose Antonio Tubau 1c568227c2 refactor: replace select component with VnSelectWorker in RouteList.vue 2025-02-27 12:45:20 +01:00
Pablo Natek a95b87999f fix: refs #6897 prevent default event behavior in autocompleteExpense function 2025-02-27 10:35:15 +01:00
Alex Moreno b29115f409 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-27 10:31:53 +01:00
Jon Elias 854a25fb14 Merge pull request '#8649: Fixed style when clicking on icons' (!1475) from Warmfix-SearchbarStyle into test 
Reviewed-on: verdnatura/salix-front#1475
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-27 08:53:04 +00:00
Jon Elias dc4a396004 Merge branch 'test' into Warmfix-SearchbarStyle 2025-02-27 08:51:34 +00:00
Pablo Natek 2b26283401 Merge pull request 'refactor: update ItemDescriptor to use dynamic labels for values' (!1505) from hotFixItemDescriptor into master 
Reviewed-on: verdnatura/salix-front#1505
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-02-27 08:25:55 +00:00
Pablo Natek 30a1cede35 Merge branch 'master' into hotFixItemDescriptor 2025-02-27 08:10:34 +00:00
Pablo Natek 579786d121 refactor: refs #6897 update component props and attributes for consistency and improved functionality 2025-02-27 06:17:31 +01:00
Javier Segarra b17f08f467 Merge pull request 'HOTFIX: select fk' (!1507) from hotfix_agency_autoSelected into master 
Reviewed-on: verdnatura/salix-front#1507
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-26 13:41:18 +00:00
Javier Segarra 1c9c703b46 fix: select fk 2025-02-26 14:39:51 +01:00
Pablo Natek e4c53dde45 Merge branch 'master' into hotFixItemDescriptor 2025-02-26 11:48:30 +00:00
Javier Segarra 56e71b01d3 Merge pull request 'HOTFIX: TicketSale refresh panel data' (!1499) from hotfix_ticketSale_updatePanel into master 
Reviewed-on: verdnatura/salix-front#1499
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-26 11:35:58 +00:00
Pablo Natek c362282772 Merge branch 'master' into hotFixItemDescriptor 2025-02-26 11:32:38 +00:00
Pablo Natek 754d673d0b refactor: update ItemDescriptor to use dynamic labels for values 2025-02-26 12:19:51 +01:00
Javier Segarra 2427fed2e8 fix: refs #8242 workerDepartmentTree bug 2025-02-26 11:54:14 +01:00
Jose Antonio Tubau 0225dcc736 fix: fixed agency and vehicle Fk and add select fields on create form 2025-02-26 11:47:31 +01:00
Javier Segarra 82faba62ca feat: refs #8242 use stateStore 2025-02-26 10:40:17 +01:00