fix(loyalty): align menu item IDs with URL segments for sidebar highlight

The store and merchant init-alpine.js derive currentPage from the URL's last segment (e.g., /loyalty/program -> 'program'). Loyalty menu items used prefixed IDs like 'loyalty-program' which never matched, so sidebar items never highlighted. Fixed by renaming all store/merchant menu item IDs and JS currentPage values to match URL segments: program, cards, analytics, transactions, pins, settings — consistent with how every other module works. Also reverted the init-alpine.js guard that broke storeCode extraction, and added missing loyalty.common.contact_admin_setup translation. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-23 18:32:50 +01:00
parent ce0caa5685
commit 1d90bfe044
20 changed files with 3497 additions and 3494 deletions
--- a/app/modules/core/static/store/js/init-alpine.js
+++ b/app/modules/core/static/store/js/init-alpine.js
@@ -65,8 +65,7 @@ function data() {
        openSections: getStoreSidebarSectionsFromStorage(),

        init() {
-            // Set current page from URL (only if not already set by child component)
-            if (!this.currentPage) {
+            // Set current page from URL
            const path = window.location.pathname;
            const segments = path.split('/').filter(Boolean);
            // For /store/ABC/orders/123 -> 'orders' (skip numeric IDs)
@@ -74,7 +73,6 @@ function data() {
            this.currentPage = /^\d+$/.test(last) && segments.length > 2
                ? segments[segments.length - 2]
                : last;
-            }

            // Get store code from server-rendered value or URL fallback
            this.storeCode = window.STORE_CODE || null;
--- a/app/modules/loyalty/definition.py
+++ b/app/modules/loyalty/definition.py
@@ -132,16 +132,17 @@ loyalty_module = ModuleDefinition(
        FrontendType.STORE: [
            "terminal",  # Loyalty terminal
            "cards",  # Customer cards
-            "loyalty-program",  # Program config
-            "loyalty-analytics",  # Store analytics
+            "pins",  # Staff PINs
+            "program",  # Program config
+            "analytics",  # Store analytics
        ],
        FrontendType.MERCHANT: [
-            "loyalty-program",  # Merchant loyalty program
-            "loyalty-cards",  # Customer cards
-            "loyalty-analytics",  # Merchant loyalty analytics
-            "loyalty-transactions",  # Transaction feed
-            "loyalty-pins",  # Staff PINs
-            "loyalty-settings",  # Settings (read-only)
+            "program",  # Merchant loyalty program
+            "cards",  # Customer cards
+            "analytics",  # Merchant loyalty analytics
+            "transactions",  # Transaction feed
+            "pins",  # Staff PINs
+            "settings",  # Settings (read-only)
        ],
    },
    # New module-driven menu definitions
@@ -210,7 +211,7 @@ loyalty_module = ModuleDefinition(
                        requires_permission="loyalty.view_programs",
                    ),
                    MenuItemDefinition(
-                        id="loyalty-program",
+                        id="program",
                        label_key="loyalty.menu.program",
                        icon="cog",
                        route="/store/{store_code}/loyalty/program",
@@ -218,7 +219,7 @@ loyalty_module = ModuleDefinition(
                        requires_permission="loyalty.view_programs",
                    ),
                    MenuItemDefinition(
-                        id="loyalty-analytics",
+                        id="analytics",
                        label_key="loyalty.menu.analytics",
                        icon="chart-bar",
                        route="/store/{store_code}/loyalty/analytics",
@@ -236,42 +237,42 @@ loyalty_module = ModuleDefinition(
                order=60,
                items=[
                    MenuItemDefinition(
-                        id="loyalty-program",
+                        id="program",
                        label_key="loyalty.menu.program",
                        icon="gift",
                        route="/merchants/loyalty/program",
                        order=10,
                    ),
                    MenuItemDefinition(
-                        id="loyalty-cards",
+                        id="cards",
                        label_key="loyalty.menu.customer_cards",
                        icon="identification",
                        route="/merchants/loyalty/cards",
                        order=15,
                    ),
                    MenuItemDefinition(
-                        id="loyalty-analytics",
+                        id="analytics",
                        label_key="loyalty.menu.analytics",
                        icon="chart-bar",
                        route="/merchants/loyalty/analytics",
                        order=20,
                    ),
                    MenuItemDefinition(
-                        id="loyalty-transactions",
+                        id="transactions",
                        label_key="loyalty.menu.transactions",
                        icon="clock",
                        route="/merchants/loyalty/transactions",
                        order=25,
                    ),
                    MenuItemDefinition(
-                        id="loyalty-pins",
+                        id="pins",
                        label_key="loyalty.menu.staff_pins",
                        icon="key",
                        route="/merchants/loyalty/pins",
                        order=30,
                    ),
                    MenuItemDefinition(
-                        id="loyalty-settings",
+                        id="settings",
                        label_key="loyalty.menu.settings",
                        icon="cog",
                        route="/merchants/loyalty/settings",
--- a/app/modules/loyalty/locales/de.json
+++ b/app/modules/loyalty/locales/de.json
@@ -168,7 +168,8 @@
    "saving": "Speichern...",
    "total": "GESAMT",
    "view": "Anzeigen",
-        "yes": "Ja"
+    "yes": "Ja",
+    "contact_admin_setup": "Kontaktieren Sie Ihren Administrator um das Treueprogramm einzurichten"
  },
  "transactions": {
    "card_created": "Angemeldet",
--- a/app/modules/loyalty/locales/en.json
+++ b/app/modules/loyalty/locales/en.json
@@ -168,7 +168,8 @@
    "saving": "Saving...",
    "total": "TOTAL",
    "view": "View",
-        "yes": "Yes"
+    "yes": "Yes",
+    "contact_admin_setup": "Contact your administrator to set up the loyalty program"
  },
  "transactions": {
    "card_created": "Enrolled",
--- a/app/modules/loyalty/locales/fr.json
+++ b/app/modules/loyalty/locales/fr.json
@@ -168,7 +168,8 @@
    "saving": "Enregistrement...",
    "total": "TOTAL",
    "view": "Voir",
-        "yes": "Oui"
+    "yes": "Oui",
+    "contact_admin_setup": "Contactez votre administrateur pour configurer le programme fidélité"
  },
  "transactions": {
    "card_created": "Inscrit",
--- a/app/modules/loyalty/locales/lb.json
+++ b/app/modules/loyalty/locales/lb.json
@@ -168,7 +168,8 @@
    "saving": "Späicheren...",
    "total": "TOTAL",
    "view": "Kucken",
-        "yes": "Jo"
+    "yes": "Jo",
+    "contact_admin_setup": "Kontaktéiert Ären Administrator fir d'Treieprogramm anzeriichten"
  },
  "transactions": {
    "card_created": "Ageschriwwen",
--- a/app/modules/loyalty/static/merchant/js/loyalty-analytics.js
+++ b/app/modules/loyalty/static/merchant/js/loyalty-analytics.js
@@ -6,7 +6,7 @@ const loyaltyAnalyticsLog = window.LogConfig.loggers.loyaltyAnalytics || window.
 function merchantLoyaltyAnalytics() {
    return {
        ...data(),
-        currentPage: 'loyalty-analytics',
+        currentPage: 'analytics',

        program: null,
        locations: [],
--- a/app/modules/loyalty/static/merchant/js/loyalty-card-detail.js
+++ b/app/modules/loyalty/static/merchant/js/loyalty-card-detail.js
@@ -7,7 +7,7 @@ function merchantLoyaltyCardDetail() {
    return loyaltyCardDetailView({
        apiPrefix: '/merchants/loyalty',
        backUrl: '/merchants/loyalty/cards',
-        currentPage: 'loyalty-cards',
+        currentPage: 'cards',
    });
 }

--- a/app/modules/loyalty/static/merchant/js/loyalty-cards.js
+++ b/app/modules/loyalty/static/merchant/js/loyalty-cards.js
@@ -8,7 +8,7 @@ function merchantLoyaltyCards() {
        apiPrefix: '/merchants/loyalty',
        baseUrl: '/merchants/loyalty/cards',
        showStoreFilter: true,
-        currentPage: 'loyalty-cards',
+        currentPage: 'cards',
    });
 }

--- a/app/modules/loyalty/static/merchant/js/loyalty-merchant-settings.js
+++ b/app/modules/loyalty/static/merchant/js/loyalty-merchant-settings.js
@@ -6,7 +6,7 @@ const merchantSettingsViewLog = window.LogConfig.loggers.merchantSettingsView ||
 function merchantLoyaltyMerchantSettings() {
    return {
        ...data(),
-        currentPage: 'loyalty-settings',
+        currentPage: 'settings',

        settings: null,
        loading: false,
--- a/app/modules/loyalty/static/merchant/js/loyalty-pins.js
+++ b/app/modules/loyalty/static/merchant/js/loyalty-pins.js
@@ -8,7 +8,7 @@ function merchantLoyaltyPins() {
        apiPrefix: '/merchants/loyalty',
        showStoreFilter: true,
        showCrud: true,
-        currentPage: 'loyalty-pins',
+        currentPage: 'pins',
    });
 }

--- a/app/modules/loyalty/static/merchant/js/loyalty-settings.js
+++ b/app/modules/loyalty/static/merchant/js/loyalty-settings.js
@@ -7,7 +7,7 @@ function merchantLoyaltySettings() {
    return {
        ...data(),
        ...createProgramFormMixin(),
-        currentPage: 'loyalty-program',
+        currentPage: 'program',

        loading: false,
        error: null,
--- a/app/modules/loyalty/static/merchant/js/loyalty-transactions.js
+++ b/app/modules/loyalty/static/merchant/js/loyalty-transactions.js
@@ -7,7 +7,7 @@ function merchantLoyaltyTransactions() {
    return loyaltyTransactionsList({
        apiPrefix: '/merchants/loyalty',
        showStoreFilter: true,
-        currentPage: 'loyalty-transactions',
+        currentPage: 'transactions',
    });
 }

--- a/app/modules/loyalty/static/store/js/loyalty-analytics.js
+++ b/app/modules/loyalty/static/store/js/loyalty-analytics.js
@@ -6,7 +6,7 @@ const loyaltyAnalyticsLog = window.LogConfig.loggers.loyaltyAnalytics || window.
 function storeLoyaltyAnalytics() {
    return {
        ...data(),
-        currentPage: 'loyalty-analytics',
+        currentPage: 'analytics',

        program: null,

--- a/app/modules/loyalty/static/store/js/loyalty-card-detail.js
+++ b/app/modules/loyalty/static/store/js/loyalty-card-detail.js
@@ -6,7 +6,7 @@ const loyaltyCardDetailLog = window.LogConfig.loggers.loyaltyCardDetail || windo
 function storeLoyaltyCardDetail() {
    return {
        ...data(),
-        currentPage: 'loyalty-card-detail',
+        currentPage: 'cards',

        cardId: null,
        card: null,
--- a/app/modules/loyalty/static/store/js/loyalty-cards.js
+++ b/app/modules/loyalty/static/store/js/loyalty-cards.js
@@ -6,7 +6,7 @@ const loyaltyCardsLog = window.LogConfig.loggers.loyaltyCards || window.LogConfi
 function storeLoyaltyCards() {
    return {
        ...data(),
-        currentPage: 'loyalty-cards',
+        currentPage: 'cards',

        // Data
        cards: [],
--- a/app/modules/loyalty/static/store/js/loyalty-enroll.js
+++ b/app/modules/loyalty/static/store/js/loyalty-enroll.js
@@ -6,7 +6,7 @@ const loyaltyEnrollLog = window.LogConfig.loggers.loyaltyEnroll || window.LogCon
 function storeLoyaltyEnroll() {
    return {
        ...data(),
-        currentPage: 'loyalty-enroll',
+        currentPage: 'terminal',

        program: null,
        form: {
--- a/app/modules/loyalty/static/store/js/loyalty-settings.js
+++ b/app/modules/loyalty/static/store/js/loyalty-settings.js
@@ -13,7 +13,7 @@ function loyaltySettings() {
        ...createProgramFormMixin(),

        // Page identifier
-        currentPage: 'loyalty-program',
+        currentPage: 'program',

        // State
        loading: false,
--- a/app/modules/loyalty/static/store/js/loyalty-terminal.js
+++ b/app/modules/loyalty/static/store/js/loyalty-terminal.js
@@ -13,7 +13,7 @@ function storeLoyaltyTerminal() {
        ...data(),

        // Page identifier
-        currentPage: 'loyalty-terminal',
+        currentPage: 'terminal',

        // Program state
        program: null,
--- a/app/modules/loyalty/templates/loyalty/store/program.html
+++ b/app/modules/loyalty/templates/loyalty/store/program.html
@@ -61,7 +61,7 @@
 function storeLoyaltyProgram() {
    return {
        ...data(),
-        currentPage: 'loyalty-program',
+        currentPage: 'program',

        program: null,
        loading: false,