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

7314 Commits

Author SHA1 Message Date
Javier Segarra ed41bb6ecb Merge branch 'master' into hotfix_itemFixedPrice 2024-11-29 07:51:54 +01:00
Alex Moreno 36de1ad400 fix(MailForwarding): add try catch 2024-11-29 07:27:14 +01: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
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
Javier Segarra 8bc3c1610b Merge branch 'master' into hotfix_ticketSale_enter 2024-11-28 08:39:18 +00:00
Guillermo Bonet 41fb880c0e fix: refs #7266 Minor fixes 2024-11-28 08:59:13 +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 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
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
Javier Segarra dc156e44b6 Merge branch 'master' into hotfix_ticketSale_enter 2024-11-27 07:40:24 +00: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 e3bdea2197 fix: ticketSale keyup.enter 2024-11-27 01:15:16 +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 4539a73efc test: improve clientList 2024-11-26 23:34:57 +01:00
Javier Segarra cf34204f82 Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-26 23:21:05 +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