* @package CRM
* @copyright CiviCRM LLC (c) 2004-2016
*/
-class CRM_Contribute_BAO_Query {
+class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
/**
* Static field for all the export/import contribution fields.
return;
case 'contribution_batch_id':
- $batches = CRM_Contribute_PseudoConstant::batch();
- $query->_where[$grouping][] = " civicrm_entity_batch.batch_id $op $value";
- $query->_qill[$grouping][] = ts('Batch Name %1 %2', array(1 => $op, 2 => $batches[$value]));
+ list($qillOp, $qillValue) = CRM_Contact_BAO_Query::buildQillForFieldValue('CRM_Batch_BAO_EntityBatch', 'batch_id', $value, $op);
+ $query->_qill[$grouping][] = ts('Batch Name %1 %2', array(1 => $qillOp, 2 => $qillValue));
+ $query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause('civicrm_entity_batch.batch_id', $op, $value);
$query->_tables['civicrm_contribution'] = $query->_whereTables['civicrm_contribution'] = 1;
$query->_tables['contribution_batch'] = $query->_whereTables['contribution_batch'] = 1;
return;
'contribution_product_id' => 1,
'product_name' => 1,
'currency' => 1,
+ 'cancel_date' => 1,
);
if (self::isSoftCreditOptionEnabled()) {
$properties = array_merge($properties, self::softCreditReturnProperties());
FALSE, array('class' => 'crm-select2', 'multiple' => 'multiple', 'placeholder' => ts('- any -'))
);
- // Add all the custom searchable fields
- $contribution = array('Contribution');
- $groupDetails = CRM_Core_BAO_CustomGroup::getGroupDetail(NULL, TRUE, $contribution);
- if ($groupDetails) {
- $form->assign('contributeGroupTree', $groupDetails);
- foreach ($groupDetails as $group) {
- foreach ($group['fields'] as $field) {
- $fieldId = $field['id'];
- $elementName = 'custom_' . $fieldId;
- CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
- }
- }
- }
+ self::addCustomFormFields($form, array('Contribution'));
CRM_Campaign_BAO_Campaign::addCampaignInComponentSearch($form, 'contribution_campaign_id');
if (!empty($batches)) {
$form->add('select', 'contribution_batch_id',
ts('Batch Name'),
- array('' => ts('- any -')) + $batches,
+ array(
+ '' => ts('- any -'),
+ // CRM-19325
+ 'IS NULL' => ts('None'),
+ ) + $batches,
FALSE, array('class' => 'crm-select2')
);
}
CRM_Contribute_BAO_ContributionRecur::recurringContribution($form);
}
- /**
- * Function that may not be needed.
- *
- * @param array $row
- * @param int $id
- */
- public static function searchAction(&$row, $id) {
- }
-
/**
* Get table names.
*