Commit Graph

7252 Commits

Author SHA1 Message Date
Javier Segarra cf34204f82 Merge branch 'master' into hotfix_8217_updateCustomerCredit
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-26 23:21:05 +01:00
Javier Segarra 511a5bc614 Merge pull request 'feat: add Options Style in AddressList from TicketCrete' (!999) from hotfix_addressSelect_optionFormat into master
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
Reviewed-on: #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
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-26 12:42:41 +00:00
Carlos Andrés b20803e6b9 Actualizar src/pages/Travel/Card/TravelBasicData.vue
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-26 12:31:23 +00:00
Carlos Satorres 75986bf7a8 Merge pull request 'fix: hotfix travel' (!1003) from hotfix-7366travel into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1003
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-11-26 12:17:06 +00:00
Carlos Satorres c5f2be688c fix: fix true
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-26 13:12:53 +01:00
Carlos Satorres 4008f50781 fix: remove
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-26 13:08:28 +01:00
Carlos Satorres 728055352d fix: fix raidDays
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-26 13:06:55 +01:00
Carlos Satorres ad8d5b5e9a fix: hotfix travel
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-26 13:00:38 +01:00
Javier Segarra ac1153b14c feat: add Options style in AddressList from OrderCreate
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-26 12:26:18 +01:00
Javier Segarra 0e9fe82d3d Merge branch 'master' into hotfix_addressSelect_optionFormat
gitea/salix-front/pipeline/pr-master This commit looks good Details
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
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #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
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-26 10:42:14 +01:00
Jorge Penadés a33f801543 refactor: refs #8232 use composable
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-26 10:19:54 +01:00
Jorge Penadés 84adc40c18 feat: refs #8232 change default scopeDays
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-26 10:16:53 +01:00
Alex Moreno 7feea110a6 fix(CustomerSummary): fixed CustomerSummaryTable max width
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-26 09:29:09 +01:00
Alex Moreno 2076072eeb fix(TicketSale): set old quantity when error
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-26 09:21:51 +01:00
Alex Moreno 8fbf7fed43 fix(TicketSale): throw error when it should
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-26 09:05:46 +01:00
Alex Moreno 1e4cda6c6a fix(OrderCatalogFilter): remove limit
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-26 07:39:37 +01:00
Alex Moreno 1ce1f1f8e0 Merge pull request '8231_testToMaster_2448' (!997) from 8231_testToMaster_2448 into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #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
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-26 00:18:42 +01:00
Javier Segarra e28d026ca9 test: perf clientList descriptor action
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 23:53:14 +01:00
Javier Segarra 4e5754ccb5 test: perf clientList descriptor action 2024-11-25 23:49:24 +01:00
Javier Segarra 6c6144864f revert: remove customer test
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 23:21:32 +01:00
Javier Segarra c0d427ecb9 Revert "test: rename client by customer"
gitea/salix-front/pipeline/pr-master This commit looks good Details
This reverts commit 30a2da027b.
2024-11-25 23:20:15 +01:00
Javier Segarra 7e924bc791 Merge branch '8231_testToMaster_2448' of https://gitea.verdnatura.es/verdnatura/salix-front into 8231_testToMaster_2448
gitea/salix-front/pipeline/pr-master This commit looks good Details
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
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 14:49:10 +01:00
Javier Segarra 60590f6c97 Merge branch 'master' into hotfix_8217_updateCustomerCredit
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 12:28:23 +00:00
Alex Moreno fbd57dc96b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 13:02:58 +01:00
Jon Elias 843c54fcc1 Merge pull request 'Hotfix: ZoneLocationsTree' (!995) from Fix-ZoneLocationsTree2 into master
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #995
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-11-25 11:56:30 +00:00
Alex Moreno 8e7cb9c46e fix: zoneLocationsTree check selected sons
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 12:54:15 +01:00
Jon Elias f3429297cf Merge branch 'master' into Fix-ZoneLocationsTree2
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 11:20:17 +00:00
Jon Elias d191d88e81 refactor: modified button to prevent submit
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 12:19:20 +01:00
Javier Segarra 424dfc0a5c Merge branch 'master' into hotfix_8217_updateCustomerCredit
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 11:18:18 +00:00
Jorge Penadés 6c30ea9e7a Merge pull request '#8207 hotfix-tableActions' (!991) from 8207-hotfix-tableActions into master
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
Reviewed-on: #991
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-11-25 11:13:45 +00:00
Jorge Penadés e994ae72b6 fix: refs #8207 add filter to reset
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 12:08:37 +01:00
Jorge Penadés a1284cefc2 refactor: refs #8207 add update fn
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 12:01:28 +01:00
Jon Elias c558636799 refactor: requested changes
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 11:12:11 +01:00
Jorge Penadés a3f56aaf24 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8207-hotfix-tableActions
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 10:27:00 +01:00
Jon Elias 1dedf00fef Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-ZoneLocationsTree2
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 09:24:58 +01:00
Jon Elias a1aa9337c8 fix: show data and fixed search button when excluding a location
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2024-11-25 09:21:20 +01:00
Alex Moreno e10e0d01e6 fix: zoneEventExclusion form dated
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-24 11:53:40 +01:00
Javier Segarra a45bf4c83b perf: remove comments
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-24 08:49:03 +01:00
Javier Segarra 8d59cfa9c3 perf: use FetchData instead VnPAginate 2024-11-24 08:48:56 +01:00
Javier Segarra 4fa5d47481 test: more e2e customer tests
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-23 01:12:59 +01:00
Javier Segarra 30a2da027b test: rename client by customer 2024-11-23 00:51:45 +01:00
Javier Segarra 8a1a748c92 test: add data-cy 2024-11-23 00:51:33 +01:00
Javier Segarra 4233385267 Merge branch 'hotfix_8217_updateCustomerCredit' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_8217_updateCustomerCredit 2024-11-23 00:33:36 +01:00