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

10406 Commits

Author SHA1 Message Date
Jon Elias a99faf17bb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into Warmfix-AccountDescriptorMenu 2025-02-25 11:57:43 +01:00
Pablo Natek 5585367ab7 Merge pull request 'refactor: refs #6897 update VnTable components for improved value handling and UI adjustments' (!1480) from 6897-minorFixes into test 
Reviewed-on: verdnatura/salix-front#1480
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-25 09:48:36 +00:00
Alex Moreno efd1c1fe87 Merge branch 'test' into 6897-minorFixes 2025-02-25 09:13:03 +00:00
Alex Moreno d72e45918a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-25 09:53:10 +01:00
Pablo Natek dc3721f62c Merge pull request 'Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34"' (!1491) from fix_revert_revert into test 
Reviewed-on: verdnatura/salix-front#1491
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2025-02-25 08:45:13 +00:00
Alex Moreno b9b5bd4c8a Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34" 
This reverts commit 223a1ea449.
 2025-02-25 09:40:46 +01:00
Carlos Satorres 5e803782d3 Merge pull request 'fix: refs #6553 workerBusiness' (!1469) from 6553-fixWorkerBusinessV2 into test 
Reviewed-on: verdnatura/salix-front#1469
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-25 08:14:19 +00:00
Carlos Satorres be858f8134 Merge branch 'test' into 6553-fixWorkerBusinessV2 2025-02-25 08:10:08 +00:00
Javier Segarra c07fd2d2a5 Merge pull request 'HOTFIX: maxium calls exceed' (!1490) from hotfix_customerBalance_newPayment into master 
Reviewed-on: verdnatura/salix-front#1490
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-25 08:06:02 +00:00
Javier Segarra d95b6c1a31 Merge branch 'master' into hotfix_customerBalance_newPayment 2025-02-25 07:36:07 +00:00
Javier Segarra ade32272b4 Merge pull request 'HOTFIX: mana axios deacoplate' (!1489) from hotfix_mana_deacoplate into master 
Reviewed-on: verdnatura/salix-front#1489
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-25 07:35:51 +00:00
Jon Elias c84225aed5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into Warmfix-AccountDescriptorMenu 2025-02-25 08:07:40 +01:00
Javier Segarra 56f8657bba fix: maxium calls exceed 2025-02-24 22:58:57 +01:00
Javier Segarra e44d6a2915 test: remove test 2025-02-24 22:48:48 +01:00
Javier Segarra b6b3759758 Merge branch 'master' into hotfix_mana_deacoplate 2025-02-24 22:48:00 +01:00
Javier Segarra 2655e0a8e5 fix: mana axios deacoplate 2025-02-24 22:46:27 +01:00
Javier Segarra 223a1ea449 revert 1015acefb7 
revert Merge branch 'test' into master
 2025-02-24 15:52:21 +00:00
Javier Segarra 1015acefb7 Merge branch 'test' into master 2025-02-24 15:21:32 +00:00
Jon Elias 7f1be98b74 fix: fixed account descriptor menu and created e2e 2025-02-24 16:20:28 +01:00
Javier Segarra 3e5180a6c6 Merge pull request 'fix: check type variable' (!1486) from hotfix_mana_showproxy into master 
Reviewed-on: verdnatura/salix-front#1486
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-24 15:18:25 +00:00
Javier Segarra dbcace84f6 Merge branch 'master' into hotfix_mana_showproxy 2025-02-24 16:09:46 +01:00
Javier Segarra ab5ae580b3 fix: check type variable 2025-02-24 16:08:40 +01:00
Javier Segarra 7096d6fb81 Merge pull request 'HOTFIX: check type variable' (!1485) from hotfix_mana_edit into master 
Reviewed-on: verdnatura/salix-front#1485
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-02-24 14:33:12 +00:00
Javier Segarra 3a9a9bd517 fix: check type variable 2025-02-24 15:30:30 +01:00
Alex Moreno 04f657bc04 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-24 14:38:41 +01:00
Pablo Natek 6954cd599a Merge pull request 'feat: enhance item tags with data attributes for improved testing' (!1471) from hotFixItemTags into master 
Reviewed-on: verdnatura/salix-front#1471
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-24 13:10:39 +00:00
Pablo Natek 3345c59ca7 Merge branch 'master' into hotFixItemTags 2025-02-24 12:50:38 +00:00
Pablo Natek 4354fc2293 refactor: refs #6897 update VnTable components for improved value handling and UI adjustments 2025-02-24 13:48:19 +01:00
Jorge Penadés 498c351c51 Merge pull request 'refactor: refs #8372 update FormModelPopup to use props for save and continue logic' (!1477) from 8372-warmfix-saveAndContinue into test 
Reviewed-on: verdnatura/salix-front#1477
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-24 12:37:44 +00:00
Jorge Penadés 659d87020f refactor: refs #8372 update FormModelPopup to enhance save and continue logic with state management 2025-02-24 13:20:59 +01:00
Jorge Penadés fbce97dd01 chore: refs #8372 rollback 2025-02-24 11:44:00 +01:00
Jorge Penadés b26db960be refactor: refs #8372 prueba 2025-02-24 11:43:29 +01:00
Jorge Penadés f551e1a14a refactor: refs #8372 simplify cancel btn click 2025-02-24 11:06:20 +01:00
Jorge Penadés 09b613cac1 refactor: refs #8372 update FormModelPopup to use props for save and continue logic 2025-02-24 11:03:14 +01:00
Jorge Penadés 30532c9eab Merge pull request 'fix: refs #6919 update customer data retrieval to use useArrayData for improved reactivity' (!1474) from 6919-warmfix-getCustomer into test 
Reviewed-on: verdnatura/salix-front#1474
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-24 09:15:13 +00:00
Jorge Penadés 5e8ad9df11 feat: refs #6919 add useArrayData import to CustomerSamplesCreate for improved data handling 2025-02-24 10:13:09 +01:00
Jorge Penadés 1e9e5e647d fix: refs #6919 update customer data retrieval to use useArrayData for improved reactivity 2025-02-24 10:05:13 +01:00
Carlos Satorres 98bde3bbbb Merge pull request 'fix: hotfix filters' (!1472) from hotfix-CutomerListFilter into master 
Reviewed-on: verdnatura/salix-front#1472
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-24 07:30:50 +00:00
Carlos Satorres 3b5c4731f0 fix: hotfix filters 2025-02-24 08:20:04 +01:00
Pablo Natek 24b4d0071a feat: enhance item tags with data attributes for improved testing 2025-02-23 12:57:57 +01:00
Carlos Satorres 5481ad6478 fix: refs #6553 workerBusiness 2025-02-21 15:23:44 +01:00
Javier Segarra 8c69e5c937 Merge pull request 'HOTFIX: shipped columnFilter' (!1463) from hotfix_ticket_shipped into master 
Reviewed-on: verdnatura/salix-front#1463
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-02-21 11:02:43 +00:00
Javier Segarra 26009d809e Merge branch 'master' into hotfix_ticket_shipped 2025-02-21 10:50:34 +00:00
Javier Segarra 680c1f9d9c perf: i18n 2025-02-21 11:45:41 +01:00
Javier Segarra ef624af3f8 revert: column time 2025-02-21 11:44:07 +01:00
Javier Segarra 81a33dd2fc fix: shipped columnFilter 2025-02-21 11:38:32 +01:00
Javier Segarra 98660c4e50 Merge pull request 'HOTfix: handle multiple changes' (!1458) from hotfix_ticketSale_quantity into master 
Reviewed-on: verdnatura/salix-front#1458
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-21 08:27:30 +00:00
Javier Segarra d721205973 Merge branch 'master' into hotfix_ticketSale_quantity 2025-02-21 08:03:03 +00:00
Javier Segarra 8536ade5b7 feat: add keyup.enter 2025-02-21 09:01:40 +01:00
Javier Segarra e82dc90ff9 fix: ticketSale 2025-02-21 09:01:28 +01:00