diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php index 383a73f63e1eac82cb12d1a24ae620d63ffab1d7..45864f1202b62686e1d6ed703ef12bffaee2b01f 100644 --- a/CRM/Member/Form/Membership.php +++ b/CRM/Member/Form/Membership.php @@ -213,9 +213,7 @@ class CRM_Member_Form_Membership extends CRM_Member_Form { // This string makes up part of the class names, differentiating them (not sure why) from the membership fields. $this->assign('formClass', 'membership'); parent::preProcess(); - if ($this->isUpdateToExistingRecurringMembership()) { - $this->entityFields['end_date']['is_freeze'] = TRUE; - } + // get price set id. $this->_priceSetId = CRM_Utils_Array::value('priceSetId', $_GET); $this->set('priceSetId', $this->_priceSetId); diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl index c8d2cd54394d9a66226380d0b065ac255c06d539..27a2aa5b4f64787f78dfeabd2c6a813050862f3d 100644 --- a/templates/CRM/Member/Form/Membership.tpl +++ b/templates/CRM/Member/Form/Membership.tpl @@ -27,7 +27,7 @@ {if $cancelAutoRenew} <div class="messages status no-popup"> <div class="icon inform-icon"></div> - <p>{ts 1=$cancelAutoRenew}This membership is set to renew automatically {if $endDate}on {$endDate|crmDate}{/if}. You will need to cancel the auto-renew option if you want to modify the Membership Type, End Date or Membership Status. <a href="%1">Click here</a> if you want to cancel the automatic renewal option.{/ts}</p> + <p>{ts 1=$cancelAutoRenew}This membership is set to renew automatically {if $endDate}on {$endDate|crmDate}{/if}. You will need to cancel the auto-renew option if you want to modify the Membership Type or Membership Status. <a href="%1">Click here</a> if you want to cancel the automatic renewal option.{/ts}</p> </div> {/if} <div class="spacer"></div>