Fix for CRM-17905

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 69856982eaaeb3a05c498a879ac1bda3dfaa81d7..4ad1d8e479a3673d85b47921c5f2c00e56e04337 100644 (file)
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -919,10 +919,11 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
 
     // store the fact that this is a membership and membership type is selected
     $processMembership = FALSE;
+    $priceFieldIds = $this->get('memberPriceFieldIDS');
     if ((!empty($membershipParams['selectMembership']) &&
         $membershipParams['selectMembership'] != 'no_thanks'
       ) ||
-      $this->_useForMember
+      ( $this->_useForMember && !empty($priceFieldIds) )
     ) {
       $processMembership = TRUE;
 

diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php
index 4819f9677cb715a25d28d915495f1503f2f78e6f..c074b6f58fc9eab105af7ab36c5261d3d78b675d 100644 (file)
--- a/CRM/Contribute/Form/Contribution/Main.php
+++ b/CRM/Contribute/Form/Contribution/Main.php
@@ -894,6 +894,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
       if ($self->_useForMember == 1 && !empty($check) && $membershipIsActive) {
         $priceFieldIDS = array();
         $priceFieldMemTypes = array();
+        $priceFieldIsRequired = array();
 
         foreach ($self->_priceSet['fields'] as $priceId => $value) {
           if (!empty($fields['price_' . $priceId]) || ($self->_quickConfig && $value['name'] == 'membership_amount' && empty($self->_membershipBlock['is_required']))) {
@@ -918,6 +919,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
                   )
                 ) {
                   $priceFieldMemTypes[] = $val['membership_type_id'];
+                  $priceFieldIsRequired[$priceId] = $value['is_required'];
                 }
               }
             }
@@ -948,7 +950,8 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu
           }
         }
 
-        if (empty($priceFieldMemTypes)) {
+        $priceFieldIsRequired = array_filter($priceFieldIsRequired);
+        if (empty($priceFieldMemTypes) && !empty($priceFieldIsRequired)) {
           $errors['_qf_default'] = ts('Please select at least one membership option.');
         }
       }

diff --git a/CRM/Price/BAO/PriceField.php b/CRM/Price/BAO/PriceField.php
index cc0aee8609b3eb3275c69f794fe6b68abd593e81..51dfd3637dd86dc4c40a322301710a6357018641 100644 (file)
--- a/CRM/Price/BAO/PriceField.php
+++ b/CRM/Price/BAO/PriceField.php
@@ -445,6 +445,13 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
           }
           else {
             $none = ts('- none -');
+            if (!empty($qf->_membershipBlock) && empty($qf->_quickConfig)) {
+              foreach($fieldOptions as $fieldOption) {
+                if (CRM_Utils_Array::value('membership_type_id', $fieldOption) ) {
+                  $none = ts('No thank you');
+                }
+              }
+            }
           }
 
           $choice[] = $qf->createElement('radio', NULL, '', $none, '0',