From 50750f660d7fc66d42fb6b4bd1051560d7e56794 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Mon, 27 Sep 2021 09:52:14 +1000 Subject: [PATCH] [REF] Update Frequenecy template assignments in UpdateBilling to be consistent with #21469 --- CRM/Contribute/Form/UpdateBilling.php | 4 ++-- templates/CRM/Contribute/Form/UpdateBilling.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CRM/Contribute/Form/UpdateBilling.php b/CRM/Contribute/Form/UpdateBilling.php index c8b3065f6089..6a439d3f1b8e 100644 --- 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 index 72d13b28f657..e490a94cd3f6 100644 --- 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} - {ts 1=$amount|crmMoney 2=$frequency_interval 3=$frequency_unit}Recurring Contribution Details: %1 every %2 %3{/ts} + {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}