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

12659 Commits

Author SHA1 Message Date
Benjamin Esteve 102e93ccf0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-20 08:10:34 +01:00
Benjamin Esteve a286400828 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel 2025-03-20 08:09:49 +01:00
Jon Elias 5ec0da63f2 Merge branch 'dev' into 7869-ModifyZones 2025-03-20 07:01:41 +00:00
Alex Moreno edb3c0cbce Merge pull request '6994-vnLog_descriptors' (!1579) from 6994-vnLog_descriptors into dev 
Reviewed-on: verdnatura/salix-front#1579
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-03-20 06:58:19 +00:00
Alex Moreno 9f3c068245 Merge branch 'dev' into 6994-vnLog_descriptors 2025-03-20 06:46:07 +00:00
Alex Moreno 872d89339a Merge pull request 'feat: refs #6695 clean up Cypress screenshots and archive artifacts in Jenkins pipeline' (!1596) from 6695-artifacts into dev 
Reviewed-on: verdnatura/salix-front#1596
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2025-03-20 06:44:03 +00:00
Alex Moreno 0aec126d71 Merge branch 'dev' into 8463-CardDescriptor_useCard 2025-03-20 06:43:46 +00:00
Alex Moreno 72d1281bde Merge branch 'dev' into 6994-vnLog_descriptors 2025-03-20 06:20:13 +00:00
Alex Moreno ccbd624389 Merge branch 'dev' into 6695-artifacts 2025-03-20 06:19:16 +00:00
Alex Moreno 30d287bbf6 Merge pull request '5926-refactor_docuware' (!1613) from 5926-refactor_docuware into dev 
Reviewed-on: verdnatura/salix-front#1613
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-18 13:59:04 +00:00
Alex Moreno b6706218fe feat: refs #8463 add data attributes for summary buttons in VnDescriptor component 2025-03-18 14:46:51 +01:00
Alex Moreno d9d40da4f1 Merge branch 'dev' of https: refs #8463//gitea.verdnatura.es/verdnatura/salix-front into 8463-CardDescriptor_useCard 2025-03-18 14:45:11 +01:00
Jorge Penadés f107684473 fix: refs #8581 update data-cy attribute concatenation in VnInputDate component 2025-03-18 14:21:16 +01:00
Alex Moreno 0160897030 Merge branch 'dev' into 5926-refactor_docuware 2025-03-18 13:20:00 +00:00
Jon Elias 42022889b2 fix: card descriptor imports 2025-03-18 14:13:01 +01:00
Jon Elias 092a338e72 fix: card descriptor merge 2025-03-18 14:03:38 +01:00
Jon Elias fb912725b3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into Warmfix-DepartmentIcon 2025-03-18 14:01:53 +01:00
Jon Elias 1caa3055f3 fix: fixed department descriptor icon 2025-03-18 13:59:13 +01:00
Jon Elias 4a1b6136d8 Merge pull request 'Hotfix[SendSms]: Fixed SMS when clients do not have phone' (!1610) from Hotfix-RouteSendSms into master 
Reviewed-on: verdnatura/salix-front#1610
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-18 11:55:40 +00:00
Alex Moreno c55304e1d2 refactor: refs #5926 simplify sendDocuware function to accept multiple tickets 2025-03-18 12:32:25 +01:00
Jon Elias 8ae196ac3d Merge branch 'master' into Hotfix-RouteSendSms 2025-03-18 11:25:32 +00:00
Jon Elias dfdb9685d2 fix: fixed sms when clients do not have phone 2025-03-18 12:09:46 +01:00
Jorge Penadés 6546d06f60 refactor: refs #8388 update UI feedback 2025-03-18 12:04:54 +01:00
Jorge Penadés 05bc79ec32 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn 2025-03-18 12:02:40 +01:00
Jorge Penadés 6e801e8f64 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-18 11:49:02 +01:00
Jose Antonio Tubau d698275ba2 Merge pull request 'refactor: refs #8721 swap 'client' and 'street' columns' (!1608) from 8721-reorderColumnsRouteTickets into dev 
Reviewed-on: verdnatura/salix-front#1608
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-18 10:44:45 +00:00
Jose Antonio Tubau 6d1f1770dd Merge branch 'dev' into 8721-reorderColumnsRouteTickets 2025-03-18 10:32:13 +00:00
Jorge Penadés ce5be197ce Merge branch '8581-invoiceinE2e' of https://gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-18 11:27:37 +01:00
Jorge Penadés 7ed7a38df2 fix: refs #8581 rollback 2025-03-18 11:27:35 +01:00
Jorge Penadés bfd62eaa54 Merge branch 'dev' of https: refs #8581//gitea.verdnatura.es/verdnatura/salix-front into 8581-invoiceinE2e 2025-03-18 11:23:01 +01:00
Jorge Penadés c2c21098bb Merge pull request 'feat: refs #8775 enhance VnSelect component with nextTick for improved loading handling' (!1607) from 8775-hotfix-virtualScroll into master 
Reviewed-on: verdnatura/salix-front#1607
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-18 09:28:43 +00:00
Jose Antonio Tubau acbe0730bb refactor: refs #8721 swap 'client' and 'street' columns 2025-03-18 10:15:18 +01:00
Jorge Penadés 80cb7e9075 feat: refs #8775 enhance VnSelect component with nextTick for improved loading handling 2025-03-18 10:09:10 +01:00
Alex Moreno 25799cd1da build: init new version 2025-03-18 09:48:11 +01:00
Alex Moreno 6f87af39e4 fix: align Article label to the left in EntryBuys component 2025-03-18 09:47:13 +01:00
Alex Moreno ce430c6a8f chore: downgrade version from 25.14.0 to 25.12.0 in package.json 2025-03-18 09:46:16 +01:00
Pablo Natek be7350cd34 Merge pull request '8602-refatorAndCreateEntry' (!1584) from 8602-refatorAndCreateEntry into test 
Reviewed-on: verdnatura/salix-front#1584
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-18 08:41:58 +00:00
Pablo Natek 551967410f test: refs #8602 skip custom value dialog and order creation tests in OrderCatalog and OrderList 2025-03-18 09:28:14 +01:00
Jose Antonio Tubau f68a480768 Merge branch 'dev' into 8621-createCmrListE2eTest 2025-03-18 08:17:21 +00:00
Pablo Natek 300d0aad22 Merge branch '8602-refatorAndCreateEntry' of https://gitea.verdnatura.es/verdnatura/salix-front into 8602-refatorAndCreateEntry 2025-03-18 09:00:38 +01:00
Pablo Natek 935ac752f5 test: refs #8602 skip ClaimDevelopment test suite 2025-03-18 09:00:36 +01:00
Pablo Natek 90c07d36cd Merge branch 'dev' into 8602-refatorAndCreateEntry 2025-03-18 07:40:23 +00:00
Alex Moreno 9014c148c5 build: init new version 2025-03-18 08:24:37 +01:00
Pablo Natek 96b4d9c51f refactor: refs #8602 remove redundant date input test from entryList.spec.js 2025-03-18 08:24:02 +01:00
Alex Moreno 99a40dba14 refactor: remove unnecessary login and reload calls in ClaimDevelopment tests 2025-03-18 08:12:31 +01:00
Jon Elias fdf3af0550 refactor: refs #7869 undo skip test 2025-03-18 08:12:15 +01:00
Pablo Natek 1961750c86 test: refs #8602 skip edit line and filter client tests in claimDevelopment and ticketList specs 2025-03-18 08:09:37 +01:00
Jon Elias ff39addd67 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7869-ModifyZones 2025-03-18 07:57:45 +01:00
Alex Moreno 22bdd0ef08 refactor: refs #5926 call Docuwares/upload-delivery-note 2025-03-18 07:17:33 +01:00
Jorge Penadés c8dafb65e4 Merge pull request 'fix: simplify menu structure in monitor router module' (!1602) from fix_monitor_leftMenu into dev 
Reviewed-on: verdnatura/salix-front#1602
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-03-17 16:32:00 +00:00