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

5218 Commits

Author SHA1 Message Date
Jorge Penadés 3cc5595e14 refactor: refs #8198 simplify data fetching and filtering logic 2025-01-14 13:08:52 +01:00
Carlos Satorres 64fcf3c824 fix: hotfix 7366 6943 2025-01-14 11:36:46 +01:00
Jon Elias 25dd028487 fix: modified setData in customerDescriptor to show the icons 2025-01-14 09:15:53 +01:00
Jose Antonio Tubau 702ae17d94 refactor: refs #8316 update EntryCard to use user-filter prop and remove exprBuilder from EntryList 2025-01-14 08:25:10 +01:00
Alex Moreno 837c389f64 feat(cliamList): add auto-load, in this case they need it 2025-01-14 08:16:44 +01:00
Jose Antonio Tubau bd9c2ad4dc refactor: refs #8316 remove unused OrderSearchbar component 2025-01-14 07:57:54 +01:00
Jon Elias 6e5b703018 fix: refs #8247 conflicts 2025-01-14 07:47:33 +01:00
Jon Elias 179571e3e9 Merge branch 'dev' of https: refs #8247//gitea.verdnatura.es/verdnatura/salix-front into 8247-EnableAccount 2025-01-14 07:46:34 +01:00
Alex Moreno 63a6073cce Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-14 07:37:37 +01:00
Jon Elias 3adec919dc Merge branch '8247-EnableAccount' of https://gitea.verdnatura.es/verdnatura/salix-front into 8247-EnableAccount 2025-01-14 07:37:22 +01:00
Jon Elias e5d8bfcf3a refactor: refs #8247 use new acl for sysadmin 2025-01-14 07:37:17 +01:00
Alex Moreno 099ea793bd fix: refs #8389 minor bugs 2025-01-14 07:29:44 +01:00
Alex Moreno 863d6deb10 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-13 14:49:15 +01:00
Alex Moreno d0e6c28ea2 Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-13 13:15:49 +01:00
Alex Moreno e9645cf86c Merge branch '8316-customerCardWithVnCardBeta' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-13 13:15:05 +01:00
PAU ROVIRA ROSALENY 2a8c2a1079 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-13 11:54:12 +00:00
Jon Elias a9ac5106cf Merge branch 'test' into Warmfix-OrderProblems 2025-01-13 10:56:32 +00:00
Jon Elias 5272e5aaae fix: redirect to sales when confirming lines 2025-01-13 11:53:55 +01:00
PAU ROVIRA ROSALENY f0fc748c76 fix: changed translations to only use "invoicein" 2025-01-13 11:48:45 +01:00
Javi Gallego 803b8d508d feat: refs #8381 add initial and final temperature fields to entry forms and summaries 2025-01-13 11:27:00 +01:00
PAU ROVIRA ROSALENY f5003687eb Merge branch 'traduccionesInvoiceIn' of https://gitea.verdnatura.es/verdnatura/salix-front into traduccionesInvoiceIn 2025-01-13 11:06:06 +01:00
PAU ROVIRA ROSALENY eb92c69475 fix: changed invoiceIn for InvoiceIn 2025-01-13 11:06:01 +01:00
PAU ROVIRA ROSALENY 49f54c6efe Merge branch 'dev' into traduccionesInvoiceIn 2025-01-13 09:55:20 +00:00
PAU ROVIRA ROSALENY 2a121dbbb3 fix: added missing translations in InvoiceIn 2025-01-13 10:54:28 +01:00
Alex Moreno ce698522c3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-13 10:23:41 +01:00
Alex Moreno d761af6537 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-13 10:23:27 +01:00
Alex Moreno bb8e9c5baa Merge branch 'dev' into 8225-UseSameMoreOptions 2025-01-13 09:14:24 +00:00
Javi Gallego 7018f09ad1 Merge pull request 'feat: refs #8298 add price optimum input and update translations for bonus and price optimum' (!1185) from 8298-zonePriceOptimum into dev 
Reviewed-on: verdnatura/salix-front#1185
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 08:41:49 +00:00
Jose Antonio Tubau 1af67db644 refactor: refs #8316 move order localization 2025-01-13 08:37:01 +01:00
Jon Elias f229ef1cd8 Merge branch 'dev' into 8225-UseSameMoreOptions 2025-01-13 07:35:38 +00:00
Jon Elias 413d567ffb refactor: refs #8225 requested changes 2025-01-13 08:34:32 +01:00
Pablo Natek fb5d76737d feat: add decimal places for longitude and latitude inputs in CustomerAddressEdit 2025-01-13 08:01:05 +01:00
Jose Antonio Tubau bd66d3aee5 Merge branch 'dev' into 8316-entryCardWithVnCardBeta 2025-01-13 06:45:26 +00:00
Jose Antonio Tubau a8706b3daa Merge branch 'dev' into 8316-claimCardWithVnCardBeta 2025-01-13 06:34:35 +00:00
Jose Antonio Tubau 7be5f9633b feat: refs #8316 add entryFilter prop to VnTable component in EntryList 2025-01-10 15:24:40 +01:00
Jose Antonio Tubau c896b66a50 feat: refs #8316 add entryFilter to VnTableEntryList component 2025-01-10 15:24:09 +01:00
Alex Moreno a28d9280a4 Merge branch 'dev' into 8372-workerPBX 2025-01-10 12:38:01 +00:00
PAU ROVIRA ROSALENY 47168cdeb8 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-10 10:53:10 +00:00
Jon Elias 57c538c9c9 fix: refs #8225 invoice in translations 2025-01-10 10:49:07 +01:00
Jon Elias ac1515e107 feat: refs #8225 added worker and zone modules 2025-01-10 10:27:03 +01:00
Jon Elias 69bcab0ec4 feat: refs #8225 added invoiceIn and travel module 2025-01-10 10:25:16 +01:00
Jon Elias 300d64b076 feat: refs #8225 added entry module and fixed translations 2025-01-10 10:22:37 +01:00
Jon Elias 774c714755 feat: refs #8225 added route and shelving module 2025-01-10 10:14:56 +01:00
Jon Elias 5d9227723e feat: refs #8225 added account and invoiceOut modules 2025-01-10 10:10:16 +01:00
Jon Elias 1b986f4b4c feat: refs #8225 use it in claim, item and order modules 2025-01-10 10:03:51 +01:00
Jon Elias 95712728d6 feat: refs #8225 added moreOptions and use it in customer and ticket summary 2025-01-10 10:00:42 +01:00
PAU ROVIRA ROSALENY f834f3b754 feat: refs #8258 added button to pass to uppercase 2025-01-10 07:52:22 +01:00
PAU ROVIRA ROSALENY 3148461dc1 Merge branch 'dev' of https: refs #8258//gitea.verdnatura.es/verdnatura/salix-front into 8258-uppercaseInputs 2025-01-10 07:44:02 +01:00
PAU ROVIRA ROSALENY 27aa2969e8 fix: fixed InvoiceIn filter translations 2025-01-10 07:34:29 +01:00
Robert Ferrús 0057932bfa feat: refs #8372 workerPBX 2025-01-09 14:46:53 +01:00
PAU ROVIRA ROSALENY 343c1b538a Merge branch 'dev' into 8322-workerDepartment 2025-01-09 09:01:42 +00:00
Alex Moreno c95d2d7eac Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-09 09:54:26 +01:00
Alex Moreno e36e9b5617 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-09 09:54:15 +01:00
Alex Moreno a317006cc4 fix: refs #8316 ref="claimFilterRef" 2025-01-09 09:52:44 +01:00
Carlos Satorres 5882ee8463 fix: fix confirmRequest 2025-01-09 09:44:37 +01:00
PAU ROVIRA ROSALENY e9ea70de19 fix: removed unused searchbar 2025-01-09 08:03:59 +00:00
Javi Gallego bd09090e11 fix: update button sizes in ExtraCommunity.vue for better visibility 2025-01-09 08:47:18 +01:00
Carlos Satorres 5e31b93675 fix: modelName 2025-01-09 08:00:30 +01:00
Alex Moreno 6d1478f703 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-09 07:59:34 +01:00
Carlos Satorres ad8f58e3e1 Merge branch 'dev' into 7699-refactroViewPassword 2025-01-08 13:04:00 +00:00
Jon Elias 1c2f3e7c53 Merge branch 'dev' into Fix-VnTableFilterTranslations 2025-01-08 12:24:52 +00:00
Robert Ferrús 65b9da7b54 Merge branch 'master' into 8001-expeditionGrafanaHotFix 2025-01-08 12:02:23 +00:00
Alex Moreno e693323166 fix: workerTimeControl state week colors 2025-01-08 12:57:15 +01:00
Robert Ferrús 1a72eda359 fix: refs #8001 change link grafana 2025-01-08 12:44:35 +01:00
Alex Moreno 3ba37d515a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-08 12:19:51 +01:00
Alex Moreno b889bfd178 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-08 12:19:38 +01:00
Alex Moreno 70f692ffd5 fix(WorkerTimeControl): fix isoYear 2025-01-08 12:19:27 +01:00
Javi Gallego 3e06f604bb feat: refs #8298 add price optimum input and update translations for bonus and price optimum 2025-01-08 10:32:15 +01:00
Carlos Satorres 96f8cab38c Merge branch 'dev' into 7699-refactroViewPassword 2025-01-08 08:27:54 +00:00
Pablo Natek d392e93efd Merge branch 'master' into 8348-exportDataOnCsv 2025-01-08 07:15:05 +00:00
PAU ROVIRA ROSALENY dfd7ba9379 feat: refs #8258 added uppercase option to VnInput 2025-01-08 08:14:37 +01:00
Jose Antonio Tubau 7f1684ddfc refactor: refs #8316 added entryFilter 2025-01-08 08:14:05 +01:00
Jose Antonio Tubau 11642c075c refactor: refs #8316 added claimFilter 2025-01-08 08:10:00 +01:00
Jon Elias ec40dc6171 Merge branch 'dev' of https: refs #8219//gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E 2025-01-08 07:15:52 +01:00
Jon Elias 39917e656e Merge branch 'dev' into Fix-VnTableFilterTranslations 2025-01-08 06:13:35 +00:00
Jon Elias f4b443f2b0 fix: translations 2025-01-08 07:11:26 +01:00
Jose Antonio Tubau cdcc3de917 Merge branch 'dev' into 8317-buttonsToRightOnItemFixedPrice 2025-01-08 06:08:44 +00:00
Jose Antonio Tubau eb6121cbb5 Merge branch 'dev' into 8117-filtersAndValuesReviewed 2025-01-08 06:01:45 +00:00
Jose Antonio Tubau 6ce571a8ab Merge branch 'dev' into 8317-buttonsToRightOnItemFixedPrice 2025-01-08 05:59:56 +00:00
Alex Moreno 5dcf77a226 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-07 15:05:44 +01:00
Alex Moreno 621d98b32b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-07 15:05:33 +01:00
Jon Elias 33ba6d3142 Merge branch 'dev' into 8220-ItemsE2E 2025-01-07 12:48:26 +00:00
PAU ROVIRA ROSALENY 8e1f888134 Merge branch 'dev' into 8322-worker 2025-01-07 12:24:44 +00:00
Jon Elias ea89cf4062 Merge branch 'dev' into 8220-ItemsE2E 2025-01-07 12:22:32 +00:00
Jon Elias 548db113eb refactor: refs #8220 requested changes 2025-01-07 13:16:05 +01:00
Jon Elias 5de2805fa9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E 2025-01-07 13:13:12 +01:00
Alex Moreno 62cdc2b4f7 Merge branch 'dev' into 8322-worker 2025-01-07 12:02:22 +00:00
Alex Moreno 02973cc7d6 fix: refs #8322 unnecessary section 2025-01-07 13:02:04 +01:00
Alex Moreno 5440d94df2 chore: refs #8322 unnecessary prop 2025-01-07 13:00:42 +01:00
Alex Moreno 245530b542 refactor: refs #8322 set department inside worker 2025-01-07 13:00:00 +01:00
PAU ROVIRA ROSALENY 07222f9fb8 fix: refs #8338 removed chipLocale property/added more translations 2025-01-07 11:43:39 +01:00
Jorge Penadés da0e31b978 fix: refs #7323 update getAbsences to handle multiple years for absence data 2025-01-07 11:17:56 +01:00
PAU ROVIRA ROSALENY e8bad89008 Merge branch 'dev' into 8338-traduccionesVnTable 2025-01-07 09:42:16 +00:00
Jon Elias 04f1a805ab Merge branch 'dev' into Fix-EntrySummary 2025-01-07 09:24:00 +00:00
PAU ROVIRA ROSALENY e7f2d6ae7f Merge branch 'dev' into 8322-worker 2025-01-07 09:22:40 +00:00
Jon Elias 48ba567489 Merge branch 'dev' into Fix-IntegrationE2ETests 2025-01-07 09:09:35 +00:00
Jon Elias 2373404d90 Merge branch 'dev' into 7202-AddCustomAgentFkColumn2 2025-01-07 09:02:13 +00:00
Jon Elias bc2b8fff0f Merge branch 'dev' into Fix-IntegrationE2ETests 2025-01-07 08:58:19 +00:00
Alex Moreno 1d92e84227 fix: claimList order 2025-01-07 09:51:36 +01:00
Alex Moreno ddc2f99efd Merge branch 'test' of https: refs #8356//gitea.verdnatura.es/verdnatura/salix-front into 8356-devToTest 2025-01-07 09:33:47 +01:00
Alex Moreno c645a8b4b6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-07 09:07:08 +01:00
Alex Moreno e46b4b0b97 fix: vnNotes filter & fix: itemFixedPrice order 2025-01-07 09:06:41 +01:00
Jon Elias 582e1de8df Merge branch 'Fix-IntegrationE2ETests' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests 2025-01-07 07:55:20 +01:00
Jon Elias 5c839b2dfa Merge branch 'dev' into 8246-ZoneAddressFk 2025-01-07 06:22:27 +00:00
Jon Elias b0cb3597de feat: refs #8246 added new field in list 2025-01-07 07:11:04 +01:00
Alex Moreno 17db5ac882 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-07 07:02:04 +01:00
Alex Moreno 7fe2dd9ca7 Merge branch 'test' into 8197-perf_redirection 2025-01-03 12:50:59 +00:00
Alex Moreno 81116b4b13 Merge branch 'Fix-IntegrationE2ETests' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests 2025-01-03 13:43:12 +01:00
Alex Moreno ac2336064b test: fix expedition e2e 2025-01-03 13:43:10 +01:00
Jose Antonio Tubau c35a468e01 fix: refs #8317 disable action buttons when no rows are selected in ItemFixedPrice 2025-01-03 13:33:44 +01:00
PAU ROVIRA ROSALENY 50ace09482 Merge branch 'dev' into 8338-traduccionesVnTable 2025-01-03 11:52:10 +00:00
PAU ROVIRA ROSALENY a40da6b5d9 fix: refs #8338 fixed VnTable translations 2025-01-03 12:51:26 +01:00
Jose Antonio Tubau f53906f9c9 Merge branch 'dev' into 8117-filtersAndValuesReviewed 2025-01-03 11:50:10 +00:00
Jose Antonio Tubau 1a90be0561 feat: refs #8316 added order param 2025-01-03 12:47:24 +01:00
Pablo Natek 2b643a9dc1 feat: refs #8348 add CSV download functionality and update print label icon 2025-01-03 12:16:24 +01:00
Jon Elias dddfb62a95 Merge branch 'dev' into Fix-ItemFixedPrice 2025-01-03 10:48:10 +00:00
Alex Moreno 6d7053b1b5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-03 11:43:19 +01:00
Alex Moreno eb8fbe23ce fix: add data-key 2025-01-03 11:39:28 +01:00
Jon Elias cec7de7fc6 Merge branch 'dev' into Fix-ItemFixedPrice 2025-01-03 10:12:59 +00:00
Alex Moreno 9a631a61f9 fix: refs #8197 redirection 2025-01-03 10:46:43 +01:00
Alex Moreno 2e3e7c6a5d fix: refs #8316 use rightMenu 2025-01-03 09:44:00 +01:00
Carlos Satorres ae42142524 Merge branch 'dev' into 7699-refactroViewPassword 2025-01-03 08:37:05 +00:00
Carlos Satorres a89fad0ae2 fix: refs #7699 fix tfront clean code 2025-01-03 09:35:03 +01:00
Alex Moreno 80a99d1261 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-03 09:24:06 +01:00
Carlos Satorres 009cf2322b Merge branch '7699-refactroViewPassword' of https://gitea.verdnatura.es/verdnatura/salix-front into 7699-refactroViewPassword 2025-01-03 08:46:25 +01:00
Carlos Satorres cd6cc5c865 fix: refs #7699 fix vnInputPassword 2025-01-03 08:46:22 +01:00
Carlos Satorres 3cf4c5ed80 Merge branch 'dev' into 7699-refactroViewPassword 2025-01-03 07:26:19 +00:00
Carlos Satorres 60f3ea838a fix: refs #7699 fix component 2025-01-03 08:18:11 +01:00
Jon Elias a6ac9c9d3f refactor: item fixedPrice 2025-01-03 08:12:50 +01:00
Pablo Natek 7eb11c497b Merge branch 'test' into 7301-warmFix 2025-01-02 13:48:39 +00:00
Jon Elias e648b82ecc fix: dated field 2025-01-02 14:23:13 +01:00
PAU ROVIRA ROSALENY 93ba88f236 feat: refs #8322 added department changes 2025-01-02 13:31:37 +01:00
Jon Elias 1941e896e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E 2025-01-02 13:10:25 +01:00
PAU ROVIRA ROSALENY 8eccf557f0 Merge branch 'dev' into 8322-worker 2025-01-02 12:04:55 +00:00
Pablo Natek fb21bcc02e feat: refs #7301 enhance VnDateBadge styling and improve ItemLastEntries component 2025-01-02 11:38:04 +01:00
Jon Elias 1cecea4aee feat: refs #7202 added new field 2025-01-02 10:04:57 +01:00
Jon Elias 832ba01a52 Merge branch 'dev' into 8247-EnableAccount 2025-01-02 09:01:31 +00:00
Jon Elias 5259b8200b fix: refs #8247 fixed acls and added lost options 2025-01-02 09:57:56 +01:00
Alex Moreno 268ddb027b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-02 08:45:52 +01:00
Alex Moreno a7e04557dc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-02 07:52:47 +01:00
Alex Moreno a65b8432d8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-02 07:51:39 +01:00
Jon Elias 9525eef025 Merge branch 'master' into Hotfix-ZoneEventSelect 2024-12-31 12:33:33 +00:00
Javier Segarra b6161a41e8 perf: use dateRange 2024-12-31 10:48:07 +01:00
Javier Segarra 229130409a fix: init fix 2024-12-31 10:45:37 +01:00
Jon Elias 843710255e refactor: refs #8220 requested changes 2024-12-31 08:07:47 +01:00
Jon Elias a98c1b38e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E 2024-12-31 06:52:35 +01:00
Jon Elias 582b4f68e0 Merge branch 'dev' into Fix-EntrySummary 2024-12-31 05:36:01 +00:00
Jon Elias 90c5aefac3 fix: entry summary view and build warnings 2024-12-31 06:14:23 +01:00
Jorge Penadés dd90af9b6c feat: refs #7119 add VehicleNotes component and update routing to include notes section 2024-12-30 18:02:26 +01:00
Jorge Penadés 6f5aed2cbe fix: refs #7119 update VehicleList.vue to improve data formatting and add column filter for vehicle state 2024-12-30 17:31:59 +01:00