Merged in CRM-17364 (pull request civicrm#7)

Add in Status Override to Membeship Search options
ErichBSchulz · Oct 15, 2015 · a7cc53c · a7cc53c
2 parents 789a95f + 3f0bb08
commit a7cc53c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/CRM/Member/BAO/Query.php b/CRM/Member/BAO/Query.php
@@ -307,6 +307,12 @@ public static function whereClauseSingle(&$values, &$query) {
         $query->_tables['civicrm_membership'] = $query->_whereTables['civicrm_membership'] = 1;
         return;
 
+      case 'member_is_override':
+        $query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause("civicrm_membership.is_override", $op, $value, "Boolean");
+        $query->_qill[$grouping][] = $value ? ts("Is Membership Status overriden? Yes") : ts("Is Membership Status overriden? No");
+        $query->_tables['civicrm_membership'] = $query->_whereTables['civicrm_membership'] = 1;
+        return;
+
       case 'member_campaign_id':
         if (CRM_Utils_Array::value($op, $value)) {
           $value = $value[$op];
@@ -396,6 +402,7 @@ public static function defaultReturnProperties(
         'max_related' => 1,
         'membership_recur_id' => 1,
         'member_campaign_id' => 1,
+        'member_is_override' => 1,
       );
 
       if ($includeCustomFields) {
@@ -444,6 +451,7 @@ public static function buildSearchForm(&$form) {
     $form->addYesNo('member_pay_later', ts('Pay Later?'), TRUE);
     $form->addYesNo('member_auto_renew', ts('Auto-Renew?'), TRUE);
     $form->addYesNo('member_test', ts('Membership is a Test?'), TRUE);
+    $form->addYesNo('member_is_override', ts('Membership Status Is Override?'), TRUE);
 
     // add all the custom  searchable fields
     $extends = array('Membership');

diff --git a/templates/CRM/Member/Form/Search.hlp b/templates/CRM/Member/Form/Search.hlp
@@ -33,3 +33,13 @@
     <li>{ts}Select neither to show all members, regardless of whether they are the direct member or inherit it through a relationship,{/ts}</li>
   </ul>
 {/htxt}
+{htxt id="id-member_is_override-title"}
+  {ts}Membership Status Is Override?{/ts}
+{/htxt}
+{htxt id="id-member_is_override"}
+  <ul>
+    <li>{ts}Select "Yes" to display only membership with Status Override set (membership is manually forced to a specific status){/ts}</li>
+    <li>{ts}Select "No" to display only memberships without Status Override set (membership is subject to the normal status rules){/ts}</li>
+    <li>{ts}Select neither to show all memberships{/ts}</li>
+  </ul>
+{/htxt}
diff --git a/templates/CRM/Member/Form/Search/Common.tpl b/templates/CRM/Member/Form/Search/Common.tpl
@@ -52,6 +52,11 @@
     <p>
     {$form.member_auto_renew.label}&nbsp;{$form.member_auto_renew.html}
     </p>
+    <p>
+    {$form.member_is_override.label}
+    {help id="id-member_is_override" file="CRM/Member/Form/Search.hlp"}
+    {$form.member_is_override.html}
+    </p>
   </td>
 </tr>