Fix membership join date from being overwritten by api

diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 9ee8b864ec8c8c766f64034fccdb0223dd7c9da4..8cee375460c8d9daadf812591736e9a58afb29ff 100644 (file)
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -250,7 +250,7 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership {
         $excludeIsAdmin = TRUE;
       }
 
-      $calcStatus = $calcStatus = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($start_date, $end_date, $join_date,
+      $calcStatus = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($start_date, $end_date, $join_date,
         'today', $excludeIsAdmin
       );
       if (empty($calcStatus)) {

diff --git a/CRM/Member/BAO/MembershipType.php b/CRM/Member/BAO/MembershipType.php
index 05fb74ed21cf981c8e45c45fde00a2ce11f328e8..be9be0d3f75e4ea5155e74d22bb026b77a0fc902 100644 (file)
--- a/CRM/Member/BAO/MembershipType.php
+++ b/CRM/Member/BAO/MembershipType.php
@@ -457,6 +457,9 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType {
     $params            = array('id' => $membershipId);
     $membershipDetails = CRM_Member_BAO_Membership::getValues($params, $values);
     $statusID          = $membershipDetails[$membershipId]->status_id;
+    $membershipDates = array(
+      'join_date' => CRM_Utils_Date::customFormat($membershipDetails[$membershipId]->join_date, '%Y%m%d'),
+    );
 
     $oldPeriodType = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipType',
         CRM_Core_DAO::getFieldValue('CRM_Member_DAO_Membership', $membershipId, 'membership_type_id'), 'period_type');
@@ -523,7 +526,6 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType {
           ));
       }
       $today = date('Y-m-d');
-      $membershipDates = array();
       $membershipDates['today'] = CRM_Utils_Date::customFormat($today, '%Y%m%d');
       $membershipDates['start_date'] = CRM_Utils_Date::customFormat($startDate, '%Y%m%d');
       $membershipDates['end_date'] = CRM_Utils_Date::customFormat($endDate, '%Y%m%d');
@@ -538,7 +540,6 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType {
       $renewalDates = self::getDatesForMembershipType($membershipTypeDetails['id'],
         $today, NULL, NULL, $numRenewTerms
       );
-      $membershipDates = array();
       $membershipDates['today'] = CRM_Utils_Date::customFormat($today, '%Y%m%d');
       $membershipDates['start_date'] = $renewalDates['start_date'];
       $membershipDates['end_date'] = $renewalDates['end_date'];