Merge pull request #21635 from seamuslee001/ref_update_frequency_vari…

…ables [REF] Update Frequenecy template assignments in UpdateBilling to be c…
civicrm · Sep 27, 2021 · d182fa5 · d182fa5
2 parents e057652 + 50750f6
commit d182fa5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CRM/Contribute/Form/UpdateBilling.php b/CRM/Contribute/Form/UpdateBilling.php
@@ -66,8 +66,8 @@ public function preProcess() {
 
     $this->assignBillingType();
 
-    $this->assign('frequency_unit', $this->getSubscriptionDetails()->frequency_unit);
-    $this->assign('frequency_interval', $this->getSubscriptionDetails()->frequency_interval);
+    $this->assign('recur_frequency_unit', $this->getSubscriptionDetails()->frequency_unit);
+    $this->assign('recur_frequency_interval', $this->getSubscriptionDetails()->frequency_interval);
     $this->assign('amount', $this->getSubscriptionDetails()->amount);
     $this->assign('installments', $this->getSubscriptionDetails()->installments);
     $this->assign('mode', $this->_mode);

diff --git a/templates/CRM/Contribute/Form/UpdateBilling.tpl b/templates/CRM/Contribute/Form/UpdateBilling.tpl
@@ -12,7 +12,7 @@
   {if $mode eq 'auto_renew'}
       {ts}Use this form to update the credit card and billing name and address used with the auto-renewal option for your {$membershipType} membership.{/ts}
   {else}
-    <strong>{ts 1=$amount|crmMoney 2=$frequency_interval 3=$frequency_unit}Recurring Contribution Details: %1 every %2 %3{/ts}
+    <strong>{ts 1=$amount|crmMoney 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring Contribution Details: %1 every %2 %3{/ts}
     {if $installments}
       {ts 1=$installments}for %1 installments{/ts}.
     {/if}</strong>