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.

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

Add test for recurring links and clean up method of retrieving recurring #18790

Merged
merged 1 commit into from
Oct 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CRM/Contribute/BAO/ContributionRecur.php
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ public static function getPaymentProcessor($id) {
* (since it still makes sense to update / cancel
*/
public static function getPaymentProcessorObject($id) {
CRM_Core_Error::deprecatedFunctionWarning('Use Civi\Payment\System');
$processor = self::getPaymentProcessor($id);
return is_array($processor) ? $processor['object'] : NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion CRM/Contribute/Page/Tab.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public static function recurLinks($recurID = FALSE, $context = 'contribution') {
];

if ($recurID) {
$paymentProcessorObj = CRM_Contribute_BAO_ContributionRecur::getPaymentProcessorObject($recurID);
$paymentProcessorObj = Civi\Payment\System::singleton()->getById(CRM_Contribute_BAO_ContributionRecur::getPaymentProcessorID($recurID));
if ($paymentProcessorObj) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This IF can go as it is always true & would be removed in a follow up PR

if ($paymentProcessorObj->supports('cancelRecurring')) {
unset($links[CRM_Core_Action::DISABLE]['extra'], $links[CRM_Core_Action::DISABLE]['ref']);
Expand Down
11 changes: 7 additions & 4 deletions Civi/Payment/System.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,19 @@ public function checkProcessorConfig($processor) {
*
* @param int $id
*
* @return \CRM_Core_Payment|NULL
* @return \CRM_Core_Payment
*
* @throws \CiviCRM_API3_Exception
* @throws \CiviCRM_API3_Exception|\CRM_Core_Exception
*/
public function getById($id) {
if ($id == 0) {
if (isset($this->cache[$id])) {
return $this->cache[$id];
}
if ((int) $id === 0) {
return new \CRM_Core_Payment_Manual();
}
$processor = civicrm_api3('payment_processor', 'getsingle', ['id' => $id, 'is_test' => NULL]);
return self::getByProcessor($processor);
return $this->getByProcessor($processor);
}

/**
Expand Down
59 changes: 59 additions & 0 deletions tests/phpunit/CRM/Contribute/Page/TabTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?php
/*
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC. All rights reserved. |
| |
| Use of this source code is governed by the AGPL license with some |
| permitted exceptions and without any warranty. For full license |
| and copyright information, see https://civicrm.org/licensing |
+--------------------------------------------------------------------+
*/

use Civi\Api4\Contribution;
use Civi\Api4\ContributionRecur;

/**
* Class CRM_Contribute_Page_AjaxTest
* @group headless
*/
class CRM_Contribute_Page_TabTest extends CiviUnitTestCase {

/**
* Test links render correctly for manual processor.
*
* @throws \API_Exception
* @throws \CiviCRM_API3_Exception
*/
public function testLinks() {
$contactID = $this->individualCreate();
$recurID = ContributionRecur::create()->setValues([
'contact_id' => $contactID,
'amount' => 10,
'frequency_interval' => 'week',
'start_date' => 'now',
'is_active' => TRUE,
'contribution_status_id:name' => 'Pending',
])
->addChain(
'contribution',
Contribution::create()->setValues([
'contribution_id' => '$id',
'financial_type_id:name' => 'Donation',
'total_amount' => 60,
'receive_date' => 'now',
'contact_id' => $contactID,
])
)->execute()->first()['id'];
$page = new CRM_Contribute_Page_Tab();
$page->_contactId = $contactID;
$page->_action = CRM_Core_Action::VIEW;
$page->browse();

$templateVariable = CRM_Core_Smarty::singleton()->get_template_vars();
$this->assertEquals('Mr. Anthony Anderson II', $templateVariable['displayName']);
$this->assertEquals("<span><a href=\"/index.php?q=civicrm/contact/view/contributionrecur&amp;reset=1&amp;id=" . $recurID . "&amp;cid=" . $contactID . "&amp;context=contribution\" class=\"action-item crm-hover-button\" title='View Recurring Payment' >View</a><a href=\"/index.php?q=civicrm/contribute/updaterecur&amp;reset=1&amp;action=update&amp;crid=1&amp;cid=3&amp;context=contribution\" class=\"action-item crm-hover-button\" title='Edit Recurring Payment' >Edit</a><a href=\"#\" class=\"action-item crm-hover-button crm-enable-disable\" title='Cancel' >Cancel</a></span>",
$templateVariable['activeRecurRows'][1]['action']
);
}

}