Commit Graph

5414 Commits

Author SHA1 Message Date
Jon Elias 9ba16e4116 Merge branch 'Hotfix-RecalculatePriceReload' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-RecalculatePriceReload
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-25 06:48:11 +02:00
Jon Elias 994237260e refactor: changed name of emitted event 2024-10-25 06:48:09 +02:00
Carlos Andrés 12c236276d feat: refs #8087 Traspasar redadas a travels
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 19:32:20 +02:00
Alex Moreno 92e147355f fix: better performance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 15:13:05 +02:00
Carlos Satorres 67a5d10a5e Merge branch 'dev' into 7283-itemMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 13:10:23 +00:00
Javier Segarra 855979d22d perf: refs #7283 #7283 i18n params
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 14:59:14 +02:00
Javier Segarra 9a518ed990 Merge branch 'test' into warmfix_createNewPostcodeForm
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-10-24 12:48:25 +00:00
Alex Moreno fd72f4dd45 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-24 14:45:34 +02:00
Alex Moreno 9daed096db Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-24 14:45:23 +02:00
Javier Segarra 26de0cf72f perf: remove limit
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-10-24 12:39:49 +00:00
Jorge Penadés 4828e32c9e fix: refs #7652 datakey
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-24 14:26:16 +02:00
Jon Elias 7a4e43a025 Merge branch 'master' into Hotfix-RecalculatePriceReload
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-24 12:13:48 +00:00
Carlos Satorres 8cee3ac713 Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 14:08:14 +02:00
Carlos Satorres c2043902f8 fix: refs #7283 fix required 2024-10-24 14:08:11 +02:00
Javier Segarra 70dcadc57d Actualizar src/components/CreateNewPostcodeForm.vue
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-10-24 11:52:13 +00:00
Carlos Satorres 92ff8c188e Merge branch 'dev' into 7283-itemMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 11:39:33 +00:00
Carlos Satorres 551b81e421 Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 13:38:16 +02:00
Carlos Satorres 671d9fd6fb fix: refs #7283 itemtype fix 2024-10-24 13:38:13 +02:00
Jorge Penadés 823c354ef1 fix: refs #7524 vnProgressModal
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-24 13:27:08 +02:00
Jorge Penadés f52b4c9a59 fix: refs #7524 vnProgressModal 2024-10-24 13:24:45 +02:00
Carlos Andrés 64f36c7d4b feat: refs #8087 Traspasar redadas a travels
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 12:35:11 +02:00
Javier Segarra 3f640c650b perf: refs #7283 #7283 handle i18n
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 12:32:15 +02:00
Jorge Penadés c9cfb2b1cf fix: refs #7524 changes
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-24 12:29:46 +02:00
Jon Elias c9e82f2caf refactor: deleted log
gitea/salix-front/pipeline/pr-master Build queued... Details
2024-10-24 12:04:54 +02:00
Jon Elias b02199eb07 fix: reload window when price is recalculated
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-24 12:03:49 +02:00
Jorge Penadés f1350dece5 fix: refs #7524 changes
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-10-24 11:43:29 +02:00
Javier Segarra 87d2e0a39b perf: refs #7283 #7283 handle composable i18n
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 10:36:48 +02:00
Javier Segarra 45e6d2011f Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-24 10:35:24 +02:00
Jorge Penadés 2779e7ac8d Merge branch 'test' of https: refs #7524//gitea.verdnatura.es/verdnatura/salix-front into 7524-warmfix-useVnTable
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-10-24 10:29:55 +02:00
Jorge Penadés d918b76010 chore: refs #7524 drop useless code
gitea/salix-front/pipeline/pr-master This commit looks good Details
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2024-10-24 10:24:28 +02:00
Jorge Penadés 6f57d9e490 refactor: refs #7524 use VnTable
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2024-10-24 10:21:25 +02:00
Alex Moreno de7f55c589 Merge branch 'dev' of https: refs #8039//gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 07:56:00 +02:00
Alex Moreno 32b4636706 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-24 07:49:10 +02:00
Alex Moreno f26976b744 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-24 07:49:01 +02:00
Carlos Satorres 56ef811584 fix: refs #7283 order translation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 07:47:26 +02:00
Javier Segarra 1c8eabe293 perf: refs #7283 #7283 declare composable inst4ead code duplicated 2024-10-24 00:39:35 +02:00
Jorge Penadés 1bfede4a55 fix: refs #8083 drop useless code
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-23 16:13:32 +02:00
Jorge Penadés 4e31566ddd fix: refs #8083 drop useless code
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-23 16:13:04 +02:00
Jorge Penadés 33ee1ea01b fix: refs #8083 drop useless code
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-23 16:11:58 +02:00
Jorge Penadés 126bb3f039 feat: refs #8083 insert
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-23 16:10:14 +02:00
Jorge Penadés 9673f7be1e fix: refs #8083 update rightly 2024-10-23 15:17:06 +02:00
Alex Moreno d1e4017869 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-23 13:59:11 +02:00
Alex Moreno 2420c6dee2 Merge branch 'dev' of https: refs #8039//gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-23 13:14:30 +02:00
Alex Moreno 0528474250 chore: refs #8010 kebab-case
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-10-23 13:13:00 +02:00
Jon Elias 76ed5150a5 Merge branch 'dev' into Fix_OrderModuleProblems
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-23 11:05:14 +00:00
Jon Elias 37b3affdbf refactor: revert catalog changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-23 13:02:28 +02:00
Carlos Satorres d8b80cfa6d fix: refs #7283 fix pr
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-23 12:30:04 +02:00
Alex Moreno e7acdfd4f7 fix: refs #8010 footer class
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-10-23 10:48:30 +02:00
Carlos Satorres d2da1e3544 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-23 09:54:25 +02:00
Carlos Satorres b40af0ce7b fix: refs #7283 fix pr
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-10-23 09:49:48 +02:00
Jon Elias 4bde0dffa7 fix: fixed item packaging type field showing repetitive values
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-10-23 09:17:14 +02:00
Carlos Satorres 84dae53d66 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-10-23 07:53:02 +02:00
Javi Gallego 1bf1844c8f fix: refs #7349 dependencia no usada
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-23 07:46:52 +02:00
Javi Gallego ae56c06628 feat: refs #7349 usa back con permisos 2024-10-23 07:45:00 +02:00
Alex Moreno 735ee09ef8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-22 15:08:20 +02:00
Alex Moreno aaf749db6c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-22 15:08:11 +02:00
Alex Moreno 81a55a9e7a chore: test gitea
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2024-10-22 14:55:47 +02:00
Jorge Penadés 033d6bddbe fix: refs #8083 move expeditions
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-22 14:43:43 +02:00
Jorge Penadés da4c1e9c12 fix: refs #8083 add order
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-22 14:36:30 +02:00
Jorge Penadés 9f3c834ce4 Merge branch 'master' of https: refs #8083//gitea.verdnatura.es/verdnatura/salix-front into 8083-hotfix-changeState
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-22 14:24:41 +02:00
Jorge Penadés b1a511ff6f fix: refs #8083 delete btn & redirect
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2024-10-22 14:21:03 +02:00
Alex Moreno ee31bc8262 chore: refs #8039 not required 2024-10-22 14:07:27 +02:00
Alex Moreno dd2dc86eea fix: refs #8039 o not handle unnecessary errors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-22 14:05:15 +02:00
Alex Moreno cd00a3c67f test: refs #8039 fix WorkerNotification e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-22 13:55:35 +02:00
Alex Moreno 0c9c01b6e9 test: refs #8039 fix ZoneWarehouse e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-22 13:53:01 +02:00
Alex Moreno 2d81cffb33 feat: refs #8039 show duplicate request in local
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-22 13:34:20 +02:00
Jorge Penadés f751408de2 feat: refs #8083 add change state btn
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-22 13:22:43 +02:00
Alex Moreno a732ec05fb test: refs #8039 add hasNotify and, refactor: agencyWorkCenter test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-22 13:21:16 +02:00
Alex Moreno 9db1c4f721 fix: refs #8039 bad tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-22 12:29:33 +02:00
Alex Moreno ffd4a402ab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify 2024-10-22 12:14:09 +02:00
Javier Segarra 49c0d64c07 fix: refs #7283 #7283 ItemSummary bugs
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-10-22 12:13:43 +02:00
Javier Segarra fff3310658 fix: refs #7283 tooltips !Item
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-10-22 12:09:32 +02:00
Javier Segarra d6b8d41b6c fix: refs #7283 #7283 ItemSummary bugs 2024-10-22 12:09:19 +02:00
Jon Elias 1346a2e7fd fix: tag chips
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-22 12:05:44 +02:00
Javier Segarra f3a6209189 fix: refs #7283 #7283 bugs
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-10-22 12:00:11 +02:00
Jon Elias 5b116a7301 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems 2024-10-22 11:31:45 +02:00
Alex Moreno 36221121f5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/pr-4774-traducciones This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-22 07:43:07 +02:00
Alex Moreno b4d4844100 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-22 07:42:54 +02:00
Jorge Penadés 0fbd5f45e1 fix: refs #7524 select department
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-21 14:29:29 +02:00
Javier Segarra 29a7f3b2fe fix: refs #7283 #7283 ItemDiary subToolbar 2024-10-21 13:48:43 +02:00
Jon Elias cd4b17048c Merge branch 'dev' into Fix-TicketsModule
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-21 11:40:02 +00:00
Alex Moreno 8478d89183 Merge branch '8039-canceledError_not_notify' of https://gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-10-21 13:33:14 +02:00
Alex Moreno 9780fe596f feat: refs #8039 notify error unify 2024-10-21 13:33:12 +02:00
Alex Moreno 6f79275521 Merge branch 'dev' into 8039-canceledError_not_notify
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-21 11:24:08 +00:00
Alex Moreno 52981953f7 feat(): refs #8039 canceledError not notify 2024-10-21 13:23:45 +02:00
Javier Segarra e5064e8a37 Merge branch 'dev' into 7679_improve_newPostcode_form
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-21 11:17:01 +00:00
Alex Moreno 0afcba0b07 Merge branch 'dev' into 6233-fix_ticketBasicData_zone
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-21 10:49:43 +00:00
Jorge Penadés a4358ec0ed chore: refs #7524 refactor order
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-21 12:36:16 +02:00
Jorge Penadés 2b2ccbc6a1 feat: refs #7524 myTeam filter & default params
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-21 12:14:54 +02:00
Alex Moreno d221b8e3c4 chore: refs #7632 change requests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-21 12:04:20 +02:00
Alex Moreno fcc213f307 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7632-axios_isLoading 2024-10-21 12:03:15 +02:00
Alex Moreno f2147311d3 fix(TicketBasicData_zone): refs #6233 add acls and fix get zones
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-21 08:41:19 +02:00
Alex Moreno 0cc1090739 Merge branch 'dev' into 7632-axios_isLoading
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-21 06:23:05 +00:00
Jon Elias fa0625aa86 Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-18 14:12:25 +02:00
Jon Elias 11bf70d76c fix: category and tags filters 2024-10-18 14:12:23 +02:00
Jon Elias 11092866b8 fix: merge conflicts 2024-10-18 13:33:28 +02:00
Jon Elias 64c0496f7a Merge branch 'dev' into Fix-ItemRequest
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-18 11:20:43 +00:00
Alex Moreno 175ebbc343 feat(navBar): refs #7632 isLoading
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-18 11:03:43 +02:00
Jorge Penadés 2aaba93c3c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fixLoadOnScroll
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-18 10:11:11 +02:00
Jorge Penadés 0c2d9e6ec6 fix: refs #7353 load on scroll end 80% zoom
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-18 10:08:46 +02:00