wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
2,828 Commits 155 Branches 0 Tags 29 MiB
Commit Graph

997 Commits

Author SHA1 Message Date
Jorge Penadés 984539b70f Merge branch '6480-improveCard' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-11 08:42:17 +02:00
Jorge Penadés d7ab6e8a02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-11 08:41:52 +02:00
Javier Segarra 5f502c2aad #6480: POC Claims 2024-04-10 20:52:45 +02:00
William Buezas 9dfe5f5e68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-10 09:34:51 -03:00
William Buezas c881fe6577 Resolve conflicts 2024-04-10 09:19:54 -03:00
William Buezas e676933942 Update worker dms remove 2024-04-10 08:59:05 -03:00
William Buezas eceb60f6e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-10 08:46:00 -03:00
William Buezas e8486099fc Resolve conflicts 2024-04-10 08:37:52 -03:00
William Buezas 39af4278a6 Add delete model to worker dms 2024-04-10 08:27:30 -03:00
Jorge Penadés 14d9147cc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-10 13:02:22 +02:00
William Buezas c3835dfd7a resolve conflicts 2024-04-09 15:23:05 -03:00
William Buezas 9bffc9bb25 classes and size improvements 2024-04-09 15:20:29 -03:00
William Buezas 9ea0a62046 Add border and change background color 2024-04-09 14:03:18 -03:00
Jorge Penadés 83bf8183f0 fix: refs #6992 warning console & formModel hook 2024-04-09 15:12:54 +02:00
jcasado 97ad1c7579 refs #7179 changes customer proxy and client Id 2024-04-09 13:32:01 +02:00
William Buezas f6e140e369 Apply workerDms changes 2024-04-09 08:28:00 -03:00
William Buezas e51ea9996b Item list view 2024-04-09 08:18:18 -03:00
Guillermo Bonet 4b9e69625b Merge branch 'dev' into 6636-pickup 2024-04-09 08:02:30 +00:00
Jon Elias f988923b4b Merge branch 'dev' into 6973-UpdateVnLocationLabel 2024-04-09 06:48:06 +00:00
Jon Elias b7788512bc refactor: refs #6973 fix requested changes 2024-04-09 08:41:44 +02:00
Jon Elias 3bededcd94 refactor: refs #6973 updated label and updated cypress test 2024-04-09 07:47:40 +02:00
Jorge Penadés dfac40adb3 feat: refs #6480 vnCard 2024-04-08 10:27:37 +02:00
Jorge Penadés 4fa311120d feat: refs #6480 hide if no content 2024-04-08 10:11:50 +02:00
Guillermo Bonet b2ef381f1d Merge branch 'dev' into 6636-pickup 2024-04-08 05:18:34 +00:00
William Buezas 7584857c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/WorkerTimeControl 2024-04-05 09:11:23 -03:00
William Buezas 52611beaf1 Changes in isHimSelf computed and FormPopup buttons order 2024-04-05 08:57:25 -03:00
William Buezas 970d1a48e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into features/ms_submodulos_worker 2024-04-05 08:25:28 -03:00
Javier Casado 5d7fed3b32 Merge branch 'dev' into 6816-removeMicroSip 2024-04-05 07:57:21 +00:00
Alex Moreno e14993c114 minor changes 2024-04-05 09:12:49 +02:00
Guillermo Bonet 9310d863aa fix: refs #6636 Icon save and reset 2024-04-05 07:39:05 +02:00
William Buezas 5ae54d557b Fix form model beforeRouteLeave 2024-04-04 13:27:50 -03:00
William Buezas cb55115cd2 Remove unused component 2024-04-04 12:02:43 -03:00
Guillermo Bonet b09ecefad4 feat: refs #6636 Added pickup in claim 2024-04-04 14:12:16 +02:00
jcasado d00ec3c41c refs #6816 remove microsip tag 2024-04-04 09:38:47 +02:00
William Buezas 95b19d35e7 Change form model popup buttons order 2024-04-03 13:50:25 -03:00
William Buezas 4ee8c45fdc resolve conflicts 2024-04-03 11:22:52 -03:00
William Buezas bfee37b631 WIP 2024-04-03 08:08:54 -03:00
William Buezas addbe9345b Resolve conflicts 2024-04-02 12:40:26 -03:00
William Buezas 94644de4fa VnSmsDialog adapt style and add tooltip 2024-04-02 10:44:02 -03:00
Pablo Natek f18cefd999 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7128-copyStyles 2024-04-02 14:12:58 +02:00
Pablo Natek c66be3c2b5 feat #7128 fix styles 2024-04-02 14:04:09 +02:00
Pablo Natek 148224344d feat(style): refs #7128 add style 2024-04-02 10:46:27 +02:00
William Buezas bafb938e23 VnSmsDialog add default value to template prop as empty string 2024-03-28 17:10:07 -03:00
William Buezas 239daceca6 Apply changes in Worker PBX 2024-03-28 13:45:35 -03:00
William Buezas cb238476e7 Components reubication and change calendar selected date color 2024-03-28 09:47:39 -03:00
Jon Elias 2b1fe6fd77 Merge branch '6514-gestDocSupplier' of https://gitea.verdnatura.es/verdnatura/salix-front into 6514-gestDocSupplier 2024-03-28 08:31:57 +01:00
Jon Elias b2691a35e1 refactor: refs #6514 fixed tranlation 2024-03-28 08:31:56 +01:00
William Buezas 0d6d18b8c8 Apply VnDmsList component and add docuware action 2024-03-27 20:33:35 -03:00
William Buezas b546b63352 resolve conflicts 2024-03-27 10:11:20 -03:00
William Buezas 112112b069 Small change 2024-03-27 09:13:53 -03:00
William Buezas de912b266c Finish calendar integration 2024-03-27 08:26:28 -03:00
Jorge Penadés 0d74c7f6c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord 2024-03-27 11:18:41 +01:00
Jorge Penadés 20102a89ab feat: refs #6893 improve VnSearchbar & create tests 2024-03-27 11:14:54 +01:00
Jorge Penadés 375461abd7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord 2024-03-27 08:35:24 +01:00
Jorge Penadés 9c83c4cd6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-27 08:30:37 +01:00
William Buezas 0a74b2a96e QCalendar implementation WIP 2024-03-26 15:38:06 -03:00
Jon Elias 2c6d95336c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination 2024-03-26 09:35:23 +01:00
Jorge Penadés a0dcd6aee1 feat: refs #6893 replace id & redirect to Card or list 2024-03-26 09:11:53 +01:00
Jorge Penadés b46760116f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-03-26 08:34:15 +01:00
Alex Moreno c335accffb refs #6905 fix translation and warnings 2024-03-25 12:42:48 +01:00
Carlos Satorres 3ed3093fd9 Merge branch 'dev' into 6905-userPanelConfig 2024-03-25 08:50:42 +00:00
Jorge Penadés f49c091461 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-25 08:50:18 +01:00
William Buezas 71a4a20f20 Disable text area when is not himself 2024-03-22 18:38:18 -03:00
William Buezas f1faf18523 General improvements 2024-03-22 14:10:00 -03:00
Jorge Penadés d2efbb204f feat: refs #5186 use arrayData in summary 2024-03-22 14:57:36 +01:00
William Buezas bdd0e657ec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/WorkerTimeControl 2024-03-22 08:36:41 -03:00
Carlos Satorres a284f5ce5f refs #6905 fix 2024-03-22 11:56:44 +01:00
Carlos Satorres 95d943e6f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig 2024-03-22 10:17:36 +01:00
Javier Segarra b11462e244 refs #7124 perf: avoid focus in VnFilterPanel 2024-03-22 07:32:33 +01:00
Javier Segarra 36a6554fb1 Merge branch 'dev' into 6907_fix_input_clearable_hover 2024-03-22 06:16:40 +00:00
Jorge Penadés f86c331afa feat: refs #5186 use arrayData in descriptor 2024-03-21 16:38:49 +01:00
Jorge Penadés 4f242b0840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-21 15:31:15 +01:00
William Buezas aa8e052633 QCalendar implementation test 2024-03-21 11:15:18 -03:00
Javier Segarra d7d83fd886 refs #7124 feat: autofocus without property 2024-03-21 14:56:39 +01:00
Javier Segarra fedec76b62 refs #6907 feat: merge changes 2024-03-21 13:11:22 +01:00
William Buezas 65da9a3e69 resolve conflicts 2024-03-21 08:53:42 -03:00
William Buezas fc5d858bf1 WIP 2024-03-21 08:37:11 -03:00
Javier Segarra 18d4be0ea2 refs #6907 feat: merge changes 2024-03-21 12:33:28 +01:00
Javier Segarra f5d6c45339 refs #6907 updates 2024-03-21 10:45:30 +01:00
Pablo Natek eb799c6321 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles 2024-03-21 10:37:48 +01:00
Javier Segarra 85a78d847b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover 2024-03-21 10:30:51 +01:00
William Buezas 522b01b293 WIP 2024-03-20 10:31:42 -03:00
jcasado 2f27b8537c refactor: #6946 add table and floating button 2024-03-20 12:50:47 +01:00
Pablo Natek 5580d15606 remove: refs #7001 custom chip 2024-03-20 11:30:43 +01:00
Pablo Natek 2fa5b1303d remove(vnChip): refs #7001 remove component 2024-03-20 11:28:50 +01:00
Carlos Satorres 798ffa7de3 refs #6905 fix 2024-03-20 10:20:05 +01:00
Carlos Satorres 0946a34422 Merge branch '6905-userPanelConfig' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig 2024-03-20 09:38:14 +01:00
Carlos Satorres 89fc147ad8 refs #6905 fix traduction 2024-03-20 09:38:11 +01:00
William Buezas 7ff8bc642e WIP 2024-03-19 13:39:46 -03:00
Pablo Natek 22eef14bb3 feat(light theme): refs #7001 add light theme 2024-03-19 11:15:54 +01:00
Pablo Natek 2386090c15 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles 2024-03-18 13:56:18 +01:00
Jorge Penadés f0e414e160 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-18 09:47:06 +01:00
William Buezas dce974eba4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections 2024-03-15 10:20:46 -03:00
Alex Moreno cb4ec856fd refs #6905 fix css 2024-03-15 14:08:16 +01:00
Jon Elias 2321ca6605 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination 2024-03-15 12:54:05 +01:00
Jon Elias ff5e09d315 refs #6993 fixed QTable behaviour 2024-03-15 12:45:15 +01:00
Alex Moreno 17df7e8b09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-us 2024-03-15 12:24:30 +01:00
Carlos Satorres d8419a146a refs #6905 fix userConfig 2024-03-15 10:48:02 +01:00
Javier Segarra efb3ae6e2a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6930_scopedToken_Multimedia 2024-03-15 09:47:13 +01:00
Javier Segarra e0e5082e1e refs #6321 perf: replace QIcon with clearable prop 2024-03-15 06:16:37 +01:00
Carlos Fonseca f25e46cf08 Merge branch 'dev' into PR-CUSTOMER 2024-03-15 03:12:46 +00:00
Jorge Penadés dd91449818 feat: refs #5186 use global locales 2024-03-14 15:16:50 +01:00
Pablo Natek 077fa7e2a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles 2024-03-14 15:10:41 +01:00
Pablo Natek 00a47cd5b2 refactor(style): refs #7001 add style font vnTitle vnChip 2024-03-14 15:06:06 +01:00
Jorge Penadés f39595087a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-14 15:00:16 +01:00
William Buezas 22c49d9cf7 resolve conflicts 2024-03-14 09:50:27 -03:00
Jon Elias 667359ed92 Merge branch 'dev' into 6993-HideAllPagination 2024-03-14 12:09:18 +00:00
Kevin Martinez 8587d46943 Merge branch 'salix-dev' into feature/route-module 
# Conflicts:
#	src/pages/Route/Card/RouteSummary.vue
 2024-03-14 08:05:51 -03:00
Carlos Fonseca a3097a9223 Merge branch 'dev' into PR-CUSTOMER 2024-03-14 10:55:02 +00:00
Jorge Penadés 0c012ed71a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-14 08:54:21 +01:00
Jon Elias 37a2c33f9f refactor: #6993 set default QTable pagination 2024-03-14 08:51:26 +01:00
William Buezas f26d14e875 resolve conflicts 2024-03-13 12:57:41 -03:00
Javi Gallego 4bc57d0287 Merge branch 'dev' into CambiosSolicitadosSuppliers 2024-03-13 14:37:06 +00:00
William Buezas 4925bed845 resolve conflicts 2024-03-13 11:31:55 -03:00
Jorge Penadés e793b3dd93 feat: refs #5186 use global locales 2024-03-13 15:06:02 +01:00
William Buezas 632049c13b Assign button change 2024-03-12 11:31:32 -03:00
William Buezas 433843ea09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosSuppliers 2024-03-12 08:16:40 -03:00
Carlos Satorres 2d880be0f8 refs #6905 fix vnrow 2024-03-12 11:04:57 +01:00
Carlos Satorres 374bc4a703 refs #6905 add rows 2024-03-12 09:58:24 +01:00
Pablo Natek 0c3dc30b8c fix(styles): refs #7001 create VnTitle and correct background-page color 2024-03-12 09:49:58 +01:00
Jorge Penadés 33ef118dea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-11 09:32:30 +01:00
William Buezas ed99aea4a3 Finish create manual invoice popup form 2024-03-08 15:05:11 -03:00
William Buezas 9ced305797 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into EntryLatestBuysFilters 2024-03-08 09:03:33 -03:00
William Buezas 0e79676f58 Create manual invoice WIP 2024-03-08 09:02:49 -03:00
Pablo Natek e5e0d8f806 Merge branch 'dev' into 6349-removeRma 2024-03-08 07:08:36 +00:00
Jorge Penadés d8a0adb852 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-07 15:57:54 +01:00
Javier Segarra 764ccbd151 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover 2024-03-07 14:25:33 +01:00
William Buezas b994d39369 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections 2024-03-07 08:44:30 -03:00
Kevin Martinez 80b2683001 Merge branch 'salix-dev' into feature/input-date-updates 2024-03-07 08:11:48 -03:00
Carlos Satorres 39009d055d fix px 2024-03-07 11:19:25 +01:00
Carlos Satorres cd8eb4ce5c refs #6892 fix checkbox 2024-03-07 09:24:17 +01:00
Kevin Martinez d3a93da849 Merge branch 'salix-dev' into feature/route-module 
# Conflicts:
#	src/components/ui/VnPaginate.vue
 2024-03-06 23:19:47 -03:00
Kevin Martinez c34fc0f79e Fix date time timezone 2024-03-06 22:45:23 -03:00
William Buezas 2449488927 Changes 2024-03-06 19:00:50 -03:00
William Buezas fe8e4a8342 add VnSelectDialog refill to action icon 2024-03-06 09:52:43 -03:00
William Buezas 6a105d5d38 resolve conflicts 2024-03-06 08:35:49 -03:00
William Buezas 800b626c99 fire searchbar search on icon click 2024-03-06 08:21:26 -03:00
Javier Segarra 7e769164d7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-refactor-claimSummary 2024-03-06 09:48:34 +01:00
Pablo Natek 1aedb3c7da Merge branch 'dev' into 6486-salixColors 2024-03-06 08:43:21 +00:00
Pablo Natek 28b63831cc Merge branch 'dev' into 6486-salixColors 2024-03-06 08:41:49 +00:00
Carlos Satorres 207b95c0e9 Merge branch 'dev' into 6892-summaryCardRefact 2024-03-06 08:40:46 +00:00
William Buezas 992ada0984 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections 2024-03-05 18:21:00 -03:00
William Buezas 912d54ea55 new bank entity add focus to bic input on mounted 2024-03-05 11:03:07 -03:00
Carlos Satorres ed44d96589 refs #6892 fix checkbox 2024-03-05 14:45:13 +01:00
Javier Segarra 8ad2aed994 refs #6935 perf: improve css class to handle content after 2024-03-05 13:10:29 +01:00
Kevin Martinez 98cf665126 Update input date/time behaviour 2024-03-04 22:22:23 -03:00
Pablo Natek bfab1918e6 Merge branch 'dev' into 6349-removeRma 2024-03-04 13:56:38 +00:00
William Buezas 432280884f Resolve conflicts 2024-03-04 10:46:11 -03:00
Alex Moreno 4484f431bf refs #6336 feat: polish claims 2024-03-04 14:42:15 +01:00
Carlos Satorres 8f9048a786 refs #6892 fix scss class 2024-03-04 13:51:14 +01:00