Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev/financial#72 Filter contribution status lists for batch creation and update #15472

Merged
merged 2 commits into from
Oct 13, 2019
Merged

dev/financial#72 Filter contribution status lists for batch creation and update #15472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0aaecf
dev/financial#72 Filter contrib status search selects
ejegg Oct 9, 2019
9805da7
dev/financial#72 Filter contribution status in create/update
ejegg Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CRM/Contribute/BAO/ContributionRecur.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ public static function recurringContribution(&$form) {

// Add field for contribution status
$form->addSelect('contribution_recur_contribution_status_id',
['entity' => 'contribution', 'multiple' => 'multiple', 'context' => 'search', 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label')]
['entity' => 'contribution', 'multiple' => 'multiple', 'context' => 'search', 'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search')]
);

$form->addElement('text', 'contribution_recur_processor_id', ts('Processor ID'), CRM_Core_DAO::getAttribute('CRM_Contribute_DAO_ContributionRecur', 'processor_id'));
Expand Down
4 changes: 2 additions & 2 deletions CRM/Contribute/BAO/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ public static function getSearchFieldMetadata() {
}

/**
* Add all the elements shared between contribute search and advnaced search.
* Add all the elements shared between contribute search and advanced search.
*
* @param \CRM_Contribute_Form_Search $form
*
Expand Down Expand Up @@ -976,7 +976,7 @@ public static function buildSearchForm(&$form) {
ts('Personal Campaign Page'),
CRM_Contribute_PseudoConstant::pcPage(), FALSE, ['class' => 'crm-select2', 'multiple' => 'multiple', 'placeholder' => ts('- any -')]);

$statusValues = CRM_Core_PseudoConstant::get('CRM_Contribute_DAO_Contribution', 'contribution_status_id');
$statusValues = CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search');
$form->add('select', 'contribution_status_id',
ts('Contribution Status'), $statusValues,
FALSE, ['class' => 'crm-select2', 'multiple' => 'multiple']
Expand Down
14 changes: 10 additions & 4 deletions CRM/Contribute/Form/Task/Status.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,16 @@ public function preProcess() {
* Build the form object.
*/
public function buildQuickForm() {
$status = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label');
unset($status[2]);
unset($status[5]);
unset($status[6]);
$status = CRM_Contribute_BAO_Contribution_Utils::getContributionStatuses(
'contribution', $this->_contributionIds[0]
);
$byName = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
// FIXME: if it's invalid to transition from Pending to
// In Progress or Overdue, we should move that logic to
// CRM_Contribute_BAO_Contribution_Utils::getContributionStatuses.
foreach (['Pending', 'In Progress', 'Overdue'] as $suppress) {
unset($status[CRM_Utils_Array::key($suppress, $byName)]);
}
$this->add('select', 'contribution_status_id',
ts('Contribution Status'),
$status,
Expand Down
6 changes: 1 addition & 5 deletions CRM/Core/BAO/UFGroup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2123,11 +2123,7 @@ public static function buildProfile(
);
}
elseif ($fieldName === 'contribution_status_id') {
$contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label');
$statusName = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
foreach (['In Progress', 'Overdue', 'Refunded'] as $suppress) {
unset($contributionStatuses[CRM_Utils_Array::key($suppress, $statusName)]);
}
$contributionStatuses = CRM_Contribute_BAO_Contribution_Utils::getContributionStatuses();

$form->add('select', $name, $title,
[
Expand Down
4 changes: 2 additions & 2 deletions CRM/Report/Form/Contribute/Bookkeeping.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ public function __construct() {
'contribution_status_id' => [
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => [1],
],
],
Expand Down Expand Up @@ -386,7 +386,7 @@ public function __construct() {
'status_id' => [
'title' => ts('Financial Transaction Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => [1],
],
'card_type_id' => [
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/Detail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ public function __construct() {
'contribution_status_id' => [
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => [1],
'type' => CRM_Utils_Type::T_INT,
],
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/History.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public function __construct() {
'contribution_status_id' => [
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => [1],
],
'financial_type_id' => [
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/HouseholdSummary.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public function __construct() {
'contribution_status_id' => [
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => [1],
],
'financial_type_id' => [
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/Lybunt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public function __construct() {
'contribution_status_id' => [
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => ['1'],
],
],
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/OrganizationSummary.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public function __construct() {
'contribution_status_id' => [
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => [1],
],
],
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/Recur.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public function __construct() {
'contribution_status_id' => [
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => [5],
'type' => CRM_Utils_Type::T_INT,
],
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/Repeat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public function __construct() {
'contribution_status_id' => array(
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => array('1'),
),
),
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/SoftCredit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ public function __construct() {
'contribution_status_id' => [
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => [1],
],
],
Expand Down
4 changes: 2 additions & 2 deletions CRM/Report/Form/Contribute/Summary.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public function __construct() {
'contribution_status_id' => array(
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => array(1),
'type' => CRM_Utils_Type::T_INT,
),
Expand Down Expand Up @@ -220,7 +220,7 @@ public function __construct() {
'contribution_status_id' => array(
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => array(1),
'type' => CRM_Utils_Type::T_INT,
),
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/Sybunt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public function __construct() {
'contribution_status_id' => [
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => ['1'],
],
],
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/TopDonor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public function __construct() {
'contribution_status_id' => [
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => [1],
],
],
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Event/ParticipantListing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ public function __construct() {
'contribution_status_id' => array(
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => NULL,
),
),
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Member/ContributionDetail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public function __construct() {
'contribution_status_id' => [
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'default' => [1],
],
'total_amount' => ['title' => ts('Contribution Amount')],
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Member/Detail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public function __construct() {
'contribution_status_id' => [
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
'type' => CRM_Utils_Type::T_INT,
],
'total_amount' => ['title' => ts('Contribution Amount')],
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Member/Summary.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public function __construct() {
'contribution_status_id' => [
'title' => ts('Contribution Status'),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'),
'options' => CRM_Contribute_BAO_Contribution::buildOptions('contribution_status_id', 'search'),
],
],
'grouping' => 'member-fields',
Expand Down