From a423bcf03e4f1b18ddd8ddb5310d0ac62526494c Mon Sep 17 00:00:00 2001 From: Samir Boulahtit Date: Mon, 23 Mar 2026 14:03:18 +0100 Subject: [PATCH] fix(loyalty): show merchant name in admin on-behalf page headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switch admin sub-pages (cards, pins, transactions) from page_header_flex to detail_page_header with merchant name context, matching the settings page pattern. Headers now show "MerchantName — Cards" with back button to merchant detail hub. Co-Authored-By: Claude Opus 4.6 (1M context) --- .../loyalty/admin/merchant-card-detail.html | 4 ++-- .../templates/loyalty/admin/merchant-cards.html | 13 +++---------- .../templates/loyalty/admin/merchant-pins.html | 13 +++---------- .../loyalty/admin/merchant-transactions.html | 13 +++---------- 4 files changed, 11 insertions(+), 32 deletions(-) diff --git a/app/modules/loyalty/templates/loyalty/admin/merchant-card-detail.html b/app/modules/loyalty/templates/loyalty/admin/merchant-card-detail.html index 7d3fc62d..2d0dd945 100644 --- a/app/modules/loyalty/templates/loyalty/admin/merchant-card-detail.html +++ b/app/modules/loyalty/templates/loyalty/admin/merchant-card-detail.html @@ -8,8 +8,8 @@ {% block alpine_data %}adminMerchantCardDetail(){% endblock %} {% block content %} -{% call detail_page_header("card?.card_number || 'Card Detail'", '/admin/loyalty/merchants/' + merchant_id|string + '/cards', subtitle_show='card') %} - +{% call detail_page_header("(card?.customer_name || '" + _('loyalty.admin.merchant_card_detail.title') + "')", '/admin/loyalty/merchants/' ~ merchant_id ~ '/cards', subtitle_show='card') %} + {% endcall %} {{ loading_state(_('loyalty.admin.merchant_card_detail.loading')) }} diff --git a/app/modules/loyalty/templates/loyalty/admin/merchant-cards.html b/app/modules/loyalty/templates/loyalty/admin/merchant-cards.html index 90852ba3..cc994822 100644 --- a/app/modules/loyalty/templates/loyalty/admin/merchant-cards.html +++ b/app/modules/loyalty/templates/loyalty/admin/merchant-cards.html @@ -1,6 +1,6 @@ {# app/modules/loyalty/templates/loyalty/admin/merchant-cards.html #} {% extends "admin/base.html" %} -{% from 'shared/macros/headers.html' import page_header_flex, refresh_button %} +{% from 'shared/macros/headers.html' import detail_page_header, refresh_button %} {% from 'shared/macros/alerts.html' import loading_state, error_state %} {% block title %}{{ _('loyalty.admin.merchant_cards.title') }}{% endblock %} @@ -8,15 +8,8 @@ {% block alpine_data %}adminMerchantCards(){% endblock %} {% block content %} -{% call page_header_flex(title=_('loyalty.admin.merchant_cards.title'), subtitle=_('loyalty.admin.merchant_cards.subtitle')) %} -
- {{ refresh_button(loading_var='loading', onclick='loadCards()', variant='secondary') }} - - - {{ _('loyalty.common.back') }} - -
+{% call detail_page_header("(program?.merchant_name || '') + ' — " + _('loyalty.admin.merchant_cards.title') + "'", '/admin/loyalty/merchants/' ~ merchant_id, subtitle_show='program') %} + {{ _('loyalty.admin.merchant_cards.subtitle') }} {% endcall %} {{ loading_state(_('loyalty.admin.merchant_cards.loading')) }} diff --git a/app/modules/loyalty/templates/loyalty/admin/merchant-pins.html b/app/modules/loyalty/templates/loyalty/admin/merchant-pins.html index 4317cf4f..c87e7b38 100644 --- a/app/modules/loyalty/templates/loyalty/admin/merchant-pins.html +++ b/app/modules/loyalty/templates/loyalty/admin/merchant-pins.html @@ -1,6 +1,6 @@ {# app/modules/loyalty/templates/loyalty/admin/merchant-pins.html #} {% extends "admin/base.html" %} -{% from 'shared/macros/headers.html' import page_header_flex, refresh_button %} +{% from 'shared/macros/headers.html' import detail_page_header, refresh_button %} {% from 'shared/macros/alerts.html' import loading_state, error_state %} {% block title %}{{ _('loyalty.admin.merchant_pins.title') }}{% endblock %} @@ -8,15 +8,8 @@ {% block alpine_data %}adminMerchantPins(){% endblock %} {% block content %} -{% call page_header_flex(title=_('loyalty.admin.merchant_pins.title'), subtitle=_('loyalty.admin.merchant_pins.subtitle')) %} -
- {{ refresh_button(loading_var='loading', onclick='loadPins()', variant='secondary') }} - - - {{ _('loyalty.common.back') }} - -
+{% call detail_page_header("(program?.merchant_name || '') + ' — " + _('loyalty.admin.merchant_pins.title') + "'", '/admin/loyalty/merchants/' ~ merchant_id, subtitle_show='program') %} + {{ _('loyalty.admin.merchant_pins.subtitle') }} {% endcall %} {{ loading_state(_('loyalty.admin.merchant_pins.loading')) }} diff --git a/app/modules/loyalty/templates/loyalty/admin/merchant-transactions.html b/app/modules/loyalty/templates/loyalty/admin/merchant-transactions.html index 131b1c61..cceaf419 100644 --- a/app/modules/loyalty/templates/loyalty/admin/merchant-transactions.html +++ b/app/modules/loyalty/templates/loyalty/admin/merchant-transactions.html @@ -1,6 +1,6 @@ {# app/modules/loyalty/templates/loyalty/admin/merchant-transactions.html #} {% extends "admin/base.html" %} -{% from 'shared/macros/headers.html' import page_header_flex, refresh_button %} +{% from 'shared/macros/headers.html' import detail_page_header, refresh_button %} {% from 'shared/macros/alerts.html' import loading_state, error_state %} {% block title %}{{ _('loyalty.admin.merchant_transactions.title') }}{% endblock %} @@ -8,15 +8,8 @@ {% block alpine_data %}adminMerchantTransactions(){% endblock %} {% block content %} -{% call page_header_flex(title=_('loyalty.admin.merchant_transactions.title'), subtitle=_('loyalty.admin.merchant_transactions.subtitle')) %} -
- {{ refresh_button(loading_var='loading', onclick='loadTransactions()', variant='secondary') }} - - - {{ _('loyalty.common.back') }} - -
+{% call detail_page_header("(program?.merchant_name || '') + ' — " + _('loyalty.admin.merchant_transactions.title') + "'", '/admin/loyalty/merchants/' ~ merchant_id, subtitle_show='program') %} + {{ _('loyalty.admin.merchant_transactions.subtitle') }} {% endcall %} {{ loading_state(_('loyalty.admin.merchant_transactions.loading')) }}