Skip to content

Commit

Permalink
Applying #15834 (comment)
Browse files Browse the repository at this point in the history
  • Loading branch information
francescbassas authored Feb 19, 2020
1 parent b142388 commit 2036513
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CRM/Contribute/BAO/Query.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,18 +295,18 @@ public static function whereClauseSingle(&$values, &$query) {
}
elseif ($value == 'both_related') {
$query->_where[$grouping][] = "contribution_search_scredit_combined.filter_id IS NOT NULL";
$query->_qill[$grouping][] = ts('Contributions OR Soft Credits? - Soft Credits with related Hard Credit');
$query->_qill[$grouping][] = ts('Contributions OR Soft Credits? - Contributions and their related soft credit');
$query->_tables['civicrm_contribution'] = $query->_whereTables['civicrm_contribution'] = 1;
$query->_tables['civicrm_contribution_soft'] = $query->_whereTables['civicrm_contribution_soft'] = 1;
}
elseif ($value == 'both') {
$query->_qill[$grouping][] = ts('Contributions OR Soft Credits? - Both');
$query->_qill[$grouping][] = ts('Contributions OR Soft Credits? - All');
$query->_tables['civicrm_contribution'] = $query->_whereTables['civicrm_contribution'] = 1;
$query->_tables['civicrm_contribution_soft'] = $query->_whereTables['civicrm_contribution_soft'] = 1;
}
elseif ($value == 'only_contribs_unsoftcredited') {
$query->_where[$grouping][] = "contribution_search_scredit_combined.filter_id IS NULL";
$query->_qill[$grouping][] = ts('Contributions without a soft credit');
$query->_qill[$grouping][] = ts('Contributions OR Soft Credits? - Contributions without a soft credit');
$query->_tables['civicrm_contribution'] = $query->_whereTables['civicrm_contribution'] = 1;
$query->_tables['civicrm_contribution_soft'] = $query->_whereTables['civicrm_contribution_soft'] = 1;
}
Expand Down

0 comments on commit 2036513

Please sign in to comment.