jenkins-bot has submitted this change and it was merged.
Change subject: Merge branch 'master' into deployment
......................................................................
Merge branch 'master' into deployment
+ c859415b640f8f8837efaee76de077582436f14e amend update to fix Direct
Mail Appeal custom field
+ d122660844245dd52dd90d59c9417cfc8ccd59f2 enable passthru of utm_*
fields during check import
+ a777f6ffd320a61cf15d64770571daca5be962a9 Generate CurrencyRates.php
instead of old tables
+ d77dc8dd89af8cf5e0be2049f953b8222813e519 corrects engage contribution
type
Change-Id: I2859255f52cbf3764981fa5e76a86fbc4b3dc6b8
---
D sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
D sites/all/modules/recurring_globalcollect/tests/RecurringGlobalcollectTest.php
2 files changed, 0 insertions(+), 210 deletions(-)
Approvals:
Cdentinger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
b/sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
deleted file mode 100644
index 89ab94c..0000000
--- a/sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<<<<<<< HEAD (292ad1 Merge branch 'master' into deployment)
-=======
-<?php
-
-/**
- * @group Import
- * @group Offline2Civicrm
- */
-class EngageChecksFileTest extends BaseChecksFileTest {
- function setUp() {
- parent::setUp();
-
- require_once __DIR__ . "/includes/EngageChecksFileProbe.php";
- }
-
- function testParseRow_Individual() {
- $data = array(
- 'Batch' => '1234',
- 'Contribution Type' => 'Engage',
- 'Total Amount' => '50',
- 'Source' => 'USD 50.00',
- 'Postmark Date' => '',
- 'Received Date' => '4/1/14',
- 'Payment Instrument' => 'Check',
- 'Check Number' => '2020',
- 'Restrictions' => 'Unrestricted - General',
- 'Gift Source' => 'Community Gift',
- 'Direct Mail Appeal' => 'White Mail',
- 'Prefix' => 'Mrs.',
- 'First Name' => 'Sub',
- 'Last Name' => 'Tell',
- 'Suffix' => '',
- 'Street Address' => '1000 Markdown Markov',
- 'Additional Address 1' => '',
- 'Additional Address 2' => '',
- 'City' => 'Best St. Louis',
- 'State' => 'MA',
- 'Postal Code' => '2468',
- 'Country' => '',
- 'Phone' => '(123) 456-0000',
- 'Email' => '',
- 'Thank You Letter Date' => '5/1/14',
- 'AC Flag' => 'Y',
- );
- $expected_normal = array(
- 'check_number' => '2020',
- 'city' => 'Best St. Louis',
- 'contact_source' => 'check',
- 'contact_type' => 'Individual',
- 'contribution_source' => 'USD 50.00',
- 'contribution_type' => 'engage',
- 'country' => 'US',
- 'currency' => 'USD',
- 'date' => 1396310400,
- 'direct_mail_appeal' => 'White Mail',
- 'first_name' => 'Sub',
- 'gateway' => 'engage',
- 'gateway_txn_id' => 'e59ed825ea04516fb2abf1c130d47525',
- 'gift_source' => 'Community Gift',
- 'gross' => '50',
- 'import_batch_number' => '1234',
- 'last_name' => 'Tell',
- 'name_prefix' => 'Mrs.',
- 'payment_method' => 'Check',
- 'postal_code' => '02468',
- 'raw_contribution_type' => 'Engage',
- 'restrictions' => 'Unrestricted - General',
- 'state_province' => 'MA',
- 'street_address' => '1000 Markdown Markov',
- 'thankyou_date' => 1398902400,
- );
-
- $importer = new EngageChecksFileProbe( "null URI" );
- $output = $importer->_parseRow( $data );
-
- $this->stripSourceData( $output );
- $this->assertEquals( $expected_normal, $output );
- }
-
- function testParseRow_Organization() {
- $data = array(
- 'Batch' => '1235',
- 'Contribution Type' => 'Engage',
- 'Total Amount' => '51.23',
- 'Source' => 'USD 51.23',
- 'Postmark Date' => '',
- 'Received Date' => '4/1/14',
- 'Payment Instrument' => 'Check',
- 'Check Number' => '202000001',
- 'Restrictions' => 'Restricted-Foundation',
- 'Gift Source' => 'Foundation Gift',
- 'Direct Mail Appeal' => 'White Mail',
- 'Organization Name' => 'One Pacific Entitlement',
- 'Street Address' => '1000 Markdown Markov',
- 'Additional Address 1' => '',
- 'Additional Address 2' => '',
- 'City' => 'Best St. Louis',
- 'State' => 'MA',
- 'Postal Code' => '123-LAX',
- 'Country' => 'FR',
- 'Phone' => '+357 (123) 456-0000',
- 'Email' => '',
- 'Thank You Letter Date' => '5/1/14',
- 'AC Flag' => '',
- );
- $expected_normal = array(
- 'check_number' => '202000001',
- 'city' => 'Best St. Louis',
- 'contact_source' => 'check',
- 'contact_type' => 'Organization',
- 'contribution_source' => 'USD 51.23',
- 'contribution_type' => 'engage',
- 'country' => 'FR',
- 'currency' => 'USD',
- 'date' => 1396310400,
- 'direct_mail_appeal' => 'White Mail',
- 'gateway' => 'engage',
- 'gateway_txn_id' => '6dbb8d844c7509076e2a275fb76d0130',
- 'gift_source' => 'Foundation Gift',
- 'gross' => 51.23,
- 'import_batch_number' => '1235',
- 'organization_name' => 'One Pacific Entitlement',
- 'payment_method' => 'Check',
- 'postal_code' => '123-LAX',
- 'raw_contribution_type' => 'Engage',
- 'restrictions' => 'Restricted-Foundation',
- 'state_province' => 'MA',
- 'street_address' => '1000 Markdown Markov',
- 'thankyou_date' => 1398902400,
- );
-
- $importer = new EngageChecksFileProbe( "null URI" );
- $output = $importer->_parseRow( $data );
-
- $this->stripSourceData( $output );
- $this->assertEquals( $expected_normal, $output );
- }
-}
->>>>>>> BRANCH (d77dc8 corrects engage contribution type)
diff --git
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalcollectTest.php
b/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalcollectTest.php
deleted file mode 100644
index 870c60e..0000000
---
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalcollectTest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<<<<<<< HEAD (292ad1 Merge branch 'master' into deployment)
-=======
-<?php
-
-/**
- * @group Globalcollect
- */
-class RecurringGlobalcollectTest extends BaseWmfDrupalPhpUnitTestCase {
- function setUp() {
- parent::setUp();
- civicrm_initialize();
-
- $this->subscription_id = 'SUB-FOO-' . mt_rand();
- $this->amount = '1.12';
-
- $this->contributions = array();
-
- $result = civicrm_api3( 'Contact', 'create', array(
- 'first_name' => 'Testes',
- 'contact_type' => 'Individual',
- ) );
- $this->contact_id = $result['id'];
-
- $result = civicrm_api3( 'ContributionRecur', 'create', array(
- 'contact_id' => $this->contact_id,
- 'amount' => $this->amount,
- 'frequency_interval' => 1,
- 'frequency_unit' => 'month',
- 'next_sched_contribution' =>
wmf_common_date_unix_to_civicrm(strtotime('+1 month')),
- 'installments' => 0,
- 'processor_id' => 1,
- 'currency' => 'USD',
- 'trxn_id' => "RECURRING GLOBALCOLLECT {$this->subscription_id}",
- ) );
- $this->contribution_recur_id = $result['id'];
-
- $result = civicrm_api3( 'Contribution', 'create', array(
- 'contact_id' => $this->contact_id,
- 'contribution_recur_id' => $this->contribution_recur_id,
- 'currency' => 'USD',
- 'total_amount' => $this->amount,
- 'contribution_type' => 'Cash',
- 'payment_instrument' => 'Credit Card',
- 'trxn_id' => 'RECURRING GLOBALCOLLECT STUB_ORIG_CONTRIB-' .
mt_rand(),
- ) );
- $this->contributions[] = $result['id'];
- wmf_civicrm_insert_contribution_tracking( '..rcc', 'civicrm',
null, wmf_common_date_unix_to_sql( strtotime( 'now' ) ), $result['id'] );
- }
-
- function testCharge() {
- // FIXME: don't make real API calls, rely on DI test fixture responses
instead.
- $this->markTestSkipped( 'Makes API calls.' );
-
- recurring_globalcollect_charge( $this->contribution_recur_id );
-
- $result = civicrm_api3( 'Contribution', 'get', array(
- 'contact_id' => $this->contact_id,
- ) );
- $this->assertEquals( 2, count( $result['values'] ) );
- foreach ( $result['values'] as $contribution ) {
- if ( $contribution['id'] == $this->contributions[0] ) {
- // Skip assertions on the synthetic original contribution
- continue;
- }
-
- $this->assertEquals( 1,
- preg_match( "/^RECURRING GLOBALCOLLECT
{$this->subscription_id}-2\$/", $contribution['trxn_id'] ) );
- }
- }
-}
->>>>>>> BRANCH (d77dc8 corrects engage contribution type)
--
To view, visit https://gerrit.wikimedia.org/r/226449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2859255f52cbf3764981fa5e76a86fbc4b3dc6b8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Cdentinger <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[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
