wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
4,511 Commits 154 Branches 0 Tags 24 MiB
Commit Graph

3588 Commits

Author SHA1 Message Date
Alex Moreno 4272990a7a Merge branch 'dev' into 6917-inputDate_inpuTime 2024-07-03 06:48:59 +00:00
Carlos Satorres b40e3f2c7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2 2024-07-03 08:48:33 +02:00
Jon Elias 467ec08f3e Merge branch 'dev' into 6151-FixOrderModule 2024-07-03 06:48:33 +00:00
Carlos Satorres 21d5d6b986 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration2 2024-07-03 08:46:05 +02:00
Carlos Satorres ad2265fe7c refs #7366 fix travel migration 2024-07-03 08:43:23 +02:00
Javier Segarra f46443ee69 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-03 08:33:33 +02:00
Javier Segarra d15dc7336b Merge branch 'dev' into 7648_dev_customerEntries 2024-07-03 08:26:27 +02:00
Jon Elias e114bd7523 Merge branch '7543-StandarizeDescriptors' of https://gitea.verdnatura.es/verdnatura/salix-front into 7543-StandarizeDescriptors 2024-07-03 08:20:18 +02: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
Jon Elias d5b934a239 Merge branch 'dev' into 7030-FixTranslations 2024-07-03 05:06:01 +00:00
Javier Segarra 147d17301f remove unnussed tags 2024-07-03 01:50:45 +02:00
Javier Segarra 7e374c258e test: test:e2e 2024-07-03 01:47:14 +02:00
Javier Segarra 0dcd2a861b Merge branch 'dev' into 7543-StandarizeDescriptors 2024-07-02 18:59:43 +00:00
Javier Segarra e70162d342 Merge branch 'dev' into 6917-inputDate_inpuTime 2024-07-02 18:42:29 +00:00
Javier Segarra 5c2c9d0805 perf: change field column 2024-07-02 20:41:37 +02:00
Javier Segarra 8a94701422 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-02 20:32:08 +02:00
Jorge Penadés 1c5583f439 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-02 16:08:04 +02:00
Jorge Penadés 96a3298280 Merge branch 'dev' into 7652-fixPagination 2024-07-02 14:04:19 +00:00
Alex Moreno 6d12c0f00c feat(VnTable): add selected funcitionality 2024-07-02 15:01:43 +02:00
Alex Moreno 22f42ca7f9 feat(VnTable): add slots for columns 2024-07-02 14:55:32 +02:00
Alex Moreno 249aedeaf5 remove unnecessary translation 2024-07-02 13:51:33 +02:00
Alex Moreno 739be5fe7c fix(VnInputDate & VnInputTime): fix clearable 2024-07-02 13:49:29 +02:00
Alex Moreno 0384123564 fix: vntable filter where 2024-07-02 12:24:33 +02:00
Jon Elias c0e65ff3b7 fix: refs #7030 solve conflicts 2024-07-02 11:50:07 +02:00
Pablo Natek 2ad9530b1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route 2024-07-02 09:58:46 +02:00
Jorge Penadés 2c9c1bed09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-02 09:56:55 +02:00
Alex Moreno b4f92724ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime 2024-07-02 09:22:57 +02:00
Alex Moreno cb5c33dcc9 feat: rework VnInputTime and fix VnInputDate bugs 2024-07-02 08:06:31 +02:00
Javier Segarra 956ccf93c0 perf: remove unnecessary code 2024-07-01 21:12:44 +02:00
Javier Segarra aa2885e6ca feat: remove isEmployee by acl.back 2024-07-01 21:12:21 +02:00
Javier Segarra f2304ab6f0 feat: myEntries 2024-07-01 19:05:59 +02:00
Javier Segarra 68298b9ba6 feat: rreplace eti by labeler 2024-07-01 19:03:17 +02:00
Javier Segarra 5d1873808d feat: restore component 2024-07-01 19:03:05 +02:00
Jorge Penadés 93d7aee127 chore: refs #7652 fix redirection 2024-07-01 17:25:20 +02:00
Jorge Penadés cc187cfeab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7652-fixPagination 2024-07-01 15:28:11 +02:00
Javier Segarra 0cbd7c9cae Merge branch 'dev' into feature/TicketService 2024-07-01 14:53:08 +02:00
Javier Segarra 527c565ca9 Merge branch 'dev' into feature/TicketTracking 2024-07-01 14:50:23 +02:00
Javier Segarra 9bb75b8305 Merge branch 'dev' into feature/TicketVolume 2024-07-01 14:48:12 +02:00
Jorge Penadés 269fe18a9a refactor: refs #7652 Update ClaimDescriptor and ParkingDescriptor 2024-07-01 14:47:04 +02:00
Jorge Penadés 150c446d70 fix: refs #7652 update url 2024-07-01 14:46:28 +02:00
Javier Segarra e34904ea70 Merge branch 'dev' into feature/TicketNotes 2024-07-01 12:44:38 +00:00
Javier Segarra ae71321339 fix: map selected 2024-07-01 14:43:39 +02:00
Javier Segarra 79d986b9ec perf: remove warnings 2024-07-01 14:33:07 +02:00
Javier Segarra 814056d920 feat: showLabelerDialog 2024-07-01 14:20:31 +02:00
Jorge Penadés f1323ad2c4 fix: refs #7197 add url InvoiceInSearchbar 2024-07-01 14:20:30 +02:00
Javier Segarra d2292601de feat: use VnTable 2024-07-01 14:05:52 +02:00
Jorge Penadés f2b8217883 fix: refs #7197 rollback 2024-07-01 13:50:29 +02:00
Carlos Satorres f4a77f5030 refs #6898 fix search datakey 2024-07-01 13:31:24 +02:00
Carlos Satorres 56017645c2 refs #6898 fix search 2024-07-01 13:20:55 +02:00
Javier Segarra eeab4ed915 updates 2024-07-01 13:18:19 +02:00
Carlos Satorres 95a3043359 refs #6898 fix colmns subtoolbar 2024-07-01 13:16:25 +02:00
Carlos Satorres ff9e78cd47 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-07-01 12:56:34 +02:00
Carlos Satorres 31cd266ec7 refs #7366 fix component 2024-07-01 12:44:09 +02:00
Javier Segarra 0dfdb1edb0 Merge branch '7648_customerEntries' into 7648_dev_customerEntries 2024-07-01 12:27:07 +02:00
Carlos Satorres 0c31755fdb refs #7366 fix summary 2024-07-01 12:21:18 +02:00
Javier Segarra 71900b15a6 feat: newsection and i18n 2024-07-01 12:18:58 +02:00
Carlos Satorres 3965608a18 refs #7366 fix travelList 2024-07-01 12:15:05 +02:00
Carlos Satorres dc619b5275 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration2 2024-07-01 11:58:02 +02:00
Carlos Satorres 58e87a9af6 refs #6897 remove 2024-07-01 11:56:12 +02:00
Jorge Penadés 4ffe0894c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-01 11:55:16 +02:00
Jorge Penadés 9b7ffbf3d2 fix: fix pagination issue & skip url query param 2024-07-01 11:48:27 +02:00
Javier Segarra 379d90d4c9 updates 2024-07-01 11:40:57 +02:00
Carlos Satorres 00321803ab refs #6897 fix filters, right filters 2024-07-01 10:57:13 +02:00
Carlos Satorres a6bb9af1a7 refs #6897 fix filters 2024-07-01 10:48:58 +02:00
Carlos Satorres 9d1e7363ab refs #6897 fix filters 2024-07-01 10:13:33 +02:00
Jon Elias ff420d2b04 Merge branch 'dev' into 6151-FixOrderModule 2024-07-01 07:47:47 +00:00
Pablo Natek 8cd04bd230 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route 2024-07-01 09:30:43 +02:00
Alex Moreno 938389de2e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime 2024-07-01 09:30:24 +02:00
Jorge Penadés ad3416cb0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData 2024-07-01 09:17:22 +02:00
Jorge Penadés 84d6785a4c Merge branch 'dev' into 7436-showQCheckbox 2024-07-01 07:00:51 +00:00
Alex Moreno f4975d1f15 fix: ticketFilter adapt VnInputDate 2024-07-01 09:00:45 +02:00
Alex Moreno 3b18375cdb fix(TicketService): pay use selected 2024-07-01 08:13:49 +02:00
Alex Moreno 7b9e26528a feat(TicketService): use correct format 2024-07-01 08:08:41 +02:00
Alex Moreno 128303939b fix(ticket router): typo 2024-07-01 07:41:58 +02:00
Pablo Natek a69235e4d4 fix: refs #7404 add e2e and fix route 2024-07-01 07:39:35 +02:00
Javier Segarra 666cb519c5 feat: #7648 handle EntryBuys 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
Jorge Penadés 0ac1f53348 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData 2024-06-28 17:51:15 +02:00
Alex Moreno c399d40daf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime 2024-06-28 17:48:00 +02:00
Alex Moreno 4cf389e00c fixes: fix vnFilter params and redirect 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
Jorge Penadés bf9a731bcc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData 2024-06-28 15:10:52 +02:00
Carlos Satorres 41d6c3f07e refs #6897 fix columns trad 2024-06-28 15:00:35 +02:00
Jon Elias 9664978733 Merge branch 'dev' into 6826-RolSummary 2024-06-28 12:58:51 +00:00
Carlos Satorres e62e914e48 refs #6897 change image, fit component 2024-06-28 14:55:44 +02:00
Carlos Satorres 9fe5fd2391 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2 2024-06-28 13:33:02 +02:00
Jon Elias 6ee5fc954b fix: refs #6826 fix redirect 2024-06-28 13:26:53 +02:00
Javier Segarra 946a2d4823 Merge branch 'dev' into feature/TicketService 2024-06-28 13:24:24 +02:00
Jon Elias 25e4494266 Merge branch 'dev' into 5447-travelExtraCommunity 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
Jorge Penadés 06420fcbef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData 2024-06-28 12:52:40 +02:00
Jon Elias 93c109b70d refactor: new translations 2024-06-28 11:25:38 +02:00
Carlos Satorres b05528ae14 refs #6897 fix latestbuys trad 2024-06-28 11:23:29 +02:00
Jorge Penadés ffdcb28522 refactor: refs #6943 initialize totalAmount as undefined 2024-06-28 11:17:42 +02:00
Javier Segarra 68552b8da9 perf: add QBtn in CardDescriptor instead each ModuleDescriptor 2024-06-28 11:07:32 +02:00
Jon Elias 8e9b238eaa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7030-FixTranslations 2024-06-28 10:58:57 +02:00
Jon Elias 369cb9dc75 refactor: refs #7030 added translations 2024-06-28 10:56:09 +02:00