Commit Graph

1119 Commits

Author SHA1 Message Date
Alex Moreno 6270653589 fix(TicketExpedition): add filter
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-04 08:48:09 +01:00
Javier Segarra 15d94ca165 fix: add order and sortBy
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-03 23:10:44 +01:00
Jon Elias b6fb36e9fb Merge branch 'dev' into 7949-TicketModifications
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 15:13:22 +00:00
Alex Moreno 82942c37c7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-03 14:42:52 +01:00
Alex Moreno b325ce191d Merge branch 'test' into warmfix_ticketList
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-03-03 13:10:43 +00:00
Alex Moreno 557927a673 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-03 13:59:31 +01:00
Jose Antonio Tubau be91e591e1 Merge branch 'dev' into 7587-addClaimedTicketRefToRefundTicket
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 12:51:46 +00:00
Jon Elias 2907d8a9d9 Merge branch 'dev' into 7949-TicketModifications
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 11:34:37 +00:00
Benjamin Esteve af6d9a60b7 Merge branch 'dev' into 8041-unifyClassLink
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 09:45:05 +00:00
Alex Moreno f0e00e1721 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-03 10:11:30 +01:00
Jose Antonio Tubau 8b370c4a50 feat: refs #7587 add 'ticketClaimed' translation and implement claims retrieval in TicketDescriptor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 09:25:02 +01:00
Javier Segarra 947024ef56 perf: refs #7356 minor changes
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-03-02 23:50:23 +01:00
Javier Segarra 8df6c95640 Merge branch 'test' into warmfix_ticketList
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-03-02 23:22:18 +01:00
Javier Segarra b4dad7a29b revert: filter logic moved to other branch 2025-03-02 23:22:01 +01:00
Javi Gallego 05ff68624f Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-03-01 12:41:03 +01:00
Javier Segarra ba98816f93 Merge branch 'test' into 7356_ticketService
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-03-01 01:41:22 +00:00
Javier Segarra 358c9fa81a Merge branch 'test' into 8681_ticketAdvance_updates
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-28 18:29:22 +00:00
Jon Elias 719db3b177 Merge branch 'dev' into 7949-TicketModifications
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 06:30:07 +00:00
Benjamin Esteve bc89c6fed8 Merge branch 'dev' into 8041-unifyClassLink
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 06:25:27 +00:00
Alex Moreno 82669f8abf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-28 07:04:33 +01:00
Javi Gallego 1931cb8906 Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-02-28 06:52:39 +01:00
Pablo Natek 773caeee6d Merge branch 'test' into 6897-fixMinorIssues
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-28 05:06:46 +00:00
Javier Segarra 321e99f501 feat: add order for table
gitea/salix-front/pipeline/pr-test Build queued... Details
2025-02-27 19:14:21 +00:00
Jon Elias 00fff12093 Merge branch 'dev' into 7949-TicketModifications
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-27 14:01:31 +00:00
Alex Moreno a3e8c3bd50 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-27 10:32:16 +01:00
Alex Moreno b29115f409 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-dev This commit looks good Details
2025-02-27 10:31:53 +01:00
Benjamin Esteve 8f0bd73e9f refactor: refs #8041 unify class link and unify titles to VnTitles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-27 10:13:35 +01:00
Jon Elias a0b92e990a feat: refs #7949 show new field in ticket sales
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-27 09:14:28 +01:00
Pablo Natek 579786d121 refactor: refs #6897 update component props and attributes for consistency and improved functionality
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-27 06:17:31 +01:00
Javier Segarra 1c9c703b46 fix: select fk
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-26 14:39:51 +01:00
Javi Gallego 524a9e4d7c Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-02-25 16:25:15 +01:00
Javier Segarra 653259aeae fix: refreshData
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-25 14:41:32 +01:00
Javier Segarra 1d2707b48e Merge branch 'test' into warmfix_ticketList
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-25 11:54:57 +01:00
Javi Gallego 430995a399 refactor: update labels and conditions in Claim components
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-25 11:49:12 +01:00
Alex Moreno d72e45918a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-25 09:53:10 +01:00
Alex Moreno b9b5bd4c8a Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34"
gitea/salix-front/pipeline/pr-test This commit looks good Details
This reverts commit 223a1ea449.
2025-02-25 09:40:46 +01:00
Javier Segarra e44d6a2915 test: remove test
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-24 22:48:48 +01:00
Javier Segarra b6b3759758 Merge branch 'master' into hotfix_mana_deacoplate
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-02-24 22:48:00 +01:00
Javier Segarra 2655e0a8e5 fix: mana axios deacoplate
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-02-24 22:46:27 +01:00
Javier Segarra 223a1ea449 revert 1015acefb7
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
revert Merge branch 'test' into master
2025-02-24 15:52:21 +00:00
Javier Segarra 1015acefb7 Merge branch 'test' into master
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-24 15:21:32 +00:00
Javier Segarra ab5ae580b3 fix: check type variable
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-02-24 16:08:40 +01:00
Javier Segarra 3a9a9bd517 fix: check type variable
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-24 15:30:30 +01:00
Alex Moreno 04f657bc04 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-dev There was a failure building this commit Details
2025-02-24 14:38:41 +01:00
Javier Segarra 7a1a5ad501 fix: refs #7356 ticketService 2025-02-24 12:54:41 +01:00
Javier Segarra 2117cbfb55 fix: date ticketExpedition 2025-02-24 12:22:42 +01:00
Javier Segarra 403159629b feat: ticketVolum 6 cols 2025-02-24 02:32:27 +01:00
Javier Segarra 7daa97999b perf: remove comments
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-02-23 14:08:28 +01:00
Javier Segarra 2725571ee1 perf: remove comments 2025-02-23 14:06:31 +01:00
Javier Segarra 93326db2d9 fix: call filterpanel from searchbar 2025-02-23 13:11:43 +01:00
Javier Segarra 26009d809e Merge branch 'master' into hotfix_ticket_shipped
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-21 10:50:34 +00:00
Javier Segarra 680c1f9d9c perf: i18n
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-21 11:45:41 +01:00
Javier Segarra ef624af3f8 revert: column time
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-21 11:44:07 +01:00
Javier Segarra 81a33dd2fc fix: shipped columnFilter
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-02-21 11:38:32 +01:00
Javier Segarra fdf9cfab74 Merge branch 'test' into warmfix_ticketList
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-02-21 08:26:52 +00:00
Javier Segarra d721205973 Merge branch 'master' into hotfix_ticketSale_quantity
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-21 08:03:03 +00:00
Javier Segarra 8536ade5b7 feat: add keyup.enter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-21 09:01:40 +01:00
Javier Segarra e82dc90ff9 fix: ticketSale 2025-02-21 09:01:28 +01:00
Javier Segarra 57c0171bdd fix: transfer style
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-21 08:38:15 +01:00
Javier Segarra a3828ab869 fix: handle multiple changes
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-20 21:16:05 +01:00
Javi Gallego ef2f34c431 Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-02-20 15:44:34 +01:00
Javier Segarra 64f29e0696 fix: address
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-20 13:37:17 +01:00
Alex Moreno ae0158d529 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-20 08:51:22 +01:00
Javier Segarra b2184635d3 test: improve test
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-19 23:42:10 +01:00
Javier Segarra 874fbb48f5 feat: refactor canProceed
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-19 22:16:02 +01:00
Javier Segarra ee23bf60dc fix: bug and simplify
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-19 10:22:27 +01:00
Javier Segarra f33d396d82 perf: minor changes
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-19 00:12:01 +01:00
Javier Segarra ce15bdd99e Merge branch 'test' into warmfix_ticketList
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-19 00:05:28 +01:00
Javier Segarra f62f72832a perf: rename prop 2025-02-19 00:03:28 +01:00
Javier Segarra 18a813dbbf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into warmfix_ticketList 2025-02-18 11:49:47 +01:00
Alex Moreno e514c9cf73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8627-devToTest
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-18 10:34:56 +01:00
Alex Moreno 4d49404105 fix(TicketProblems): refs #8627 fix isTaxDataChecked and add claim
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-18 10:28:39 +01:00
Guillermo Bonet a7a592505b Merge branch 'test' into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-18 10:13:59 +01:00
Javier Segarra ab62cd5627 Merge branch 'master' into hotfix_ticketSale_discount
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-18 08:02:22 +00:00
Javier Segarra 93401dfcdc fix: use mana in ticketSale.discount
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-18 00:40:39 +01:00
Javier Segarra 6bb758b88c fix: reload table when apply discount 2025-02-18 00:40:13 +01:00
Javier Segarra df794391ec feat: agency in ticketlist sort data 2025-02-17 23:08:57 +01:00
Javier Segarra c0823b0f48 perf: comments 2025-02-17 19:33:29 +01:00
Javier Segarra c212b8e21c Merge branch 'test' into warmfix_ticketList
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-17 08:52:31 +00:00
Alex Moreno accea946d1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-17 07:54:54 +01:00
Alex Moreno 0c79f7f5d2 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-17 07:54:22 +01:00
Javier Segarra 443a2747cc style: remove proposal
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-16 23:46:05 +01:00
Javier Segarra 33d6662f97 feat: same searchbar logic filter in VnFilterPanel 2025-02-16 23:35:56 +01:00
Javier Segarra 2ec5c2b49f fix: ticketList columnfilter
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-16 03:18:10 +01:00
Javier Segarra ab3ac4fdeb fix: remove bad code
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-02-16 00:50:39 +01:00
Javier Segarra b998aab6dd test: add test
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-02-16 00:46:20 +01:00
Javier Segarra 70fe95661a style: remove optionId and optionLabel 2025-02-16 00:00:24 +01:00
Javier Segarra 3b3332f15c feat: use clientFK in dialog 2025-02-15 23:59:22 +01:00
Javier Segarra cad6b077f0 fix: ticketfilter from and to 2025-02-15 17:45:06 +01:00
Jon Elias 04ef8e1886 perf: refs #8604 changed lines and deleted useless code 2025-02-14 12:43:20 +01:00
Javier Segarra eb9512fafb style: refs #8604 update styles
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-14 12:37:16 +01:00
Jon Elias 90a34d56f7 refactor: refs #8604 changed origin/destination values
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-14 12:36:14 +01:00
Jon Elias 029c9157e7 Merge branch '8604-FixTicketFuture' of https://gitea.verdnatura.es/verdnatura/salix-front into 8604-FixTicketFuture
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-14 12:17:07 +01:00
Jon Elias 69e77b57ba refactor: refs #8604 requested changes 2025-02-14 12:17:04 +01:00
Javier Segarra 96a04d20b1 style: refs #8604 fix style
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-14 12:13:11 +01:00
Jon Elias 012da1edfb refactor: refs #8604 changed TicketFuture to Vntable and modified filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-14 10:53:46 +01:00
Javi Gallego cb408636ff Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-02-14 09:52:24 +01:00
Javi Gallego fba3a66c83 refactor: refs #6802 update import paths for DepartmentDescriptorProxy to use Worker directory 2025-02-14 09:49:04 +01:00
Jon Elias 23e029b225 Merge branch 'dev' into fix_ticketNegatives
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-12 15:30:07 +00:00
Javier Segarra a0dbb63346 fix: updates vntable2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-12 16:24:34 +01:00