Commit Graph

157 Commits

Author SHA1 Message Date
Javi Gallego 5a75a1551e Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-02-07 15:58:44 +01:00
Javier Segarra 14c7ec2e39 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets 2025-02-07 07:54:21 +01:00
Jorge Penadés 848d00a8b3 Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-02-06 10:32:00 +01:00
Javier Segarra 4f4071f13b Merge branch 'dev' of https: refs #6321//gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets 2025-02-05 15:38:13 +01:00
Javier Segarra 0d2aada01f Merge branch 'dev' into improve_shortcut_directive
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-05 12:18:00 +00:00
Javier Segarra 5d71a16ec7 feat: refs #6321 changes after review 2025-02-03 09:30:31 +01:00
Javi Gallego 71a8e72f20 refactor: refs #6802 replace 'salesPerson' terminology with 'team' across multiple locales and components 2025-01-31 12:26:20 +01:00
Javier Segarra 107b8a7692 perf: refs #6321 clean code 2025-01-31 01:37:08 +01:00
Javier Segarra af940c67c6 perf: replace shortcut=+ by v-shortcut=+ 2025-01-30 20:29:45 +01:00
Jorge Penadés abe894c8bd Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-28 14:33:34 +01:00
Jon Elias 51c1e8a2e1 Merge branch 'dev' of https: refs #6242//gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2025-01-24 13:35:35 +01:00
Javier Segarra 5161aaf53d Merge branch 'dev' into 6321_negative_tickets 2025-01-24 07:38:59 +01:00
Alex Moreno fc886c2a8b Merge branch 'dev' of https: refs #8197//gitea.verdnatura.es/verdnatura/salix-front into 8197-advancedMenu
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-23 07:33:45 +01:00
Javier Segarra d4fecd8d85 Merge branch 'dev' into 6321_negative_tickets 2025-01-21 23:44:12 +01:00
Jon Elias 8ff78a0a76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2025-01-21 16:22:31 +01:00
Carlos Satorres a3cdb18535 fix: fix use-like
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 12:04:59 +01:00
Carlos Satorres a1254b25b4 fix: fix ticketSale quantity
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-01-20 11:26:57 +01:00
Alex Moreno bb3ce4f862 fix: refs #8197 use RightMenu in subsections 2025-01-20 10:03:49 +01:00
Javier Segarra af56321377 Merge branch 'dev' into 6321_negative_tickets 2025-01-14 12:22:46 +01:00
Jorge Penadés 011344b761 fix: refs #6919 use right data-key 2025-01-13 16:20:09 +01:00
Jon Elias c379491df0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2025-01-09 09:37:40 +01:00
Alex Moreno a65b8432d8 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-01-02 07:51:39 +01:00
Jon Elias f918bbd539 fix: modified bottom button to show it when no data in the table and refactored add sale function
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-18 08:47:29 +01:00
Jon Elias 4dff5a2eec refactor: use teleport to avoid qdrawer overlapping
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 09:03:09 +01:00
Jon Elias 9d1c375d59 refactor: refs #6242 added TicketProblems like list to sale and summary 2024-12-12 08:22:31 +01:00
Javier Segarra 6573b04dab Merge branch 'dev' into 6321_negative_tickets 2024-12-09 14:34:42 +01:00
Jon Elias 338058c1a4 Merge branch 'dev' into Fix-Items-Module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-09 07:22:17 +00:00
Jon Elias 0c88db5931 refactor: deleted onUnmounted code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-09 08:20:35 +01:00
Guillermo Bonet 407b81f4b7 Merge branch 'master' into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-05 09:24:35 +01:00
Javier Segarra ad176f3f95 fix: use right variable instead item.name
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-04 13:45:12 +00:00
Jon Elias b590c91892 Merge branch 'dev' of https: refs #6242//gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2024-11-29 10:41:05 +01:00
Alex Moreno 50796df06a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-29 07:28:06 +01:00
Javier Segarra e3bdea2197 fix: ticketSale keyup.enter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-27 01:15:16 +01:00
Alex Moreno 9086b7d48d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-26 14:20:08 +01:00
Alex Moreno 2076072eeb fix(TicketSale): set old quantity when error
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-26 09:21:51 +01:00
Alex Moreno 8fbf7fed43 fix(TicketSale): throw error when it should
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-26 09:05:46 +01:00
Alex Moreno 26c1394321 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-22 10:52:51 +01:00
Alex Moreno 367f660508 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-22 10:52:30 +01:00
Alex Moreno bf29be1c5f fix: remove all try catch(err) (error) console.error
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-22 08:39:46 +01:00
Javier Segarra 81d7b9f04f Merge branch 'dev' into 8162-E2ETickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-21 08:20:29 +00:00
William Buezas 8e411125bf test: refs #8162 more tests and change data-testid for data-cy
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-20 18:58:08 -03:00
Alex Moreno fdafeee39d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-19 14:49:22 +01:00
Alex Moreno e7b431e9ec fix(VnPaginate): disable pagination
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2024-11-19 09:32:35 +01:00
Alex Moreno afaf2df2ee Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-19 07:56:04 +01:00
William Buezas 28bfda869a refactor: refs #8162 remove comment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-18 10:47:57 -03:00
Carlos Satorres d3993442b6 fix: hotfix OrderTickets
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-18 13:26:27 +01:00
Javier Segarra 2f06eea8ea Merge branch 'dev' into 8162-E2ETickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-18 12:03:10 +00:00
William Buezas d8c1bd5b16 test: refs #8162 more tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-17 15:24:46 -03:00
Jon Elias 354f2ce055 fix: deleted duplicate VnUsesMana
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-15 08:21:29 +01:00
Jon Elias 540e0348a1 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-13 14:10:08 +01:00
Jon Elias 454be43884 Merge branch 'dev' into 7970-NotifySaleChanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-28 07:17:06 +00:00
Jon Elias ca6547e174 feat: refs #7970 notify changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-28 07:48:11 +01:00
Alex Moreno c1e4c45318 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-25 13:08:26 +02:00
Jon Elias 994237260e refactor: changed name of emitted event 2024-10-25 06:48:09 +02:00
Jon Elias e18d129b32 fix: refs #6242 merge conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 12:56:33 +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
Jon Elias 03f2da8169 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-23 12:14:50 +02:00
Jon Elias 11092866b8 fix: merge conflicts 2024-10-18 13:33:28 +02:00
Jon Elias 58e88f605c refactor: refs #7132 delete duplicate translations' keys
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-18 08:04:52 +02:00
Jon Elias f6051ae15c refactor: refs #6242 modified front to show ticket problems
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-17 07:32:06 +02:00
Jon Elias 2dd3e09928 refactor: requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-10 08:26:16 +02:00
Alex Moreno b6778aaf17 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/head This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-10-08 12:24:39 +02:00
Jon Elias afc52f6cea fix: changes in sale and summary 2024-10-07 13:29:43 +02:00
Javier Segarra 0ed9fdd55d fix: refs VnImg zoom resolution missing property
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-07 13:02:40 +02:00
Jon Elias 7b63bb38f2 fix: deleted code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 12:34:39 +02:00
Jon Elias 76a77dcee9 fix: duplicate call
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-30 14:35:10 +02:00
Jon Elias fdf6fd2bba feat: refs #6242 added rounding field
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-25 14:05:35 +02:00
Javier Segarra fea760d2f9 Merge branch 'dev' into 6321_negative_tickets
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-24 22:14:04 +02:00
Jon Elias cd96003c0e refactor: refs #7553 requested changes and added keyup.enter 2024-09-24 10:35:59 +02:00
Jon Elias 3716507f93 perf: refs #7553 removeSales function 2024-09-23 13:51:20 +02:00
Jon Elias f025b4361e refactor: refs #7553 last requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-23 10:21:30 +02:00
Jon Elias 2c15f79a2d Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-20 09:08:13 +02:00
Jon Elias 44d98865fe fix: refs #7553 requested changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-20 09:04:31 +02:00
Javier Segarra 1550d79160 feat: add shortcut more buttons
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-19 00:10:28 +02:00
Jon Elias 4a1f5e922c refactor: refs #7553 align ticket sale qdrawer fields
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-12 10:19:21 +02:00
Jon Elias ff7bcfb00a refactor: refs #7553 modified ticket sale to create a row in the table
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-11 10:16:42 +02:00
Javier Segarra 78c5836431 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-11 08:50:39 +02:00
Jon Elias 6248a4117d refactor: refs #7553 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 13:52:41 +02:00
Jon Elias 0e5607d685 feat: refs #7553 ticket component to vntable and fixed minor errors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 13:59:50 +02:00
Jon Elias 19ae1f9d80 refactor: deleted useless prop in FetchedTags 2024-09-04 10:05:18 +02:00
Jon Elias f35e33cf10 fix: refs #7553 fixed TicketTransfer
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-03 12:54:44 +02:00
Jon Elias d18ca14b4e fix: refs #7553 merge changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-03 07:45:46 +02:00
Jon Elias 3d683c1da3 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-03 07:45:23 +02:00
Jon Elias 45d9322892 feat: refs #7553 added icons, descriptors and missing columns in TicketList and minor changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-02 11:24:06 +02:00
Jorge Penadés 42e7629c40 fix: refs #7524 use limit ticket section
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-08-29 13:53:10 +02:00
Javier Segarra b8dea8551d perf: TicketTransferSale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-27 12:04:33 +02:00
Javier Segarra c19585fb1b fix: quasar build warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-19 11:36:12 +02:00
Jon Elias 4a57c53c3d fix: refs #7553 & #7356 migration
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-08-19 11:30:20 +02:00
Jon Elias 954a6ff6c0 refacotr: refs #7553 refactor sales, purchaseRequest and saleTracking
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-02 13:55:51 +02:00
Jon Elias 2ab7d48b0c feat: refs #7553 added VnTable in Expedition, new field & minor changes in rest of section
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-26 09:55:24 +02:00
Javier Segarra 437d70d415 perf: TransferSale and implementations 2024-07-23 12:33:11 +02:00
Javier Segarra 3979a328e9 WIP: 28213bcc minor i18n updates 2024-07-22 17:30:15 +02:00
Javier Segarra 6bd119abc3 Merge branch 'dev' into 6896_Order_End
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 13:01:34 +00:00
Javier Segarra 20eb26127a fix: Right menu double icon
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 15:00:45 +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 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
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 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
William Buezas 6b7c76dde3 mini change
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-17 12:19:44 -03:00
William Buezas c31e865faa Fix card searchbar routing 2024-06-15 12:04:31 -03:00