Check isBackOffice before checking billing_profile_id

It won't be set from back office forms & will e-notice...

diff --git a/templates/CRM/common/paymentBlock.tpl b/templates/CRM/common/paymentBlock.tpl
index 8434b62ad3247f8061ae5384f029c70677488361..4d71d21ded9d63dfc07a21d2eeed248c94ecb229 100644 (file)
--- 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}