Skip to content

Commit

Permalink
[REF] Reverse if statement
Browse files Browse the repository at this point in the history
This splits out a minor code cleanup from #18196 (which can probably
build on the unit test work in 20210)
  • Loading branch information
eileenmcnaughton committed May 3, 2021
1 parent 41ac307 commit cb187dc
Showing 1 changed file with 18 additions and 22 deletions.
40 changes: 18 additions & 22 deletions CRM/Contribute/Page/Tab.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,34 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page {
* @return array
*/
public static function recurLinks(int $recurID, $context = 'contribution') {
$paymentProcessorObj = Civi\Payment\System::singleton()->getById(CRM_Contribute_BAO_ContributionRecur::getPaymentProcessorID($recurID));
$links = [
CRM_Core_Action::VIEW => [
'name' => ts('View'),
'title' => ts('View Recurring Payment'),
'url' => 'civicrm/contact/view/contributionrecur',
'qs' => "reset=1&id=%%crid%%&cid=%%cid%%&context={$context}",
],
CRM_Core_Action::UPDATE => [
];
if (
(CRM_Core_Permission::check('edit contributions') && $context === 'contribution') ||
($paymentProcessorObj->supports('ChangeSubscriptionAmount')
|| $paymentProcessorObj->supports('EditRecurringContribution')
)) {
$links[CRM_Core_Action::UPDATE] = [
'name' => ts('Edit'),
'title' => ts('Edit Recurring Payment'),
'url' => 'civicrm/contribute/updaterecur',
'qs' => "reset=1&action=update&crid=%%crid%%&cid=%%cid%%&context={$context}",
],
CRM_Core_Action::DISABLE => [
'name' => ts('Cancel'),
'title' => ts('Cancel'),
'ref' => 'crm-enable-disable',
],
];
}

$links[CRM_Core_Action::DISABLE] = [
'name' => ts('Cancel'),
'title' => ts('Cancel'),
'ref' => 'crm-enable-disable',
];

$paymentProcessorObj = Civi\Payment\System::singleton()->getById(CRM_Contribute_BAO_ContributionRecur::getPaymentProcessorID($recurID));
if ($paymentProcessorObj->supports('cancelRecurring')) {
unset($links[CRM_Core_Action::DISABLE]['extra'], $links[CRM_Core_Action::DISABLE]['ref']);
$links[CRM_Core_Action::DISABLE]['url'] = "civicrm/contribute/unsubscribe";
Expand All @@ -84,14 +91,6 @@ public static function recurLinks(int $recurID, $context = 'contribution') {
];
}

if (
(!CRM_Core_Permission::check('edit contributions') && $context === 'contribution') ||
(!$paymentProcessorObj->supports('ChangeSubscriptionAmount')
&& !$paymentProcessorObj->supports('EditRecurringContribution')
)) {
unset($links[CRM_Core_Action::UPDATE]);
}

return $links;
}

Expand All @@ -102,10 +101,7 @@ public static function recurLinks(int $recurID, $context = 'contribution') {
public function browse() {
// add annual contribution
$annual = [];
list($annual['count'],
$annual['amount'],
$annual['avg']
) = CRM_Contribute_BAO_Contribution::annual($this->_contactId);
[$annual['count'], $annual['amount'], $annual['avg']] = CRM_Contribute_BAO_Contribution::annual($this->_contactId);
$this->assign('annual', $annual);

$controller = new CRM_Core_Controller_Simple(
Expand Down Expand Up @@ -164,8 +160,8 @@ public function browse() {
* Get all the recurring contribution information and assign to the template
*/
private function addRecurringContributionsBlock() {
list($activeContributions, $activeContributionsCount) = $this->getActiveRecurringContributions();
list($inactiveRecurringContributions, $inactiveContributionsCount) = $this->getInactiveRecurringContributions();
[$activeContributions, $activeContributionsCount] = $this->getActiveRecurringContributions();
[$inactiveRecurringContributions, $inactiveContributionsCount] = $this->getInactiveRecurringContributions();

if (!empty($activeContributions) || !empty($inactiveRecurringContributions)) {
// assign vars to templates
Expand Down

0 comments on commit cb187dc

Please sign in to comment.