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

4028 Commits

Author SHA1 Message Date
Alex Moreno 80f34edb66 hotFix: try to fix myEntries 2024-07-24 20:41:34 +02:00
Alex Moreno 38de6867b7 hotFix: try to fix myEntries 2024-07-24 20:38:25 +02:00
Alex Moreno e3204e0ce3 hotFix: try to fix myEntries 2024-07-24 20:34:09 +02:00
Alex Moreno c926b047e2 hotFix: try to fix myEntries 2024-07-24 20:29:52 +02:00
Alex Moreno c904f7f88b hotFix: try to fix myEntries 2024-07-24 20:25:46 +02:00
Alex Moreno f88ec2a2ae hotFix: try to fix myEntries 2024-07-24 20:22:31 +02:00
Alex Moreno 29299970f4 hotFix: try to fix myEntries 2024-07-24 20:19:55 +02:00
Alex Moreno 369736f362 hotFix: try to fix myEntries 2024-07-24 20:17:23 +02:00
Alex Moreno 68c4c93f9f hotFix: try to fix myEntries 2024-07-24 20:14:45 +02:00
Alex Moreno 3d6ba060c2 hotFix: try to fix myEntries 2024-07-24 20:10:50 +02:00
Alex Moreno 64a62ca208 hotFix: try to fix myEntries 2024-07-24 20:10:18 +02:00
Alex Moreno 3023d83739 hotFix: myEntries 2024-07-24 20:00:02 +02:00
Alex Moreno ae5ec1328b hotFix: myEntries 2024-07-24 19:55:13 +02:00
Carlos Satorres 2e56100623 refs #6898 fix 2024-07-24 11:36:00 +02:00
Jon Elias 3a9116987c Merge branch 'dev' into 7717_fixOrderCatalog 2024-07-24 08:35:24 +00:00
Jon Elias cc518d5a80 perf: refs #7717 right menu filter 2024-07-24 10:33:22 +02:00
Alex Moreno 4d8ba2bca0 Merge branch 'dev' into 6943-fixCustomer 2024-07-24 05:52:29 +00:00
Javier Segarra 6c7509856e Merge branch 'dev' into 7014-RefactorQDrawer 2024-07-23 21:08:56 +00:00
Javier Segarra 2c0b215023 Merge branch 'dev' into 6943-fixCustomer 2024-07-23 18:44:08 +00:00
Javier Segarra e013e5571d perf: use ref at component start 2024-07-23 20:18:53 +02:00
Javier Segarra 1ac0a85969 updates 2024-07-23 15:09:42 +02:00
Alex Moreno e6709db3a2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-23 14:46:44 +02:00
Alex Moreno 38437aa2f9 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-07-23 14:46:27 +02:00
Alex Moreno db3813ccf0 warmFix: orderBy tableActions false 2024-07-23 14:46:05 +02:00
Alex Moreno eb90fe359f fix: customer defaulter add amount order 2024-07-23 14:03:45 +02:00
Carlos Satorres 369e730670 refs #7355 fix search exprBuilder 2024-07-23 13:03:12 +02:00
Alex Moreno 0cd42e6fac Merge branch 'dev' into 6943-fixCustomer 2024-07-23 09:47:01 +00:00
Jon Elias ce6a94bab8 fix: refs #7717 fix catalog searchbar and worker tests(refs #7323) 2024-07-23 11:46:21 +02:00
Jon Elias 67275e435e refactor: refs #7014 refactor ZoneCard, deleted ZoneMain & created basic tests for functionality 2024-07-23 10:38:45 +02:00
Alex Moreno 451619fb88 hotFix(VnTable): add ctrl + click 2024-07-23 10:09:42 +02:00
Alex Moreno ad87fd8311 hotfix(entry_latest-buys): refs #6897 img 2024-07-23 09:36:23 +02:00
Jon Elias e76d8bf269 fix: fix conflicts 2024-07-23 09:15:06 +02:00
Jon Elias a3256c7dc8 Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-07-23 09:14:53 +02:00
Alex Moreno ca9425cfb7 hotfix(entry_latest-buys): refs #6897 img 2024-07-23 09:14:22 +02:00
Jon Elias 18dac38fb2 Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-07-23 09:14:14 +02:00
Jon Elias 33ad8fcb9d refactor: refs #7014 improved route.js & deleted RouteMain 2024-07-23 09:12:00 +02:00
Alex Moreno c7d54668e6 hotfix(entry_latest-buys): refs #6897 redirect to entry 2024-07-23 08:45:54 +02:00
Jon Elias 92b053013f Merge branch 'dev' into 7014-RefactorQDrawer 2024-07-23 06:18:17 +00:00
Carlos Satorres b4f801e328 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-23 07:26:51 +02:00
Pablo Natek 1a091e5b5a Merge branch '7129-fixFilters' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixFilters 2024-07-22 17:50:59 +02:00
Pablo Natek 3ceb0771a7 fix: refs #7129 remove templates 2024-07-22 17:50:58 +02:00
Pablo Natek f2b56c92c6 Merge branch 'test' into 7129-fixFilters 2024-07-22 15:37:35 +00:00
Javier Segarra 368b8404fa updates: OrderCatlago 2024-07-22 15:13:03 +02:00
Pablo Natek 5f0c4fea3c feat: refs #7129 add e2e 2024-07-22 13:19:41 +02:00
Jon Elias def3ca33a2 fix: refs #7717 fixed searchbar filter with rightmenu filters' applied 2024-07-22 12:52:58 +02:00
Pablo Natek 6f959ff99c fix: refs #7129 fix filters 2024-07-22 09:18:53 +02:00
Pablo Natek af6a20729b fix: refs #7129 fixFilters 2024-07-22 09:12:56 +02:00
Guillermo Bonet 0a431ef5cb Merge branch 'test' into dev 2024-07-22 08:20:16 +02:00
Guillermo Bonet 580777af65 Deleted repeated labeler i18n 2024-07-22 08:20:08 +02:00
Jon Elias 02e1de083a fix: duplicate key 2024-07-19 15:00:05 +02:00
Jon Elias eb2df02ad6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-19 14:55:09 +02:00
Jon Elias 7f376c8ea4 fix: refs #7717 fix catalog filter, searchbar redirect and search 2024-07-19 14:53:44 +02:00
Guillermo Bonet 76517d102d Merge branch 'test' into dev 2024-07-19 13:09:19 +02:00
Guillermo Bonet c5903e29e8 Merge branch 'master' into test 2024-07-19 13:08:41 +02:00
Guillermo Bonet 50c8b3c672 fix: refs #7648 Fix order property 2024-07-19 13:07:30 +02:00
Javier Segarra 569b86c2c1 Merge branch 'master' into 7648_myEntries 2024-07-19 10:27:57 +00:00
Javier Segarra bcde62afb5 Merge branch 'dev' into 6943-fixCustomer 2024-07-19 07:41:55 +00:00
Javier Segarra 55c8de78fc perf: VnFilterPanel 2024-07-19 09:20:33 +02:00
Jon Elias 89aa987c58 Merge branch 'dev' into 7323_WorkerMigration_End 2024-07-19 06:20:57 +00:00
Jon Elias 26cdae2384 refactor: refs #7323 hidden column filter proposal 2024-07-19 08:18:41 +02:00
Alex Moreno dbe56fa3a0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-19 08:02:58 +02:00
Alex Moreno 9b1636355d fix: customerNotifications filter 2024-07-19 07:58:34 +02:00
Jon Elias 6f6ab74220 Merge branch '7323_WorkerMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-19 07:42:59 +02:00
Jon Elias f171774605 fix: refs #7323 fixed left filter 2024-07-19 07:42:58 +02:00
Alex Moreno 3fe566796b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer 2024-07-18 14:01:28 +02:00
Alex Moreno f8026dd3f6 feat: improve VnSelectCache add find by Object 2024-07-18 13:54:22 +02:00
Alex Moreno 5833b4d856 fix(VnTable): autoload when has url parameters 2024-07-18 13:53:57 +02:00
Jon Elias f4fa9b3c1f Merge branch 'dev' into 7323_WorkerMigration_End 2024-07-18 10:14:26 +00:00
Jon Elias 4a544b0b6c Merge branch '7323_WorkerMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-18 12:13:39 +02:00
Jon Elias 901a9e1f6d fix: refs #7323 fix department & email table filter 2024-07-18 12:13:38 +02:00
Jon Elias 108375bb69 perf: refs #7356 TicketList state column 2024-07-18 12:05:10 +02:00
Jon Elias 78e074d2fb refactor: refs #7356 requested changes 2024-07-18 10:53:44 +02:00
Alex Moreno 71d6e57ea5 Merge branch 'dev' into 6943-fixCustomer 2024-07-18 06:26:19 +00:00
Alex Moreno 83596daf76 fix: customerDefaulter correct functionality 2024-07-18 08:19:08 +02:00
Javier Segarra ac89c4f328 Merge branch 'dev' into 7323_WorkerMigration_End 2024-07-18 05:49:58 +00:00
Jon Elias b2b613a1d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_TicketMigration_End 2024-07-17 14:58:25 +02:00
Alex Moreno ea5fef9d7f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-17 14:19:25 +02:00
Alex Moreno 1c006a278e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-07-17 14:19:08 +02:00
Alex Moreno 3999d93268 fix(WorkerTimeControl): url 2024-07-17 14:17:00 +02:00
Alex Moreno 725b7053f7 fix(workerTimeControl): correct request 'updateMailState' 2024-07-17 13:32:04 +02:00
Jon Elias a544ea224b Merge branch '7356_TicketMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_TicketMigration_End 2024-07-17 13:02:22 +02:00
Jon Elias 1e959307d8 refactor: refs #7356 fixed VnTable filters 2024-07-17 13:02:21 +02:00
Jon Elias 0d60f63771 Merge branch 'dev' into 7356_TicketMigration_End 2024-07-17 06:52:42 +00:00
Jon Elias cb610608df feat: refs #7356 list & weekly to VnTable and style fixes 2024-07-17 08:49:38 +02:00
Jon Elias 9e78d30a4c Merge branch dev of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-17 07:45:24 +02:00
Alex Moreno c253959e01 feat: customerPayments card view 2024-07-16 14:08:03 +02:00
Alex Moreno 3cd185360b fix: columns style 2024-07-16 14:03:14 +02:00
Javier Segarra c7c6f0f1c6 filter: vnfilterPanel 2024-07-16 13:50:16 +02:00
Javier Segarra 86a84784b1 feat: userPanel 2024-07-16 13:50:07 +02:00
Alex Moreno 90db8b403f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-16 13:15:17 +02:00
Javier Segarra f7135008a2 feat: entryBuys 2024-07-16 12:22:08 +02:00
Javier Segarra ace529a4ba feat: vnTable template 2024-07-16 12:22:01 +02:00
Javier Segarra 5fbbd27273 fat: i18n 2024-07-16 12:21:50 +02:00
Javier Segarra d467657928 feat: myEntries 2024-07-16 12:21:36 +02:00
Alex Moreno 4f36a78681 feat: curso in start when is 00:00 2024-07-16 12:13:16 +02:00
Alex Moreno 9cc11f0a28 variable 2024-07-16 10:18:28 +02:00
Alex Moreno c13f7fe237 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inputTime_improviments 2024-07-16 10:11:50 +02:00
Alex Moreno 493081254d feat: improve to set time 2024-07-16 10:11:27 +02:00
Javier Segarra d2a17bc376 Merge branch 'dev' into 7353-MonitorsFixes 2024-07-16 07:28:14 +00:00
Alex Moreno 4f802a4786 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-16 07:40:51 +02:00
Javier Segarra da43760688 Merge branch 'dev' into '7353-MonitorFixes' 2024-07-15 15:00:01 +02:00
Alex Moreno b488a013c7 fix(arrayData): reset 2024-07-15 14:55:06 +02:00
Alex Moreno bfa61d9bea refactor: CustomerNotifications use VnTable 2024-07-15 14:54:31 +02:00
Alex Moreno fd11259f74 refactor: CustomerPayments use VnTable 2024-07-15 14:18:21 +02:00
Alex Moreno 81a9719207 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer 2024-07-15 13:13:24 +02:00
Jon Elias 94aa3bc7a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-15 12:47:59 +02:00
Jon Elias 243a8cbdc6 fix: refs #7323 fix workerTimeControl form 2024-07-15 12:42:14 +02:00
Alex Moreno ea3effd7f4 feat: VnInputDate & VnInputTime improviments 2024-07-15 12:33:58 +02:00
Alex Moreno 1ccf515509 fix: editable columns 2024-07-15 12:33:33 +02:00
Javier Segarra be86b69079 fix: ticket menu order and i18n 2024-07-15 11:53:10 +02:00
Javier Segarra 5d58676288 Merge branch 'dev' into feature/TicketAdvanceFilter 2024-07-15 09:31:22 +00:00
Javier Segarra 8ea1fb6793 Merge branch 'dev' into feature/TicketDms 2024-07-15 09:30:10 +00:00
Javier Segarra c56610515c Merge branch 'dev' into TicketDms 2024-07-15 11:29:27 +02:00
Pablo Natek 35a165b9f3 Merge branch 'dev' into 7129-finishMigration 2024-07-15 09:25:52 +00:00
Javier Segarra ae55983405 Merge branch 'dev' into feature/SaleTracking 2024-07-15 09:23:53 +00:00
Javier Segarra a779853095 Merge branch 'dev' into 7648_myEntries_filter 2024-07-15 09:22:46 +00:00
Pablo Natek a4f11fb497 Merge branch 'dev' into 7129-finishMigration 2024-07-15 08:42:30 +00:00
Pablo Natek 9a115dac3c Merge branch '7129-finishMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-finishMigration 2024-07-15 10:42:12 +02:00
Pablo Natek 6007e0c7cc fix: refs #7129 fix e2e 2024-07-15 10:42:11 +02:00
Alex Moreno cc8062785a Merge branch 'dev' into feature/SaleTracking 2024-07-15 08:17:01 +00:00
Alex Moreno 3f3d0c7337 fix(claimList): claimList client column 2024-07-15 09:39:57 +02:00
Javier Segarra d84fd34c4b Merge branch 'dev' into 7648_myEntries_filter 2024-07-15 07:38:45 +00:00
Pablo Natek fea9c8b7fb Merge branch 'dev' into 7129-finishMigration 2024-07-15 07:37:15 +00:00
Alex Moreno dbba7589ef fix: VnBreadcrumbs return if not has matched 2024-07-15 08:32:53 +02:00
Alex Moreno a4afba6000 Merge branch 'dev' into 6825-vnSelectCache 2024-07-15 05:19:53 +00:00
Alex Moreno b3d14ebeee fix: order left panel 2024-07-15 07:11:02 +02:00
Javier Segarra 1e668d1fbd Merge branch 'dev' into 7648_myEntries_filter 2024-07-12 20:42:05 +00:00
Javier Segarra 7f7bf9c0e6 feat: remove empty locales 2024-07-12 22:40:34 +02:00
Javier Segarra 20403287dd feat: scopeDays replace by daysOnward 2024-07-12 22:38:38 +02:00
Javier Segarra 65381e6536 perf: #7648 remove default value 2024-07-12 22:38:23 +02:00
Alex Moreno bfab1ec314 useAttrs 2024-07-12 14:13:35 +02:00
Alex Moreno b30da92c1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnSelectCache 2024-07-12 14:09:06 +02:00
Alex Moreno 3087dbf512 fix(CrudModel): onChange $index 2024-07-12 14:02:29 +02:00
Guillermo Bonet 9494a30ddd feat: refs #7704 Added min quantity label in catalog 2024-07-12 13:59:03 +02:00
Alex Moreno 904acfd48f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-finishMigration 2024-07-12 13:37:04 +02:00
Alex Moreno 73c5e0f1f4 fix: formModelPoup defaultActions false 2024-07-12 13:34:31 +02:00
Jon Elias 74c36a28b2 fix: workerCreate form street field to be always upperCase 2024-07-12 13:05:46 +02:00
Alex Moreno 58d029c5bb fix(vnTable_order): default value 2024-07-12 13:03:49 +02:00
Pablo Natek eaea8a50f0 fix: refs #7129 fix styles 2024-07-12 11:49:37 +02:00
Carlos Satorres f7d0b30eb5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-12 11:47:31 +02:00
Alex Moreno de814f9881 Merge branch 'dev' into 6825-vnSelectCache 2024-07-12 09:20:02 +00:00
Alex Moreno a77bf93e0d feat: create VnSelectCache and add in VnColumn 2024-07-12 11:19:37 +02:00
Javier Segarra 7ddf84ac11 Merge branch 'dev' into 7648_myEntries_filter 2024-07-12 11:09:01 +02:00
Alex Moreno 79928910ca Merge branch 'dev' into 6825-improve-css 2024-07-12 09:02:42 +00:00
Pablo Natek a736867e6e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-finishMigration 2024-07-12 11:02:41 +02:00
Javier Segarra 1d4454604b Merge branch 'dev' into 7648_myEntries_filter 2024-07-12 10:51:19 +02:00
Pablo Natek 72b86c0eec remove: refs #7129 remove console log 2024-07-12 10:43:15 +02:00
Pablo Natek 9098e63793 refactor: refs #7129 refactor with vnTable 2024-07-12 10:41:18 +02:00
Guillermo Bonet 686bbc26bd Merge branch 'dev' into 6769-itemDiary 2024-07-12 08:02:11 +00:00
Guillermo Bonet 3e0c495f97 Merge branch 'dev' into 7704-itemMinimalQuantity 2024-07-12 07:43:04 +00:00