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

7409 Commits

Author SHA1 Message Date
Jorge Penadés 0eeb22d40a chore: refs #8207 drop useless code 2024-11-22 13:56:30 +01:00
Jorge Penadés 7048f96565 refactor: refs #8207 imrove logic 2024-11-22 13:55:22 +01:00
Jorge Penadés 50fbf64cf9 fix: refs #8207 update btn wip 2024-11-22 13:33:35 +01:00
Jorge Penadés c72fa52851 fix: refs #8207 auto-refresh 2024-11-22 13:03:23 +01:00
Alex Moreno 14d2ddfa83 fix: merge errors 2024-11-22 12:40:07 +01:00
Alex Moreno 4913cf2c29 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-22 12:10:04 +01:00
Javier Segarra 651b67e98f Merge pull request 'fix: orderCatalogFilter and fix useArrayData' (!989) from hotFix_orderCatalogFilter_refactor_fix into master 
Reviewed-on: verdnatura/salix-front#989
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-22 10:24:18 +00:00
Alex Moreno 94361f18fa Merge branch 'master' into hotFix_orderCatalogFilter_refactor_fix 2024-11-22 10:23:10 +00:00
Alex Moreno 142302193e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-22 11:21:33 +01:00
Alex Moreno 9d7f2b95e8 revert: VnVisibleColumn try catch 2024-11-22 11:21:08 +01:00
Alex Moreno 2db0369b74 fix: resetCategory 2024-11-22 11:05:48 +01:00
Javier Segarra 1c2c2538ed perf: formModel 2024-11-22 11:05:19 +01:00
Alex Moreno 1709795cf9 Merge branch 'master' into hotFix_orderCatalogFilter_refactor_fix 2024-11-22 09:56:04 +00:00
Alex Moreno 367f660508 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-22 10:52:30 +01:00
Javier Segarra 4ea0d04b86 perf: formModel 2024-11-22 10:48:03 +01:00
Alex Moreno 9019d4ff90 Merge pull request 'fix: remove all try catch(err) (error) console.error' (!988) from hotFix_tryCatch_badPractice into master 
Reviewed-on: verdnatura/salix-front#988
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-22 09:47:32 +00:00
Alex Moreno 522f32aa9a fix: orderCatalogFilter and fix useArrayData 2024-11-22 10:40:49 +01:00
Javier Segarra 8a4a6061e7 test: add e2e 2024-11-22 10:16:56 +01:00
Javier Segarra c6b547bc55 perf: change fn name 2024-11-22 10:04:17 +01:00
Javier Segarra e2f092948e Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-22 08:24:44 +00:00
Alex Moreno bf29be1c5f fix: remove all try catch(err) (error) console.error 2024-11-22 08:39:46 +01:00
Alex Moreno 8cbf40f465 fix(TicketSummary): observationTypes use .description 2024-11-22 07:45:49 +01:00
Alex Moreno 3b03f0dfee fix(TicketNotes): observationTypes use .description 2024-11-22 07:43:59 +01:00
Javier Segarra 94514a3254 feat: #8217 send just changes 2024-11-21 20:14:54 +01:00
Carlos Andrés e04d77f55e Merge pull request 'feat: refs#8087 Redadas en travel' (!984) from travelisRaidTest into test 
Reviewed-on: verdnatura/salix-front#984
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-21 14:56:09 +00:00
Carlos Andrés 5268140d8b feat: refs#8087 Redadas en travel 2024-11-21 15:51:27 +01:00
Carlos Satorres 69498cccf9 Merge pull request 'hotfix-clientAddress' (!983) from hotfix-clientAddress into master 
Reviewed-on: verdnatura/salix-front#983
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-21 09:28:38 +00:00
Carlos Satorres 518ed40c91 Merge branch 'master' into hotfix-clientAddress 2024-11-21 09:26:45 +00:00
Alex Moreno bf0bda0e27 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-21 10:26:29 +01:00
Carlos Satorres 8a972507a4 fix: remove s 2024-11-21 10:20:42 +01:00
Carlos Satorres 837f42d21f fix: provinceName 2024-11-21 10:18:25 +01:00
Jon Elias 0cefe391cb Merge pull request 'Hotfix: Show only the correct path of the search' (!954) from Hotfix-ZoneLocationsTree into master 
Reviewed-on: verdnatura/salix-front#954
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-21 09:15:45 +00:00
Jon Elias 747bc4af76 Merge branch 'master' into Hotfix-ZoneLocationsTree 2024-11-21 09:13:42 +00:00
Jon Elias 5ff95c2b93 fix: locations tree 2024-11-21 10:10:44 +01:00
Alex Moreno 0c3581f3dc Merge pull request 'hotFix(orderCatalogFilter): fix searchByTag' (!961) from hotFix_orderCatalogFilter_values into master 
Reviewed-on: verdnatura/salix-front#961
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-21 09:09:51 +00:00
Javier Segarra f36363dbd2 Merge pull request 'warmfix: ItemLastEntries to date' (!981) from warmfix_itemLastEntriesFilter into test 
Reviewed-on: verdnatura/salix-front#981
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-11-21 09:09:50 +00:00
Javier Segarra e5434e7436 warmfix: ItemLastEntries to date 2024-11-21 09:08:52 +00:00
Javier Segarra 0434332ec4 Merge branch 'master' into hotFix_orderCatalogFilter_values 2024-11-21 08:27:13 +00:00
Javier Segarra 6f324b44b8 Merge pull request 'WARMFIX: e2e jsegarra' (!973) from fix_js_e2e into test 
Reviewed-on: verdnatura/salix-front#973
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-21 08:20:21 +00:00
Javier Segarra 5a90434425 Merge branch 'test' into fix_js_e2e 2024-11-21 08:19:21 +00:00
Alex Moreno 6b8470d6e1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-21 07:59:42 +01:00
Javier Segarra 350c28eef0 Merge pull request 'HOTfix: use id instead description to open InvoiceOutDescriptor' (!980) from hotFix_customer_balance_email into master 
Reviewed-on: verdnatura/salix-front#980
 2024-11-21 06:52:01 +00:00
Alex Moreno 44f2ecca28 chore: requested changes 2024-11-21 07:49:10 +01:00
Alex Moreno c5acde22a3 chore: requested changes 2024-11-21 07:42:00 +01:00
Alex Moreno c1e06325d3 Merge pull request '#7874 show name' (!978) from 7874-warmfix-useName into test 
Reviewed-on: verdnatura/salix-front#978
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-21 06:04:47 +00:00
Javier Segarra 3b5d385d22 fix: use id instead description to open InvoiceOutDescriptor 2024-11-20 22:43:04 +01:00
Jorge Penadés 7039b68bba fix: refs #7874 show name 2024-11-20 17:23:40 +01:00
Alex Moreno 42d24359cd Merge branch 'master' into hotFix_orderCatalogFilter_values 2024-11-20 12:40:39 +00:00
Alex Moreno abd79283ff fix(CatalogFilterValueDialog): from dev and fix 2024-11-20 13:38:22 +01:00
Javi Gallego 2a1cc49499 fix: ticketDescriptor 2024-11-20 13:15:40 +01:00