From edd55cd2fd7d01c052554cf93b75a2b56151ec54 Mon Sep 17 00:00:00 2001
From: Samir Boulahtit <samir.boulahtit@wizard.lu>
Date: Mon, 23 Mar 2026 16:37:28 +0100
Subject: [PATCH] fix: context-aware back button for cross-module admin
 navigation

The tenancy merchant detail page now reads an optional ?back= query
parameter to determine the back button destination. Falls back to
/admin/merchants when no param is present (default behavior preserved).

The loyalty merchant detail "View Merchant" link now passes
?back=/admin/loyalty/merchants/{id} so clicking back from the tenancy
page returns to the loyalty context instead of the merchants list.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../loyalty/templates/loyalty/admin/merchant-detail.html      | 4 +---
 .../tenancy/templates/tenancy/admin/merchant-detail.html      | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/modules/loyalty/templates/loyalty/admin/merchant-detail.html b/app/modules/loyalty/templates/loyalty/admin/merchant-detail.html
index 2eb6fc30..a27a8c47 100644
--- a/app/modules/loyalty/templates/loyalty/admin/merchant-detail.html
+++ b/app/modules/loyalty/templates/loyalty/admin/merchant-detail.html
@@ -41,12 +41,10 @@
                 {{ _('loyalty.admin.merchant_detail.admin_policy') }}
             </a>
             <a
-                :href="`/admin/merchants/${merchant?.id}`"
-                target="_blank"
+                :href="`/admin/merchants/${merchant?.id}?back=/admin/loyalty/merchants/${merchantId}`"
                 class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-gray-700 transition-colors duration-150 bg-gray-100 border border-gray-300 rounded-lg hover:bg-gray-200 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-600 dark:hover:bg-gray-600">
                 <span x-html="$icon('building-office', 'w-4 h-4 mr-2')"></span>
                 {{ _('loyalty.admin.merchant_detail.view_merchant') }}
-                <span x-html="$icon('arrow-top-right-on-square', 'w-3 h-3 ml-1 opacity-50')"></span>
             </a>
             <a x-show="program"
                 :href="`/admin/loyalty/merchants/${merchantId}/cards`"
diff --git a/app/modules/tenancy/templates/tenancy/admin/merchant-detail.html b/app/modules/tenancy/templates/tenancy/admin/merchant-detail.html
index 87bd179f..9aaaafef 100644
--- a/app/modules/tenancy/templates/tenancy/admin/merchant-detail.html
+++ b/app/modules/tenancy/templates/tenancy/admin/merchant-detail.html
@@ -11,7 +11,7 @@
 {% block alpine_data %}adminMerchantDetail(){% endblock %}
 
 {% block content %}
-{% call detail_page_header("merchant?.name || 'Merchant Details'", '/admin/merchants', subtitle_show='merchant') %}
+{% call detail_page_header("merchant?.name || 'Merchant Details'", request.query_params.get('back', '/admin/merchants'), subtitle_show='merchant') %}
     ID: <span x-text="merchantId"></span>
     <span class="text-gray-400 mx-2">|</span>
     <span x-text="merchant?.store_count || 0"></span> store(s)