From d824fb6e37021dad080f1c7d0777832cf5c30c0a Mon Sep 17 00:00:00 2001
From: eileen <eileen@fuzion.co.nz>
Date: Sat, 3 Aug 2013 10:04:13 +1200
Subject: [PATCH] CRM-13067 refactor recordMembershipContribution into
 MembershipPayment::create step one

CRM-13067 refactor recordMembershipContribution into MembershipPayment::create step one

CRM-13067 reinstate change to fn signature lost during gitting
---
 CRM/Batch/Form/Entry.php              |  2 +-
 CRM/Member/BAO/Membership.php         | 12 ++++++------
 CRM/Member/Form/MembershipRenewal.php |  4 +---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php
index 8c5efd085b..39c0be96ef 100644
--- a/CRM/Batch/Form/Entry.php
+++ b/CRM/Batch/Form/Entry.php
@@ -705,7 +705,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
           );
 
           // make contribution entry
-          CRM_Member_BAO_Membership::recordMembershipContribution( $value, CRM_Core_DAO::$_nullArray, $membership->id );
+          CRM_Member_BAO_Membership::recordMembershipContribution( array_merge($value, array('membership_id' => $membership->id)));
         }
         else {
           $membership = CRM_Member_BAO_Membership::create($value, CRM_Core_DAO::$_nullArray);
diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 0e10c56b90..25d8da69a5 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -322,7 +322,7 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
 
     //record contribution for this membership
     if (CRM_Utils_Array::value('contribution_status_id', $params) && !CRM_Utils_Array::value('relate_contribution_id', $params)) {
-      $params['contribution'] = self::recordMembershipContribution( $params, $ids, $membership->id );
+      $params['contribution'] = self::recordMembershipContribution( array_merge($params, array('membership_id' => $membership->id), $ids);
     }
 
     //insert payment record for this membership
@@ -579,9 +579,9 @@ INNER JOIN  civicrm_membership_type type ON ( type.id = membership.membership_ty
   static function del($membershipId) {
     //delete related first and then delete parent.
     self::deleteRelatedMemberships($membershipId);
-    return self::deleteMembership($membershipId);    
+    return self::deleteMembership($membershipId);
   }
-  
+
   /**
    * Function to delete membership.
    *
@@ -2676,13 +2676,13 @@ WHERE      civicrm_membership.is_test = 0";
    * Function to record contribution record associated with membership
    *
    * @param array  $params array of submitted params
-   * @param array  $ids    array of ids
-   * @param object $membershipId  membership id
+   * @param array  $ids (param in process of being removed - try to use params)   array of ids
    *
    * @return void
    * @static
    */
-  static function recordMembershipContribution( &$params, &$ids, $membershipId ) {
+  static function recordMembershipContribution( &$params, $ids = array()) {
+    $membershipId = $params['membership_id'];
     $contributionParams = array();
     $config = CRM_Core_Config::singleton();
     $contributionParams['currency'] = $config->defaultCurrency;
diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php
index 28c0bfe133..bc8caa2b05 100644
--- a/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@ -778,9 +778,7 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
       }
       $formValues['contact_id'] = $this->_contactID;
 
-      CRM_Member_BAO_Membership::recordMembershipContribution( $formValues,
-        CRM_Core_DAO::$_nullArray,
-        $renewMembership->id );
+      CRM_Member_BAO_Membership::recordMembershipContribution( array_merge($formValues, array('membership_id' => $renewMembership->id);
     }
 
     if (CRM_Utils_Array::value('send_receipt', $formValues)) {
-- 
2.25.1