Commit Graph

358 Commits

Author SHA1 Message Date
Javier Segarra aabd575854 Merge branch 'dev' into feature/TicketPackages
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 10:55:14 +02:00
Javier Segarra 84462fe201 Merge branch 'dev' into feature/TicketComponents
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 10:14:13 +02:00
Javier Segarra f87b806406 Merge branch 'dev' into feature/TicketPhotos
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 10:10:24 +02:00
Javier Segarra a303942f76 Merge branch 'dev' into feature/TicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 08:05:33 +00:00
William Buezas 1de091da47 Initial value of quantity 0
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-05 17:03:31 -03:00
William Buezas 98595e9ce4 Add ticket price
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-05 16:53:39 -03:00
Javier Segarra 1cfa2edc01 fix: i18n
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-05 21:18:41 +02:00
William Buezas b87e88ae7f Handle quantity empty value
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-05 12:04:18 -03:00
William Buezas 3490ba1a8c Add input type number
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-05 11:36:37 -03:00
William Buezas 0adbd3e6d2 Ticket advance filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-05 11:29:06 -03:00
Javier Segarra c2da14e59a perf: remove warningsCLI
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-05 10:42:52 +02:00
Javier Segarra 9d4cfbd90c Merge branch 'dev' into feature/TicketPackages 2024-07-05 09:28:31 +02:00
Guillermo Bonet a616498d1a hotfix: refs #6769 Fix 2024-07-05 08:42:13 +02:00
William Buezas 273641cd98 Change translation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-04 13:02:24 -03:00
William Buezas 9b1f73d30f Rename catalog item 2024-07-04 08:45:51 -03:00
Javier Segarra d6cc447989 Merge branch 'dev' into feature/SaleTracking 2024-07-04 10:44:50 +02:00
Javier Segarra 4a01f1d930 perf: cleancode
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-04 10:40:11 +02:00
Javier Segarra 6ce03287ef perf: remove justify-center CSS class
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-04 09:53:06 +02:00
Javier Segarra 14e26f0285 Merge branch 'dev' into feature/TicketComponents 2024-07-04 09:40:00 +02:00
Javier Segarra e2054c2eb7 fix: Itemdescriptor .link
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 21:35:19 +02:00
Javier Segarra 2b0b470120 fix: TicketComponent Sales column
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 21:30:29 +02:00
William Buezas 8baf5b1489 Apply right alignment to total and import columns
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 16:14:47 -03:00
William Buezas 02ce4f2658 Small change
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 15:12:20 -03:00
William Buezas 91eb966586 Ticket photos 2024-07-03 14:44:36 -03:00
Javier Segarra c25b04e075 improve QChebox
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 11:48:51 +02:00
Jon Elias f8d263c347 Merge branch 'dev' into 7543-StandarizeDescriptors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 07:52:35 +00:00
Jon Elias 363abb899f fix: refs #7543 fix changed descriptors 2024-07-03 08:20:16 +02:00
Jon Elias e13f98dffb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7543-StandarizeDescriptors 2024-07-03 07:12:07 +02:00
William Buezas 34ee92ac24 Small change
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-02 21:46:45 -03:00
William Buezas 5c36ad14f4 Ticket components 2024-07-02 21:33:19 -03:00
William Buezas 9179dc7432 Ticket package 2024-07-02 09:35:18 -03:00
Alex Moreno b4f92724ba 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-07-02 09:22:57 +02:00
Javier Segarra 95f2ddc6a4 fix: simple i18n
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 18:24:31 +02:00
William Buezas 71d6506539 remove unused filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 11:13:36 -03:00
Javier Segarra 3f5f918684 Merge branch 'dev' into feature/TicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 15:12:40 +02:00
Javier Segarra 7896e3d7f9 Merge branch 'dev' into feature/TicketDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 14:59:09 +02:00
Javier Segarra 0cbd7c9cae Merge branch 'dev' into feature/TicketService
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 14:53:08 +02:00
William Buezas 72aef18c49 Add tooltip
gitea/salix-front/pipeline/pr-dev Build queued... Details
2024-07-01 09:51:42 -03:00
Javier Segarra 527c565ca9 Merge branch 'dev' into feature/TicketTracking
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 14:50:23 +02:00
William Buezas c3a064eeda Change dms import form ubication 2024-07-01 09:48:27 -03:00
Javier Segarra 9bb75b8305 Merge branch 'dev' into feature/TicketVolume
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 14:48:12 +02:00
Javier Segarra ae71321339 fix: map selected
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 14:43:39 +02:00
Alex Moreno f4975d1f15 fix: ticketFilter adapt VnInputDate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 09:00:45 +02:00
Alex Moreno 3b18375cdb fix(TicketService): pay use selected
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 08:13:49 +02:00
Alex Moreno 7b9e26528a feat(TicketService): use correct format
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 08:08:41 +02:00
William Buezas 768b619904 Sale tracking 2024-06-30 17:43:21 -03:00
Javier Segarra 9f68c380da Merge branch 'dev' into feature/TicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-29 00:32:33 +02:00
William Buezas fe67f21206 Ticket expedition
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-28 08:27:21 -03: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
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
William Buezas 053059997a WIP 2024-06-27 08:37:48 -03:00
William Buezas 0e8106af17 Resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 17:21:31 -03:00
William Buezas 826e8ed068 changes 2024-06-26 17:19:07 -03: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
Jon Elias 452d1000bc refactor: refs #7543 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 14:28:21 +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
William Buezas ad950f33c6 WIP 2024-06-26 08:27:36 -03:00
Jon Elias 677e71d1a7 refactor: refs #7543 standarized descriptors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 08:26:04 +02:00
Jon Elias 42df3894ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-06-26 07:16:42 +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 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
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
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
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 d7cc983f29 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-25 13:33:19 +02:00
William Buezas 8e538fb463 WIP 2024-06-25 08:27:25 -03: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 54d7263d13 Merge remote-tracking branch 'origin/dev' into feature/TicketSale 2024-06-25 12:23:32 +02:00
Javier Segarra d10f6b4d6c replace value sale.itemFk 2024-06-25 10:33:15 +02:00
Jon Elias e8111502c0 refactor: refs #7014 deleted main files and changed route files 2024-06-25 10:28:48 +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
William Buezas fb12d4ddc0 WIP 2024-06-24 17:24:36 -03:00
William Buezas c500dd6346 Add allow import feature in VnDmsList 2024-06-24 16:58:26 -03:00
William Buezas 4effba1580 Ticket dms 2024-06-24 16:38:41 -03: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
Jon Elias 9207b37419 refactor: refs #7014 refactor <module>Main.vue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-24 13:46:06 +02:00