Ejegg has submitted this change and it was merged.
Change subject: CRM-17951 preliminary refactoring to improve code legibility
......................................................................
CRM-17951 preliminary refactoring to improve code legibility
Change-Id: I51fcaf6898dee9e32b56ea9fbe5b9d4c9bc457a6
---
M CRM/Contribute/BAO/Contribution.php
1 file changed, 8 insertions(+), 8 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CRM/Contribute/BAO/Contribution.php
b/CRM/Contribute/BAO/Contribution.php
index 5bc43d5..7b23c01 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -3070,8 +3070,9 @@
$itemAmount = $trxnID = NULL;
//get all the statuses
$contributionStatus =
CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
- if (($params['prevContribution']->contribution_status_id ==
array_search('Pending', $contributionStatus)
- || $params['prevContribution']->contribution_status_id ==
array_search('In Progress', $contributionStatus))
+ $previousContributionStatus =
CRM_Contribute_PseudoConstant::contributionStatus($params['prevContribution']->contribution_status_id,
'name');
+ if (($previousContributionStatus == 'Pending'
+ || $previousContributionStatus == 'In Progress')
&& $params['contribution']->contribution_status_id ==
array_search('Completed', $contributionStatus)
&& $context == 'changePaymentInstrument'
) {
@@ -3083,8 +3084,7 @@
if ($context == 'changedStatus') {
//get all the statuses
$contributionStatus =
CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
-
- if ($params['prevContribution']->contribution_status_id ==
array_search('Completed', $contributionStatus)
+ if ($previousContributionStatus == 'Completed'
&& ($params['contribution']->contribution_status_id ==
array_search('Refunded', $contributionStatus)
|| $params['contribution']->contribution_status_id ==
array_search('Cancelled', $contributionStatus))
) {
@@ -3094,8 +3094,8 @@
CRM_Core_DAO::setFieldValue('CRM_Contribute_DAO_Contribution',
$params['contribution']->id, 'creditnote_id', $creditNoteId);
}
}
- elseif (($params['prevContribution']->contribution_status_id ==
array_search('Pending', $contributionStatus)
- && $params['prevContribution']->is_pay_later) ||
$params['prevContribution']->contribution_status_id == array_search('In
Progress', $contributionStatus)
+ elseif (($previousContributionStatus == 'Pending'
+ && $params['prevContribution']->is_pay_later) ||
$previousContributionStatus == 'In Progress'
) {
$financialTypeID = CRM_Utils_Array::value('financial_type_id',
$params) ? $params['financial_type_id'] :
$params['prevContribution']->financial_type_id;
$relationTypeId =
key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL,
" AND v.name LIKE 'Accounts Receivable Account is' "));
@@ -3132,8 +3132,8 @@
$params['entity_id'] = $trxn->id;
if ($context == 'changedStatus') {
- if (($params['prevContribution']->contribution_status_id ==
array_search('Pending', $contributionStatus)
- || $params['prevContribution']->contribution_status_id ==
array_search('In Progress', $contributionStatus))
+ if (($previousContributionStatus == 'Pending'
+ || $previousContributionStatus == 'In Progress')
&& ($params['contribution']->contribution_status_id ==
array_search('Completed', $contributionStatus))
) {
$query = "UPDATE civicrm_financial_item SET status_id = %1 WHERE
entity_id = %2 and entity_table = 'civicrm_line_item'";
--
To view, visit https://gerrit.wikimedia.org/r/268460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I51fcaf6898dee9e32b56ea9fbe5b9d4c9bc457a6
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
