From 55d64ba6268089dd94b5c55372d3fb80889c9734 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 28 Jul 2023 16:21:00 +1200
Subject: [PATCH] Check isBackOffice before checking billing_profile_id

It won't be set from back office forms & will e-notice...
---
 templates/CRM/common/paymentBlock.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/CRM/common/paymentBlock.tpl b/templates/CRM/common/paymentBlock.tpl
index 8434b62ad3..4d71d21ded 100644
--- a/templates/CRM/common/paymentBlock.tpl
+++ b/templates/CRM/common/paymentBlock.tpl
@@ -90,7 +90,8 @@
       {else}
         {capture assign='urlPathVar'}{/capture}
       {/if}
-      {if $billing_profile_id}
+      // Billing profile ID is only ever set on front end forms, to force entering address for pay later.
+      {if !$isBackOffice && $billing_profile_id}
         {capture assign='profilePathVar'}billing_profile_id={$billing_profile_id}&{/capture}
       {else}
         {capture assign='profilePathVar'}{/capture}
-- 
2.25.1