CiviWare
/
com.megaphonetech.softcreditcustomfields
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed code to support contribution search for soft credit filter

This commit is contained in:
CiviWare Solutions 2019-03-26 21:51:17 +00:00
parent a24c24e846
commit 37bc03a58f
3 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CRM/SoftCredit/SoftCreditQueryObject.php
View File

@ -20,18 +20,16 @@ class CRM_SoftCredit_SoftCreditQueryObject extends CRM_Contact_BAO_Query_Interfa
* *
*/ */
public function where(&$query) { public function where(&$query) {
if (empty($query->_paramLookup['soft_credit_name'])) { if (!empty($query->_paramLookup['soft_credit_name'])) {
return; list($name, $op, $value, $grouping, $wildcard) = reset($query->_paramLookup['soft_credit_name']);
} if ($value) {
if (!in_array(CRM_Contribute_BAO_Query::$_contribOrSoftCredit, array("only_scredits", "both_related", "both"))) { $query->_where[$grouping][] = "civicrm_contact_creditee.sort_name LIKE '%{$value}%'";
return; $query->_whereTables['civicrm_contribution_soft_creditee_contact'] = 1;
} $query->_tables['civicrm_contribution_soft_creditee_contact'] = 1;
list($name, $op, $value, $grouping, $wildcard) = reset($query->_paramLookup['soft_credit_name']); $query->_whereTables['civicrm_contribution_soft'] = 1;
if ($value) { $query->_tables['civicrm_contribution_soft'] = 1;
$query->_where[$grouping][] = "civicrm_contact_creditee.sort_name LIKE '%{$value}%'"; $query->_qill[$grouping][] = ts("%1 %2 - '%3'", [1 => 'Soft Creditee\'s name', 2 => 'LIKE', 3 => $value]);
$query->_whereTables['civicrm_contribution_soft_creditee_contact'] = 1; }
$query->_tables['civicrm_contribution_soft_creditee_contact'] = 1;
$query->_qill[$grouping][] = ts("%1 %2 - '%3'", [1 => 'Soft Creditee\'s name', 2 => 'LIKE', 3 => $value]);
} }
} }
@ -45,7 +43,6 @@ class CRM_SoftCredit_SoftCreditQueryObject extends CRM_Contact_BAO_Query_Interfa
if ($name == 'civicrm_contribution_soft_creditee_contact') { if ($name == 'civicrm_contribution_soft_creditee_contact') {
return " $side JOIN civicrm_contact civicrm_contact_creditee return " $side JOIN civicrm_contact civicrm_contact_creditee
ON (civicrm_contribution_soft.contact_id = civicrm_contact_creditee.id) ON (civicrm_contribution_soft.contact_id = civicrm_contact_creditee.id)
AND contribution_search_scredit_combined.scredit_id IS NOT NULL
"; ";
} }
} }

18
softcreditcustomfields.php
View File

@ -335,3 +335,21 @@ function softcreditcustomfields_civicrm_queryObjects(&$queryObjects, $type) {
$queryObjects[] = new CRM_SoftCredit_SoftCreditQueryObject(); $queryObjects[] = new CRM_SoftCredit_SoftCreditQueryObject();
} }
} }
/**
* Implements hook_civicrm_queryObjects().
*
* @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_queryObjects
*/
function softcreditcustomfields_civicrm_alterContent(&$content, $context, $tplName, &$object) {
if (in_array($tplName, [
'CRM/Contribute/Form/Search/AdvancedSearchPane.tpl',
'CRM/Contribute/Form/Search.tpl'
])) {
$content = str_replace(
"cj('#contribution_soft_credit_type_id').val('');",
'',
$content
);
}
}

11
templates/CRM/Contribute/Form/Search/SoftCredit-Search.tpl
View File

@ -16,6 +16,17 @@
CRM.$(function($) { CRM.$(function($) {
$('div#contribution_soft_credit_type_wrapper').append($('div.crm-softcredit-form-block-soft_credit_sort_name')); $('div#contribution_soft_credit_type_wrapper').append($('div.crm-softcredit-form-block-soft_credit_sort_name'));
$('div#contribution_soft_credit_type_wrapper').append($('div.softcredit_custom_groups')); $('div#contribution_soft_credit_type_wrapper').append($('div.softcredit_custom_groups'));
hideShowInMemoryOf();
$('select#contribution_or_softcredits').change(hideShowInMemoryOf);
function hideShowInMemoryOf() {
let softOption = $('select#contribution_or_softcredits').val();
if (softOption == 'only_contribs') {
$('div#contribution_soft_credit_type_wrapper').show();
}
}
}); });
{/literal} {/literal}
</script> </script>