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

9555 Commits

Author SHA1 Message Date
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
Javier Segarra a3828ab869 fix: handle multiple changes 2025-02-20 21:16:05 +01:00
Jon Elias b426f0f206 Merge pull request 'HOTFIX TicketSummary address' (!1455) from hotfix_ticket_address_sumamry into master 
Reviewed-on: verdnatura/salix-front#1455
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-20 12:55:28 +00:00
Javier Segarra 64f29e0696 fix: address 2025-02-20 13:37:17 +01:00
Jorge Penadés 7563ce6472 Merge pull request 'fix: refs #8198 handle potential null values in itemBalances computation' (!1453) from 8198-hotfix-preventNull into master 
Reviewed-on: verdnatura/salix-front#1453
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-20 09:22:58 +00:00
Jorge Penadés 91b0833460 fix: refs #8198 handle potential null values in itemBalances computation 2025-02-20 10:17:59 +01:00
Javier Segarra f9c2d9e641 Merge pull request 'HOTFIX: refactor canProceed' (!1449) from hotfix_ticketSale_other into master 
Reviewed-on: verdnatura/salix-front#1449
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-20 07:27:26 +00:00
Javier Segarra b8e6b27303 test: improve test 2025-02-19 23:54:31 +01:00
Javier Segarra b2184635d3 test: improve test 2025-02-19 23:42:10 +01:00
Javier Segarra 874fbb48f5 feat: refactor canProceed 2025-02-19 22:16:02 +01:00
Javier Segarra b2dab7ba59 Merge pull request 'HOTFix: bug and simplify' (!1440) from hotfix_double_ticketSale into master 
Reviewed-on: verdnatura/salix-front#1440
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-19 10:49:48 +00:00
Javier Segarra cfc377847f Merge branch 'master' into hotfix_double_ticketSale 2025-02-19 09:25:12 +00:00
Javier Segarra ee23bf60dc fix: bug and simplify 2025-02-19 10:22:27 +01:00
Javier Segarra 289d9b211e Merge pull request 'fix: update option-filter-value to use thermographFk in TravelThermographsForm' (!1430) from hotFixThermographsSelect into master 
Reviewed-on: verdnatura/salix-front#1430
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-02-18 13:33:23 +00:00
Pablo Natek a1db140d67 fix: update option-filter-value to use thermographFk in TravelThermographsForm 2025-02-18 14:30:12 +01:00
Jorge Penadés 6bef98bd10 Merge pull request 'fix: refs #8571 safely delete Authorization header from config in useCau' (!1429) from 8571-hotfix-preventNull into master 
Reviewed-on: verdnatura/salix-front#1429
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-18 12:01:25 +00:00
Jorge Penadés c3f786214f fix: refs #8571 safely delete Authorization header from config in useCau 2025-02-18 12:45:11 +01:00
Guillermo Bonet 79d29fc071 Merge pull request 'fix: refs #8225 update email verification condition in WorkerDescriptorMenu' (!1419) from 8225-hotfix-condition into master 
Reviewed-on: verdnatura/salix-front#1419
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2025-02-18 09:13:02 +00:00
Jorge Penadés ced34ccec3 fix: refs #8225 update email verification condition in WorkerDescriptorMenu 2025-02-18 10:08:28 +01:00
Javier Segarra a8d0f4374e Merge pull request 'hotfix ticketSale_discount' (!1416) from hotfix_ticketSale_discount into master 
Reviewed-on: verdnatura/salix-front#1416
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-18 08:08:56 +00:00
Javier Segarra ab62cd5627 Merge branch 'master' into hotfix_ticketSale_discount 2025-02-18 08:02:22 +00:00
Alex Moreno 8a81621076 Merge pull request '8622-testToMaster' (!1411) from 8622-testToMaster into master 
Reviewed-on: verdnatura/salix-front#1411
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2025-02-18 07:54:23 +00:00
Alex Moreno f7f3146e77 chore: refs #8622 changelog 2025-02-18 07:24:54 +01:00
Javier Segarra 93401dfcdc fix: use mana in ticketSale.discount 2025-02-18 00:40:39 +01:00
Javier Segarra 6bb758b88c fix: reload table when apply discount 2025-02-18 00:40:13 +01:00
Javier Segarra 38df9c27ae Merge pull request 'Warmfix: #6943 addressPropagate' (!1389) from 6943_re_propagate into test 
Reviewed-on: verdnatura/salix-front#1389
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-17 12:20:34 +00:00
Javier Segarra 985eac702f Merge branch 'test' into 6943_re_propagate 2025-02-17 11:20:03 +00:00
Javier Segarra 1d3be4856b fix: refs #6943 required 2025-02-17 12:18:43 +01:00
Javier Segarra 8daf425adf Merge pull request 'Warmfix labels and monitorRisk' (!1406) from warmfix_labels into test 
Reviewed-on: verdnatura/salix-front#1406
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-17 08:52:10 +00:00
Jon Elias 05d4b08979 Merge branch 'test' into warmfix_labels 2025-02-17 07:40:48 +00:00
Alex Moreno 0c79f7f5d2 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-17 07:54:22 +01:00
Jose Antonio Tubau 75f6a31c8c Merge pull request 'refactor: refs #7524 remove limit and sort parameters from FetchData components' (!1344) from 7524-hotfix-removeFetchData into master 
Reviewed-on: verdnatura/salix-front#1344
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-02-17 06:48:16 +00:00
Jose Antonio Tubau 8cd8d90925 Merge branch 'master' into 7524-hotfix-removeFetchData 2025-02-17 06:08:52 +00:00
Javier Segarra a3804d5e10 Merge branch 'test' into 6943_re_propagate 2025-02-17 00:40:08 +01:00
Javier Segarra 54b4791849 test: refs #6943 fix tests 2025-02-17 00:38:28 +01:00
Javier Segarra a8dbcfbd74 feat: toCurrency in risk icon 2025-02-16 03:35:23 +01:00
Javier Segarra 3d7cb05661 fix: replace labels 2025-02-16 03:34:00 +01:00
Javier Segarra fc80946817 fix: refs #6943 minor changes 2025-02-14 17:18:36 +01:00
Jorge Penadés 63659a1a77 Merge pull request 'fix: refs #8247 allow password change for users themselves in AccountDescriptorMenu' (!1401) from 8247-hotfix-showOpt into master 
Reviewed-on: verdnatura/salix-front#1401
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-02-14 13:37:19 +00:00
Alex Moreno fb0cc0272f build: empty commit 2025-02-14 14:32:55 +01:00
Jorge Penadés fff129e913 fix: refs #8247 allow password change for users themselves in AccountDescriptorMenu 2025-02-14 13:48:04 +01:00
Guillermo Bonet bf6bb954bb Merge branch 'master' into test 2025-02-14 12:42:04 +01:00