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

7252 Commits

Author SHA1 Message Date
Jon Elias 6263481a3e refactor: exclusionCreate function and translations 2024-11-28 13:42:22 +01:00
Jon Elias 61d0d71538 fix: fixed functionality like Salix 2024-11-28 12:26:33 +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 a7f5c13acf Merge branch 'master' into Hotfix-ZoneEventsExclusion 2024-11-27 18:15:05 +00: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
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
Jon Elias 6b95df0202 Merge branch 'master' into Hotfix-ZoneEventsExclusion 2024-11-27 07:13:18 +00:00
Jon Elias 07ba02aec8 fix: fixed delete event and dated value when excluding a day 2024-11-27 08:02:18 +01:00
Javier Segarra bfb0915da0 Merge pull request 'feat: remove More options separator' (!1007) from hotfix_remove_moreOptions into master 
Reviewed-on: verdnatura/salix-front#1007
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-27 06:58:06 +00:00
Javier Segarra 13ee4625be Merge branch 'master' into hotfix_remove_moreOptions 2024-11-27 06:57:23 +00:00
Javier Segarra 1f752e19f2 Merge pull request 'HOTFIX SaySimple redirect' (!1005) from hotfix_saySimple into master 
Reviewed-on: verdnatura/salix-front#1005
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-27 06:56:29 +00:00
Javier Segarra abec8035a9 Merge branch 'master' into hotfix_saySimple 2024-11-27 06:55:22 +00:00
Javier Segarra fd9dd7ae55 Merge pull request 'HOTFIX Agency list should be ordered' (!1006) from hotfix_agencySelect_ordered into master 
Reviewed-on: verdnatura/salix-front#1006
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-27 06:53:53 +00:00
Javier Segarra 72a481ae5b test: remove only 2024-11-27 01:30:42 +01:00
Javier Segarra ff91ca2dfe feat: remove More options separator 2024-11-26 23:57:10 +01:00
Javier Segarra bc0d7f110d fix: apply dataByOrder 2024-11-26 23:48:47 +01:00
Javier Segarra 1b3500bbce test: add vitest VnLinkPhone filter 2024-11-26 22:58:36 +01:00
Javier Segarra 21eda340a8 fix: #6818 VnLinkPhone using spanish prefix 2024-11-26 22:57:47 +01:00
Javier Segarra 511a5bc614 Merge pull request 'feat: add Options Style in AddressList from TicketCrete' (!999) from hotfix_addressSelect_optionFormat into master 
Reviewed-on: verdnatura/salix-front#999
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-26 14:09:46 +00:00
Javier Segarra 1af90f695e Merge branch 'master' into hotfix_addressSelect_optionFormat 2024-11-26 12:42:41 +00:00
Carlos Andrés b20803e6b9 Actualizar src/pages/Travel/Card/TravelBasicData.vue 2024-11-26 12:31:23 +00:00
Carlos Satorres 75986bf7a8 Merge pull request 'fix: hotfix travel' (!1003) from hotfix-7366travel into master 
Reviewed-on: verdnatura/salix-front#1003
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
 2024-11-26 12:17:06 +00:00
Carlos Satorres c5f2be688c fix: fix true 2024-11-26 13:12:53 +01:00
Carlos Satorres 4008f50781 fix: remove 2024-11-26 13:08:28 +01:00
Carlos Satorres 728055352d fix: fix raidDays 2024-11-26 13:06:55 +01:00
Carlos Satorres ad8d5b5e9a fix: hotfix travel 2024-11-26 13:00:38 +01:00
Javier Segarra ac1153b14c feat: add Options style in AddressList from OrderCreate 2024-11-26 12:26:18 +01:00
Javier Segarra 0e9fe82d3d Merge branch 'master' into hotfix_addressSelect_optionFormat 2024-11-26 12:23:39 +01:00
Javier Segarra 63536ea0f5 feat: add Options style in AddressList from OrderCreate 2024-11-26 12:17:33 +01:00
Jorge Penadés 9c5125a4d2 Merge pull request '#8232 change default scopeDays' (!1000) from 8232-changeDefaultScopeDays into master 
Reviewed-on: verdnatura/salix-front#1000
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-26 09:44:18 +00:00
Jorge Penadés 15c1898044 feat: refs #8232 hide only if it is null 2024-11-26 10:42:14 +01:00
Jorge Penadés a33f801543 refactor: refs #8232 use composable 2024-11-26 10:19:54 +01:00
Jorge Penadés 84adc40c18 feat: refs #8232 change default scopeDays 2024-11-26 10:16:53 +01:00
Alex Moreno 7feea110a6 fix(CustomerSummary): fixed CustomerSummaryTable max width 2024-11-26 09:29:09 +01:00
Alex Moreno 2076072eeb fix(TicketSale): set old quantity when error 2024-11-26 09:21:51 +01:00
Alex Moreno 8fbf7fed43 fix(TicketSale): throw error when it should 2024-11-26 09:05:46 +01:00
Alex Moreno 1e4cda6c6a fix(OrderCatalogFilter): remove limit 2024-11-26 07:39:37 +01:00
Alex Moreno 1ce1f1f8e0 Merge pull request '8231_testToMaster_2448' (!997) from 8231_testToMaster_2448 into master 
Reviewed-on: verdnatura/salix-front#997
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-11-26 06:28:29 +00:00
Javier Segarra c3510aea60 feat: add Options Style in AddressList from TicketCrete 2024-11-26 00:18:42 +01:00
Javier Segarra 7e924bc791 Merge branch '8231_testToMaster_2448' of https://gitea.verdnatura.es/verdnatura/salix-front into 8231_testToMaster_2448 2024-11-25 14:59:29 +01:00
Javier Segarra 2ead484026 test: refs #8231 fix VnLocation 2024-11-25 14:59:26 +01:00
Alex Moreno 594fc60eec chore: refs #8231 add changelog 2024-11-25 14:49:10 +01:00
Alex Moreno fbd57dc96b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-25 13:02:58 +01:00
Jon Elias 843c54fcc1 Merge pull request 'Hotfix: ZoneLocationsTree' (!995) from Fix-ZoneLocationsTree2 into master 
Reviewed-on: verdnatura/salix-front#995
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-25 11:56:30 +00:00
Alex Moreno 8e7cb9c46e fix: zoneLocationsTree check selected sons 2024-11-25 12:54:15 +01:00