From bdc83164d58c5454162a304136ab291f2c06deaa Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 18 Sep 2023 22:32:01 +1200 Subject: [PATCH] Fix last notices on Online event registration by removing variables I hunted through to see why these variables are assigned and they pre-date the switch to load the payment block from the CRM_Financial_Form_Payment There is no evidence of that form looking them up in any way - so I think they can go.... https://github.com/civicrm/civicrm-core/commit/aaff4c697d6f94f01f5dacf5a3d876a95e50f5cb#diff-660258b71b4d1db49bdef38c7b3fcb4b698004ab39b57dcbd49083e256444272 --- templates/CRM/common/paymentBlock.tpl | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/templates/CRM/common/paymentBlock.tpl b/templates/CRM/common/paymentBlock.tpl index 1130a5177e..7844e4a7e5 100644 --- a/templates/CRM/common/paymentBlock.tpl +++ b/templates/CRM/common/paymentBlock.tpl @@ -75,21 +75,11 @@ function buildPaymentBlock(type) { var $form = $('#billing-payment-block').closest('form'); {/literal} - {if !$isBackOffice && $contributionPageID} - {capture assign='contributionPageID'}&id={$contributionPageID}{/capture} - {else} - {capture assign='contributionPageID'}{/capture} - {/if} {if !$isBackOffice && $custom_pre_id} {capture assign='preProfileID'}&pre_profile_id={$custom_pre_id}{/capture} {else} {capture assign='preProfileID'}{/capture} {/if} - {if $urlPathVar} - {capture assign='urlPathVar'}&{$urlPathVar}{/capture} - {else} - {capture assign='urlPathVar'}{/capture} - {/if} {* 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} @@ -104,7 +94,7 @@ var currency = '{$currency}'; currency = currency == '' ? $('#currency').val() : currency; - var dataUrl = "{crmURL p='civicrm/payment/form' h=0 q="formName=`$form.formName``$urlPathVar``$isBackOfficePathVar``$profilePathVar``$contributionPageID``$preProfileID`"}"; + var dataUrl = "{crmURL p='civicrm/payment/form' h=0 q="formName=`$form.formName``$isBackOfficePathVar``$profilePathVar``$preProfileID`"}"; {literal} if (typeof(CRM.vars) != "undefined") { if (typeof(CRM.vars.coreForm) != "undefined") { -- 2.25.1