Merge pull request #9648 from MegaphoneJon/CRM-19608

CRM-19608 - Show/hide auto-renew element on membership pages even whe…

diff --git a/CRM/Price/BAO/PriceField.php b/CRM/Price/BAO/PriceField.php
index 31cd8c52fb8b635af047b79a883cddd7eecbd29d..000b977e2312a384f7a3a00958f9ea3e412441c9 100644 (file)
--- a/CRM/Price/BAO/PriceField.php
+++ b/CRM/Price/BAO/PriceField.php
@@ -456,7 +456,7 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
           if (!empty($qf->_quickConfig) && $field->name == 'contribution_amount') {
             $extra += array('onclick' => 'clearAmountOther();');
           }
-          elseif (!empty($qf->_quickConfig) && $field->name == 'membership_amount') {
+          if ($field->name == 'membership_amount') {
             $extra += array(
               'onclick' => "return showHideAutoRenew({$opt['membership_type_id']});",
               'membership-type' => $opt['membership_type_id'],

diff --git a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
index 075a50a224f073566eba9be16ef15adcbbe09147..a2c40a1696edc1a0645277fd7b1d821e1d7bfe4c 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
@@ -231,7 +231,7 @@ CRM.$(function($) {
     {/strip}
 {/if}
 {* Include JS for auto renew membership if priceset is Quick Config*}
-{if $membershipBlock AND $quickConfig}
+{if $membershipBlock}
 {literal}
 <script type="text/javascript">
 CRM.$(function($) {