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

276 Commits

Author SHA1 Message Date
William Buezas 0e55f7abdc test: order catalog tests 2024-11-25 09:18:11 -03:00
Alex Moreno 6276843613 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-22 12:40:27 +01:00
Alex Moreno 14d2ddfa83 fix: merge errors 2024-11-22 12:40:07 +01:00
Alex Moreno ef426dc579 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-22 12:10:34 +01:00
Alex Moreno 4913cf2c29 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-22 12:10:04 +01:00
Alex Moreno 2db0369b74 fix: resetCategory 2024-11-22 11:05:48 +01:00
Alex Moreno 1709795cf9 Merge branch 'master' into hotFix_orderCatalogFilter_refactor_fix 2024-11-22 09:56:04 +00:00
Alex Moreno 26c1394321 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-22 10:52:51 +01:00
Alex Moreno 367f660508 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-22 10:52:30 +01:00
Alex Moreno 522f32aa9a fix: orderCatalogFilter and fix useArrayData 2024-11-22 10:40:49 +01:00
Alex Moreno bf29be1c5f fix: remove all try catch(err) (error) console.error 2024-11-22 08:39:46 +01:00
Alex Moreno fdc71a13ff Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-21 10:26:38 +01:00
Alex Moreno bf0bda0e27 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-21 10:26:29 +01:00
Alex Moreno 44f2ecca28 chore: requested changes 2024-11-21 07:49:10 +01:00
Alex Moreno c5acde22a3 chore: requested changes 2024-11-21 07:42:00 +01:00
Alex Moreno abd79283ff fix(CatalogFilterValueDialog): from dev and fix 2024-11-20 13:38:22 +01:00
Jon Elias 2b235e93e7 feat: refs #8194 created VnSelectWorker component and use it in Lilium 2024-11-20 11:25:17 +01:00
Alex Moreno 32fdc836f9 fix(OrderCatalogFilter): fix field value 2024-11-20 09:26:38 +01:00
Javi Gallego 9c271eee08 Merge pull request '#7346 manualInvoice' (!793) from 7346-manualInvoice into dev 
Reviewed-on: verdnatura/salix-front#793
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-19 07:10:06 +00:00
Alex Moreno afaf2df2ee Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-19 07:56:04 +01:00
Javi Gallego 7d2f4bcf44 Merge branch 'dev' into 7346-manualInvoice 2024-11-18 15:46:08 +01:00
Alex Moreno c2db7be8cd fix(orderCatalogFilter): fix searchByTag 2024-11-18 15:06:09 +01:00
Alex Moreno 00fdbfa2e4 fix(OrderCatalogFilter): hotFix use search-url="params" 2024-11-18 13:41:54 +01:00
Carlos Satorres d3993442b6 fix: hotfix OrderTickets 2024-11-18 13:26:27 +01:00
Javier Segarra 0c36d385ec Merge branch 'test' into solveConflicts_test_to_dev 2024-11-18 10:50:42 +01:00
Javier Segarra 5916923521 fix: Redirect to catalog when create new order 2024-11-15 12:51:25 +00:00
Javier Segarra 54a34e8034 fix: Redirect to catalog when create new order 2024-11-15 12:33:56 +00:00
Javier Segarra 8e52bd0688 perf: #6943 improve OrderList 2024-11-15 11:37:27 +01:00
Javi Gallego 79ce2ad79e Merge branch 'dev' into 7346-manualInvoice 2024-11-14 09:22:18 +01:00
Jon Elias 540e0348a1 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations 2024-11-13 14:10:08 +01:00
William Buezas ade90afd03 refactor: change keyup.enter for update:model-value 2024-11-08 10:13:35 -03:00
William Buezas c1d623622d refactor: remove unused variable 2024-11-08 10:11:15 -03:00
Javier Segarra 3825dc3851 feat: disabled buttons 2024-11-08 11:54:04 +01:00
Javier Segarra 96d68ed106 Merge branch 'dev' into fix/OrderCatalog 2024-11-08 06:59:26 +00:00
William Buezas 8bff7fc1d6 fix: reset category 2024-11-07 21:09:39 -03:00
William Buezas 52a2250acc refactor: apply QPopupProxy 2024-11-07 19:16:06 -03:00
William Buezas 498a52a3e5 refactor: small change 2024-11-07 19:07:03 -03:00
William Buezas d627c1f698 fix: order catalog 2024-11-03 10:29:03 -03:00
Jon Elias 8be4210138 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7206-ModifySelectAddress 2024-10-29 13:21:56 +01:00
Jon Elias 476ef1dedd feat: refs #7206 added inactive label and corrected minor errors 2024-10-29 13:14:42 +01:00
Jon Elias 5663064dd8 refactor: modified composable 2024-10-29 09:23:49 +01:00
Jon Elias cab5a165d2 refactor: changed confirmOrder directory 2024-10-28 12:59:25 +01:00
Jon Elias 17b1921af6 feat: added composable to confirm orders 2024-10-28 12:21:26 +01:00
William Buezas c93f152060 fix: order catalog fixes 2024-10-27 15:27:53 -03:00
William Buezas 211da859bd fix: catalog view category and type filter 2024-10-25 08:57:16 -03:00
Jon Elias 37b3affdbf refactor: revert catalog changes 2024-10-23 13:02:28 +02:00
Javi Gallego 2a94916bc2 feat: refs #7346 radioButton 2024-10-22 15:04:23 +02:00
Jon Elias 1346a2e7fd fix: tag chips 2024-10-22 12:05:44 +02:00
Jon Elias 5b116a7301 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems 2024-10-22 11:31:45 +02:00
Javi Gallego 69215851bb Merge branch 'dev' into 7346-manualInvoice 2024-10-21 14:01:18 +02:00
Jon Elias e5cd9d4b8f refactor: refs #7132 global translations files changed 2024-10-21 12:56:09 +02:00
Jon Elias 11bf70d76c fix: category and tags filters 2024-10-18 14:12:23 +02:00
Jon Elias 89cb9aacec refactor: refs #7132 1st wave of changes in global translations files 2024-10-18 12:54:21 +02:00
Pablo Natek 7f1ae16270 fix: refs #8004 fix conflict 2024-10-16 06:20:41 +02:00
Alex Moreno d87e8ec4ae Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-15 08:01:22 +02:00
Jorge Penadés 4b78c1acd0 fix: refs #7524 dynamic 2024-10-14 12:00:05 +02:00
Pablo Natek b32c8dd9f0 fix: refs #8004 more list style issues 2024-10-13 11:20:51 +02:00
Jon Elias 419d3d2d45 fix: refs #6896 fixed module problems 2024-10-10 07:20:33 +02:00
Alex Moreno b6778aaf17 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-08 12:24:39 +02:00
Javier Segarra 43da6ea1b8 Merge branch 'master' into hotfix_vnImg_zoom_resolution 2024-10-07 12:00:12 +00:00
Javier Segarra 0ed9fdd55d fix: refs VnImg zoom resolution missing property 2024-10-07 13:02:40 +02:00
Alex Moreno 426b7254d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-07 09:01:57 +02:00
Javier Segarra 04b2a4d9ce perf: clean warnings 2024-10-05 00:31:41 +02:00
Jon Elias aee23c75e8 fix: order module 2024-10-04 14:31:39 +02:00
Jon Elias 3a21f6aadb fix: order catalog 2024-10-04 14:22:00 +02:00
Jon Elias 7874db1647 fix: zone delivery postcodes filter and order catalog type filter 2024-10-04 09:58:23 +02:00
Javi Gallego fc3a025047 feat: manualInvoice with address 2024-10-01 13:03:55 +02:00
Jon Elias cd96003c0e refactor: refs #7553 requested changes and added keyup.enter 2024-09-24 10:35:59 +02:00
Jon Elias f025b4361e refactor: refs #7553 last requested changes 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 2024-09-20 09:08:13 +02:00
Jon Elias 44d98865fe fix: refs #7553 requested changes 2024-09-20 09:04:31 +02:00
Javier Segarra 08bec59a37 add_circle 2024-09-19 00:04:58 +02:00
Javier Segarra bcfa67baec Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-09-10 12:26:17 +02:00
Javier Segarra 9bb298bbeb feat: handle create row 2024-09-06 13:14:46 +02:00
Javier Segarra 1f96f5c09a feat: orderCreateDialog 2024-09-05 22:20:57 +02:00
Jon Elias 19ae1f9d80 refactor: deleted useless prop in FetchedTags 2024-09-04 10:05:18 +02:00
Jon Elias 75e18a1e2f fix: added missing descriptors and small details 2024-09-03 09:55:58 +02:00
Carlos Satorres 8300109394 refs #6896 fix searchbar 2024-08-29 09:30:10 +02:00
Jon Elias f3d7590edf refactor: refs #7717 delete useless function and import 2024-08-19 10:49:04 +02:00
Alex Moreno 3222a7a42c fix(orderLines): reload when delete and redirect when confirm 2024-08-12 11:51:21 +02:00
Alex Moreno 190579e7fd fix: orderCatalogFilter order 2024-08-12 10:22:52 +02:00
Alex Moreno e11e51f432 fix: order description to vnTable 2024-08-12 09:17:51 +02:00
Alex Moreno 37244cdbc7 feat(orderBasicData): add notes 2024-08-09 14:55:49 +02:00
Alex Moreno dc7c686508 feat(orderList): correct create order 2024-08-09 14:19:08 +02:00
Alex Moreno ee71ae9d24 feat(orderList): use orderFilter and fixed this 2024-08-09 13:07:37 +02:00
Jon Elias 3f76b5496a fix: refs #7717 fix order sections 2024-08-09 07:46:32 +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
Jon Elias 7e3bfce732 fix: refs #7717 fix basic data form & minor errors 2024-07-30 13:31:12 +02:00
Jon Elias be113656ae Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-26 14:56:27 +02:00
Jon Elias 4d7fe0fd86 fix: refs #7717 fix volume and lines redirect 2024-07-26 14:56:26 +02:00
Jon Elias 356e7768b7 Merge branch 'dev' into 7717_fixOrderCatalog 2024-07-26 12:11:18 +00:00
Jon Elias 4cad7cbced Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-26 14:09:10 +02:00
Jon Elias d588db05ac fix: refs #7717 fix OrderList table filters' and summary table style 2024-07-26 14:09:09 +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
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
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