Commit Graph

3465 Commits

Author SHA1 Message Date
Javier Segarra 666cb519c5 feat: #7648 handle EntryBuys
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-06-29 00:08:35 +02:00
Javier Segarra 4bbf0f29d5 feat: #7648 handle EntryList 2024-06-29 00:07:09 +02:00
Javier Segarra 361024abe2 feat: #7648 handle LeftMenu 2024-06-29 00:07:00 +02:00
Javier Segarra e418a647be feat: #7648 handle NavBar 2024-06-29 00:06:49 +02:00
Alex Moreno c399d40daf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-28 17:48:00 +02:00
Alex Moreno 4cf389e00c fixes: fix vnFilter params and redirect
gitea/salix-front/pipeline/head This commit looks good Details
2024-06-28 17:45:04 +02:00
Alex Moreno 7bc9042c02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime 2024-06-28 16:32:22 +02:00
Jon Elias 9664978733 Merge branch 'dev' into 6826-RolSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-28 12:58:51 +00:00
Jon Elias 6ee5fc954b fix: refs #6826 fix redirect
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-28 13:26:53 +02:00
Javier Segarra 946a2d4823 Merge branch 'dev' into feature/TicketService
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-28 13:24:24 +02:00
Jon Elias 25e4494266 Merge branch 'dev' into 5447-travelExtraCommunity
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-28 11:17:10 +00:00
Jon Elias a3704ce456 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6826-RolSummary 2024-06-28 13:13:53 +02:00
Jon Elias 93c109b70d refactor: new translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-28 11:25:38 +02:00
Jon Elias 8e9b238eaa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7030-FixTranslations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-28 10:58:57 +02:00
Jon Elias 369cb9dc75 refactor: refs #7030 added translations
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-28 10:56:09 +02:00
Jorge Penadés 97c84f7aaa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7436-showQCheckbox 2024-06-28 10:21:47 +02:00
Jon Elias ec5eeaa308 fix: refs #6151 fixed filters and styles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-28 10:14:24 +02:00
William Buezas db4c3a6799 Changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-27 11:46:31 -03:00
Alex Moreno 381a9c6d1d feat: remake vnInputDate and fix: FormModel has changes when error 2024-06-27 13:56:20 +02:00
Jorge Penadés e7ad147d04 fix: refs #7433 skeleton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-27 13:16:42 +02:00
Jorge Penadés ed642b299e feat: refs #7436 show checkbox
gitea/salix-front/pipeline/pr-dev Build queued... Details
2024-06-27 12:27:04 +02:00
Jon Elias 95f70ba765 Merge branch '6464-fixNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-27 10:15:18 +02:00
Jon Elias fd744158ac fix: refs 6464 deleted useless class in checkbox 2024-06-27 10:15:17 +02:00
Jon Elias f6e0cb41ce Merge branch 'dev' into 6464-fixNegativeBases
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-27 07:36:02 +00:00
William Buezas 5b07f3015d small change
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 17:02:21 -03:00
Jorge Penadés 92f9869a36 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 14:18:57 +02:00
William Buezas fd03336c7a Resolve conflicts 2024-06-26 09:12:23 -03:00
William Buezas ae73dd047f changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 08:55:30 -03:00
William Buezas 8ee4fa2e7d Resolve conflicts 2024-06-26 08:39:56 -03:00
William Buezas cd01ba8fe1 changes 2024-06-26 08:36:17 -03:00
Carlos Satorres c570f2058b Merge branch 'dev' into 7409-workerBalance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 09:37:52 +00:00
Carlos Satorres 6f2573880c refs #7409 fix balance and formation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 09:59:37 +02:00
Jorge Penadés 752f3ace58 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 09:38:37 +02:00
Jon Elias de2c3cc244 fix: refs #6826 fix roleDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 08:56:17 +02:00
Javier Segarra 120a119b38 Merge branch 'dev' into feature/TicketTracking
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 23:05:11 +02:00
Javier Segarra 151978160b fix: ticket order
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 23:01:26 +02:00
Javier Segarra ff02e5d160 Merge branch 'dev' into feature/WeeklyTickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 22:59:16 +02:00
Javier Segarra d409b9ea86 fix: WorkerSelect option format
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 22:51:26 +02:00
Javier Segarra 7a2b334a64 Merge branch 'dev' into feature/TicketTracking 2024-06-25 22:41:15 +02:00
Javier Segarra 56560d4b50 fix: merge dev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 22:35:20 +02:00
Javier Segarra 4e4563d481 fix: merge dev
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 22:34:19 +02:00
Javier Segarra c45c24e983 Merge branch 'dev' into feature/TicketPurchaseRequest
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 22:31:52 +02:00
Javier Segarra 5419bc4d52 Merge branch 'feature/TicketBasicData' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/TicketBasicData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 22:27:21 +02:00
Javier Segarra 1a2b4739c3 Merge branch 'dev' into feature/TicketBasicData 2024-06-25 22:27:18 +02:00
William Buezas 6e6c6301d2 fix log view not refreshing when changing id param
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 15:27:48 -03:00
William Buezas 1529e2dd4f Add tooltip to add state button
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 12:58:49 -03:00
William Buezas a57df459a6 Add pay button 2024-06-25 12:54:21 -03:00
Carlos Satorres 6e33a2930b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 17:04:47 +02:00
Jorge Penadés ca96e4e6e0 fix: refs #7623 bugs & tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 16:07:26 +02:00
Jorge Penadés 121204fee4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection 2024-06-25 15:37:00 +02:00
Jon Elias cff9831b88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases 2024-06-25 15:21:44 +02:00
Javier Segarra 0715e86530 Merge branch 'dev' into feature/WeeklyTickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 12:49:14 +00:00
Javier Segarra d29bf09535 remove warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 14:48:39 +02:00
Javier Segarra 1e080d02ed Merge branch 'dev' into feature/WeeklyTickets 2024-06-25 14:48:31 +02:00
Jon Elias 31f8ab7c07 refactor: refs #6739 fix redirect transferInvoice 2024-06-25 14:41:11 +02:00
Jon Elias 975c844d65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut 2024-06-25 14:37:50 +02:00
Javier Segarra 3374b84f38 Merge branch 'dev' into feature/TicketsFuture
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 12:26:53 +00:00
Alex Moreno 1b544e0ff0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-06-25 14:24:59 +02:00
Alex Moreno 0776db2e0f warmFix: correct id 2024-06-25 14:24:58 +02:00
Javier Segarra 049174232a Merge branch 'dev' into feature/TicketsFuture
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 14:24:38 +02:00
Javier Segarra 5685d99cd6 Merge branch 'dev' into feature/TicketsAdvance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 14:22:00 +02:00
Javier Segarra 603cbde09f Merge branch 'dev' into feature/TicketSale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 12:19:17 +00:00
William Buezas 4de347d0e8 Rmove nav navigation and organize buttons
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 09:19:12 -03:00
William Buezas ba8145eabb Add required rule to VnInputTime and VnInputDate
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 08:43:10 -03:00
Jorge Penadés b0cd40ab2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 13:41:12 +02:00
William Buezas 54e3eb6f0d Add required rule to VnInputTime and VnInputDate 2024-06-25 08:40:21 -03:00
Javier Segarra 0816105e5f Merge branch 'feature/TicketBasicData' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/TicketBasicData
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 13:35:49 +02:00
Javier Segarra 9817ae8c2c fix: column hidden v-if 2024-06-25 13:35:16 +02:00
William Buezas 266657fab5 Fix total difference
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 08:35:11 -03:00
Alex Moreno 10a663b400 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
2024-06-25 13:33:23 +02:00
Alex Moreno d7cc983f29 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-25 13:33:19 +02:00
Jorge Penadés 8d921322c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 13:32:39 +02:00
Jorge Penadés 239cdd74b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection 2024-06-25 13:27:50 +02:00
William Buezas 8e538fb463 WIP 2024-06-25 08:27:25 -03:00
Carlos Satorres 49b86672f5 Merge branch 'dev' into 7406-workerFormation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 11:18:05 +00:00
Jorge Penadés ff33923b7a feat: refs #7578 add data-key attribute to CardSummary components
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-06-25 12:49:54 +02:00
Javier Segarra 1eaa0c9ce2 perf: replace ItemPicture in favour of VnImg
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 12:39:21 +02:00
Javier Segarra 0c42bba779 perf: remove ItemPicture 2024-06-25 12:39:05 +02:00
Javier Segarra 98510c1d38 Merge remote-tracking branch 'origin/6977-ClonedURL' into feature/TicketSale 2024-06-25 12:38:53 +02:00
Javier Segarra 54d7263d13 Merge remote-tracking branch 'origin/dev' into feature/TicketSale 2024-06-25 12:23:32 +02:00
Carlos Satorres a705245783 refs #7406 fix pr
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 12:18:02 +02:00
Jon Elias 2ab105dda5 feat: refs #6826 added rol summary link
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 12:03:41 +02:00
Jorge Penadés 3c810254a4 fix: refs #7623 redirect
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 11:40:07 +02:00
Javier Segarra d10f6b4d6c replace value sale.itemFk 2024-06-25 10:33:15 +02:00
Javier Segarra 5a66af341f fix: state translations 2024-06-25 10:07:36 +02:00
Javier Segarra ea7ee97867 proposals 2024-06-25 09:35:21 +02:00
Alex Moreno d421cefeb1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-06-25 07:32:17 +02:00
William Buezas fb12d4ddc0 WIP 2024-06-24 17:24:36 -03:00
Jorge Penadés cdf3a588af fix: refs #7623 updating skip param
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-24 16:55:09 +02:00
William Buezas 91df35fcae Ticket volume 2024-06-24 11:12:49 -03:00
William Buezas 17e9d95702 Ticket notes 2024-06-24 09:02:29 -03:00
Jorge Penadés 0765166423 fix: refs #7623 disable router update
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-24 13:56:50 +02:00
Jorge Penadés 9169b793a9 fix: refs #7623 update add updateRoute prop in VnPaginate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-24 12:51:44 +02:00
Jon Elias 50d135f282 refactor: refs #6977 fix VnImg props
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-24 09:20:47 +02:00
Jon Elias da20abf34c Merge branch '6977-ClonedURL' of https://gitea.verdnatura.es/verdnatura/salix-front into 6977-ClonedURL
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-24 08:30:07 +02:00
Jon Elias 82cc844ddd refactor: refs #6977 refactor VnImg 2024-06-24 08:30:06 +02:00
William Buezas 3d0cbcfd12 remove form model expose
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-21 16:57:51 -03:00
William Buezas 3d9d41afcb Add deep true
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-21 16:55:33 -03:00
William Buezas dfb67f6f2b refactor 2024-06-21 16:51:29 -03:00
Javier Segarra 01816613f2 Merge branch 'dev' into 7323_department_descriptor_routerLink
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-21 12:50:14 +00:00