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

RC fix for CRM-20591: Fix class_name on update of payment processor #10402

Merged
merged 1 commit into from
May 23, 2017
Merged

RC fix for CRM-20591: Fix class_name on update of payment processor #10402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions CRM/Financial/BAO/PaymentProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,19 @@ public static function create($params) {
$processor = new CRM_Financial_DAO_PaymentProcessor();
$processor->copyValues($params);

$ppTypeDAO = new CRM_Financial_DAO_PaymentProcessorType();
$ppTypeDAO->id = $params['payment_processor_type_id'];
if (!$ppTypeDAO->find(TRUE)) {
CRM_Core_Error::fatal(ts('Could not find payment processor meta information'));
}
if (empty($params['id'])) {
$ppTypeDAO = new CRM_Financial_DAO_PaymentProcessorType();
$ppTypeDAO->id = $params['payment_processor_type_id'];
if (!$ppTypeDAO->find(TRUE)) {
CRM_Core_Error::fatal(ts('Could not find payment processor meta information'));
}

// also copy meta fields from the info DAO
$processor->is_recur = $ppTypeDAO->is_recur;
$processor->billing_mode = $ppTypeDAO->billing_mode;
$processor->class_name = $ppTypeDAO->class_name;
$processor->payment_type = $ppTypeDAO->payment_type;
// also copy meta fields from the info DAO
$processor->is_recur = $ppTypeDAO->is_recur;
$processor->billing_mode = $ppTypeDAO->billing_mode;
$processor->class_name = $ppTypeDAO->class_name;
$processor->payment_type = $ppTypeDAO->payment_type;
}

$processor->save();
// CRM-11826, add entry in civicrm_entity_financial_account
Expand Down
32 changes: 32 additions & 0 deletions tests/phpunit/api/v3/PaymentProcessorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,38 @@ public function testPaymentProcessorCreate() {
return $result['id'];
}

/**
* Update payment processor.
*/
public function testPaymentProcessorUpdate() {
$params = $this->_params;
$result = $this->callAPISuccess('payment_processor', 'create', $params);
$this->assertNotNull($result['id']);

$updateParams = array(
'id' => $result['id'],
'name' => 'Update API Test',
);
$this->assertDBState('CRM_Financial_DAO_PaymentProcessor', $result['id'], $params);
$this->callAPISuccess('payment_processor', 'create', $updateParams);
$result = $this->callAPISuccess('payment_processor', 'get', array('id' => $result['id']));

$expectedResult = array(
'id' => $result['id'],
'domain_id' => $params['domain_id'],
'name' => $updateParams['name'],
'payment_processor_type_id' => $params['payment_processor_type_id'],
'is_default' => 0,
'is_test' => 0,
'class_name' => $params['class_name'],
'billing_mode' => 1,
'is_recur' => $params['is_recur'],
'payment_type' => 1,
'payment_instrument_id' => 1,
);
$this->checkArrayEquals($expectedResult, $result['values'][$result['id']]);
}

/**
* Test using example code.
*/
Expand Down