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

7596 Commits

Author SHA1 Message Date
Robert Ferrús 650acccbee Merge branch 'master' into 245362-hotFixItemTags 2024-11-29 04:53:09 +00:00
Carlos Andrés 67c257ce0e fix: translations travel 2024-11-28 19:24:13 +01:00
Carlos Satorres bc535ff0a1 Merge branch 'master' into hotfix-7366TravelSearch 2024-11-28 13:07:55 +00:00
Javier Segarra 7a3e2c0a9b Merge pull request 'fix: remove message when setWeigth ticket' (!1019) from setWeight_modal into master 
Reviewed-on: verdnatura/salix-front#1019
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-11-28 13:06:00 +00:00
Javier Segarra 280a70a145 fix: remove message when setWeigth ticket 2024-11-28 14:05:04 +01:00
Jon Elias ddfcc0aff5 Merge pull request 'Hotfix: delete event and dated value when excluding a day' (!1010) from Hotfix-ZoneEventsExclusion into master 
Reviewed-on: verdnatura/salix-front#1010
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-28 12:51:44 +00:00
Jon Elias 4193710123 Merge branch 'master' into Hotfix-ZoneEventsExclusion 2024-11-28 12:43:41 +00:00
Jon Elias 6263481a3e refactor: exclusionCreate function and translations 2024-11-28 13:42:22 +01:00
Javier Segarra d74bad50cb Merge pull request 'HOTFIX #8217 Update Customer Credit' (!986) from hotfix_8217_updateCustomerCredit into master 
Reviewed-on: verdnatura/salix-front#986
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-28 12:34:11 +00:00
Javier Segarra 07274002cf Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-28 12:33:07 +00:00
Jon Elias 61d0d71538 fix: fixed functionality like Salix 2024-11-28 12:26:33 +01:00
Robert Ferrús 547455d976 Merge branch 'master' into 245362-hotFixItemTags 2024-11-28 10:38:00 +00:00
Robert Ferrús 97c12bced3 feat: refs #245362 change request 2024-11-28 11:36:59 +01:00
Carlos Satorres aaeabefdfe fix: refs #8114 fix removeAddress 2024-11-28 11:11:45 +01:00
Javier Segarra 1bbce5f828 Merge pull request 'HOTFIX: ticketSale keyup.enter' (!1009) from hotfix_ticketSale_enter into master 
Reviewed-on: verdnatura/salix-front#1009
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-28 10:03:40 +00:00
Jorge Penadés 6745c15b0e fix: refs #6818 add early return for empty phone input in parsePhone function 2024-11-28 10:28:06 +01:00
Jorge Penadés d4028da92e fix: refs #6818 refactor phone parsing and improve error handling 2024-11-28 10:25:50 +01:00
Javier Segarra 8bc3c1610b Merge branch 'master' into hotfix_ticketSale_enter 2024-11-28 08:39:18 +00:00
Jorge Penadés ad45d612ee Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-hotfix-refactorParsePhone 2024-11-28 09:38:56 +01:00
Robert Ferrús 5c79c6bfef feat: refs #245362 itemTags 2024-11-28 09:38:28 +01:00
Guillermo Bonet 7315d117c0 Merge branch 'test' into dev 2024-11-28 09:01:17 +01:00
Guillermo Bonet 41fb880c0e fix: refs #7266 Minor fixes 2024-11-28 08:59:13 +01:00
Alex Moreno 1ae53791bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-28 08:41:58 +01:00
Alex Moreno a251e348a8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-28 08:41:56 +01:00
Guillermo Bonet 4af309ce8d Merge branch 'test' into dev 2024-11-28 08:36:36 +01:00
Javier Segarra 8daa08b99c Merge branch 'master' into hotfix_ticketSale_enter 2024-11-28 07:35:46 +00:00
Alex Moreno fe34eefc55 Merge pull request 'fix: not fetch on mounted' (!1015) from hotfix-notRedirectOnLoad into master 
Reviewed-on: verdnatura/salix-front#1015
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-28 07:34:21 +00:00
Alex Moreno 118e346a07 Merge branch 'master' into hotfix-notRedirectOnLoad 2024-11-28 07:32:52 +00:00
Guillermo Bonet 55b9e3ddcd fix: refs #7266 Bad report 2024-11-28 08:21:09 +01:00
Jon Elias aaab41fe97 fix: translations 2024-11-28 07:37:50 +01:00
Jon Elias b2e99230b3 Merge branch 'Hotfix-ZoneEventsExclusion' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneEventsExclusion 2024-11-28 07:21:04 +01:00
Jon Elias 1a0406b5b1 fix: fixed exclusionCreate when excluding an event already excluded 2024-11-28 07:21:02 +01:00
Javier Segarra c287c04894 Merge pull request '#8061 Improve_newCP' (!1016) from 8061_improve_newCP into dev 
Reviewed-on: verdnatura/salix-front#1016
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2024-11-28 05:52:26 +00:00
Javier Segarra 89a2486f62 fix: refs #8061 improve code dependencies 2024-11-27 23:33:39 +01:00
Javier Segarra 3a695bdfe1 perf: refs #8061 use opts from VnSelect 2024-11-27 22:42:18 +01:00
Javier Segarra 507b78f5e8 perf: refs #8061 filter autonomy 2024-11-27 22:33:00 +01:00
Javier Segarra 827f6032b6 Merge pull request 'test: Order catalog tests' (!1008) from wbuezas/salix-front-mindshore-fork2:feature/CatalogTests into dev 
Reviewed-on: verdnatura/salix-front#1008
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-27 20:02:34 +00:00
William Buezas 63f0db459c test: change file name and path 2024-11-27 16:17:37 -03:00
Javier Segarra 38d8dbab8e Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-27 18:28:20 +00:00
Javier Segarra e23c6bc144 Merge branch 'master' into hotfix_ticketSale_enter 2024-11-27 18:19:59 +00:00
Javier Segarra a7f5c13acf Merge branch 'master' into Hotfix-ZoneEventsExclusion 2024-11-27 18:15:05 +00:00
Jorge Penadés 33de645e37 fix: not fetch on mounted 2024-11-27 17:02:41 +01:00
Jon Elias 5889dbf3de Merge pull request 'Hotfix: fixed ref filter in InvoiceOutList' (!1014) from Hotfix-InvoiceOutRefFilter into master 
Reviewed-on: verdnatura/salix-front#1014
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-11-27 13:16:30 +00:00
Jon Elias d2cee10141 Merge branch 'master' into Hotfix-InvoiceOutRefFilter 2024-11-27 13:13:57 +00:00
Jon Elias 7d28037c29 fix: fixed ref filter in InvoiceOutList 2024-11-27 14:09:37 +01:00
Jorge Penadés 25b8535f19 refactor: refs #6818 check prefix 2024-11-27 12:54:11 +01:00
Carlos Satorres 8b69940d41 Merge branch 'dev' into 7304-warningCustomerBasicData 2024-11-27 11:54:05 +00:00
Jon Elias e94c99662d Merge branch 'Hotfix-ZoneEventsExclusion' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneEventsExclusion 2024-11-27 12:53:08 +01:00
Jon Elias e764f4066f fix: ticket notes translation and deleted useless code 2024-11-27 12:53:07 +01:00
Carlos Satorres a531973421 fix: hotfix search 2024-11-27 10:18:32 +01:00