Merge remote-tracking branch 'origin/master'

2026-06-17 21:56:49 +03:00
parent e1e9d4baf1
commit e14c1c176a
34 changed files with 7402 additions and 704 deletions
--- a/ui/src/router/routes.js
+++ b/ui/src/router/routes.js
@@ -382,6 +382,13 @@ const routes = [
        component: () => import('pages/BrandClassification.vue'), 
        meta: { permission: 'pricing:view' } 
      }, 
+      { 
+        path: 'pricing/brandgroupcurrency',
+        alias: ['pricing/brandproupcurrency', 'pricing/brand-group-currency'],
+        name: 'brandgroupcurrency',
+        component: () => import('pages/BrandGroupCurrency.vue'),
+        meta: { permission: 'pricing:view' }
+      },
      { 
        path: 'pricing/pricing-rules', 
        name: 'pricing-rules',