subject:"\[MediaWiki\-commits\] \[Gerrit\] wikimedia...crm\[deployment\]\: Merge branch 'master' into deployment"

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-05-24 Thread XenoRyet (Code Review)

XenoRyet has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/355569 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

0715cc0 Audit processors can read normalized fields in logs
a23b082 Unique-ify invoice ID for recurring
c974314 Payments-init consumer can handle 'currency' message field.

Change-Id: I694d02c19ea58a6e56d96fe000c4d7cfe4c7d2b0
---
D sites/all/modules/queue2civicrm/tests/data/payments-init.json
D sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
D sites/all/modules/wmf_audit/tests/AdyenAuditTest.php
D 
sites/all/modules/wmf_audit/tests/data/Adyen/donation_new/settlement_detail_report_batch_2.csv
D sites/all/modules/wmf_audit/tests/data/logs/payments-adyen-20170218.gz
5 files changed, 0 insertions(+), 350 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/69/355569/1

diff --git a/sites/all/modules/queue2civicrm/tests/data/payments-init.json 
b/sites/all/modules/queue2civicrm/tests/data/payments-init.json
deleted file mode 100644
index 7ddcc1b..000
--- a/sites/all/modules/queue2civicrm/tests/data/payments-init.json
+++ /dev/null
@@ -1,18 +0,0 @@
-<<< HEAD   (9b7a74 Merge branch 'master' into deployment)
-===
-{
-   "contribution_tracking_id": "12345",
-   "gateway": "testgateway",
-   "order_id": "",
-   "gateway_txn_id": "",
-   "validation_action": "process",
-   "payments_final_status": "complete",
-   "payment_method": "paypal",
-   "payment_submethod": "",
-   "country": "IT",
-   "amount": "2.00",
-   "currency": "EUR",
-   "server": "testpayments1002",
-   "date": "1445990999"
-}
->>> BRANCH (c97431 Payments-init consumer can handle 'currency' message 
field.)
diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
deleted file mode 100644
index c727d87..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<<< HEAD   (9b7a74 Merge branch 'master' into deployment)
-===
-createTable( 'test' );
-   $this->consumer = new PaymentsInitQueueConsumer(
-   'test'
-   );
-   }
-
-   public function testValidMessage() {
-   $message = $this->getMessage();
-   $this->consumer->processMessage( $message );
-
-   $this->compareMessageWithDb( $message );
-   }
-
-   /**
-* The first message for a ct_id / order_id pair needs to be complete
-*
-* @expectedException FredgeDataValidationException
-*/
-   public function testIncompleteMessage() {
-   $message = $this->getMessage();
-   unset( $message['payment_method'] );
-   $this->consumer->processMessage( $message );
-   }
-
-   /**
-* After one complete message has been inserted, a second message
-* with the same ct_id / order_id can update only selected fields
-*/
-   public function testUpdatedMessage() {
-   $message1 = $this->getMessage();
-   $message2 = $this->getMessage();
-   $message2['contribution_tracking_id'] = 
$message1['contribution_tracking_id'];
-   $message2['order_id'] = $message1['order_id'];
-
-   $message1['payments_final_status'] = 'pending';
-   $message2['payments_final_status'] = 'pending';
-   unset( $message2['payment_method'] );
-
-   $this->consumer->processMessage( $message1 );
-   $this->compareMessageWithDb( $message1 );
-
-   $this->consumer->processMessage( $message2 );
-   $updated = array_merge(
-   $message1, $message2
-   );
-   $this->compareMessageWithDb( $updated );
-   }
-
-   protected function compareMessageWithDb( $message ) {
-   $dbEntries = $this->getDbEntries(
-   $message['contribution_tracking_id'], 
$message['order_id']
-   );
-   $this->assertEquals( 1, count( $dbEntries ) );
-   $fields = array(
-   'gateway',  'gateway_txn_id', 'validation_action',
-   'payments_final_status', 'payment_method', 
'payment_submethod',
-   'country', 'amount', 'server'
-   );
-   foreach ( $fields as $field ) {
-   $this->assertEquals( $message[$field], 
$dbEntries[0][$field] );
-   }
-   $this->assertEquals( $message['currency'], 
$dbEntries[0]['currency_code'] );
-   $this->assertEquals(
-   $message['date'], wmf_common_date_civicrm_to_unix( 
$dbEntries[0]['date']

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-05-22 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/355129 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

843921f Lint .module, .install, .inc PHP files too
b68791e Delete extension, update currency symbols via install script Bug: 
T151957
7a8a78d Change thank you and thank you test to thank you send
57dc577 Quit stuffing order_id with other fields
7a2e0d7 Store order id in invoice_id column
88f69e9 Create time limit based on user configuration Bug: T163412

Change-Id: I545ee3e931b663ba2283699aff8a0bb0f7eec4d9
---
D sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
1 file changed, 0 insertions(+), 341 deletions(-)

Approvals:
  Mepps: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
deleted file mode 100644
index cd7a0c0..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<<< HEAD   (4ece34 Merge branch 'master' into deployment)
-===
-pendingDb = PendingDatabase::get();
-   $this->pendingDb->createTable();
-   $this->queueConsumer = new DonationQueueConsumer( 'test' );
-   }
-
-   /**
-* Process an ordinary (one-time) donation message
-*/
-   public function testDonation() {
-   $message = new TransactionMessage(
-   array( 'gross' => 400, 'original_gross' => 400, 
'original_currency' => 'USD' )
-   );
-   $message2 = new TransactionMessage();
-
-   exchange_rate_cache_set( 'USD', $message->get( 'date' ), 1 );
-   exchange_rate_cache_set( $message->get( 'currency' ), 
$message->get( 'date' ), 3 );
-
-   $this->queueConsumer->processMessage( $message->getBody() );
-   $this->queueConsumer->processMessage( $message2->getBody() );
-
-   $campaignField = wmf_civicrm_get_custom_field_name( 'campaign' 
);
-
-   $expected = array(
-   'contact_type' => 'Individual',
-   'sort_name' => 'laast, firrst',
-   'display_name' => 'firrst laast',
-   'first_name' => 'firrst',
-   'last_name' => 'laast',
-   'currency' => 'USD',
-   'total_amount' => '400.00',
-   'fee_amount' => '0.00',
-   'net_amount' => '400.00',
-   'trxn_id' => 'GLOBALCOLLECT ' . 
$message->getGatewayTxnId(),
-   'contribution_source' => 'USD 400',
-   'financial_type' => 'Cash',
-   'contribution_status' => 'Completed',
-   'payment_instrument' => 'Credit Card: Visa',
-   'invoice_id' => $message->get('order_id'),
-   $campaignField => '',
-   );
-   $returnFields = array_keys( $expected );
-
-   $contribution = civicrm_api3(
-   'Contribution',
-   'getsingle',
-   array(
-   wmf_civicrm_get_custom_field_name( 
'gateway_txn_id' ) => $message->getGatewayTxnId(),
-   'return' => $returnFields
-   )
-   );
-
-   $this->assertArraySubset( $expected, $contribution );
-
-   $contribution2 = civicrm_api3(
-   'Contribution',
-   'getsingle',
-   array(
-   wmf_civicrm_get_custom_field_name( 
'gateway_txn_id' ) => $message2->getGatewayTxnId(),
-   'return' => $returnFields
-   )
-   );
-
-   $expected = array(
-   'contact_type' => 'Individual',
-   'sort_name' => 'laast, firrst',
-   'display_name' => 'firrst laast',
-   'first_name' => 'firrst',
-   'last_name' => 'laast',
-   'currency' => 'USD',
-   'total_amount' => '2857.02',
-   'fee_amount' => '0.00',
-   'net_amount' => '2857.02',
-   'trxn_id' => 'GLOBALCOLLECT ' . 
$message2->getGatewayTxnId(),
-   'contribution_source' => 'PLN 952.34',
-   'financial_type' => 'Cash',
-   'contribution_status' => 'Completed',
-   'payment_instrument' => 'Credit Card: Visa',
-   'invoice_id' => $message2->get('order_id'),
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-05-22 Thread Mepps (Code Review)

Mepps has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/355129 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

843921f Lint .module, .install, .inc PHP files too
b68791e Delete extension, update currency symbols via install script Bug: 
T151957
7a8a78d Change thank you and thank you test to thank you send
57dc577 Quit stuffing order_id with other fields
7a2e0d7 Store order id in invoice_id column
88f69e9 Create time limit based on user configuration Bug: T163412

Change-Id: I545ee3e931b663ba2283699aff8a0bb0f7eec4d9
---
D sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
1 file changed, 0 insertions(+), 341 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/29/355129/1

diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
deleted file mode 100644
index cd7a0c0..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<<< HEAD   (4ece34 Merge branch 'master' into deployment)
-===
-pendingDb = PendingDatabase::get();
-   $this->pendingDb->createTable();
-   $this->queueConsumer = new DonationQueueConsumer( 'test' );
-   }
-
-   /**
-* Process an ordinary (one-time) donation message
-*/
-   public function testDonation() {
-   $message = new TransactionMessage(
-   array( 'gross' => 400, 'original_gross' => 400, 
'original_currency' => 'USD' )
-   );
-   $message2 = new TransactionMessage();
-
-   exchange_rate_cache_set( 'USD', $message->get( 'date' ), 1 );
-   exchange_rate_cache_set( $message->get( 'currency' ), 
$message->get( 'date' ), 3 );
-
-   $this->queueConsumer->processMessage( $message->getBody() );
-   $this->queueConsumer->processMessage( $message2->getBody() );
-
-   $campaignField = wmf_civicrm_get_custom_field_name( 'campaign' 
);
-
-   $expected = array(
-   'contact_type' => 'Individual',
-   'sort_name' => 'laast, firrst',
-   'display_name' => 'firrst laast',
-   'first_name' => 'firrst',
-   'last_name' => 'laast',
-   'currency' => 'USD',
-   'total_amount' => '400.00',
-   'fee_amount' => '0.00',
-   'net_amount' => '400.00',
-   'trxn_id' => 'GLOBALCOLLECT ' . 
$message->getGatewayTxnId(),
-   'contribution_source' => 'USD 400',
-   'financial_type' => 'Cash',
-   'contribution_status' => 'Completed',
-   'payment_instrument' => 'Credit Card: Visa',
-   'invoice_id' => $message->get('order_id'),
-   $campaignField => '',
-   );
-   $returnFields = array_keys( $expected );
-
-   $contribution = civicrm_api3(
-   'Contribution',
-   'getsingle',
-   array(
-   wmf_civicrm_get_custom_field_name( 
'gateway_txn_id' ) => $message->getGatewayTxnId(),
-   'return' => $returnFields
-   )
-   );
-
-   $this->assertArraySubset( $expected, $contribution );
-
-   $contribution2 = civicrm_api3(
-   'Contribution',
-   'getsingle',
-   array(
-   wmf_civicrm_get_custom_field_name( 
'gateway_txn_id' ) => $message2->getGatewayTxnId(),
-   'return' => $returnFields
-   )
-   );
-
-   $expected = array(
-   'contact_type' => 'Individual',
-   'sort_name' => 'laast, firrst',
-   'display_name' => 'firrst laast',
-   'first_name' => 'firrst',
-   'last_name' => 'laast',
-   'currency' => 'USD',
-   'total_amount' => '2857.02',
-   'fee_amount' => '0.00',
-   'net_amount' => '2857.02',
-   'trxn_id' => 'GLOBALCOLLECT ' . 
$message2->getGatewayTxnId(),
-   'contribution_source' => 'PLN 952.34',
-   'financial_type' => 'Cash',
-   'contribution_status' => 'Completed',
-   'payment_instrument' => 'Credit Card: Visa',
-   'invoice_id' => $message2->get('order_id'),
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-04-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350094 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

15f0271 init Civi before backfill

Change-Id: Ic0f64fcee5f85bf9eeea7c875490f05e36e19acb
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/350094
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0f64fcee5f85bf9eeea7c875490f05e36e19acb
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-04-24 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350094 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

15f0271 init Civi before backfill

Change-Id: Ic0f64fcee5f85bf9eeea7c875490f05e36e19acb
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/94/350094/1


-- 
To view, visit https://gerrit.wikimedia.org/r/350094
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0f64fcee5f85bf9eeea7c875490f05e36e19acb
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-04-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350092 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

6b453e7 Remove 'Module missing message fixer' module

Change-Id: Ic378d8d1352824507e1998e3d1fc1bfa43aaa1fd
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/350092
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic378d8d1352824507e1998e3d1fc1bfa43aaa1fd
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-04-24 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350092 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

6b453e7 Remove 'Module missing message fixer' module

Change-Id: Ic378d8d1352824507e1998e3d1fc1bfa43aaa1fd
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/92/350092/1


-- 
To view, visit https://gerrit.wikimedia.org/r/350092
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic378d8d1352824507e1998e3d1fc1bfa43aaa1fd
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-04-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350086 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And update vendor submodule

7250d79 Delete old PP-specific normalization
c5ee155 Fix civibuild options for updated amp
e2a5c5f Always update c_t table for initial recurring
f584563 Backfill missing contribution_tracking links
8480400 Use : after host in mysql dsn
f550a8c Add de Bijenkorf card
56d8d15 Update SmashPig library

Change-Id: Id090f5f995ce64be5e682984f3673db69a9f47a8
---
D sites/all/modules/queue2civicrm/tests/data/recurring_payment.json
D sites/all/modules/queue2civicrm/tests/data/recurring_signup.json
D sites/all/modules/queue2civicrm/tests/includes/Message.php
D sites/all/modules/queue2civicrm/tests/phpunit/RecurringQueueTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
M vendor
6 files changed, 1 insertion(+), 607 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/queue2civicrm/tests/data/recurring_payment.json 
b/sites/all/modules/queue2civicrm/tests/data/recurring_payment.json
deleted file mode 100644
index c4af77c..000
--- a/sites/all/modules/queue2civicrm/tests/data/recurring_payment.json
+++ /dev/null
@@ -1,25 +0,0 @@
-<<< HEAD   (51dbba Merge branch 'master' into deployment)
-===
-{
-"date": 1383346353,
-"subscr_id": null,
-"txn_type": "subscr_payment",
-"contribution_tracking_id": "15017277",
-"email": "test...@wikimedia.org",
-"first_name": "Gen",
-"middle_name": "",
-"last_name": "Russ",
-"street_address": "1211122 132 st",
-"city": "Edmonton",
-"state_province": "Alberta",
-"country": "CA",
-"postal_code": "T4V 2L2",
-"gateway_txn_id": 1765009520,
-"currency": "CAD",
-"gross": "3.00",
-"fee": "0.33",
-"net": 2.67,
-"gateway": "paypal",
-"recurring": true
-}
->>> BRANCH (56d8d1 Update SmashPig library)
diff --git a/sites/all/modules/queue2civicrm/tests/data/recurring_signup.json 
b/sites/all/modules/queue2civicrm/tests/data/recurring_signup.json
deleted file mode 100644
index 5a72bb4..000
--- a/sites/all/modules/queue2civicrm/tests/data/recurring_signup.json
+++ /dev/null
@@ -1,27 +0,0 @@
-<<< HEAD   (51dbba Merge branch 'master' into deployment)
-===
-{
-"subscr_id": 2048343366,
-"txn_type": "subscr_signup",
-"contribution_tracking_id": "15028173",
-"email": "test+recur...@wikimedia.org",
-"first_name": "Gen D",
-"middle_name": "",
-"last_name": "Russ",
-"street_address": "5109 Lockwood Rd",
-"city": "Bethel Park",
-"state_province": "PA",
-"country": "US",
-"postal_code": "15110-1232",
-"frequency_interval": "1",
-"frequency_unit": "month",
-"installments": 0,
-"gross": "3.00",
-"currency": "CAD",
-"create_date": 1383347225,
-"start_date": 1383347225,
-"date": 1383347225,
-"gateway": "paypal",
-"recurring": true
-}
->>> BRANCH (56d8d1 Update SmashPig library)
diff --git a/sites/all/modules/queue2civicrm/tests/includes/Message.php 
b/sites/all/modules/queue2civicrm/tests/includes/Message.php
deleted file mode 100644
index 3ba532f..000
--- a/sites/all/modules/queue2civicrm/tests/includes/Message.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<<< HEAD   (51dbba Merge branch 'master' into deployment)
-===
-data = $this->defaults;
-$this->headers = array();
-$this->set( $values );
-}
-
-function set( $values ) {
-if ( is_array( $values ) ) {
-$this->data = $values + $this->data;
-}
-
-$this->body = json_encode( $this->data );
-}
-
-function setHeaders( $values ) {
-if ( is_array( $values ) ) {
-$this->headers = array_merge( $this->headers, $values );
-}
-}
-
-function getBody() {
-return $this->data;
-}
-
-function getHeaders() {
-return $this->headers;
-}
-
-function loadDefaults( $name ) {
-if ( !$this->defaults ) {
-$path = __DIR__ . "/../data/{$name}.json";
-$this->defaults = json_decode( file_get_contents( $path ), true );
-}
-}
-
-/**
- * Generates random data for queue and donation insertion testing
- */
-public static function generateRandom() {
-//language codes
-$lang = array( 'en', 'de', 'fr' );
-
-$currency_codes = array( 'USD', 'GBP', 'EUR', 'ILS' );
-shuffle( $currency_codes );
-$currency = ( mt_rand( 0, 1 ) ) ? 'USD' : $currency_codes[0];
-
-$message = array(
-'contribution_tracking_id' => '',
-'optout' => mt_rand( 0, 1 ),
-'anonymous' => mt_rand( 0, 1 ),
-'comment' => mt_rand(),
-'utm_source' => mt_rand(),
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-04-24 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350086 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

And update vendor submodule

7250d79 Delete old PP-specific normalization
c5ee155 Fix civibuild options for updated amp
e2a5c5f Always update c_t table for initial recurring
f584563 Backfill missing contribution_tracking links
8480400 Use : after host in mysql dsn
f550a8c Add de Bijenkorf card
56d8d15 Update SmashPig library

Change-Id: Id090f5f995ce64be5e682984f3673db69a9f47a8
---
D sites/all/modules/queue2civicrm/tests/data/recurring_payment.json
D sites/all/modules/queue2civicrm/tests/data/recurring_signup.json
D sites/all/modules/queue2civicrm/tests/includes/Message.php
D sites/all/modules/queue2civicrm/tests/phpunit/RecurringQueueTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/HelperFunctionsTest.php
M vendor
6 files changed, 1 insertion(+), 607 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/86/350086/1

diff --git a/sites/all/modules/queue2civicrm/tests/data/recurring_payment.json 
b/sites/all/modules/queue2civicrm/tests/data/recurring_payment.json
deleted file mode 100644
index c4af77c..000
--- a/sites/all/modules/queue2civicrm/tests/data/recurring_payment.json
+++ /dev/null
@@ -1,25 +0,0 @@
-<<< HEAD   (51dbba Merge branch 'master' into deployment)
-===
-{
-"date": 1383346353,
-"subscr_id": null,
-"txn_type": "subscr_payment",
-"contribution_tracking_id": "15017277",
-"email": "test...@wikimedia.org",
-"first_name": "Gen",
-"middle_name": "",
-"last_name": "Russ",
-"street_address": "1211122 132 st",
-"city": "Edmonton",
-"state_province": "Alberta",
-"country": "CA",
-"postal_code": "T4V 2L2",
-"gateway_txn_id": 1765009520,
-"currency": "CAD",
-"gross": "3.00",
-"fee": "0.33",
-"net": 2.67,
-"gateway": "paypal",
-"recurring": true
-}
->>> BRANCH (56d8d1 Update SmashPig library)
diff --git a/sites/all/modules/queue2civicrm/tests/data/recurring_signup.json 
b/sites/all/modules/queue2civicrm/tests/data/recurring_signup.json
deleted file mode 100644
index 5a72bb4..000
--- a/sites/all/modules/queue2civicrm/tests/data/recurring_signup.json
+++ /dev/null
@@ -1,27 +0,0 @@
-<<< HEAD   (51dbba Merge branch 'master' into deployment)
-===
-{
-"subscr_id": 2048343366,
-"txn_type": "subscr_signup",
-"contribution_tracking_id": "15028173",
-"email": "test+recur...@wikimedia.org",
-"first_name": "Gen D",
-"middle_name": "",
-"last_name": "Russ",
-"street_address": "5109 Lockwood Rd",
-"city": "Bethel Park",
-"state_province": "PA",
-"country": "US",
-"postal_code": "15110-1232",
-"frequency_interval": "1",
-"frequency_unit": "month",
-"installments": 0,
-"gross": "3.00",
-"currency": "CAD",
-"create_date": 1383347225,
-"start_date": 1383347225,
-"date": 1383347225,
-"gateway": "paypal",
-"recurring": true
-}
->>> BRANCH (56d8d1 Update SmashPig library)
diff --git a/sites/all/modules/queue2civicrm/tests/includes/Message.php 
b/sites/all/modules/queue2civicrm/tests/includes/Message.php
deleted file mode 100644
index 3ba532f..000
--- a/sites/all/modules/queue2civicrm/tests/includes/Message.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<<< HEAD   (51dbba Merge branch 'master' into deployment)
-===
-data = $this->defaults;
-$this->headers = array();
-$this->set( $values );
-}
-
-function set( $values ) {
-if ( is_array( $values ) ) {
-$this->data = $values + $this->data;
-}
-
-$this->body = json_encode( $this->data );
-}
-
-function setHeaders( $values ) {
-if ( is_array( $values ) ) {
-$this->headers = array_merge( $this->headers, $values );
-}
-}
-
-function getBody() {
-return $this->data;
-}
-
-function getHeaders() {
-return $this->headers;
-}
-
-function loadDefaults( $name ) {
-if ( !$this->defaults ) {
-$path = __DIR__ . "/../data/{$name}.json";
-$this->defaults = json_decode( file_get_contents( $path ), true );
-}
-}
-
-/**
- * Generates random data for queue and donation insertion testing
- */
-public static function generateRandom() {
-//language codes
-$lang = array( 'en', 'de', 'fr' );
-
-$currency_codes = array( 'USD', 'GBP', 'EUR', 'ILS' );
-shuffle( $currency_codes );
-$currency = ( mt_rand( 0, 1 ) ) ? 'USD' : $currency_codes[0];
-
-$message = array(
-'contribution_tracking_id' => '',
-'optout' => mt_rand( 0, 1 ),
-'anonymous' => mt_rand( 0, 1 ),
-'comment' => mt_rand(),
-'utm_source' => mt_rand(),

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-04-19 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/349141 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And update vendor

a384013 Update libraries (upstream php-queue)

Change-Id: I4f4caaa2500300874e2a5dbc14ef0b3e1c684117
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/vendor b/vendor
index 8343a58..91d1300 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 8343a58142b81afa05683678e6afc9a42ad9abcf
+Subproject commit 91d130095b7102a59608f969ef890ae7a17e0dbc

-- 
To view, visit https://gerrit.wikimedia.org/r/349141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f4caaa2500300874e2a5dbc14ef0b3e1c684117
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-04-19 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/349141 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

And update vendor

a384013 Update libraries (upstream php-queue)

Change-Id: I4f4caaa2500300874e2a5dbc14ef0b3e1c684117
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/41/349141/1

diff --git a/vendor b/vendor
index 8343a58..91d1300 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 8343a58142b81afa05683678e6afc9a42ad9abcf
+Subproject commit 91d130095b7102a59608f969ef890ae7a17e0dbc

-- 
To view, visit https://gerrit.wikimedia.org/r/349141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f4caaa2500300874e2a5dbc14ef0b3e1c684117
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-04-13 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/348126 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

and update vendor

148e7fa Get rid of subscription paths
3f54ac8 Get rid of -new suffix on refund and recurring queues

Change-Id: Ibc94ef300af202403696d4fbd9f212a9b73639bc
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/26/348126/1

diff --git a/vendor b/vendor
index f0e28be..8343a58 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit f0e28be01e1798ec36cf6e45a665f5730515f484
+Subproject commit 8343a58142b81afa05683678e6afc9a42ad9abcf

-- 
To view, visit https://gerrit.wikimedia.org/r/348126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc94ef300af202403696d4fbd9f212a9b73639bc
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-04-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/348126 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

and update vendor

148e7fa Get rid of subscription paths
3f54ac8 Get rid of -new suffix on refund and recurring queues

Change-Id: Ibc94ef300af202403696d4fbd9f212a9b73639bc
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/vendor b/vendor
index f0e28be..8343a58 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit f0e28be01e1798ec36cf6e45a665f5730515f484
+Subproject commit 8343a58142b81afa05683678e6afc9a42ad9abcf

-- 
To view, visit https://gerrit.wikimedia.org/r/348126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc94ef300af202403696d4fbd9f212a9b73639bc
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-03-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/343125 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And update vendor submodule for autoload_static

1dedfce Set street address to NULL where placeholder info has been used.
38ace7f Update civicrm subrepo

Change-Id: I5954d38e1283f7fb92e3dc9ebfee2769eba733e9
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/vendor b/vendor
index 8c0bb4b..f8bf486 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 8c0bb4bc7a5addb575358d6dfc1b6272c4f8b2f1
+Subproject commit f8bf48695ab0b11763322eed876dcbf5d3258793

-- 
To view, visit https://gerrit.wikimedia.org/r/343125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5954d38e1283f7fb92e3dc9ebfee2769eba733e9
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-03-16 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/343125 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

And update vendor submodule for autoload_static

1dedfce Set street address to NULL where placeholder info has been used.
38ace7f Update civicrm subrepo

Change-Id: I5954d38e1283f7fb92e3dc9ebfee2769eba733e9
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/25/343125/1

diff --git a/vendor b/vendor
index 8c0bb4b..f8bf486 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 8c0bb4bc7a5addb575358d6dfc1b6272c4f8b2f1
+Subproject commit f8bf48695ab0b11763322eed876dcbf5d3258793

-- 
To view, visit https://gerrit.wikimedia.org/r/343125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5954d38e1283f7fb92e3dc9ebfee2769eba733e9
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-03-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/340910 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

4cf6fcf Fix busted SQL comment

Change-Id: Ib6105da4909bb54c7aefdeb279494af22bd47ff7
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/340910
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6105da4909bb54c7aefdeb279494af22bd47ff7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-03-02 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/340910 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

4cf6fcf Fix busted SQL comment

Change-Id: Ib6105da4909bb54c7aefdeb279494af22bd47ff7
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/10/340910/1


-- 
To view, visit https://gerrit.wikimedia.org/r/340910
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6105da4909bb54c7aefdeb279494af22bd47ff7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-03-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/340899 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

07ff70d Create table of blank addresses.
361717d Fix (most) missing names
42e6650 Extend fix to contacts that have been touched

Change-Id: I9f943ea4edd6d9c411928bd9848af3adb627d779
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/340899
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f943ea4edd6d9c411928bd9848af3adb627d779
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-03-02 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/340899 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

07ff70d Create table of blank addresses.
361717d Fix (most) missing names
42e6650 Extend fix to contacts that have been touched

Change-Id: I9f943ea4edd6d9c411928bd9848af3adb627d779
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/99/340899/1


-- 
To view, visit https://gerrit.wikimedia.org/r/340899
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f943ea4edd6d9c411928bd9848af3adb627d779
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch master into deployment

2017-03-01 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/340545 )

Change subject: Merge branch master into deployment
..


Merge branch master into deployment

78df60bb589a880908d941e4e68a38c417d0de39 Adjust contribution date on 4 
recurring contributions to get past blockage.

Change-Id: Iaa2adfbbd81ff1256da1d729fd3cacf840ccce0a
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Awight: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/340545
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa2adfbbd81ff1256da1d729fd3cacf840ccce0a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch master into deployment

2017-03-01 Thread Awight (Code Review)

Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/340545 )

Change subject: Merge branch master into deployment
..

Merge branch master into deployment

78df60bb589a880908d941e4e68a38c417d0de39 Adjust contribution date on 4 
recurring contributions to get past blockage.

Change-Id: Iaa2adfbbd81ff1256da1d729fd3cacf840ccce0a
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/45/340545/1


-- 
To view, visit https://gerrit.wikimedia.org/r/340545
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa2adfbbd81ff1256da1d729fd3cacf840ccce0a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-02-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337964 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And update 'vendor' submodule

afd2d95 Fix command in CurrencyRates template header
6f3d25c Update PHPMailer to 5.2.22

Change-Id: I19f78e4307bba823c56e7a60e36d846cdfad03f1
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/vendor b/vendor
index e3c1e1c..8c0bb4b 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit e3c1e1c5474b032280763d753c31479e942124bf
+Subproject commit 8c0bb4bc7a5addb575358d6dfc1b6272c4f8b2f1

-- 
To view, visit https://gerrit.wikimedia.org/r/337964
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I19f78e4307bba823c56e7a60e36d846cdfad03f1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-02-15 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337964 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

And update 'vendor' submodule

afd2d95 Fix command in CurrencyRates template header
6f3d25c Update PHPMailer to 5.2.22

Change-Id: I19f78e4307bba823c56e7a60e36d846cdfad03f1
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/64/337964/1

diff --git a/vendor b/vendor
index e3c1e1c..8c0bb4b 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit e3c1e1c5474b032280763d753c31479e942124bf
+Subproject commit 8c0bb4bc7a5addb575358d6dfc1b6272c4f8b2f1

-- 
To view, visit https://gerrit.wikimedia.org/r/337964
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19f78e4307bba823c56e7a60e36d846cdfad03f1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-01-25 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334219 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

a5a7c70 Update libraries (no more Stomp!)

Also update vendor and stop nulling out packages-dev in composer.lock

Change-Id: Ifb1fc23bf4c8d717e4b992a076c39890ff84e7d4
---
M composer.lock
M vendor
2 files changed, 1 insertion(+), 5 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/composer.lock b/composer.lock
index 31128a6..0f07766 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1204,9 +1204,6 @@
 "time": "2015-11-05 07:14:57"
 }
 ],
-<<< HEAD   (cd058a Merge branch 'master' into deployment)
-"packages-dev": null,
-===
 "packages-dev": [
 {
 "name": "doctrine/instantiator",
@@ -2265,7 +2262,6 @@
 "time": "2016-11-23 20:04:58"
 }
 ],
->>> BRANCH (a5a7c7 Update libraries (no more Stomp!))
 "aliases": [],
 "minimum-stability": "stable",
 "stability-flags": {
diff --git a/vendor b/vendor
index 4260d17..e3c1e1c 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 4260d175c1691436047aa1e1d8fb19c50b823f03
+Subproject commit e3c1e1c5474b032280763d753c31479e942124bf

-- 
To view, visit https://gerrit.wikimedia.org/r/334219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb1fc23bf4c8d717e4b992a076c39890ff84e7d4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-01-25 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334219 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

a5a7c70 Update libraries (no more Stomp!)

Also update vendor and stop nulling out packages-dev in composer.lock

Change-Id: Ifb1fc23bf4c8d717e4b992a076c39890ff84e7d4
---
M composer.lock
M vendor
2 files changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/19/334219/1

diff --git a/composer.lock b/composer.lock
index 31128a6..0f07766 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1204,9 +1204,6 @@
 "time": "2015-11-05 07:14:57"
 }
 ],
-<<< HEAD   (cd058a Merge branch 'master' into deployment)
-"packages-dev": null,
-===
 "packages-dev": [
 {
 "name": "doctrine/instantiator",
@@ -2265,7 +2262,6 @@
 "time": "2016-11-23 20:04:58"
 }
 ],
->>> BRANCH (a5a7c7 Update libraries (no more Stomp!))
 "aliases": [],
 "minimum-stability": "stable",
 "stability-flags": {
diff --git a/vendor b/vendor
index 4260d17..e3c1e1c 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 4260d175c1691436047aa1e1d8fb19c50b823f03
+Subproject commit e3c1e1c5474b032280763d753c31479e942124bf

-- 
To view, visit https://gerrit.wikimedia.org/r/334219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb1fc23bf4c8d717e4b992a076c39890ff84e7d4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-01-25 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334212 )

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

349b521 Always reconnect before sending queue messages
041a47f Round off all the geo_codes to 4 digits
4132268 Early return when there are no contacts to dedupe
fca1b88 Revert "Round off all the geo_codes to 4 digits"
1d1c10b Better fix for lat/long woes

Change-Id: I16c90fc58e3b4b542889a38a7fa0109b80e25b97
---
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
1 file changed, 0 insertions(+), 587 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index 7566635..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ /dev/null
@@ -1,587 +0,0 @@
-<<< HEAD   (af8d73 Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
- WMF_CAMPAIGNS_OPTION_GROUP_NAME,
-'label' => ImportMessageTest_campaign,
-'value' => ImportMessageTest_campaign,
-) );
-}
-
-public function tearDown() {
-if ( $this->contribution_id ) {
-civicrm_api_classapi()->Contribution->Delete( array(
-'id' => $this->contribution_id,
-'version' => '3',
-) );
-}
-parent::tearDown();
-}
-
-/**
- * @dataProvider messageProvider
- */
-public function testMessageInsert( $msg, $expected ) {
-$contribution = wmf_civicrm_contribution_message_import( $msg );
-$this->contribution_id = $contribution['id'];
-
-// Ignore contact_id if we have no expectation.
-if ( empty( $expected['contribution']['contact_id'] ) ) {
-$this->fieldsToIgnore[] = 'contact_id';
-}
-
-$this->assertComparable( $expected['contribution'], $contribution );
-
-if ( !empty( $expected['contribution_custom_values'] ) ) {
-$actual_contribution_custom_values = wmf_civicrm_get_custom_values(
-$contribution['id'],
-array_keys( $expected['contribution_custom_values'] )
-);
-$this->assertEquals( $expected['contribution_custom_values'], 
$actual_contribution_custom_values );
-}
-
-if ( !empty( $expected['contact'] ) ) {
-$api = civicrm_api_classapi();
-$api->Contact->Get( array(
-'id' => $contribution['contact_id'],
-'version' => 3,
-) );
-$contact = (array) $api->values[0];
-$renamedFields = array('prefix' => 1, 'suffix' => 1);
-$this->assertEquals( array_diff_key($expected['contact'], 
$renamedFields), array_intersect_key( $expected['contact'], $contact ) );
-foreach (array_keys($renamedFields) as $renamedField) {
-$this->assertEquals(civicrm_api3('OptionValue', 'getvalue', 
array(
-'value' => $contact[$renamedField . '_id'],
-'option_group_id' => 'individual_' . $renamedField,
-'return' => 'name',
-)), $expected['contact'][$renamedField]);
-}
-}
-
-   if ( !empty( $expected['address'] ) ) {
-   $addresses = civicrm_api3( 'Address', 'get', array(
-   'contact_id' => $contribution['contact_id'],
-   'return' => 
'city,postal_code,street_address,geo_code_1,geo_code_2,timezone',
-   ) );
-   $address = $addresses['values'][$addresses['id']];
-   $this->assertComparable( $expected['address'], $address 
);
-   }
-
-if ( !empty( $expected['contact_custom_values'] ) ) {
-$actual_contact_custom_values = wmf_civicrm_get_custom_values(
-$contribution['contact_id'],
-array_keys( $expected['contact_custom_values'] )
-);
-$this->assertEquals( $expected['contact_custom_values'], 
$actual_contact_custom_values );
-}
-}
-
-public function messageProvider() {
-// Make static so it isn't destroyed until class cleanup.
-self::$fixtures = CiviFixtures::create();
-
-$contribution_type_cash = wmf_civicrm_get_civi_id( 
'contribution_type_id', 'Cash' );
-$payment_instrument_cc = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Credit Card' );
-$payment_instrument_check = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Check' );
-
-$gateway_txn_id = mt_rand();
-$check_number = (string) mt_rand();
-
-$new_prefix = 'M' . mt_rand();
-
-return array(
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2017-01-25 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334212 )

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

349b521 Always reconnect before sending queue messages
041a47f Round off all the geo_codes to 4 digits
4132268 Early return when there are no contacts to dedupe
fca1b88 Revert "Round off all the geo_codes to 4 digits"
1d1c10b Better fix for lat/long woes

Change-Id: I16c90fc58e3b4b542889a38a7fa0109b80e25b97
---
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
1 file changed, 0 insertions(+), 587 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/12/334212/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index 7566635..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ /dev/null
@@ -1,587 +0,0 @@
-<<< HEAD   (af8d73 Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
- WMF_CAMPAIGNS_OPTION_GROUP_NAME,
-'label' => ImportMessageTest_campaign,
-'value' => ImportMessageTest_campaign,
-) );
-}
-
-public function tearDown() {
-if ( $this->contribution_id ) {
-civicrm_api_classapi()->Contribution->Delete( array(
-'id' => $this->contribution_id,
-'version' => '3',
-) );
-}
-parent::tearDown();
-}
-
-/**
- * @dataProvider messageProvider
- */
-public function testMessageInsert( $msg, $expected ) {
-$contribution = wmf_civicrm_contribution_message_import( $msg );
-$this->contribution_id = $contribution['id'];
-
-// Ignore contact_id if we have no expectation.
-if ( empty( $expected['contribution']['contact_id'] ) ) {
-$this->fieldsToIgnore[] = 'contact_id';
-}
-
-$this->assertComparable( $expected['contribution'], $contribution );
-
-if ( !empty( $expected['contribution_custom_values'] ) ) {
-$actual_contribution_custom_values = wmf_civicrm_get_custom_values(
-$contribution['id'],
-array_keys( $expected['contribution_custom_values'] )
-);
-$this->assertEquals( $expected['contribution_custom_values'], 
$actual_contribution_custom_values );
-}
-
-if ( !empty( $expected['contact'] ) ) {
-$api = civicrm_api_classapi();
-$api->Contact->Get( array(
-'id' => $contribution['contact_id'],
-'version' => 3,
-) );
-$contact = (array) $api->values[0];
-$renamedFields = array('prefix' => 1, 'suffix' => 1);
-$this->assertEquals( array_diff_key($expected['contact'], 
$renamedFields), array_intersect_key( $expected['contact'], $contact ) );
-foreach (array_keys($renamedFields) as $renamedField) {
-$this->assertEquals(civicrm_api3('OptionValue', 'getvalue', 
array(
-'value' => $contact[$renamedField . '_id'],
-'option_group_id' => 'individual_' . $renamedField,
-'return' => 'name',
-)), $expected['contact'][$renamedField]);
-}
-}
-
-   if ( !empty( $expected['address'] ) ) {
-   $addresses = civicrm_api3( 'Address', 'get', array(
-   'contact_id' => $contribution['contact_id'],
-   'return' => 
'city,postal_code,street_address,geo_code_1,geo_code_2,timezone',
-   ) );
-   $address = $addresses['values'][$addresses['id']];
-   $this->assertComparable( $expected['address'], $address 
);
-   }
-
-if ( !empty( $expected['contact_custom_values'] ) ) {
-$actual_contact_custom_values = wmf_civicrm_get_custom_values(
-$contribution['contact_id'],
-array_keys( $expected['contact_custom_values'] )
-);
-$this->assertEquals( $expected['contact_custom_values'], 
$actual_contact_custom_values );
-}
-}
-
-public function messageProvider() {
-// Make static so it isn't destroyed until class cleanup.
-self::$fixtures = CiviFixtures::create();
-
-$contribution_type_cash = wmf_civicrm_get_civi_id( 
'contribution_type_id', 'Cash' );
-$payment_instrument_cc = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Credit Card' );
-$payment_instrument_check = wmf_civicrm_get_civi_id( 
'payment_instrument_id', 'Check' );
-
-$gateway_txn_id = mt_rand();
-$check_number = (string) mt_rand();
-
-$new_prefix = 'M' . mt_rand();
-
-return array(

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-12-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

8d7c42d Update SmashPig library

Change-Id: Ie8fba1b5369dcd30d0e30eec47e5948b4753dded
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/vendor b/vendor
index 36f9e5b..b861ec0 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 36f9e5b9d0e7cfe125dbc18ccf479ef6d7847edd
+Subproject commit b861ec091301115a10c0efb5969b869f861e6ef7

-- 
To view, visit https://gerrit.wikimedia.org/r/325723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8fba1b5369dcd30d0e30eec47e5948b4753dded
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-12-06 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325723

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

8d7c42d Update SmashPig library

Change-Id: Ie8fba1b5369dcd30d0e30eec47e5948b4753dded
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/23/325723/1

diff --git a/vendor b/vendor
index 36f9e5b..b861ec0 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 36f9e5b9d0e7cfe125dbc18ccf479ef6d7847edd
+Subproject commit b861ec091301115a10c0efb5969b869f861e6ef7

-- 
To view, visit https://gerrit.wikimedia.org/r/325723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8fba1b5369dcd30d0e30eec47e5948b4753dded
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-12-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

4f6227f Alternate fix for reconciliation report doubling some rows.

Change-Id: I9b4777523860541939b1f6cf02652dfc1f23772c
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/325691
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b4777523860541939b1f6cf02652dfc1f23772c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-12-06 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325691

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

4f6227f Alternate fix for reconciliation report doubling some rows.

Change-Id: I9b4777523860541939b1f6cf02652dfc1f23772c
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/91/325691/1


-- 
To view, visit https://gerrit.wikimedia.org/r/325691
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b4777523860541939b1f6cf02652dfc1f23772c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-21 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/322783

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

0fb91a4 Cache GiftData getOptions result
2fa4015 Cache campaign query results
681711e Cache Entity Tag lookup results

Change-Id: I2bc5fb6c99d244e180d6e17aa013d3437f0be7ad
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/83/322783/1


-- 
To view, visit https://gerrit.wikimedia.org/r/322783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bc5fb6c99d244e180d6e17aa013d3437f0be7ad
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-21 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

0fb91a4 Cache GiftData getOptions result
2fa4015 Cache campaign query results
681711e Cache Entity Tag lookup results

Change-Id: I2bc5fb6c99d244e180d6e17aa013d3437f0be7ad
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/322783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2bc5fb6c99d244e180d6e17aa013d3437f0be7ad
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-21 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And delete tests

e288e71 return value for TestMailer::send
705666f Speed up ty date update

Change-Id: Id9978dc5fc57db3bec08931c28ce6e1cbf608f34
---
D sites/all/modules/wmf_communication/tests/TestMailer.php
1 file changed, 0 insertions(+), 34 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/sites/all/modules/wmf_communication/tests/TestMailer.php 
b/sites/all/modules/wmf_communication/tests/TestMailer.php
deleted file mode 100644
index 226b2f5..000
--- a/sites/all/modules/wmf_communication/tests/TestMailer.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<<< HEAD   (9d462b Merge branch 'master' into deployment)
-===
->> BRANCH (9f3964 Merge "Speed up ty date update")

-- 
To view, visit https://gerrit.wikimedia.org/r/322719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9978dc5fc57db3bec08931c28ce6e1cbf608f34
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-21 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/322719

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

And delete tests

e288e71 return value for TestMailer::send
705666f Speed up ty date update

Change-Id: Id9978dc5fc57db3bec08931c28ce6e1cbf608f34
---
D sites/all/modules/wmf_communication/tests/TestMailer.php
1 file changed, 0 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/19/322719/1

diff --git a/sites/all/modules/wmf_communication/tests/TestMailer.php 
b/sites/all/modules/wmf_communication/tests/TestMailer.php
deleted file mode 100644
index 226b2f5..000
--- a/sites/all/modules/wmf_communication/tests/TestMailer.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<<< HEAD   (9d462b Merge branch 'master' into deployment)
-===
->> BRANCH (9f3964 Merge "Speed up ty date update")

-- 
To view, visit https://gerrit.wikimedia.org/r/322719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9978dc5fc57db3bec08931c28ce6e1cbf608f34
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-18 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/322285

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

d622cbb DRY up some message date code
3620795 Drop bad banner history entries w/o failmail

Change-Id: Id5058b809f1658fce4041741d4a038419d9e27e7
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/85/322285/1


-- 
To view, visit https://gerrit.wikimedia.org/r/322285
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5058b809f1658fce4041741d4a038419d9e27e7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

and update vendor submodule

1d22c6a Comment to explain salt-wierdness
9741d00 Update CiviCRM submodule
50ddfaf Update SmashPig library

Change-Id: I6c4c4d672137f287fafb1335287e95281de3effa
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/vendor b/vendor
index 555b3e7..36f9e5b 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 555b3e71552d230bddfc9aa7a7f7c2bcd98970bd
+Subproject commit 36f9e5b9d0e7cfe125dbc18ccf479ef6d7847edd

-- 
To view, visit https://gerrit.wikimedia.org/r/322003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c4c4d672137f287fafb1335287e95281de3effa
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-07 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And update vendor submodule

f83dbdd Fill in missing city and state from US zip code
55502be Kill any configured fraud checks before making recurring charges
81f8f07 Update DonationInterface library

Change-Id: I92310f473609cfc0c999ad49b89582a6a5ddf38c
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ejegg: Verified; Looks good to me, approved



diff --git a/vendor b/vendor
index 445cdbb..555b3e7 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 445cdbb5afe3df6ca1cf65d8dc600b5f4358b3b2
+Subproject commit 555b3e71552d230bddfc9aa7a7f7c2bcd98970bd

-- 
To view, visit https://gerrit.wikimedia.org/r/320251
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I92310f473609cfc0c999ad49b89582a6a5ddf38c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-07 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320251

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

And update vendor submodule

f83dbdd Fill in missing city and state from US zip code
55502be Kill any configured fraud checks before making recurring charges
81f8f07 Update DonationInterface library

Change-Id: I92310f473609cfc0c999ad49b89582a6a5ddf38c
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/51/320251/1

diff --git a/vendor b/vendor
index 445cdbb..555b3e7 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 445cdbb5afe3df6ca1cf65d8dc600b5f4358b3b2
+Subproject commit 555b3e71552d230bddfc9aa7a7f7c2bcd98970bd

-- 
To view, visit https://gerrit.wikimedia.org/r/320251
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92310f473609cfc0c999ad49b89582a6a5ddf38c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-03 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

7fff2a1 Allow banner history IDs less than 16 digits long

Change-Id: Ib4b5bdd8d772d34df24a7195d48358bbe6c0215c
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/319709
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4b5bdd8d772d34df24a7195d48358bbe6c0215c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-03 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/319709

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

7fff2a1 Allow banner history IDs less than 16 digits long

Change-Id: Ib4b5bdd8d772d34df24a7195d48358bbe6c0215c
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/09/319709/1


-- 
To view, visit https://gerrit.wikimedia.org/r/319709
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4b5bdd8d772d34df24a7195d48358bbe6c0215c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-03 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

e2a97ff Fix regex typo
bc32841 Rename decile value options.
04c00b8 Geocoding: trim zip to 5 characters before lookup
0dd07a5 Set gift field on import for contributions over 999.
ef233f1 Fix enotices due to passing wrong params to watchdog()
57705e0 Further e-notice fix.
8fa9266 Backfill gift so that donations of 1000+ have a gift source.

Change-Id: I30140c279ebf6ba9d4ba3c3de4df1a95568c7b97
---
D sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
1 file changed, 0 insertions(+), 384 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
deleted file mode 100644
index f0b3a50..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
+++ /dev/null
@@ -1,384 +0,0 @@
-<<< HEAD   (954bab Merge branch 'master' into deployment)
-===
-override( array(
-   'data-store' => array(
-   'donations' => array(
-   'class' => 'PHPQueue\Backend\PDO',
-   'constructor-parameters' => array( 
array(
-   'connection_string' => 
'sqlite::memory:'
-   ) )
-   ),
-   'refund-new' => array(
-   'class' => 'PHPQueue\Backend\PDO',
-   'constructor-parameters' => array( 
array(
-   'connection_string' => 
'sqlite::memory:'
-   ) )
-   ),
-   'recurring-new' => array(
-   'class' => 'PHPQueue\Backend\PDO',
-   'constructor-parameters' => array( 
array(
-   'connection_string' => 
'sqlite::memory:'
-   ) )
-   ),
-   )
-   ) );
-   Context::initWithLogger( $config );
-   $this->pendingDb = PendingDatabase::get();
-   $this->pendingDb->createTable();
-   $this->queueConsumer = new DonationQueueConsumer( 'donations' );
-   $this->refundConsumer = new RefundQueueConsumer( 'refund-new' );
-   $this->recurringConsumer = new RecurringQueueConsumer( 
'recurring-new' );
-   }
-
-/**
- * Process an ordinary (one-time) donation message
- */
-public function testDonation() {
-$message = new TransactionMessage(array('gross' => 400, 
'original_gross' => 400, 'original_currency' => 'USD'));
-$message2 = new TransactionMessage();
-
-exchange_rate_cache_set( 'USD', $message->get( 'date' ), 1 );
-exchange_rate_cache_set( $message->get( 'currency' ), $message->get( 
'date' ), 3 );
-
-$this->queueConsumer->processMessage( $message->getBody() );
-$this->queueConsumer->processMessage( $message2->getBody() );
-
-$contribution = civicrm_api3('Contribution', 'getsingle', array(
-  wmf_civicrm_get_custom_field_name('gateway_txn_id') => 
$message->getGatewayTxnId(),
-  'return' => array(wmf_civicrm_get_custom_field_name('Campaign'), 
'total_amount'),
-));
-
$this->assertEmpty($contribution[wmf_civicrm_get_custom_field_name('campaign')] 
);
-
-$contribution2 = civicrm_api3('Contribution', 'getsingle', array(
-  wmf_civicrm_get_custom_field_name('gateway_txn_id') => 
$message2->getGatewayTxnId(),
-  'return' => array(wmf_civicrm_get_custom_field_name('Campaign'), 
'total_amount'),
-));
-
-$this->assertEquals('Benefactor Gift', 
$contribution2[wmf_civicrm_get_custom_field_name('campaign')] );
-
-$this->assertNotEquals( $contribution['contact_id'], 
$contribution2['contact_id'] );
-}
-
-/**
- * Process an ordinary (one-time) donation message with an UTF campaign.
- */
-public function testDonationWithUTFCampaignOption() {
-$message = new TransactionMessage(array('utm_campaign' => 
'EmailCampaign1'));
-$appealFieldID = $this->createCustomOption('Appeal', 'EmailCampaign1');
-
-exchange_rate_cache_set( 'USD', $message->get( 'date' ), 1 );
-exchange_rate_cache_set( $message->get( 'currency' ), $message->get( 
'date' ), 3 );
-
-$this->queueConsumer->processMessage( $message->getBody()  );
-
-$contributions = wmf_civicrm_get_contributions_from_gateway_id(

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-03 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/319652

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

e2a97ff Fix regex typo
bc32841 Rename decile value options.
04c00b8 Geocoding: trim zip to 5 characters before lookup
0dd07a5 Set gift field on import for contributions over 999.
ef233f1 Fix enotices due to passing wrong params to watchdog()
57705e0 Further e-notice fix.
8fa9266 Backfill gift so that donations of 1000+ have a gift source.

Change-Id: I30140c279ebf6ba9d4ba3c3de4df1a95568c7b97
---
D sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
1 file changed, 0 insertions(+), 384 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/52/319652/1

diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
deleted file mode 100644
index f0b3a50..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
+++ /dev/null
@@ -1,384 +0,0 @@
-<<< HEAD   (954bab Merge branch 'master' into deployment)
-===
-override( array(
-   'data-store' => array(
-   'donations' => array(
-   'class' => 'PHPQueue\Backend\PDO',
-   'constructor-parameters' => array( 
array(
-   'connection_string' => 
'sqlite::memory:'
-   ) )
-   ),
-   'refund-new' => array(
-   'class' => 'PHPQueue\Backend\PDO',
-   'constructor-parameters' => array( 
array(
-   'connection_string' => 
'sqlite::memory:'
-   ) )
-   ),
-   'recurring-new' => array(
-   'class' => 'PHPQueue\Backend\PDO',
-   'constructor-parameters' => array( 
array(
-   'connection_string' => 
'sqlite::memory:'
-   ) )
-   ),
-   )
-   ) );
-   Context::initWithLogger( $config );
-   $this->pendingDb = PendingDatabase::get();
-   $this->pendingDb->createTable();
-   $this->queueConsumer = new DonationQueueConsumer( 'donations' );
-   $this->refundConsumer = new RefundQueueConsumer( 'refund-new' );
-   $this->recurringConsumer = new RecurringQueueConsumer( 
'recurring-new' );
-   }
-
-/**
- * Process an ordinary (one-time) donation message
- */
-public function testDonation() {
-$message = new TransactionMessage(array('gross' => 400, 
'original_gross' => 400, 'original_currency' => 'USD'));
-$message2 = new TransactionMessage();
-
-exchange_rate_cache_set( 'USD', $message->get( 'date' ), 1 );
-exchange_rate_cache_set( $message->get( 'currency' ), $message->get( 
'date' ), 3 );
-
-$this->queueConsumer->processMessage( $message->getBody() );
-$this->queueConsumer->processMessage( $message2->getBody() );
-
-$contribution = civicrm_api3('Contribution', 'getsingle', array(
-  wmf_civicrm_get_custom_field_name('gateway_txn_id') => 
$message->getGatewayTxnId(),
-  'return' => array(wmf_civicrm_get_custom_field_name('Campaign'), 
'total_amount'),
-));
-
$this->assertEmpty($contribution[wmf_civicrm_get_custom_field_name('campaign')] 
);
-
-$contribution2 = civicrm_api3('Contribution', 'getsingle', array(
-  wmf_civicrm_get_custom_field_name('gateway_txn_id') => 
$message2->getGatewayTxnId(),
-  'return' => array(wmf_civicrm_get_custom_field_name('Campaign'), 
'total_amount'),
-));
-
-$this->assertEquals('Benefactor Gift', 
$contribution2[wmf_civicrm_get_custom_field_name('campaign')] );
-
-$this->assertNotEquals( $contribution['contact_id'], 
$contribution2['contact_id'] );
-}
-
-/**
- * Process an ordinary (one-time) donation message with an UTF campaign.
- */
-public function testDonationWithUTFCampaignOption() {
-$message = new TransactionMessage(array('utm_campaign' => 
'EmailCampaign1'));
-$appealFieldID = $this->createCustomOption('Appeal', 'EmailCampaign1');
-
-exchange_rate_cache_set( 'USD', $message->get( 'date' ), 1 );
-exchange_rate_cache_set( $message->get( 'currency' ), $message->get( 
'date' ), 3 );
-
-$this->queueConsumer->processMessage( $message->getBody()  );
-
-$contributions =

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-01 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

98fb6c0 Explicitly create table, break up updates

Change-Id: I0ebdb49d793c2443c14fc28d6d48e71f253135f5
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/319261
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ebdb49d793c2443c14fc28d6d48e71f253135f5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-01 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/319261

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

98fb6c0 Explicitly create table, break up updates

Change-Id: I0ebdb49d793c2443c14fc28d6d48e71f253135f5
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/61/319261/1


-- 
To view, visit https://gerrit.wikimedia.org/r/319261
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ebdb49d793c2443c14fc28d6d48e71f253135f5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-01 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

94feca9 Local geocoding for US addresses
4bc6d15 Trim whitespace when comparing names for conflicts.
a328268 Eradicate Stomp from crm repo
3eaafd1 Fix contacts who have no primary address.
e4bf03d Geocode existing US addresses
37b0b1a Fill missing order_id while normalizing

Change-Id: I7a6a1e5f809678e5d80c5c3cac5240c7fc5a3c3a
---
M sites/all/modules/queue2civicrm/queue2civicrm.info
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/NormalizeMessageTest.php
3 files changed, 1 insertion(+), 678 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/sites/all/modules/queue2civicrm/queue2civicrm.info 
b/sites/all/modules/queue2civicrm/queue2civicrm.info
index 81d80d0..40db4d2 100644
--- a/sites/all/modules/queue2civicrm/queue2civicrm.info
+++ b/sites/all/modules/queue2civicrm/queue2civicrm.info
@@ -7,9 +7,4 @@
 package = queue2civicrm
 files[] = Queue2civicrmTrxnCounter.php
 files[] = DonationQueueConsumer.php
-<<< HEAD   (56eada Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-files[] = Stomp.php
-===
-files[] = tests/includes/Message.php
-files[] = tests/includes/TestingSmashPigDbQueueConfiguration.php
->>> BRANCH (37b0b1 Fill missing order_id while normalizing)
+
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index ad29169..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ /dev/null
@@ -1,570 +0,0 @@
-<<< HEAD   (56eada Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
- WMF_CAMPAIGNS_OPTION_GROUP_NAME,
-'label' => ImportMessageTest_campaign,
-'value' => ImportMessageTest_campaign,
-) );
-}
-
-public function tearDown() {
-if ( $this->contribution_id ) {
-civicrm_api_classapi()->Contribution->Delete( array(
-'id' => $this->contribution_id,
-'version' => '3',
-) );
-}
-parent::tearDown();
-}
-
-/**
- * @dataProvider messageProvider
- */
-public function testMessageInsert( $msg, $expected ) {
-$contribution = wmf_civicrm_contribution_message_import( $msg );
-$this->contribution_id = $contribution['id'];
-
-// Ignore contact_id if we have no expectation.
-if ( empty( $expected['contribution']['contact_id'] ) ) {
-$this->fieldsToIgnore[] = 'contact_id';
-}
-
-$this->assertComparable( $expected['contribution'], $contribution );
-
-if ( !empty( $expected['contribution_custom_values'] ) ) {
-$actual_contribution_custom_values = wmf_civicrm_get_custom_values(
-$contribution['id'],
-array_keys( $expected['contribution_custom_values'] )
-);
-$this->assertEquals( $expected['contribution_custom_values'], 
$actual_contribution_custom_values );
-}
-
-if ( !empty( $expected['contact'] ) ) {
-$api = civicrm_api_classapi();
-$api->Contact->Get( array(
-'id' => $contribution['contact_id'],
-'version' => 3,
-) );
-$contact = (array) $api->values[0];
-$renamedFields = array('prefix' => 1, 'suffix' => 1);
-$this->assertEquals( array_diff_key($expected['contact'], 
$renamedFields), array_intersect_key( $expected['contact'], $contact ) );
-foreach (array_keys($renamedFields) as $renamedField) {
-$this->assertEquals(civicrm_api3('OptionValue', 'getvalue', 
array(
-'value' => $contact[$renamedField . '_id'],
-'option_group_id' => 'individual_' . $renamedField,
-'return' => 'name',
-)), $expected['contact'][$renamedField]);
-}
-}
-
-   if ( !empty( $expected['address'] ) ) {
-   $addresses = civicrm_api3( 'Address', 'get', array(
-   'contact_id' => $contribution['contact_id'],
-   'return' => 
'city,postal_code,street_address,geo_code_1,geo_code_2,timezone',
-   ) );
-   $address = $addresses['values'][$addresses['id']];
-   $this->assertComparable( $expected['address'], $address 
);
-   }
-
-if ( !empty( $expected['contact_custom_values'] ) ) {
-$actual_contact_custom_values = wmf_civicrm_get_custom_values(
-$contribution['contact_id'],
-array_keys(

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-11-01 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/319246

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

94feca9 Local geocoding for US addresses
4bc6d15 Trim whitespace when comparing names for conflicts.
a328268 Eradicate Stomp from crm repo
3eaafd1 Fix contacts who have no primary address.
e4bf03d Geocode existing US addresses
37b0b1a Fill missing order_id while normalizing

Change-Id: I7a6a1e5f809678e5d80c5c3cac5240c7fc5a3c3a
---
M sites/all/modules/queue2civicrm/queue2civicrm.info
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/NormalizeMessageTest.php
3 files changed, 1 insertion(+), 678 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/46/319246/1

diff --git a/sites/all/modules/queue2civicrm/queue2civicrm.info 
b/sites/all/modules/queue2civicrm/queue2civicrm.info
index 81d80d0..40db4d2 100644
--- a/sites/all/modules/queue2civicrm/queue2civicrm.info
+++ b/sites/all/modules/queue2civicrm/queue2civicrm.info
@@ -7,9 +7,4 @@
 package = queue2civicrm
 files[] = Queue2civicrmTrxnCounter.php
 files[] = DonationQueueConsumer.php
-<<< HEAD   (56eada Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-files[] = Stomp.php
-===
-files[] = tests/includes/Message.php
-files[] = tests/includes/TestingSmashPigDbQueueConfiguration.php
->>> BRANCH (37b0b1 Fill missing order_id while normalizing)
+
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
deleted file mode 100644
index ad29169..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ /dev/null
@@ -1,570 +0,0 @@
-<<< HEAD   (56eada Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
- WMF_CAMPAIGNS_OPTION_GROUP_NAME,
-'label' => ImportMessageTest_campaign,
-'value' => ImportMessageTest_campaign,
-) );
-}
-
-public function tearDown() {
-if ( $this->contribution_id ) {
-civicrm_api_classapi()->Contribution->Delete( array(
-'id' => $this->contribution_id,
-'version' => '3',
-) );
-}
-parent::tearDown();
-}
-
-/**
- * @dataProvider messageProvider
- */
-public function testMessageInsert( $msg, $expected ) {
-$contribution = wmf_civicrm_contribution_message_import( $msg );
-$this->contribution_id = $contribution['id'];
-
-// Ignore contact_id if we have no expectation.
-if ( empty( $expected['contribution']['contact_id'] ) ) {
-$this->fieldsToIgnore[] = 'contact_id';
-}
-
-$this->assertComparable( $expected['contribution'], $contribution );
-
-if ( !empty( $expected['contribution_custom_values'] ) ) {
-$actual_contribution_custom_values = wmf_civicrm_get_custom_values(
-$contribution['id'],
-array_keys( $expected['contribution_custom_values'] )
-);
-$this->assertEquals( $expected['contribution_custom_values'], 
$actual_contribution_custom_values );
-}
-
-if ( !empty( $expected['contact'] ) ) {
-$api = civicrm_api_classapi();
-$api->Contact->Get( array(
-'id' => $contribution['contact_id'],
-'version' => 3,
-) );
-$contact = (array) $api->values[0];
-$renamedFields = array('prefix' => 1, 'suffix' => 1);
-$this->assertEquals( array_diff_key($expected['contact'], 
$renamedFields), array_intersect_key( $expected['contact'], $contact ) );
-foreach (array_keys($renamedFields) as $renamedField) {
-$this->assertEquals(civicrm_api3('OptionValue', 'getvalue', 
array(
-'value' => $contact[$renamedField . '_id'],
-'option_group_id' => 'individual_' . $renamedField,
-'return' => 'name',
-)), $expected['contact'][$renamedField]);
-}
-}
-
-   if ( !empty( $expected['address'] ) ) {
-   $addresses = civicrm_api3( 'Address', 'get', array(
-   'contact_id' => $contribution['contact_id'],
-   'return' => 
'city,postal_code,street_address,geo_code_1,geo_code_2,timezone',
-   ) );
-   $address = $addresses['values'][$addresses['id']];
-   $this->assertComparable( $expected['address'], $address 
);
-   }
-
-if ( !empty( $expected['contact_custom_values'] ) ) {
-$actual_contact_custom_values = wmf_civicrm_get_custom_values(
-$contribution['contact_id'],
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-26 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

and update vendor

e824ec0 Update SmashPig lib
a0babf2 Log raw messages in queue consumers
b3ae49a Add decile field to prospect.
d841af3 Add new prospect custom fields to custom fields declaration.
d1f874a Update trigger mysql
97edcc1 Add benefactor fields.
d2bda21 Address a second way in which contacts are winding up without primaries.
b63ccfc Adjust preferred_language dedupe conflict resolution to prefer later 
donor.
94b6845 Remove placeholder emails (n...@na.com).
912b850 CiviCRM submodule update

Change-Id: Ia48177d190ffab725ff35ef67a138e9399b38abe
---
M composer.lock
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
M vendor
3 files changed, 1 insertion(+), 2,293 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.lock b/composer.lock
index 4343486..82fa960 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1241,1067 +1241,7 @@
 "time": "2015-11-05 07:14:57"
 }
 ],
-<<< HEAD   (586433 Merge branch 'master' into deployment)
 "packages-dev": null,
-===
-"packages-dev": [
-{
-"name": "doctrine/instantiator",
-"version": "1.0.5",
-"source": {
-"type": "git",
-"url": "https://github.com/doctrine/instantiator.git;,
-"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d;,
-"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-"shasum": ""
-},
-"require": {
-"php": ">=5.3,<8.0-DEV"
-},
-"require-dev": {
-"athletic/athletic": "~0.1.8",
-"ext-pdo": "*",
-"ext-phar": "*",
-"phpunit/phpunit": "~4.0",
-"squizlabs/php_codesniffer": "~2.0"
-},
-"type": "library",
-"extra": {
-"branch-alias": {
-"dev-master": "1.0.x-dev"
-}
-},
-"autoload": {
-"psr-4": {
-"Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Marco Pivetta",
-"email": "ocram...@gmail.com",
-"homepage": "http://ocramius.github.com/;
-}
-],
-"description": "A small, lightweight utility to instantiate 
objects in PHP without invoking their constructors",
-"homepage": "https://github.com/doctrine/instantiator;,
-"keywords": [
-"constructor",
-"instantiate"
-],
-"time": "2015-06-14 21:17:01"
-},
-{
-"name": "phpdocumentor/reflection-common",
-"version": "1.0",
-"source": {
-"type": "git",
-"url": "https://github.com/phpDocumentor/ReflectionCommon.git;,
-"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c;,
-"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-"shasum": ""
-},
-"require": {
-"php": ">=5.5"
-},
-"require-dev": {
-"phpunit/phpunit": "^4.6"
-},
-"type": "library",
-"extra": {
-"branch-alias": {
-"dev-master": "1.0.x-dev"
-}
-},
-"autoload": {
-"psr-4": {
-"phpDocumentor\\Reflection\\": [
-"src"
-]
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Jaap van Otterdijk",
-"email": "opensou...@ijaap.nl"
-}
-],
-"description": "Common reflection classes used by phpdocumentor to 
reflect the code structure",
-"homepage": "http://www.phpdoc.org;,
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-26 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/318238

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

and update vendor

e824ec0 Update SmashPig lib
a0babf2 Log raw messages in queue consumers
b3ae49a Add decile field to prospect.
d841af3 Add new prospect custom fields to custom fields declaration.
d1f874a Update trigger mysql
97edcc1 Add benefactor fields.
d2bda21 Address a second way in which contacts are winding up without primaries.
b63ccfc Adjust preferred_language dedupe conflict resolution to prefer later 
donor.
94b6845 Remove placeholder emails (n...@na.com).
912b850 CiviCRM submodule update

Change-Id: Ia48177d190ffab725ff35ef67a138e9399b38abe
---
M composer.lock
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
M vendor
3 files changed, 1 insertion(+), 2,293 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/38/318238/1

diff --git a/composer.lock b/composer.lock
index 4343486..82fa960 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1241,1067 +1241,7 @@
 "time": "2015-11-05 07:14:57"
 }
 ],
-<<< HEAD   (586433 Merge branch 'master' into deployment)
 "packages-dev": null,
-===
-"packages-dev": [
-{
-"name": "doctrine/instantiator",
-"version": "1.0.5",
-"source": {
-"type": "git",
-"url": "https://github.com/doctrine/instantiator.git;,
-"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d;,
-"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-"shasum": ""
-},
-"require": {
-"php": ">=5.3,<8.0-DEV"
-},
-"require-dev": {
-"athletic/athletic": "~0.1.8",
-"ext-pdo": "*",
-"ext-phar": "*",
-"phpunit/phpunit": "~4.0",
-"squizlabs/php_codesniffer": "~2.0"
-},
-"type": "library",
-"extra": {
-"branch-alias": {
-"dev-master": "1.0.x-dev"
-}
-},
-"autoload": {
-"psr-4": {
-"Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Marco Pivetta",
-"email": "ocram...@gmail.com",
-"homepage": "http://ocramius.github.com/;
-}
-],
-"description": "A small, lightweight utility to instantiate 
objects in PHP without invoking their constructors",
-"homepage": "https://github.com/doctrine/instantiator;,
-"keywords": [
-"constructor",
-"instantiate"
-],
-"time": "2015-06-14 21:17:01"
-},
-{
-"name": "phpdocumentor/reflection-common",
-"version": "1.0",
-"source": {
-"type": "git",
-"url": "https://github.com/phpDocumentor/ReflectionCommon.git;,
-"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c;,
-"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-"shasum": ""
-},
-"require": {
-"php": ">=5.5"
-},
-"require-dev": {
-"phpunit/phpunit": "^4.6"
-},
-"type": "library",
-"extra": {
-"branch-alias": {
-"dev-master": "1.0.x-dev"
-}
-},
-"autoload": {
-"psr-4": {
-"phpDocumentor\\Reflection\\": [
-"src"
-]
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Jaap van Otterdijk",
-"email": "opensou...@ijaap.nl"
-}
-],
-"description": "Common reflection classes used by phpdocumentor to 
reflect the code structure",
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-25 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

851768c Add pager back to damaged message form
8172fc6 Horrible terrible drupal form workaround

Change-Id: Iaae291928f33ebc6fc3d27e5051210ff5313473b
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/318001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaae291928f33ebc6fc3d27e5051210ff5313473b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-25 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/318001

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

851768c Add pager back to damaged message form
8172fc6 Horrible terrible drupal form workaround

Change-Id: Iaae291928f33ebc6fc3d27e5051210ff5313473b
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/01/318001/1


-- 
To view, visit https://gerrit.wikimedia.org/r/318001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaae291928f33ebc6fc3d27e5051210ff5313473b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-25 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

d676270 Refund QC: fix missing 'use', better logging
74fd7c6 Put offline  receipt into it's own file
5665f46 Switch receipt to use original amount & currency if provided.

Change-Id: I0c5988359dbaf596c0b5ceeddf1ef9ff9df77c51
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/317882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0c5988359dbaf596c0b5ceeddf1ef9ff9df77c51
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-25 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/317882

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

d676270 Refund QC: fix missing 'use', better logging
74fd7c6 Put offline  receipt into it's own file
5665f46 Switch receipt to use original amount & currency if provided.

Change-Id: I0c5988359dbaf596c0b5ceeddf1ef9ff9df77c51
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/82/317882/1


-- 
To view, visit https://gerrit.wikimedia.org/r/317882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c5988359dbaf596c0b5ceeddf1ef9ff9df77c51
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-24 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

And update vendor

c05d5a4 Revert "Pager glue for the damaged queue"
eb11a7a Remove remaining pager support, until we can implement correctly
dc53e8d More flexible import validation
c47a2ab Don't delete pending data for failed:review
b04e7d7 Fix composer.lock mismatch with deployment
d113c2a Only leave details for 'failed:review' status

Change-Id: Id314678a20fe21217141e44a526250546c445c63
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/vendor b/vendor
index ea99018..ca78582 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit ea9901895c3ab1290a3397b82ab6b91dcee2f1b2
+Subproject commit ca785827ac5636a3a9a0c022fb56ee834b48f4fc

-- 
To view, visit https://gerrit.wikimedia.org/r/317662
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id314678a20fe21217141e44a526250546c445c63
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-24 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/317662

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

And update vendor

c05d5a4 Revert "Pager glue for the damaged queue"
eb11a7a Remove remaining pager support, until we can implement correctly
dc53e8d More flexible import validation
c47a2ab Don't delete pending data for failed:review
b04e7d7 Fix composer.lock mismatch with deployment
d113c2a Only leave details for 'failed:review' status

Change-Id: Id314678a20fe21217141e44a526250546c445c63
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/62/317662/1

diff --git a/vendor b/vendor
index ea99018..ca78582 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit ea9901895c3ab1290a3397b82ab6b91dcee2f1b2
+Subproject commit ca785827ac5636a3a9a0c022fb56ee834b48f4fc

-- 
To view, visit https://gerrit.wikimedia.org/r/317662
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id314678a20fe21217141e44a526250546c445c63
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

Delete tests, update vendor

bd9311f Resolve conflicts on preferred language.
8913012 Update backoffice message template to allow receipt resends.
d83fb37 Update DonationInterface library

Change-Id: If2f769ec1d71cf9f8a1566e24b5fccb82c29f5d0
---
M composer.lock
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
M vendor
3 files changed, 1 insertion(+), 1,097 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.lock b/composer.lock
index ca252e9..e47ba7e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1091,11 +1091,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git;,
-<<< HEAD   (868282 Merge branch 'master' into deployment)
-"reference": "ebb773d1d725cecf1d745e9d0ff345060120bc3c"
-===
 "reference": "675a404c1114b598ca0e0cd93b04b9d3510ffc4d"
->>> BRANCH (d83fb3 Update DonationInterface library)
 },
 "require": {
 "amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1135,11 +1131,7 @@
 "GPL-2.0"
 ],
 "description": "Wikimedia Foundation payment processing library",
-<<< HEAD   (868282 Merge branch 'master' into deployment)
-"time": "2016-09-15 19:32:11"
-===
 "time": "2016-10-11 20:43:31"
->>> BRANCH (d83fb3 Update DonationInterface library)
 },
 {
 "name": "wikimedia/smash-pig",
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
deleted file mode 100644
index 415b59b..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ /dev/null
@@ -1,1088 +0,0 @@
-<<< HEAD   (868282 Merge branch 'master' into deployment)
-===
-imitateAdminUser();
-$this->doDuckHunt();
-// Run through the merge first to make sure there aren't pre-existing 
contacts in the DB
-// that will ruin the tests.
-$this->callAPISuccess('Job', 'process_batch_merge', array('mode' => 
'safe'));
-
-$this->contactID = 
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') => 
0));
-$this->contactID2 = 
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') => 
1));
-  }
-
-  public function tearDown() {
-$this->callAPISuccess('Contribution', 'get', array(
-  'contact_id' => array('IN' => array($this->contactID, 
$this->contactID2)),
-  'api.Contribution.delete' => 1,
-));
-$this->callAPISuccess('Contact', 'delete', array('id' => 
$this->contactID));
-$this->callAPISuccess('Contact', 'delete', array('id' => 
$this->contactID2));
-parent::tearDown();
-  }
-
-  /**
-   * Test that the merge hook causes our custom fields to not be treated as 
conflicts.
-   *
-   * We also need to check the custom data fields afterwards.
-   */
-  public function testMergeHook() {
-$this->callAPISuccess('Contribution', 'create', array(
-  'contact_id' => $this->contactID,
-  'financial_type_id' => 'Cash',
-  'total_amount' => 10,
-  'currency' => 'USD',
-  // Should cause 'is_2014 to be true.
-  'receive_date' => '2014-08-04',
-  wmf_civicrm_get_custom_field_name('original_currency') => 'NZD',
-  wmf_civicrm_get_custom_field_name('original_amount') => 8,
-));
-$this->callAPISuccess('Contribution', 'create', array(
-  'contact_id' => $this->contactID2,
-  'financial_type_id' => 'Cash',
-  'total_amount' => 5,
-  'currency' => 'USD',
-  // Should cause 'is_2012_donor to be true.
-  'receive_date' => '2013-01-04',
-));
-$this->callAPISuccess('Contribution', 'create', array(
-  'contact_id' => $this->contactID2,
-  'financial_type_id' => 'Cash',
-  'total_amount' => 9,
-  'currency' => 'NZD',
-  // Should cause 'is_2015_donor to be true.
-  'receive_date' => '2016-04-04',
-));
-$contact = $this->callAPISuccess('Contact', 'get', array(
-  'id' => $this->contactID,
-  'sequential' => 1,
-  'return' => 
array(wmf_civicrm_get_custom_field_name('lifetime_usd_total'), 
wmf_civicrm_get_custom_field_name('do_not_solicit')),
-));
-$this->assertEquals(10, 
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$result = $this->callAPISuccess('Job', 'process_batch_merge', array(
-  'criteria' => array('contact' => array('id' => array('IN' => 
array($this->contactID, $this->contactID2,
-));
-$this->assertEquals(1, count($result['values']['merged']));
-$contact = $this->callAPISuccess('Contact', 'get', array(
-  'id' =>

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-12 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315556

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

Delete tests, update vendor

bd9311f Resolve conflicts on preferred language.
8913012 Update backoffice message template to allow receipt resends.
d83fb37 Update DonationInterface library

Change-Id: If2f769ec1d71cf9f8a1566e24b5fccb82c29f5d0
---
M composer.lock
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
M vendor
3 files changed, 1 insertion(+), 1,097 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/56/315556/1

diff --git a/composer.lock b/composer.lock
index ca252e9..e47ba7e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1091,11 +1091,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git;,
-<<< HEAD   (868282 Merge branch 'master' into deployment)
-"reference": "ebb773d1d725cecf1d745e9d0ff345060120bc3c"
-===
 "reference": "675a404c1114b598ca0e0cd93b04b9d3510ffc4d"
->>> BRANCH (d83fb3 Update DonationInterface library)
 },
 "require": {
 "amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1135,11 +1131,7 @@
 "GPL-2.0"
 ],
 "description": "Wikimedia Foundation payment processing library",
-<<< HEAD   (868282 Merge branch 'master' into deployment)
-"time": "2016-09-15 19:32:11"
-===
 "time": "2016-10-11 20:43:31"
->>> BRANCH (d83fb3 Update DonationInterface library)
 },
 {
 "name": "wikimedia/smash-pig",
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
deleted file mode 100644
index 415b59b..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ /dev/null
@@ -1,1088 +0,0 @@
-<<< HEAD   (868282 Merge branch 'master' into deployment)
-===
-imitateAdminUser();
-$this->doDuckHunt();
-// Run through the merge first to make sure there aren't pre-existing 
contacts in the DB
-// that will ruin the tests.
-$this->callAPISuccess('Job', 'process_batch_merge', array('mode' => 
'safe'));
-
-$this->contactID = 
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') => 
0));
-$this->contactID2 = 
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') => 
1));
-  }
-
-  public function tearDown() {
-$this->callAPISuccess('Contribution', 'get', array(
-  'contact_id' => array('IN' => array($this->contactID, 
$this->contactID2)),
-  'api.Contribution.delete' => 1,
-));
-$this->callAPISuccess('Contact', 'delete', array('id' => 
$this->contactID));
-$this->callAPISuccess('Contact', 'delete', array('id' => 
$this->contactID2));
-parent::tearDown();
-  }
-
-  /**
-   * Test that the merge hook causes our custom fields to not be treated as 
conflicts.
-   *
-   * We also need to check the custom data fields afterwards.
-   */
-  public function testMergeHook() {
-$this->callAPISuccess('Contribution', 'create', array(
-  'contact_id' => $this->contactID,
-  'financial_type_id' => 'Cash',
-  'total_amount' => 10,
-  'currency' => 'USD',
-  // Should cause 'is_2014 to be true.
-  'receive_date' => '2014-08-04',
-  wmf_civicrm_get_custom_field_name('original_currency') => 'NZD',
-  wmf_civicrm_get_custom_field_name('original_amount') => 8,
-));
-$this->callAPISuccess('Contribution', 'create', array(
-  'contact_id' => $this->contactID2,
-  'financial_type_id' => 'Cash',
-  'total_amount' => 5,
-  'currency' => 'USD',
-  // Should cause 'is_2012_donor to be true.
-  'receive_date' => '2013-01-04',
-));
-$this->callAPISuccess('Contribution', 'create', array(
-  'contact_id' => $this->contactID2,
-  'financial_type_id' => 'Cash',
-  'total_amount' => 9,
-  'currency' => 'NZD',
-  // Should cause 'is_2015_donor to be true.
-  'receive_date' => '2016-04-04',
-));
-$contact = $this->callAPISuccess('Contact', 'get', array(
-  'id' => $this->contactID,
-  'sequential' => 1,
-  'return' => 
array(wmf_civicrm_get_custom_field_name('lifetime_usd_total'), 
wmf_civicrm_get_custom_field_name('do_not_solicit')),
-));
-$this->assertEquals(10, 
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$result = $this->callAPISuccess('Job', 'process_batch_merge', array(
-  'criteria' => array('contact' => array('id' => array('IN' => 
array($this->contactID, $this->contactID2,
-));
-$this->assertEquals(1, count($result['values']['merged']));
-$contact =

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-11 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

and update vendor

16cb282 Update SmashPig lib for better re-queue handling

Change-Id: I7d2246f310521e0a162715041e315793a497d31e
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/vendor b/vendor
index 98cd37f..4a66806 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 98cd37f7c23453fdc75547a98c4fc5d4a8269af1
+Subproject commit 4a6680654f7b0633f8ac2c6358417636ad7fb26c

-- 
To view, visit https://gerrit.wikimedia.org/r/315442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d2246f310521e0a162715041e315793a497d31e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-11 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315442

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

and update vendor

16cb282 Update SmashPig lib for better re-queue handling

Change-Id: I7d2246f310521e0a162715041e315793a497d31e
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/42/315442/1

diff --git a/vendor b/vendor
index 98cd37f..4a66806 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 98cd37f7c23453fdc75547a98c4fc5d4a8269af1
+Subproject commit 4a6680654f7b0633f8ac2c6358417636ad7fb26c

-- 
To view, visit https://gerrit.wikimedia.org/r/315442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d2246f310521e0a162715041e315793a497d31e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

ae45254 Initialize smashpig context on-demand

Change-Id: I7ac0a7a2ae411c5c501e7ad4fa409a764fdf157d
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/314447
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ac0a7a2ae411c5c501e7ad4fa409a764fdf157d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-05 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

and update vendor

eacb42c Remove obsolete and broken wmf_unsubscribe module
dc5c988 Stop mirroring to stomp from audit processors
7466613 Fix retry date calculation logic
1b4506c Update SmashPig to fix failmail
22751bb Fix audit refund bug from parent patch, clean up

Change-Id: Iefbb6fa5d4c0882e900ff5b8addd843758a423ed
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/vendor b/vendor
index 9b391dc..98cd37f 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 9b391dcaed3203743ca93df799313ed2f15bb71c
+Subproject commit 98cd37f7c23453fdc75547a98c4fc5d4a8269af1

-- 
To view, visit https://gerrit.wikimedia.org/r/314432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iefbb6fa5d4c0882e900ff5b8addd843758a423ed
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-05 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/314432

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

eacb42c Remove obsolete and broken wmf_unsubscribe module
dc5c988 Stop mirroring to stomp from audit processors
7466613 Fix retry date calculation logic
1b4506c Update SmashPig to fix failmail
22751bb Fix audit refund bug from parent patch, clean up

Change-Id: Iefbb6fa5d4c0882e900ff5b8addd843758a423ed
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/32/314432/1


-- 
To view, visit https://gerrit.wikimedia.org/r/314432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefbb6fa5d4c0882e900ff5b8addd843758a423ed
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-10-05 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/314320

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

5c246d891fa72adcd8d04d7a9476523f9ef1831b Payments-init consumer only deletes 
pending on fail
d1009f4e61c4b2cddf11fe0abb7defa9df509546 0 instead of '' for Unlimited messages
1d938b7c925f778954dba9eb51d5e3feecca21ea Ignore conflicts on contact source.
e0a7d86b1b334eceaead8ebc5c9c9cccfd22692b MVP: damaged message table UI
1540aefd117698747cc625a22b445ac835c0c0d5 Pager glue for the damaged queue

Change-Id: I0dc600f6aedaa7f0b4c91a5bc128215f621c15ad
---
M composer.lock
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
2 files changed, 0 insertions(+), 1,045 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/20/314320/1

diff --git a/composer.lock b/composer.lock
index 0175b12..55d8657 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1139,11 +1139,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-<<< HEAD   (5f53ef Fix merge error)
-"reference": "61f47be34b4c8ade307bf218b84c55966a8e4acb"
-===
 "reference": "172fc5b410a5f0437a535b138a50dfff00c23c31"
->>> BRANCH (0875f8 Merge "Pager glue for the damaged queue")
 },
 "require": {
 "amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1194,11 +1190,7 @@
 "donations",
 "payments"
 ],
-<<< HEAD   (5f53ef Fix merge error)
-"time": "2016-09-15 00:32:38"
-===
 "time": "2016-10-03 16:32:27"
->>> BRANCH (0875f8 Merge "Pager glue for the damaged queue")
 },
 {
 "name": "zordius/lightncandy",
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
deleted file mode 100644
index 3b31a5e..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ /dev/null
@@ -1,1037 +0,0 @@
-<<< HEAD   (5f53ef Fix merge error)
-===
-imitateAdminUser();
-$this->doDuckHunt();
-// Run through the merge first to make sure there aren't pre-existing 
contacts in the DB
-// that will ruin the tests.
-$this->callAPISuccess('Job', 'process_batch_merge', array('mode' => 
'safe'));
-
-$this->contactID = 
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') => 
0));
-$this->contactID2 = 
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') => 
1));
-  }
-
-  public function tearDown() {
-$this->callAPISuccess('Contribution', 'get', array(
-  'contact_id' => array('IN' => array($this->contactID, 
$this->contactID2)),
-  'api.Contribution.delete' => 1,
-));
-$this->callAPISuccess('Contact', 'delete', array('id' => 
$this->contactID));
-$this->callAPISuccess('Contact', 'delete', array('id' => 
$this->contactID2));
-parent::tearDown();
-  }
-
-  /**
-   * Test that the merge hook causes our custom fields to not be treated as 
conflicts.
-   *
-   * We also need to check the custom data fields afterwards.
-   */
-  public function testMergeHook() {
-$this->callAPISuccess('Contribution', 'create', array(
-  'contact_id' => $this->contactID,
-  'financial_type_id' => 'Cash',
-  'total_amount' => 10,
-  'currency' => 'USD',
-  // Should cause 'is_2014 to be true.
-  'receive_date' => '2014-08-04',
-  wmf_civicrm_get_custom_field_name('original_currency') => 'NZD',
-  wmf_civicrm_get_custom_field_name('original_amount') => 8,
-));
-$this->callAPISuccess('Contribution', 'create', array(
-  'contact_id' => $this->contactID2,
-  'financial_type_id' => 'Cash',
-  'total_amount' => 5,
-  'currency' => 'USD',
-  // Should cause 'is_2012_donor to be true.
-  'receive_date' => '2013-01-04',
-));
-$this->callAPISuccess('Contribution', 'create', array(
-  'contact_id' => $this->contactID2,
-  'financial_type_id' => 'Cash',
-  'total_amount' => 9,
-  'currency' => 'NZD',
-  // Should cause 'is_2015_donor to be true.
-  'receive_date' => '2016-04-04',
-));
-$contact = $this->callAPISuccess('Contact', 'get', array(
-  'id' => $this->contactID,
-  'sequential' => 1,
-  'return' => 
array(wmf_civicrm_get_custom_field_name('lifetime_usd_total'), 
wmf_civicrm_get_custom_field_name('do_not_solicit')),
-));
-$this->assertEquals(10, 
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$result = $this->callAPISuccess('Job', 'process_batch_merge', array(
-  'criteria' => array('contact' => array('id' => array('IN' => 
array($this->contactID, $this->contactID2,
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-09-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

4e8e1cf Remove placeholder email addresses.

Change-Id: I9908175da162a810cb2044c944f9e555164808a7
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/310057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9908175da162a810cb2044c944f9e555164808a7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-09-12 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310057

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

4e8e1cf Remove placeholder email addresses.

Change-Id: I9908175da162a810cb2044c944f9e555164808a7
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/57/310057/1


-- 
To view, visit https://gerrit.wikimedia.org/r/310057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9908175da162a810cb2044c944f9e555164808a7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-09-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

55c83351b40c49b3e43a777e3052c39d369df02d Delete from pending db once the 
transaction is completed
69e5d0bc7edef6df48d44027c58741ebfa819fe7 Let DI globals come from configuration 
files.
5183cc439a410dd30618aa6d2a0188b8a7f03ea7 Import refunds by contribution ID

Change-Id: Ife1b80962ac418b111d98fa1ce936d0875e764bb
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Awight: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/309458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife1b80962ac418b111d98fa1ce936d0875e764bb
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-09-08 Thread Awight (Code Review)

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/309458

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

55c83351b40c49b3e43a777e3052c39d369df02d Delete from pending db once the 
transaction is completed
69e5d0bc7edef6df48d44027c58741ebfa819fe7 Let DI globals come from configuration 
files.
5183cc439a410dd30618aa6d2a0188b8a7f03ea7 Import refunds by contribution ID

Change-Id: Ife1b80962ac418b111d98fa1ce936d0875e764bb
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/58/309458/1


-- 
To view, visit https://gerrit.wikimedia.org/r/309458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife1b80962ac418b111d98fa1ce936d0875e764bb
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-09-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

feffaf4 Move banner history off ActiveMQ
d0ba956 Fix log messag to count correct variable.
23c983c Remove WorldPay

Change-Id: Iea44a3ba78437da1e6ae62ec196ff6c0be0b1cb4
---
D sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
1 file changed, 0 insertions(+), 66 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
deleted file mode 100644
index b0ec1b7..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<<< HEAD   (7484c9 Merge branch 'master' into deployment)
-===
-createTable( 'test' );
-   $this->consumer = new BannerHistoryQueueConsumer(
-   'test'
-   );
-   }
-
-   public function testValidMessage() {
-   $msg = array(
-   'banner_history_id' => substr(
-   md5( mt_rand() . time() ), 0, 16
-   ),
-   'contribution_tracking_id' => strval( mt_rand() ),
-   );
-   $this->consumer->processMessage( $msg );
-   // check for thing in db
-   }
-
-   /**
-* @expectedException WmfException
-*/
-   public function testBadContributionId() {
-   $msg = array(
-   'banner_history_id' => substr(
-   md5( mt_rand() . time() ), 0, 16
-   ),
-   'contribution_tracking_id' => '1=1; DROP TABLE 
students;--',
-   );
-   $this->consumer->processMessage( $msg );
-   }
-
-   /**
-* @expectedException WmfException
-*/
-   public function testBadHistoryId() {
-   $msg = array(
-   'banner_history_id' => '\';GRANT ALL ON drupal.* TO 
\'leet\'@\'haxx0r\'',
-   'contribution_tracking_id' => strval( mt_rand() ),
-   );
-   $this->consumer->processMessage( $msg );
-   }
-}
->>> BRANCH (1e8b60 Merge "Move banner history off ActiveMQ")

-- 
To view, visit https://gerrit.wikimedia.org/r/308781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea44a3ba78437da1e6ae62ec196ff6c0be0b1cb4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-09-06 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/308781

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

feffaf4 Move banner history off ActiveMQ
d0ba956 Fix log messag to count correct variable.
23c983c Remove WorldPay

Change-Id: Iea44a3ba78437da1e6ae62ec196ff6c0be0b1cb4
---
D sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
1 file changed, 0 insertions(+), 66 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/81/308781/1

diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
deleted file mode 100644
index b0ec1b7..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<<< HEAD   (7484c9 Merge branch 'master' into deployment)
-===
-createTable( 'test' );
-   $this->consumer = new BannerHistoryQueueConsumer(
-   'test'
-   );
-   }
-
-   public function testValidMessage() {
-   $msg = array(
-   'banner_history_id' => substr(
-   md5( mt_rand() . time() ), 0, 16
-   ),
-   'contribution_tracking_id' => strval( mt_rand() ),
-   );
-   $this->consumer->processMessage( $msg );
-   // check for thing in db
-   }
-
-   /**
-* @expectedException WmfException
-*/
-   public function testBadContributionId() {
-   $msg = array(
-   'banner_history_id' => substr(
-   md5( mt_rand() . time() ), 0, 16
-   ),
-   'contribution_tracking_id' => '1=1; DROP TABLE 
students;--',
-   );
-   $this->consumer->processMessage( $msg );
-   }
-
-   /**
-* @expectedException WmfException
-*/
-   public function testBadHistoryId() {
-   $msg = array(
-   'banner_history_id' => '\';GRANT ALL ON drupal.* TO 
\'leet\'@\'haxx0r\'',
-   'contribution_tracking_id' => strval( mt_rand() ),
-   );
-   $this->consumer->processMessage( $msg );
-   }
-}
->>> BRANCH (1e8b60 Merge "Move banner history off ActiveMQ")

-- 
To view, visit https://gerrit.wikimedia.org/r/308781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea44a3ba78437da1e6ae62ec196ff6c0be0b1cb4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-09-01 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

d1213d0 Move payments-init queue off ActiveMQ
eae39f7 Don't pollute $msg with pending_id
9bfa67e Fix constructor args for payments-init consumer

Change-Id: I2ce94fa3943f2731f81b3d69f32365d587ddcbe3
---
M sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.info
M sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
D sites/all/modules/queue2civicrm/tests/data/payments-antifraud.json
D sites/all/modules/queue2civicrm/tests/data/payments-init.json
4 files changed, 0 insertions(+), 100 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.info 
b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.info
index 2aec405..04e8797 100644
--- a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.info
+++ b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.info
@@ -5,7 +5,4 @@
 configure = admin/config/queue2civicrm/fredge_qc
 dependencies[] = queue2civicrm
 files[] = AntifraudQueueConsumer.php
-<<< HEAD   (1678e1 Fix the 8 contributions which would still re-try based 
on da)
-===
 files[] = PaymentsInitQueueConsumer.php
->>> BRANCH (8b2876 Fix the 8 contributions which would still re-try based 
on da)
diff --git a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module 
b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
index 7f42339..d79537f 100644
--- a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
+++ b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
@@ -1,9 +1,6 @@
 >> BRANCH (8b2876 Fix the 8 contributions which would still re-try based 
on da)
 use SmashPig\Core\Configuration;
 use SmashPig\Core\Context;
 
@@ -79,21 +76,12 @@
   //Let's start with the simplest possible division of labor
   $cycle_time = variable_get('fredge_batch_time', 0) / 2;
 
-<<< HEAD   (1678e1 Fix the 8 contributions which would still re-try based 
on da)
-  $processed = queue2civicrm_stomp()->dequeue_loop(
-variable_get('fredge_payments_init_queue', '/queue/payments-init'),
-false,
-$cycle_time,
-'fredge_payments_init_process_message'
-  );
-===
   $paymentsInitConsumer = new PaymentsInitQueueConsumer(
 variable_get('fredge_payments_init_queue', 'payments-init'),
 $cycle_time
   );
 
   $processed = $paymentsInitConsumer->dequeueMessages();
->>> BRANCH (8b2876 Fix the 8 contributions which would still re-try based 
on da)
 
   $fraudQueueConsumer = new AntifraudQueueConsumer(
 variable_get('fredge_payments_antifraud_queue', 'payments-antifraud'),
@@ -111,50 +99,6 @@
 }
 
 /**
-<<< HEAD   (1678e1 Fix the 8 contributions which would still re-try based 
on da)
- * Processes an individual payments-init message.
- *
- * @param $msg A STOMP message class.
- *
- */
-function fredge_payments_init_process_message($msg) {
-  $txnid = $msg->headers['correlation-id'];
-  watchdog('fredge', "Beginning processing of payments-init message for 
$txnid: " . json_encode($msg), array(), WATCHDOG_INFO);
-
-  $body = json_decode($msg->body, TRUE);
-
-  $id = 0;
-  $inserting = true;
-
-  $dbs = wmf_civicrm_get_dbs();
-  $dbs->push('fredge');
-  $query = 'SELECT id FROM payments_initial WHERE contribution_tracking_id = 
:ct_id AND order_id = :order_id LIMIT 1';
-  $result = db_query( $query, array(
-':ct_id' => $body['contribution_tracking_id'],
-':order_id' => $body['order_id']
-  ) );
-  if ( $result->rowCount() === 1 ){
-$id = $result->fetch()->id;
-$inserting = false;
-  }
-
-  $data = fredge_prep_data($body, 'payments_initial', $txnid, $inserting);
-
-  if ( $inserting ) {
-db_insert( 'payments_initial' )
-  ->fields( $data )
-  ->execute();
-  } else {
-db_update( 'payments_initial' )
-  ->fields( $data )
-  ->condition( 'id', $id )
-  ->execute();
-  }
-}
-
-/**
-===
->>> BRANCH (8b2876 Fix the 8 contributions which would still re-try based 
on da)
  * Check a message against a table schema, and complain if it doesn't fit. Also
  * format date fields and discard fields with no matching column.
  * @param array $msg the array-converted message body
diff --git a/sites/all/modules/queue2civicrm/tests/data/payments-antifraud.json 
b/sites/all/modules/queue2civicrm/tests/data/payments-antifraud.json
deleted file mode 100644
index 5472480..000
--- a/sites/all/modules/queue2civicrm/tests/data/payments-antifraud.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-   "validation_action": "process",
-   "risk_score": "0.3",
-   "score_breakdown": {
-   "initial": "0",
-   "getCVVResult": "0.2",
-   "getAVSResult": "0",
-   "getScoreCountryMap": "0",
-   "getScoreUtmCampaignMap": "0",
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-09-01 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/308083

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

d1213d0 Move payments-init queue off ActiveMQ
eae39f7 Don't pollute $msg with pending_id
9bfa67e Fix constructor args for payments-init consumer

Change-Id: I2ce94fa3943f2731f81b3d69f32365d587ddcbe3
---
M sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.info
M sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
D sites/all/modules/queue2civicrm/tests/data/payments-antifraud.json
D sites/all/modules/queue2civicrm/tests/data/payments-init.json
4 files changed, 0 insertions(+), 100 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/83/308083/1

diff --git a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.info 
b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.info
index 2aec405..04e8797 100644
--- a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.info
+++ b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.info
@@ -5,7 +5,4 @@
 configure = admin/config/queue2civicrm/fredge_qc
 dependencies[] = queue2civicrm
 files[] = AntifraudQueueConsumer.php
-<<< HEAD   (1678e1 Fix the 8 contributions which would still re-try based 
on da)
-===
 files[] = PaymentsInitQueueConsumer.php
->>> BRANCH (8b2876 Fix the 8 contributions which would still re-try based 
on da)
diff --git a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module 
b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
index 7f42339..d79537f 100644
--- a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
+++ b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
@@ -1,9 +1,6 @@
 >> BRANCH (8b2876 Fix the 8 contributions which would still re-try based 
on da)
 use SmashPig\Core\Configuration;
 use SmashPig\Core\Context;
 
@@ -79,21 +76,12 @@
   //Let's start with the simplest possible division of labor
   $cycle_time = variable_get('fredge_batch_time', 0) / 2;
 
-<<< HEAD   (1678e1 Fix the 8 contributions which would still re-try based 
on da)
-  $processed = queue2civicrm_stomp()->dequeue_loop(
-variable_get('fredge_payments_init_queue', '/queue/payments-init'),
-false,
-$cycle_time,
-'fredge_payments_init_process_message'
-  );
-===
   $paymentsInitConsumer = new PaymentsInitQueueConsumer(
 variable_get('fredge_payments_init_queue', 'payments-init'),
 $cycle_time
   );
 
   $processed = $paymentsInitConsumer->dequeueMessages();
->>> BRANCH (8b2876 Fix the 8 contributions which would still re-try based 
on da)
 
   $fraudQueueConsumer = new AntifraudQueueConsumer(
 variable_get('fredge_payments_antifraud_queue', 'payments-antifraud'),
@@ -111,50 +99,6 @@
 }
 
 /**
-<<< HEAD   (1678e1 Fix the 8 contributions which would still re-try based 
on da)
- * Processes an individual payments-init message.
- *
- * @param $msg A STOMP message class.
- *
- */
-function fredge_payments_init_process_message($msg) {
-  $txnid = $msg->headers['correlation-id'];
-  watchdog('fredge', "Beginning processing of payments-init message for 
$txnid: " . json_encode($msg), array(), WATCHDOG_INFO);
-
-  $body = json_decode($msg->body, TRUE);
-
-  $id = 0;
-  $inserting = true;
-
-  $dbs = wmf_civicrm_get_dbs();
-  $dbs->push('fredge');
-  $query = 'SELECT id FROM payments_initial WHERE contribution_tracking_id = 
:ct_id AND order_id = :order_id LIMIT 1';
-  $result = db_query( $query, array(
-':ct_id' => $body['contribution_tracking_id'],
-':order_id' => $body['order_id']
-  ) );
-  if ( $result->rowCount() === 1 ){
-$id = $result->fetch()->id;
-$inserting = false;
-  }
-
-  $data = fredge_prep_data($body, 'payments_initial', $txnid, $inserting);
-
-  if ( $inserting ) {
-db_insert( 'payments_initial' )
-  ->fields( $data )
-  ->execute();
-  } else {
-db_update( 'payments_initial' )
-  ->fields( $data )
-  ->condition( 'id', $id )
-  ->execute();
-  }
-}
-
-/**
-===
->>> BRANCH (8b2876 Fix the 8 contributions which would still re-try based 
on da)
  * Check a message against a table schema, and complain if it doesn't fit. Also
  * format date fields and discard fields with no matching column.
  * @param array $msg the array-converted message body
diff --git a/sites/all/modules/queue2civicrm/tests/data/payments-antifraud.json 
b/sites/all/modules/queue2civicrm/tests/data/payments-antifraud.json
deleted file mode 100644
index 5472480..000
--- a/sites/all/modules/queue2civicrm/tests/data/payments-antifraud.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-   "validation_action": "process",
-   "risk_score": "0.3",
-   "score_breakdown": {
-   "initial": "0",
-   "getCVVResult": "0.2",
-   "getAVSResult": "0",
-   "getScoreCountryMap": "0",
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-08-29 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

cbb5be4 Import info from pending DB, not AMQ
82f2357 Check for duplicates before re-queueing MISSING_PREDECESSOR

Change-Id: Ic2fc86495133e6006810ba09d01ba4352072b1aa
---
D sites/all/modules/queue2civicrm/tests/includes/Message.php
D sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
2 files changed, 0 insertions(+), 511 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/sites/all/modules/queue2civicrm/tests/includes/Message.php 
b/sites/all/modules/queue2civicrm/tests/includes/Message.php
deleted file mode 100644
index 0e0b00a..000
--- a/sites/all/modules/queue2civicrm/tests/includes/Message.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<<< HEAD   (d04054 Update vendor submodule)
-===
-data = $this->defaults;
-$this->headers = array();
-$this->set( $values );
-}
-
-function set( $values ) {
-if ( is_array( $values ) ) {
-$this->data = $values + $this->data;
-}
-
-$this->body = json_encode( $this->data );
-}
-
-function setHeaders( $values ) {
-if ( is_array( $values ) ) {
-$this->headers = array_merge( $this->headers, $values );
-}
-}
-
-function getBody() {
-return $this->data;
-}
-
-function getHeaders() {
-return $this->headers;
-}
-
-function loadDefaults( $name ) {
-if ( !$this->defaults ) {
-$path = __DIR__ . "/../data/{$name}.json";
-$this->defaults = json_decode( file_get_contents( $path ), true );
-}
-}
-
-/**
- * Generates random data for queue and donation insertion testing
- */
-public static function generateRandom() {
-//language codes
-$lang = array( 'en', 'de', 'fr' );
-
-$currency_codes = array( 'USD', 'GBP', 'EUR', 'ILS' );
-shuffle( $currency_codes );
-$currency = ( mt_rand( 0, 1 ) ) ? 'USD' : $currency_codes[0];
-
-$message = array(
-'contribution_tracking_id' => '',
-'optout' => mt_rand( 0, 1 ),
-'anonymous' => mt_rand( 0, 1 ),
-'comment' => mt_rand(),
-'utm_source' => mt_rand(),
-'utm_medium' => mt_rand(),
-'utm_campaign' => mt_rand(),
-'language' => $lang[array_rand( $lang )],
-'email' => mt_rand() . '@example.com',
-'first_name' => mt_rand(),
-'middle_name' => mt_rand(),
-'last_name' => mt_rand(),
-'street_address' => mt_rand(),
-'supplemental_address_1' => '',
-'city' => 'San Francisco',
-'state_province' => 'CA',
-'country' => 'USA',
-'countryID' => 'US',
-'postal_code' => mt_rand( 2801, 9 ),
-'gateway' => 'insert_test',
-'gateway_txn_id' => mt_rand(),
-'response' => mt_rand(),
-'currency' => $currency,
-'original_currency' => $currency_codes[0],
-'original_gross' => mt_rand( 0, 1 ) / 100,
-'fee' => '0',
-'gross' => mt_rand( 0, 1 ) / 100,
-'net' => mt_rand( 0, 1 ) / 100,
-'date' => date( 'r' ), //time(),
-);
-return $message;
-}
-}
-
-class TransactionMessage extends Message {
-protected $txn_id_key = 'gateway_txn_id';
-
-function __construct( $values = array() ) {
-$this->loadDefaults( "donation" );
-
-parent::__construct( array(
-$this->txn_id_key => mt_rand(),
-'order_id' => mt_rand(),
-) + $values );
-
-$this->setHeaders( array(
-"persistent" => 'true',
-// FIXME: this might indicate a key error in our application code.
-"correlation-id" => 
"{$this->data['gateway']}-{$this->data[$this->txn_id_key]}",
-"JMSCorrelationID" => 
"{$this->data['gateway']}-{$this->data[$this->txn_id_key]}",
-) );
-}
-
-function getGateway() {
-return $this->data['gateway'];
-}
-
-function getGatewayTxnId() {
-return $this->data[$this->txn_id_key];
-}
-
-function get( $key ) {
-return $this->data[$key];
-}
-}
-
-class RefundMessage extends TransactionMessage {
-function __construct( $values = array() ) {
-$this->loadDefaults( "refund" );
-
-$this->txn_id_key = 'gateway_refund_id';
-
-parent::__construct( $values );
-}
-}
-
-class RecurringPaymentMessage extends TransactionMessage {
-function __construct( $values = array() ) {
-$this->loadDefaults( "recurring_payment" );
-
-$this->txn_id_key = 'txn_id';
-
-parent::__construct( $values );
-}
-}
-
-class

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-08-29 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/307432

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

cbb5be4 Import info from pending DB, not AMQ
82f2357 Check for duplicates before re-queueing MISSING_PREDECESSOR

Change-Id: Ic2fc86495133e6006810ba09d01ba4352072b1aa
---
D sites/all/modules/queue2civicrm/tests/includes/Message.php
D sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
2 files changed, 0 insertions(+), 511 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/32/307432/1

diff --git a/sites/all/modules/queue2civicrm/tests/includes/Message.php 
b/sites/all/modules/queue2civicrm/tests/includes/Message.php
deleted file mode 100644
index 0e0b00a..000
--- a/sites/all/modules/queue2civicrm/tests/includes/Message.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<<< HEAD   (d04054 Update vendor submodule)
-===
-data = $this->defaults;
-$this->headers = array();
-$this->set( $values );
-}
-
-function set( $values ) {
-if ( is_array( $values ) ) {
-$this->data = $values + $this->data;
-}
-
-$this->body = json_encode( $this->data );
-}
-
-function setHeaders( $values ) {
-if ( is_array( $values ) ) {
-$this->headers = array_merge( $this->headers, $values );
-}
-}
-
-function getBody() {
-return $this->data;
-}
-
-function getHeaders() {
-return $this->headers;
-}
-
-function loadDefaults( $name ) {
-if ( !$this->defaults ) {
-$path = __DIR__ . "/../data/{$name}.json";
-$this->defaults = json_decode( file_get_contents( $path ), true );
-}
-}
-
-/**
- * Generates random data for queue and donation insertion testing
- */
-public static function generateRandom() {
-//language codes
-$lang = array( 'en', 'de', 'fr' );
-
-$currency_codes = array( 'USD', 'GBP', 'EUR', 'ILS' );
-shuffle( $currency_codes );
-$currency = ( mt_rand( 0, 1 ) ) ? 'USD' : $currency_codes[0];
-
-$message = array(
-'contribution_tracking_id' => '',
-'optout' => mt_rand( 0, 1 ),
-'anonymous' => mt_rand( 0, 1 ),
-'comment' => mt_rand(),
-'utm_source' => mt_rand(),
-'utm_medium' => mt_rand(),
-'utm_campaign' => mt_rand(),
-'language' => $lang[array_rand( $lang )],
-'email' => mt_rand() . '@example.com',
-'first_name' => mt_rand(),
-'middle_name' => mt_rand(),
-'last_name' => mt_rand(),
-'street_address' => mt_rand(),
-'supplemental_address_1' => '',
-'city' => 'San Francisco',
-'state_province' => 'CA',
-'country' => 'USA',
-'countryID' => 'US',
-'postal_code' => mt_rand( 2801, 9 ),
-'gateway' => 'insert_test',
-'gateway_txn_id' => mt_rand(),
-'response' => mt_rand(),
-'currency' => $currency,
-'original_currency' => $currency_codes[0],
-'original_gross' => mt_rand( 0, 1 ) / 100,
-'fee' => '0',
-'gross' => mt_rand( 0, 1 ) / 100,
-'net' => mt_rand( 0, 1 ) / 100,
-'date' => date( 'r' ), //time(),
-);
-return $message;
-}
-}
-
-class TransactionMessage extends Message {
-protected $txn_id_key = 'gateway_txn_id';
-
-function __construct( $values = array() ) {
-$this->loadDefaults( "donation" );
-
-parent::__construct( array(
-$this->txn_id_key => mt_rand(),
-'order_id' => mt_rand(),
-) + $values );
-
-$this->setHeaders( array(
-"persistent" => 'true',
-// FIXME: this might indicate a key error in our application code.
-"correlation-id" => 
"{$this->data['gateway']}-{$this->data[$this->txn_id_key]}",
-"JMSCorrelationID" => 
"{$this->data['gateway']}-{$this->data[$this->txn_id_key]}",
-) );
-}
-
-function getGateway() {
-return $this->data['gateway'];
-}
-
-function getGatewayTxnId() {
-return $this->data[$this->txn_id_key];
-}
-
-function get( $key ) {
-return $this->data[$key];
-}
-}
-
-class RefundMessage extends TransactionMessage {
-function __construct( $values = array() ) {
-$this->loadDefaults( "refund" );
-
-$this->txn_id_key = 'gateway_refund_id';
-
-parent::__construct( $values );
-}
-}
-
-class RecurringPaymentMessage extends TransactionMessage {
-function __construct( $values = array() ) {
-$this->loadDefaults( "recurring_payment" );
-
-$this->txn_id_key = 'txn_id';
-
-

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-08-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

854f143 Compare pending DB row with queue message (SEE NOTES)
71c51fd Remove unused modules

Change-Id: Iccd7252bb5aceca2be691a7e2e08ca20e5fbffa6
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/305132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iccd7252bb5aceca2be691a7e2e08ca20e5fbffa6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-08-16 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/305132

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

854f143 Compare pending DB row with queue message (SEE NOTES)
71c51fd Remove unused modules

Change-Id: Iccd7252bb5aceca2be691a7e2e08ca20e5fbffa6
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/32/305132/1


-- 
To view, visit https://gerrit.wikimedia.org/r/305132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iccd7252bb5aceca2be691a7e2e08ca20e5fbffa6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-08-09 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

db9396f Fix undefined index errors in Mailer

Change-Id: I5702b95cdb4e7ef0138b376b197f8585f12ef1fa
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/303931
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5702b95cdb4e7ef0138b376b197f8585f12ef1fa
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-08-09 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/303931

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

db9396f Fix undefined index errors in Mailer

Change-Id: I5702b95cdb4e7ef0138b376b197f8585f12ef1fa
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/31/303931/1


-- 
To view, visit https://gerrit.wikimedia.org/r/303931
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5702b95cdb4e7ef0138b376b197f8585f12ef1fa
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-08-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

and delete tests

877bc6c Backfill wmf_contribution_extra
2cf9d34 Add hook & tests for address handling.
ca2b00a Add test/ handling to treat conflicts on email=on_hold as conflicts.
9bccac7 Send failmail instead of throwing exception on mismatched refund.
6ba7ae0 Fix incorrect contribution_recur rows
8b594b3 Update CiviCRM submodule
38cfe17 WmfQueueConsumer to replace dequeue_loop
8730ca7 Drush merge command
9fab588 Fix ProcessMessageTest to not fail on exchange rates.
d980aa1 Failmail can unpack multiple "to" addresses

Change-Id: I085e0d7afb98fa126c4003d3bebe33971740a763
---
D sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
M sites/all/modules/wmf_common/wmf_common.info
5 files changed, 0 insertions(+), 1,500 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
deleted file mode 100644
index 1fbc44a..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<<< HEAD   (f138a2 Remove some tests from the deployment branch)
-===
- 'Process Message',
-'group' => 'Pipeline',
-'description' => 'Push messages through the queue intake 
functions.',
-);
-}
-
-/**
- * Process an ordinary (one-time) donation message
- */
-public function testDonation() {
-$message = new TransactionMessage();
-$message2 = new TransactionMessage();
-
-exchange_rate_cache_set( 'USD', $message->get( 'date' ), 1 );
-exchange_rate_cache_set( $message->get( 'currency' ), $message->get( 
'date' ), 3 );
-
-queue2civicrm_import( $message );
-queue2civicrm_import( $message2 );
-
-$contributions = wmf_civicrm_get_contributions_from_gateway_id( 
$message->getGateway(), $message->getGatewayTxnId() );
-$this->assertEquals( 1, count( $contributions ) );
-
-$contributions2 = wmf_civicrm_get_contributions_from_gateway_id( 
$message2->getGateway(), $message2->getGatewayTxnId() );
-$this->assertEquals( 1, count( $contributions2 ) );
-
-$this->assertNotEquals( $contributions[0]['contact_id'], 
$contributions2[0]['contact_id'] );
-}
-
-/**
- * Process an ordinary (one-time) donation message with an UTF campaign.
- */
-public function testDonationWithUTFCampaignOption() {
-$message = new TransactionMessage(array('utm_campaign' => 
'EmailCampaign1'));
-$appealFieldID = $this->createCustomOption('Appeal', 'EmailCampaign1');
-
-exchange_rate_cache_set( 'USD', $message->get( 'date' ), 1 );
-exchange_rate_cache_set( $message->get( 'currency' ), $message->get( 
'date' ), 3 );
-
-queue2civicrm_import( $message );
-
-$contributions = wmf_civicrm_get_contributions_from_gateway_id( 
$message->getGateway(), $message->getGatewayTxnId() );
-$contribution = civicrm_api3('Contribution', 'getsingle', array(
-'id' => $contributions[0]['id'],
-'return' => 'custom_' . $appealFieldID,
-));
-  $this->assertEquals('EmailCampaign1', $contribution['custom_' . 
$appealFieldID]);
-$this->deleteCustomOption('Appeal', 'EmailCampaign1');
-}
-
-  /**
-   * Process an ordinary (one-time) donation message with an UTF campaign not 
already existing.
-   */
-  public function testDonationWithInvalidUTFCampaignOption() {
-  civicrm_initialize();
-  $optionValue = uniqid();
-  $message = new TransactionMessage(array('utm_campaign' => $optionValue));
-  $appealField = civicrm_api3('custom_field', 'getsingle', array('name' => 
'Appeal'));
-
-  exchange_rate_cache_set('USD', $message->get('date'), 1);
-  exchange_rate_cache_set($message->get('currency'), 
$message->get('date'), 3);
-
-  queue2civicrm_import($message);
-
-  $contributions = 
wmf_civicrm_get_contributions_from_gateway_id($message->getGateway(), 
$message->getGatewayTxnId());
-  $contribution = civicrm_api3('Contribution', 'getsingle', array(
-'id' => $contributions[0]['id'],
-'return' => 'custom_' . $appealField['id'],
-  ));
-  $this->assertEquals($optionValue, $contribution['custom_' . 
$appealField['id']]);
-  $this->deleteCustomOption('Appeal', $optionValue);
-  }
-
-  /**
-   * Process an ordinary (one-time) donation message with an UTF campaign 
previously disabled.
-   */
-  public function

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-08-08 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/303695

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

and delete tests

877bc6c Backfill wmf_contribution_extra
2cf9d34 Add hook & tests for address handling.
ca2b00a Add test/ handling to treat conflicts on email=on_hold as conflicts.
9bccac7 Send failmail instead of throwing exception on mismatched refund.
6ba7ae0 Fix incorrect contribution_recur rows
8b594b3 Update CiviCRM submodule
38cfe17 WmfQueueConsumer to replace dequeue_loop
8730ca7 Drush merge command
9fab588 Fix ProcessMessageTest to not fail on exchange rates.
d980aa1 Failmail can unpack multiple "to" addresses

Change-Id: I085e0d7afb98fa126c4003d3bebe33971740a763
---
D sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
M sites/all/modules/wmf_common/wmf_common.info
5 files changed, 0 insertions(+), 1,500 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/95/303695/1

diff --git 
a/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php 
b/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
deleted file mode 100644
index 1fbc44a..000
--- a/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<<< HEAD   (f138a2 Remove some tests from the deployment branch)
-===
- 'Process Message',
-'group' => 'Pipeline',
-'description' => 'Push messages through the queue intake 
functions.',
-);
-}
-
-/**
- * Process an ordinary (one-time) donation message
- */
-public function testDonation() {
-$message = new TransactionMessage();
-$message2 = new TransactionMessage();
-
-exchange_rate_cache_set( 'USD', $message->get( 'date' ), 1 );
-exchange_rate_cache_set( $message->get( 'currency' ), $message->get( 
'date' ), 3 );
-
-queue2civicrm_import( $message );
-queue2civicrm_import( $message2 );
-
-$contributions = wmf_civicrm_get_contributions_from_gateway_id( 
$message->getGateway(), $message->getGatewayTxnId() );
-$this->assertEquals( 1, count( $contributions ) );
-
-$contributions2 = wmf_civicrm_get_contributions_from_gateway_id( 
$message2->getGateway(), $message2->getGatewayTxnId() );
-$this->assertEquals( 1, count( $contributions2 ) );
-
-$this->assertNotEquals( $contributions[0]['contact_id'], 
$contributions2[0]['contact_id'] );
-}
-
-/**
- * Process an ordinary (one-time) donation message with an UTF campaign.
- */
-public function testDonationWithUTFCampaignOption() {
-$message = new TransactionMessage(array('utm_campaign' => 
'EmailCampaign1'));
-$appealFieldID = $this->createCustomOption('Appeal', 'EmailCampaign1');
-
-exchange_rate_cache_set( 'USD', $message->get( 'date' ), 1 );
-exchange_rate_cache_set( $message->get( 'currency' ), $message->get( 
'date' ), 3 );
-
-queue2civicrm_import( $message );
-
-$contributions = wmf_civicrm_get_contributions_from_gateway_id( 
$message->getGateway(), $message->getGatewayTxnId() );
-$contribution = civicrm_api3('Contribution', 'getsingle', array(
-'id' => $contributions[0]['id'],
-'return' => 'custom_' . $appealFieldID,
-));
-  $this->assertEquals('EmailCampaign1', $contribution['custom_' . 
$appealFieldID]);
-$this->deleteCustomOption('Appeal', 'EmailCampaign1');
-}
-
-  /**
-   * Process an ordinary (one-time) donation message with an UTF campaign not 
already existing.
-   */
-  public function testDonationWithInvalidUTFCampaignOption() {
-  civicrm_initialize();
-  $optionValue = uniqid();
-  $message = new TransactionMessage(array('utm_campaign' => $optionValue));
-  $appealField = civicrm_api3('custom_field', 'getsingle', array('name' => 
'Appeal'));
-
-  exchange_rate_cache_set('USD', $message->get('date'), 1);
-  exchange_rate_cache_set($message->get('currency'), 
$message->get('date'), 3);
-
-  queue2civicrm_import($message);
-
-  $contributions = 
wmf_civicrm_get_contributions_from_gateway_id($message->getGateway(), 
$message->getGatewayTxnId());
-  $contribution = civicrm_api3('Contribution', 'getsingle', array(
-'id' => $contributions[0]['id'],
-'return' => 'custom_' . $appealField['id'],
-  ));
-  $this->assertEquals($optionValue, $contribution['custom_' . 
$appealField['id']]);
-  $this->deleteCustomOption('Appeal', $optionValue);
-  }
-
-  /**
-   * Process an ordinary (one-time) donation message with an UTF campaign 
previously

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-08-02 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

and update vendor

adaa1f6 Update SmashPig lib

Change-Id: I9833d104a143af31af297467ff37c1472e5b42b7
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/vendor b/vendor
index a63bb23..a134cd0 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit a63bb2375f36ab6dd170277654f33713a6052581
+Subproject commit a134cd0d55a83862bc983e7ffd18ef16de29f377

-- 
To view, visit https://gerrit.wikimedia.org/r/302604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9833d104a143af31af297467ff37c1472e5b42b7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

2016-08-02 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/302604

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

and update vendor

adaa1f6 Update SmashPig lib

Change-Id: I9833d104a143af31af297467ff37c1472e5b42b7
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/04/302604/1

diff --git a/vendor b/vendor
index a63bb23..a134cd0 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit a63bb2375f36ab6dd170277654f33713a6052581
+Subproject commit a134cd0d55a83862bc983e7ffd18ef16de29f377

-- 
To view, visit https://gerrit.wikimedia.org/r/302604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9833d104a143af31af297467ff37c1472e5b42b7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

< 1 2

101 - 181 of 181 matches

Mail list logo