Unverified Commit 140d39ee authored by eileen's avatar eileen 🎱 Committed by GitHub

Merge pull request #11539 from eileenmcnaughton/payment

CRM-17647 fix for submitting payment with thousand separator
parents b8a1503f d2da7b20
......@@ -132,6 +132,7 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
else {
// @todo put a deprecated here - this should be done in the form layer.
$params['skipCleanMoney'] = FALSE;
Civi::log()->warning('Deprecated code path. Money should always be clean before it hits the BAO.', array('civi.tag' => 'deprecated'));
}
foreach ($moneyFields as $field) {
......
......@@ -986,7 +986,7 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
}
if ($this->_isPaidEvent) {
$contributionParams = array();
$contributionParams = array('skipCleanMoney' => TRUE);
$lineItem = array();
$additionalParticipantDetails = array();
if (CRM_Contribute_BAO_Contribution::checkContributeSettings('deferred_revenue_enabled')) {
......
......@@ -61,7 +61,7 @@ class CRM_Core_Payment_AuthorizeNetTest extends CiviUnitTestCase {
$invoiceID = sha1(rand());
$amount = rand(100, 1000) . '.00';
$contributionRecurParams = array(
$recur = $this->callAPISuccess('ContributionRecur', 'create', array(
'contact_id' => $contactId,
'amount' => $amount,
'currency' => 'USD',
......@@ -74,21 +74,19 @@ class CRM_Core_Payment_AuthorizeNetTest extends CiviUnitTestCase {
'contribution_status_id' => 2,
'is_test' => 1,
'payment_processor_id' => $this->_paymentProcessorID,
);
$recur = CRM_Contribute_BAO_ContributionRecur::add($contributionRecurParams);
));
$contributionParams = array(
$contribution = $this->callAPISuccess('Contribution', 'create', array(
'contact_id' => $contactId,
'financial_type_id' => $this->_financialTypeId,
'receive_date' => date('Ymd'),
'total_amount' => $amount,
'invoice_id' => $invoiceID,
'currency' => 'USD',
'contribution_recur_id' => $recur->id,
'contribution_recur_id' => $recur['id'],
'is_test' => 1,
'contribution_status_id' => 2,
);
$contribution = CRM_Contribute_BAO_Contribution::add($contributionParams);
));
$params = array(
'qfKey' => '08ed21c7ca00a1f7d32fff2488596ef7_4454',
......@@ -157,9 +155,9 @@ class CRM_Core_Payment_AuthorizeNetTest extends CiviUnitTestCase {
'contributionPageID' => '',
'email' => "{$firstName}.{$lastName}@example.com",
'contactID' => $contactId,
'contributionID' => $contribution->id,
'contributionID' => $contribution['id'],
'contributionTypeID' => $this->_financialTypeId,
'contributionRecurID' => $recur->id,
'contributionRecurID' => $recur['id'],
);
// turn verifySSL off
......@@ -169,12 +167,12 @@ class CRM_Core_Payment_AuthorizeNetTest extends CiviUnitTestCase {
Civi::settings()->set('verifySSL', '0');
// if subscription was successful, processor_id / subscription-id must not be null
$this->assertDBNotNull('CRM_Contribute_DAO_ContributionRecur', $recur->id, 'processor_id',
$this->assertDBNotNull('CRM_Contribute_DAO_ContributionRecur', $recur['id'], 'processor_id',
'id', 'Failed to create subscription with Authorize.'
);
// cancel it or the transaction will be rejected by A.net if the test is re-run
$subscriptionID = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_ContributionRecur', $recur->id, 'processor_id');
$subscriptionID = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_ContributionRecur', $recur['id'], 'processor_id');
$message = '';
$result = $this->processor->cancelSubscription($message, array('subscriptionId' => $subscriptionID));
$this->assertTrue($result, 'Failed to cancel subscription with Authorize.');
......
......@@ -145,7 +145,7 @@ class CRM_Financial_BAO_FinancialAccountTest extends CiviUnitTestCase {
'financial_type_id' => $financialType->id,
'contribution_status_id' => 1,
);
$contributions = CRM_Contribute_BAO_Contribution::create($contributionParams);
$this->callAPISuccess('Contribution', 'create', $contributionParams);
CRM_Financial_BAO_FinancialAccount::del($result->id);
$params = array('id' => $result->id);
$result = CRM_Financial_BAO_FinancialAccount::retrieve($params, $defaults);
......
......@@ -268,6 +268,7 @@ class CRM_Financial_BAO_FinancialTypeTest extends CiviUnitTestCase {
'contact_id' => $contactId,
'financial_type_id' => 1,
'contribution_status_id' => 1,
'skipCleanMoney' => TRUE,
);
foreach ($priceFields['values'] as $key => $priceField) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment