diff --git a/CRM/Report/Form/Member/ContributionDetail.php b/CRM/Report/Form/Member/ContributionDetail.php index e3dd884f8d67..3b92f9b633f4 100644 --- a/CRM/Report/Form/Member/ContributionDetail.php +++ b/CRM/Report/Form/Member/ContributionDetail.php @@ -315,7 +315,7 @@ public function __construct() { 'membership_start_date' => ['operatorType' => CRM_Report_Form::OP_DATE], 'membership_end_date' => ['operatorType' => CRM_Report_Form::OP_DATE], 'owner_membership_id' => [ - 'title' => ts('Membership Owner ID'), + 'title' => ts('Primary Membership'), 'operatorType' => CRM_Report_Form::OP_INT, ], 'tid' => [ @@ -613,14 +613,21 @@ public function statistics(&$rows) { } public function getOperationPair($type = "string", $fieldName = NULL) { - $result = parent::getOperationPair($type, $fieldName); - //re-name IS NULL/IS NOT NULL for clarity if ($fieldName == 'owner_membership_id') { + $result = []; $result['nll'] = ts('Primary members only'); $result['nnll'] = ts('Non-primary members only'); + $options = parent::getOperationPair($type, $fieldName); + foreach ($options as $key => $label) { + if (!array_key_exists($key, $result)) { + $result[$key] = $label; + } + } + } + else { + $result = parent::getOperationPair($type, $fieldName); } - return $result; } diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php index 93a64ce21c20..cdb100c8f287 100644 --- a/CRM/Report/Form/Member/Detail.php +++ b/CRM/Report/Form/Member/Detail.php @@ -119,7 +119,7 @@ public function __construct() { 'membership_start_date' => ['operatorType' => CRM_Report_Form::OP_DATE], 'membership_end_date' => ['operatorType' => CRM_Report_Form::OP_DATE], 'owner_membership_id' => [ - 'title' => ts('Membership Owner ID'), + 'title' => ts('Primary Membership'), 'operatorType' => CRM_Report_Form::OP_INT, ], 'tid' => [ @@ -285,14 +285,21 @@ public function from() { } public function getOperationPair($type = "string", $fieldName = NULL) { - $result = parent::getOperationPair($type, $fieldName); - //re-name IS NULL/IS NOT NULL for clarity if ($fieldName == 'owner_membership_id') { + $result = []; $result['nll'] = ts('Primary members only'); $result['nnll'] = ts('Non-primary members only'); + $options = parent::getOperationPair($type, $fieldName); + foreach ($options as $key => $label) { + if (!array_key_exists($key, $result)) { + $result[$key] = $label; + } + } + } + else { + $result = parent::getOperationPair($type, $fieldName); } - return $result; } diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php index cc390e7c2e1b..e4fb27ac9b99 100644 --- a/CRM/Report/Form/Member/Summary.php +++ b/CRM/Report/Form/Member/Summary.php @@ -91,7 +91,7 @@ public function __construct() { 'operatorType' => CRM_Report_Form::OP_DATE, ], 'owner_membership_id' => [ - 'title' => ts('Membership Owner ID'), + 'title' => ts('Primary Membership'), 'type' => CRM_Utils_Type::T_INT, 'operatorType' => CRM_Report_Form::OP_INT, ], @@ -437,14 +437,21 @@ public function postProcess() { } public function getOperationPair($type = "string", $fieldName = NULL) { - $result = parent::getOperationPair($type, $fieldName); - //re-name IS NULL/IS NOT NULL for clarity if ($fieldName == 'owner_membership_id') { + $result = []; $result['nll'] = ts('Primary members only'); $result['nnll'] = ts('Non-primary members only'); + $options = parent::getOperationPair($type, $fieldName); + foreach ($options as $key => $label) { + if (!array_key_exists($key, $result)) { + $result[$key] = $label; + } + } + } + else { + $result = parent::getOperationPair($type, $fieldName); } - return $result; }