Eileen has submitted this change and it was merged. Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment ......................................................................
Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment b60fd26 CiviCRM submodule update: improvements to support logging & reversal 1e09640 Store refund mismatch converted to USD 40070b7 Add hook to define log tables, specifying INNODB & indexing contact fields c105217 Send failmail when TY job can't find contribution 23040b5 Enable setting to specify logging is handled offline 3f493ea Set filter = 1 on Contact Deleted By Merge activity type 7865f8e Also add 'Contact Deleted by Merge' on new installs 4b5f413 Fix opt out fields for Civi imports b2fda2e Fix variable name error that I just added 752d06f Add debug on phone create api call Change-Id: I2d8debe09aba3f1b0150c9acd834d032021b077e --- D sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php 1 file changed, 0 insertions(+), 261 deletions(-) Approvals: Eileen: Looks good to me, approved jenkins-bot: Verified diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php b/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php deleted file mode 100644 index 81c6cc5..0000000 --- a/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php +++ /dev/null @@ -1,261 +0,0 @@ -<<<<<<< HEAD (bfe563 Merge master into deployment) -======= -<?php - -/** - * @group Pipeline - * @group WmfCivicrm - */ -class RefundTest extends BaseWmfDrupalPhpUnitTestCase { - - /** - * Id of the contribution created in the setup function. - * - * @var int - */ - protected $original_contribution_id; - - public function setUp() { - parent::setUp(); - civicrm_initialize(); - - $results = $this->callAPISuccess( 'contact', 'create', array( - 'contact_type' => 'Individual', - 'first_name' => 'Test', - 'last_name' => 'Es', - 'debug' => 1, - ) ); - $this->contact_id = $results['id']; - - $this->original_currency = 'EUR'; - $this->original_amount = '1.23'; - $this->gateway_txn_id = mt_rand(); - $time = time(); - $this->trxn_id = "TEST_GATEWAY {$this->gateway_txn_id} {$time}"; - - $this->setExchangeRates( $time, array( 'USD' => 1, 'EUR' => 0.5 ) ); - - $results = civicrm_api3( 'contribution', 'create', array( - 'contact_id' => $this->contact_id, - 'financial_type_id' => 'Cash', - 'total_amount' => $this->original_amount, - 'contribution_source' => $this->original_currency . ' ' . $this->original_amount, - 'receive_date' => wmf_common_date_unix_to_civicrm( $time ), - 'trxn_id' => $this->trxn_id, - ) ); - $this->original_contribution_id = $results['id']; - - $this->refund_contribution_id = null; - } - - public function tearDown() { - civicrm_api3('contribution', 'delete', array( - 'id' => $this->original_contribution_id, - )); - - if ($this->refund_contribution_id && $this->refund_contribution_id != $this->original_contribution_id) { - civicrm_api3('contribution', 'delete', array( - 'id' => $this->refund_contribution_id, - )); - } - - civicrm_api3( 'contact', 'delete', array( - 'id' => $this->contact_id, - ) ); - - parent::tearDown(); - } - - /** - * Check chargeback status exists. - */ - public function testStatuses() { - $options = $this->callAPISuccess('Contribution', 'getoptions', array('field' => 'contribution_status_id')); - $this->assertTrue(in_array('Chargeback', $options['values'])); - } - - /** - * Covers wmf_civicrm_mark_refund. - */ - public function testMarkRefund() { - wmf_civicrm_mark_refund( $this->original_contribution_id, 'refund', false, '2015-09-09', 'my_special_ref'); - - $contribution = civicrm_api3( 'contribution', 'getsingle', array( - 'id' => $this->original_contribution_id, - ) ); - - $this->assertEquals( 'Refunded', $contribution['contribution_status'], - 'Refunded contribution has correct status' ); - - $financialTransactions = civicrm_api3('EntityFinancialTrxn', 'get', array( - 'entity_id' => $this->original_contribution_id, - 'entity_table' => 'civicrm_contribution', - 'api.financial_trxn.get' => 1, - 'sequential' => TRUE, - )); - $this->assertEquals(2, $financialTransactions['count']); - $transaction1 = $financialTransactions['values']['0']['api.financial_trxn.get']['values'][0]; - $transaction2 = $financialTransactions['values']['1']['api.financial_trxn.get']['values'][0]; - - $this->assertEquals($transaction1['trxn_id'], $this->trxn_id); - $this->assertEquals(strtotime($transaction2['trxn_date']), strtotime('2015-09-09')); - $this->assertEquals($transaction2['trxn_id'], 'my_special_ref'); - } - - /** - * Check that marking a contribution as refunded updates custom data appropriately. - */ - public function testMarkRefundCheckCustomData() { - civicrm_api3('contribution', 'create', array( - 'contact_id' => $this->contact_id, - 'financial_type_id' => 'Cash', - 'total_amount' => 50, - 'contribution_source' => 'USD 50', - 'receive_date' => '2014-11-01', - )); - // Create an additional negative contribution. This is how they were prior to Feb 2016. - // We want to check it is ignored for the purpose of determining the most recent donation - // although it should contribute to the lifetime total. - civicrm_api3('contribution', 'create', array( - 'contact_id' => $this->contact_id, - 'financial_type_id' => 'Cash', - 'total_amount' => -10, - 'contribution_source' => 'USD -10', - 'receive_date' => '2015-12-01', - )); - wmf_civicrm_mark_refund( $this->original_contribution_id, 'refund', false, '2015-09-09', 'my_special_ref'); - $contact = civicrm_api3('Contact', 'getsingle', array( - 'id' => $this->contact_id, - 'return' => array( - wmf_civicrm_get_custom_field_name('lifetime_usd_total'), - wmf_civicrm_get_custom_field_name('last_donation_date'), - wmf_civicrm_get_custom_field_name('last_donation_amount'), - wmf_civicrm_get_custom_field_name('last_donation_usd'), - wmf_civicrm_get_custom_field_name('is_2014_donor'), - wmf_civicrm_get_custom_field_name('is_' . date('Y') . '_donor'), - wmf_civicrm_get_custom_field_name('is_2015_donor'), - ), - )); - $this->assertEquals(40.00, $contact[wmf_civicrm_get_custom_field_name('lifetime_usd_total')]); - $this->assertEquals(50.00, $contact[wmf_civicrm_get_custom_field_name('last_donation_usd')]); - $this->assertEquals(50, $contact[wmf_civicrm_get_custom_field_name('last_donation_amount')]); - $this->assertEquals('2014-11-01 00:00:00', $contact[wmf_civicrm_get_custom_field_name('last_donation_date')]); - $this->assertEquals(TRUE, $contact[wmf_civicrm_get_custom_field_name('is_2014_donor')]); - $this->assertEquals(0, $contact[wmf_civicrm_get_custom_field_name('is_' . date('Y') . '_donor')]); - $this->assertEquals(0, $contact[wmf_civicrm_get_custom_field_name('is_2015_donor')]); - } - - - /** - * Make a refund with type set to "chargeback" - */ - public function testMarkRefundWithType() { - $this->refund_contribution_id = wmf_civicrm_mark_refund( $this->original_contribution_id, 'chargeback' ); - - $contribution = civicrm_api3('contribution', 'getsingle', array( - 'id' => $this->original_contribution_id, - )); - - $this->assertEquals( 'Chargeback', $contribution['contribution_status'], - 'Refund contribution has correct type' ); - } - - /** - * Make a refund for less than the original amount - */ - public function testMakeLesserRefund() { - $lesser_amount = round( $this->original_amount - 0.25, 2 ); - wmf_civicrm_mark_refund( - $this->original_contribution_id, - 'chargeback', - true, null, null, - $this->original_currency, $lesser_amount - ); - - - $this->refund_contribution_id = CRM_Core_DAO::singleValueQuery(" - SELECT entity_id FROM wmf_contribution_extra - WHERE - parent_contribution_id = %1", - array(1 => array($this->original_contribution_id, 'Integer')) - ); - - $refund_contribution = civicrm_api3('Contribution', 'getsingle', array( - 'id' => $this->refund_contribution_id, - )); - - $this->assertEquals( - "{$this->original_currency} -0.25", - $refund_contribution['contribution_source'], - 'Refund contribution has correct lesser amount' - ); - } - - /** - * Make a refund in the wrong currency - * - * @expectedException WmfException - */ - public function testMakeWrongCurrencyRefund() { - $wrong_currency = 'GBP'; - $this->assertNotEquals( $this->original_currency, $wrong_currency ); - wmf_civicrm_mark_refund( - $this->original_contribution_id, 'refund', - true, null, null, - $wrong_currency, $this->original_amount - ); - } - - /** - * Make a refund for too much - * - * @expectedException WmfException - */ - public function testMakeScammerRefund() { - wmf_civicrm_mark_refund( - $this->original_contribution_id, 'refund', - true, null, null, - $this->original_currency, $this->original_amount + 100.00 - ); - } - - /** - * Make a lesser refund in the wrong currency - */ - public function testLesserWrongCurrencyRefund() { - $strtime = '04/03/2000'; - $dbtime = '2000-04-03'; - $epochtime = wmf_common_date_parse_string( $dbtime ); - $this->setExchangeRates( $epochtime, array('COP' => .01 ) ); - - $result = $this->callAPISuccess('contribution', 'create', array( - 'contact_id' => $this->contact_id, - 'financial_type_id' => 'Cash', - 'total_amount' => 200, - 'contribution_source' => 'COP 20000', - 'trxn_id' => "TEST_GATEWAY {$this->gateway_txn_id} " . (time() + 20), - )); - - wmf_civicrm_mark_refund( - $result['id'], - 'refund', - TRUE, - $dbtime, - NULL, - 'COP', - 5000 - ); - - $contributions = $this->callAPISuccess('Contribution', 'get', array( - 'contact_id' => $this->contact_id, - 'sequential' => TRUE - )); - $this->assertEquals(3, $contributions['count'], print_r($contributions, TRUE)); - $this->assertEquals(200, $contributions['values'][1]['total_amount']); - $this->assertEquals('USD', $contributions['values'][2]['currency']); - // Exchange rates might move a bit but hopefully it stays less than the original amount. - $this->assertEquals($contributions['values'][2]['total_amount'], 150); - } - -} ->>>>>>> BRANCH (7ec4aa Merge "CiviCRM submodule update: improvements to support log) -- To view, visit https://gerrit.wikimedia.org/r/281584 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2d8debe09aba3f1b0150c9acd834d032021b077e Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Eileen <[email protected]> Gerrit-Reviewer: Awight <[email protected]> Gerrit-Reviewer: Cdentinger <[email protected]> Gerrit-Reviewer: Eileen <[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
