CRM-16800 towards fixing recurring error,

I am trying to figure out what part of this function membership form needs to share as the form has 2 paths
depending on recurring or otherwise. Ideally the create membership function would be used in both cases & recurring
which is a small part of the shared function, could be handled separately

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 346776f20cb65879acbb616837d64ae27296cf55..adaae8a4137427912d181f62280250a973518b41 100644 (file)
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -1286,13 +1286,19 @@ LEFT JOIN civicrm_option_value contribution_status ON (civicrm_contribution.cont
   /**
    * Create address associated with contribution record.
    *
+   * As long as there is one or more billing field in the parameters we will create the address.
+   *
+   * (historically the decision to create or not was based on the payment 'type' but these lines are greyer than once
+   * thought).
+   *
    * @param array $params
    * @param int $billingLocationTypeID
    *
    * @return int
    *   address id
    */
-  public static function createAddress(&$params, $billingLocationTypeID) {
+  public static function createAddress($params, $billingLocationTypeID) {
+    $hasBillingField = FALSE;
     $billingFields = array(
       'street_address',
       'city',
@@ -1313,9 +1319,13 @@ LEFT JOIN civicrm_option_value contribution_status ON (civicrm_contribution.cont
 
     foreach ($billingFields as $value) {
       $addressParams[$value] = CRM_Utils_Array::value("billing_{$value}-{$billingLocationTypeID}", $params);
+      if (!empty($addressParams[$value])) {
+        $hasBillingField = TRUE;
+      }
+    }
+    if ($hasBillingField) {
+      $address = CRM_Core_BAO_Address::add($addressParams, FALSE);
     }
-
-    $address = CRM_Core_BAO_Address::add($addressParams, FALSE);
 
     return $address->id;
   }

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 87bc4b8a49b21079b928e2a4e780297bb39be054..863e8ef56bf2b9f77a724e6f1cf70e4d31ce1770 100644 (file)
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -935,10 +935,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
     // add these values for the recurringContrib function ,CRM-10188
     $params['financial_type_id'] = $financialType->id;
 
-    //create an contribution address
-    if ($contributeMode != 'notify' && empty($params['is_pay_later']) && $isMonetary) {
-      $addressID = CRM_Contribute_BAO_Contribution::createAddress($params, $billingLocationID);
-    }
+    $addressID = CRM_Contribute_BAO_Contribution::createAddress($params, $billingLocationID);
 
     //@todo - this is being set from the form to resolve CRM-10188 - an
     // eNotice caused by it not being set @ the front end