CRM-17522 - CiviMember - support using membership price sets on contribution pages...

diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php
index 5950346dab9bbccac0e83bc43f4646bae9ead16c..7dd7574d28dd835d6225f36d0d26fc05cca37ba8 100644 (file)
--- a/CRM/Contribute/Form/Contribution/Main.php
+++ b/CRM/Contribute/Form/Contribution/Main.php
@@ -806,7 +806,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
           }
         }
 
-        if (empty($priceFieldMemTypes)) {
+        if (empty($priceFieldMemTypes) && $self->_membershipBlock['is_required'] == 1) {
           $errors['_qf_default'] = ts('Please select at least one membership option.');
         }
       }

diff --git a/templates/CRM/Member/Form/MembershipBlock.tpl b/templates/CRM/Member/Form/MembershipBlock.tpl
index 91880beec9fd56bc33f302f95600a57a542f3293..dc702afccc070f0b81ea0cbfd4393f712f2f9f2d 100644 (file)
--- a/templates/CRM/Member/Form/MembershipBlock.tpl
+++ b/templates/CRM/Member/Form/MembershipBlock.tpl
@@ -168,14 +168,12 @@
         if ( cj('#member_price_set_id').val() ) {
             cj('#membership_type-label').hide();
             cj('#membership_type-block').hide();
-            cj('#requiredSignup').hide();
             cj('#displayFee').hide();
             cj('#separatePayment').hide();
             cj('#quickConfigConvertMessage').hide();
         } else {
             cj('#membership_type-label').show();
             cj('#membership_type-block').show();
-            cj('#requiredSignup').show();
             cj('#displayFee').show();
             cj('#separatePayment').show();
         }