From 620ce374ebe429f7506f98605df057b31ba2e40c Mon Sep 17 00:00:00 2001
From: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Mon, 28 Dec 2015 18:43:09 +0530
Subject: [PATCH] CRM-17577 -- Membership Batch Data Entry: Renewal ignores
 some fields

---
 CRM/Batch/Form/Entry.php      |  7 +++++--
 CRM/Member/BAO/Membership.php | 25 ++++++++++++++++++-------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php
index 6ae267597a..9794357499 100755
--- a/CRM/Batch/Form/Entry.php
+++ b/CRM/Batch/Form/Entry.php
@@ -805,11 +805,14 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
               $campaignId = CRM_Utils_Array::value('campaign_id', $this->_values);
             }
           }
-
+          foreach (array('join_date', 'start_date', 'end_date') as $dateType) {
+            $formDates[$dateType] = CRM_Utils_Array::value($dateType, $value);
+          }
+          $membershipSource = CRM_Utils_Array::value('source', $value);
           list($membership) = CRM_Member_BAO_Membership::renewMembership(
             $value['contact_id'], $value['membership_type_id'], FALSE,
             NULL, NULL, $value['custom'], NULL, NULL, FALSE,
-            NULL, NULL, $isPayLater, $campaignId
+            NULL, $membershipSource, $isPayLater, $campaignId, $formDates
           );
 
           // make contribution entry
diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 21d8cc2469..62d397c05d 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -1807,11 +1807,12 @@ INNER JOIN  civicrm_contact contact ON ( contact.id = membership.contact_id AND
    * @param $membershipSource
    * @param $isPayLater
    * @param int $campaignId
+   * @param array $formDates
    *
    * @throws CRM_Core_Exception
    * @return array
    */
-  public static function renewMembership($contactID, $membershipTypeID, $is_test, $changeToday, $modifiedID, $customFieldsFormatted, $numRenewTerms, $membershipID, $pending, $contributionRecurID, $membershipSource, $isPayLater, $campaignId) {
+  public static function renewMembership($contactID, $membershipTypeID, $is_test, $changeToday, $modifiedID, $customFieldsFormatted, $numRenewTerms, $membershipID, $pending, $contributionRecurID, $membershipSource, $isPayLater, $campaignId, $formDates = array()) {
     $renewalMode = $updateStatusId = FALSE;
     $allStatus = CRM_Member_PseudoConstant::membershipStatus();
     $format = '%Y%m%d';
@@ -1896,8 +1897,12 @@ INNER JOIN  civicrm_contact contact ON ( contact.id = membership.contact_id AND
         );
 
         $currentMembership['join_date'] = CRM_Utils_Date::customFormat($currentMembership['join_date'], $format);
-        $currentMembership['start_date'] = CRM_Utils_Array::value('start_date', $dates);
-        $currentMembership['end_date'] = CRM_Utils_Array::value('end_date', $dates);
+        foreach (array('start_date', 'end_date') as $dateType) {
+          $currentMembership[$dateType] = CRM_Utils_Array::value($dateType, $formDates);
+          if (empty($currentMembership[$dateType])) {
+            $currentMembership[$dateType] = CRM_Utils_Array::value($dateType, $dates);
+          }
+        }
         $currentMembership['is_test'] = $is_test;
 
         if (!empty($membershipSource)) {
@@ -1936,7 +1941,10 @@ INNER JOIN  civicrm_contact contact ON ( contact.id = membership.contact_id AND
         $memParams = array();
         $memParams['join_date'] = CRM_Utils_Date::isoToMysql($membership->join_date);
         $memParams['start_date'] = CRM_Utils_Date::isoToMysql($membership->start_date);
-        $memParams['end_date'] = CRM_Utils_Array::value('end_date', $dates);
+        $memParams['end_date'] = CRM_Utils_Array::value('end_date', $formDates);
+        if (empty($memParams['end_date'])) {
+          $memParams['end_date'] = CRM_Utils_Array::value('end_date', $dates);
+        }
         $memParams['membership_type_id'] = $membershipTypeID;
 
         //set the log start date.
@@ -1974,9 +1982,12 @@ INNER JOIN  civicrm_contact contact ON ( contact.id = membership.contact_id AND
       if (!$pending) {
         $dates = CRM_Member_BAO_MembershipType::getDatesForMembershipType($membershipTypeID, NULL, NULL, NULL, $numRenewTerms);
 
-        $memParams['join_date'] = CRM_Utils_Array::value('join_date', $dates);
-        $memParams['start_date'] = CRM_Utils_Array::value('start_date', $dates);
-        $memParams['end_date'] = CRM_Utils_Array::value('end_date', $dates);
+        foreach (array('join_date', 'start_date', 'end_date') as $dateType) {
+          $memParams[$dateType] = CRM_Utils_Array::value($dateType, $formDates);
+          if (empty($memParams[$dateType])) {
+            $memParams[$dateType] = CRM_Utils_Array::value($dateType, $dates);
+          }
+        }
 
         $status = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate(CRM_Utils_Date::customFormat($dates['start_date'],
             $statusFormat
-- 
2.25.1