Fix join_date in batch forms and in report filters

diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php
index 038f32094446fa57932af70f5732988569719df6..5d98871c54b81d288a7769f3dfc4636fd524bcf4 100644 (file)
--- a/CRM/Batch/Form/Entry.php
+++ b/CRM/Batch/Form/Entry.php
@@ -395,7 +395,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
 
       $completeStatus = CRM_Contribute_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed');
       $specialFields = [
-        'join_date' => date('Y-m-d'),
+        'membership_join_date' => date('Y-m-d'),
         'receive_date' => $currentDate,
         'contribution_status_id' => $completeStatus,
       ];
@@ -825,7 +825,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
         }
         else {
           $dateTypes = [
-            'join_date' => 'joinDate',
+            'membership_join_date' => 'joinDate',
             'membership_start_date' => 'startDate',
             'membership_end_date' => 'endDate',
           ];

diff --git a/CRM/Member/Form/Task/Batch.php b/CRM/Member/Form/Task/Batch.php
index 99d6af35a4e6f8585288ed65a9a9989195eb3508..35cc5a6b0988f78f15a6152c5b89085bb4d64ffe 100644 (file)
--- a/CRM/Member/Form/Task/Batch.php
+++ b/CRM/Member/Form/Task/Batch.php
@@ -212,7 +212,7 @@ class CRM_Member_Form_Task_Batch extends CRM_Member_Form_Task {
     // extend CRM_Event_Form_Task_BatchTest::testSubmit with a data provider to test
     // handling of custom data, specifically checkbox fields.
     $dates = [
-      'join_date',
+      'membership_join_date',
       'membership_start_date',
       'membership_end_date',
     ];

diff --git a/CRM/Member/Selector/Search.php b/CRM/Member/Selector/Search.php
index 27bf5ce2dc3649da55d2a7684c8af7d42e7fa98e..0189535ece080ffb749dc5c7a7355e1599697125 100644 (file)
--- a/CRM/Member/Selector/Search.php
+++ b/CRM/Member/Selector/Search.php
@@ -493,7 +493,7 @@ class CRM_Member_Selector_Search extends CRM_Core_Selector_Base implements CRM_C
         ],
         [
           'name' => ts('Member Since'),
-          'sort' => 'join_date',
+          'sort' => 'membership_join_date',
           'direction' => CRM_Utils_Sort::DESCENDING,
         ],
         [

diff --git a/CRM/Report/Form/Member/ContributionDetail.php b/CRM/Report/Form/Member/ContributionDetail.php
index 3b92f9b633f4a128091d4a16ad80da7c82d917cd..a1c5d33850c9897e80832f66c75e3511ea756c3d 100644 (file)
--- a/CRM/Report/Form/Member/ContributionDetail.php
+++ b/CRM/Report/Form/Member/ContributionDetail.php
@@ -311,7 +311,7 @@ class CRM_Report_Form_Member_ContributionDetail extends CRM_Report_Form {
           'source' => ['title' => ts('Membership Source')],
         ],
         'filters' => [
-          'join_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
+          'membership_join_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
           'membership_start_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
           'membership_end_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
           'owner_membership_id' => [

diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php
index cdb100c8f28703ac391929e4ef6bf77e2dcf80a7..92cd8f40e9322f488eef6bb623cec7806e374491 100644 (file)
--- a/CRM/Report/Form/Member/Detail.php
+++ b/CRM/Report/Form/Member/Detail.php
@@ -115,7 +115,7 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form {
           'source' => ['title' => ts('Source')],
         ],
         'filters' => [
-          'join_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
+          'membership_join_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
           'membership_start_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
           'membership_end_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
           'owner_membership_id' => [

diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php
index e4fb27ac9b995c02c2dc8d5a6c14486053cd6b33..386150e4bcc549d11034fa48a80ee4c258066ad2 100644 (file)
--- a/CRM/Report/Form/Member/Summary.php
+++ b/CRM/Report/Form/Member/Summary.php
@@ -595,7 +595,7 @@ GROUP BY    {$this->_aliases['civicrm_contribution']}.currency
             implode(",", $this->_params['status_id_value']);
         }
         $url = CRM_Report_Utils_Report::getNextUrl('member/detail',
-          "reset=1&force=1&join_date_from={$dateStart}&join_date_to={$dateEnd}{$typeUrl}{$statusUrl}",
+          "reset=1&force=1&membership_join_date_from={$dateStart}&membership_join_date_to={$dateEnd}{$typeUrl}{$statusUrl}",
           $this->_absoluteUrl, $this->_id, $this->_drilldownReport
         );
         $row['civicrm_membership_join_date_start'] = CRM_Utils_Date::format($row['civicrm_membership_join_date_start']);

diff --git a/CRM/Report/Form/Membership/Summary.php b/CRM/Report/Form/Membership/Summary.php
index 1a25d456039c62afeaa7c168845f98ac1d4ff21d..9ab478c0846ae746ae44c57f12c4aaaa89370705 100644 (file)
--- a/CRM/Report/Form/Membership/Summary.php
+++ b/CRM/Report/Form/Membership/Summary.php
@@ -100,7 +100,7 @@ class CRM_Report_Form_Membership_Summary extends CRM_Report_Form {
           'membership_type_id' => ['title' => ts('Membership Type')],
         ],
         'filters' => [
-          'join_date' => ['type' => CRM_Utils_Type::T_DATE],
+          'membership_join_date' => ['type' => CRM_Utils_Type::T_DATE],
         ],
       ],
       'civicrm_address' => [

diff --git a/tests/phpunit/CRM/Batch/Form/EntryTest.php b/tests/phpunit/CRM/Batch/Form/EntryTest.php
index 47b0336f193cd8d15e115e6b86ab5afab82ce9dc..9967cebfdecbb27ff72eacb3f7f5789cfeb1d17b 100644 (file)
--- a/tests/phpunit/CRM/Batch/Form/EntryTest.php
+++ b/tests/phpunit/CRM/Batch/Form/EntryTest.php
@@ -289,7 +289,7 @@ class CRM_Batch_Form_EntryTest extends CiviUnitTestCase {
       'field' => [
         1 => [
           'membership_type' => [0 => $this->_orgContactID, 1 => $this->_membershipTypeID],
-          'join_date' => '2013-07-22',
+          'membership_join_date' => '2013-07-22',
           'membership_start_date' => NULL,
           'membership_end_date' => NULL,
           'membership_source' => NULL,
@@ -304,7 +304,7 @@ class CRM_Batch_Form_EntryTest extends CiviUnitTestCase {
         ],
         2 => [
           'membership_type' => [0 => $this->_orgContactID, 1 => $this->_membershipTypeID],
-          'join_date' => '2013-07-03',
+          'membership_join_date' => '2013-07-03',
           'membership_start_date' => '2013-02-03',
           'membership_end_date' => NULL,
           'membership_source' => NULL,
@@ -320,7 +320,7 @@ class CRM_Batch_Form_EntryTest extends CiviUnitTestCase {
         // no join date, coded end date
         3 => [
           'membership_type' => [0 => $this->_orgContactID, 1 => $this->_membershipTypeID],
-          'join_date' => NULL,
+          'membership_join_date' => NULL,
           'membership_start_date' => NULL,
           'membership_end_date' => '2013-12-01',
           'membership_source' => NULL,