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

1723 Commits

Author SHA1 Message Date
Alex Moreno d3f50ec9b2 Merge branch 'dev' into 7717_fixOrderCatalog 2024-08-09 06:52:13 +00:00
Jorge Penadés 12bb88f7f8 chore: refs #6900 drop vnCurrency 2024-08-08 17:05:31 +02:00
Jorge Penadés 2afe9b445e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-fineTunning 2024-08-08 15:30:19 +02:00
Carlos Satorres 3eaa5c864d refs #7355 account fixes 2024-08-08 13:57:01 +02:00
Alex Moreno 80f63f1ae2 fix: VnCard VnSearchbar props 2024-08-08 12:52:36 +02:00
Jorge Penadés 85edc28a9b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix-6449-summaryId 2024-08-08 12:42:10 +02:00
Alex Moreno 5ac2d34125 hotFix: vnVisibleColumn fix userId 2024-08-08 10:27:27 +02:00
Jorge Penadés dc5142c20a feat: refs #6900 use VnTable & sort filter fields 2024-08-08 10:12:54 +02:00
Alex Moreno ac1434fb9c Merge branch 'dev' into vnCard-unify-searchbarParams 2024-08-08 05:56:39 +00:00
Alex Moreno 3a77be0043 change searchbar to searchbarProps 2024-08-08 07:56:29 +02:00
Alex Moreno 2f7dd0a4cb remove unecessary props 2024-08-07 14:41:30 +02:00
Alex Moreno 44e3eb779d feat(VnCard): use props searchbar 2024-08-07 14:40:28 +02:00
Jorge Penadés 855483cefd fix: refs #7323 css righ menu 2024-08-07 13:37:01 +02:00
Jorge Penadés bd67218a00 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fixErrors 2024-08-07 11:58:41 +02:00
Jorge Penadés 08ed134b12 fix: refs #7323 wrong css 2024-08-07 11:57:27 +02:00
Alex Moreno dafa8cdebd Merge branch 'dev' into 6943-customer_migration_subsection-v2 2024-08-07 08:54:36 +00:00
Jorge Penadés c6c2245a2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-07 10:17:14 +02:00
Alex Moreno 2cb99eb025 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-07 10:04:13 +02:00
Alex Moreno f9ba6e155d hotFix: VnInputTIme 2024-08-07 10:03:20 +02:00
Jon Elias 3dc2ac8bac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-08-07 07:25:57 +02:00
Alex Moreno ffcab60a06 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-06 14:31:28 +02:00
Carlos Satorres 75866f2d27 refs #6898 fix new list 2024-08-06 11:00:59 +02:00
Jorge Penadés 50468d22cc fix: refs #7283 min-width vnImg 2024-08-06 08:56:12 +02:00
Jorge Penadés db38270ed5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-06 08:47:09 +02:00
Alex Moreno f38a70c040 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-06 08:01:41 +02:00
Jorge Penadés 005f571ecf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-05 17:14:06 +02:00
Jorge Penadés b8d38f15e4 fix: refs #7283 use vnAvatar & add optional zoom 2024-08-05 17:13:15 +02:00
Alex Moreno 6abce3c7d0 hotFix(VnPaginate): watch when is mounted 2024-08-05 15:20:07 +02:00
Alex Moreno dcc2ef3d18 typo 2024-08-05 14:25:42 +02:00
Jorge Penadés 5bd0bbb3ac fix: refs #7283 userPanel pic 2024-08-05 14:03:55 +02:00
Alex Moreno 5bac9143e6 fix(customer_sms: fix reload 2024-08-05 14:02:39 +02:00
Alex Moreno 88ea25cb83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-customer_migration_subsection-v2 2024-08-05 13:46:17 +02:00
Alex Moreno 7612260359 refactor(customer_webAccess): FormModel 2024-08-05 13:36:27 +02:00
Jorge Penadés 16cfd84fab fix: refs #7283 itemTags & VnImg 2024-08-05 13:01:26 +02:00
Guillermo Bonet 59b709b57d Merge branch 'test' into dev 2024-08-05 11:59:15 +02:00
Alex Moreno 460b166a17 feat(customer_balance): refs #6943 add functionality from salix 2024-08-05 09:04:08 +02:00
Jon Elias bdf4c793dc Merge branch 'test' into hotfix_ItemDiary 2024-08-02 11:04:47 +00:00
Guillermo Bonet 0d016e0898 Merge branch 'test' into dev 2024-08-02 10:01:16 +02:00
Guillermo Bonet 33da5dd8a8 Merge branch 'master' into test 2024-08-02 10:01:01 +02:00
Guillermo Bonet 8450830b59 Merge branch 'master' into 7413-filterValueFix 2024-08-02 07:55:30 +00:00
Jon Elias 2367550bc1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_ItemDiary 2024-08-02 09:25:46 +02:00
Jon Elias 276202f0c7 fix: refs CAU 207504 fix itemDiary and logs 2024-08-02 09:23:30 +02:00
Alex Moreno 545f7c8039 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-01 14:11:15 +02:00
Alex Moreno fa60467e76 fix(claim): small details 2024-08-01 10:51:13 +02:00
Alex Moreno 3a64929c05 feat(VnLocation): onCityCreated refresh provinces 2024-08-01 10:35:33 +02:00
Carlos Satorres 8d8bd095f6 Merge branch 'dev' into 7355-accountMigration 2024-08-01 08:15:21 +00:00
Alex Moreno 0b7c8c41d2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-01 10:12:56 +02:00
Alex Moreno 5f6eeb77ea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-08-01 10:12:41 +02:00
Carlos Satorres 2d467016b2 refs #7355 fix roles 2024-08-01 09:51:18 +02:00
Alex Moreno d9fb0d9186 nullishToTrue fn 2024-08-01 09:47:38 +02:00
Alex Moreno 5233c1455a refactor: refs #7679 better way to update model 2024-07-31 14:57:25 +02:00
Guillermo Bonet f09308d956 fix: refs #7413 No id tag 2024-07-31 12:50:34 +02:00
Alex Moreno 287abcf90c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-31 08:10:30 +02:00
Alex Moreno 2ad72c3209 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-07-31 08:01:44 +02:00
Jon Elias 68ce5880dd refactor: refs #7717 deleted useless code 2024-07-31 07:35:59 +02:00
Jon Elias cf90007023 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-30 14:33:28 +02:00
Alex Moreno ed110beda6 Merge branch 'dev' into 6943-customer_migration_subsection 2024-07-30 11:33:11 +00:00
Jorge Penadés 3bb261376d chore: refs #6449 refactor model-value text 2024-07-30 13:16:45 +02:00
Jorge Penadés df907a7280 fix: refs #6449 fix summaryId 2024-07-30 12:43:26 +02:00
Jon Elias 2cd696aeb9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-30 08:03:46 +02:00
Alex Moreno 9179e13dcd fix: vnLocation 2024-07-29 15:03:21 +02:00
Jorge Penadés 5705904e40 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-29 08:04:51 +02:00
Jon Elias 356e7768b7 Merge branch 'dev' into 7717_fixOrderCatalog 2024-07-26 12:11:18 +00:00
Guillermo Bonet 7b13250a16 Merge branch 'test' into dev 2024-07-26 13:57:11 +02:00
Guillermo Bonet 86ab161302 fix: refs #6769 Fixes item diary 2024-07-26 12:37:53 +02:00
Alex Moreno 28e50512ba remove console.log 2024-07-26 09:51:46 +02:00
Alex Moreno 21dd2e4b46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-customer_migration_subsection 2024-07-26 09:49:22 +02:00
Alex Moreno 026c632a4c feat(customer): improve basicData to balance 2024-07-26 09:47:28 +02:00
Alex Moreno c5927f14c3 warmFix: rollback VnRow 2024-07-26 09:27:38 +02:00
Javier Segarra 6bba14cac9 test: e2e fixed 2024-07-25 14:31:31 +02:00
Javier Segarra ebbe6ef3b1 feat: add customfilter label 2024-07-25 12:36:16 +02:00
Jon Elias 2de11d3ecf Merge branch 'dev' into 7717_fixOrderCatalog 2024-07-25 08:07:26 +00:00
Alex Moreno 687262e78c hotFix: try to fix myEntries 2024-07-25 09:50:30 +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
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 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 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
Alex Moreno 451619fb88 hotFix(VnTable): add ctrl + click 2024-07-23 10:09:42 +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
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
Jon Elias def3ca33a2 fix: refs #7717 fixed searchbar filter with rightmenu filters' applied 2024-07-22 12:52:58 +02:00
Pablo Natek af6a20729b fix: refs #7129 fixFilters 2024-07-22 09:12:56 +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
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