[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-20 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

And update vendor

8a27d2c Merge "Update SmashPig and config handling"
0fdc947 Update SmashPig and config handling
d1f20cc Add 'Endowment Gift' to Financial types
5b4cf59 Add 'Endowment Gift' to gift source.
1675fb0 Rename unmagical validation hook
435326c T137569 Allow Engage users to enter Benefactor Give into Gift Source

Change-Id: I77294adde9a3ac6ef29b77fbcc3a7ab1b152c10c
---
D sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
M vendor
2 files changed, 0 insertions(+), 169 deletions(-)

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



diff --git a/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php 
b/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
deleted file mode 100644
index c5746fb..000
--- a/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<<< HEAD   (a386eb Merge master into deployment)
-===
- __DIR__ . '/data/logs/',
-   'amazon_audit_recon_completed_dir' => 
$this->getTempDir(),
-   'amazon_audit_working_log_dir' => $this->getTempDir(),
-   );
-
-   foreach ( $dirs as $var => $dir ) {
-   if ( !is_dir( $dir ) ) {
-   mkdir( $dir );
-   }
-   variable_set( $var, $dir );
-   }
-
-   $old_working = glob( $dirs['amazon_audit_working_log_dir'] . 
'*' );
-   foreach ( $old_working as $zap ) {
-   if ( is_file( $zap ) ) {
-   unlink( $zap );
-   }
-   }
-
-   variable_set( 'amazon_audit_log_search_past_days', 7 );
-
-   // Fakedb doesn't fake the original txn for refunds, so add one 
here
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'amazon', 'P01-4968629-7654321-C070794' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 2476135333,
-   'currency' => 'USD',
-   'date' => 1443724034,
-   'email' => 'lu...@yahoo.com',
-   'gateway' => 'amazon',
-   'gateway_txn_id' => 
'P01-4968629-7654321-C070794',
-   'gross' => 1.00,
-   'payment_method' => 'amazon',
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   $this->contact_id = $contribution['contact_id'];
-   $this->contribution_id = $contribution['id'];
-   }
-
-   public function tearDown() {
-   $api = civicrm_api_classapi();
-   $api->Contribution->Delete( array(
-   'id' => $this->contribution_id,
-   'version' => 3,
-   ) );
-   $api->Contact->Delete( array(
-   'id' => $this->contact_id,
-   'version' => 3,
-   ) );
-   parent::tearDown();
-   }
-
-   public function auditTestProvider() {
-   return array(
-   array( __DIR__ . '/data/Amazon/donation/', array(
-   'main' => array(
-   array(
-   'contribution_tracking_id' => 
'87654321',
-   'country' => 'US',
-   'currency' => 'USD',
-   'date' => 1443723034,
-   'email' => 
'nonchal...@gmail.com',
-   'fee' => '0.59',
-   'first_name' => 'Test',
-   'gateway' => 'amazon',
-   'gateway_txn_id' => 
'P01-1488694-1234567-C034811',
-   'gross' => '10.00',
-   'language' => 'en',
-   'last_name' => 'Person',
-   'payment_method' => 'amazon',
-

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-20 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

8a27d2c Merge "Update SmashPig and config handling"
0fdc947 Update SmashPig and config handling
d1f20cc Add 'Endowment Gift' to Financial types
5b4cf59 Add 'Endowment Gift' to gift source.
1675fb0 Rename unmagical validation hook
435326c T137569 Allow Engage users to enter Benefactor Give into Gift Source

Change-Id: I77294adde9a3ac6ef29b77fbcc3a7ab1b152c10c
---
D sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
1 file changed, 0 insertions(+), 169 deletions(-)


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

diff --git a/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php 
b/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
deleted file mode 100644
index c5746fb..000
--- a/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<<< HEAD   (a386eb Merge master into deployment)
-===
- __DIR__ . '/data/logs/',
-   'amazon_audit_recon_completed_dir' => 
$this->getTempDir(),
-   'amazon_audit_working_log_dir' => $this->getTempDir(),
-   );
-
-   foreach ( $dirs as $var => $dir ) {
-   if ( !is_dir( $dir ) ) {
-   mkdir( $dir );
-   }
-   variable_set( $var, $dir );
-   }
-
-   $old_working = glob( $dirs['amazon_audit_working_log_dir'] . 
'*' );
-   foreach ( $old_working as $zap ) {
-   if ( is_file( $zap ) ) {
-   unlink( $zap );
-   }
-   }
-
-   variable_set( 'amazon_audit_log_search_past_days', 7 );
-
-   // Fakedb doesn't fake the original txn for refunds, so add one 
here
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'amazon', 'P01-4968629-7654321-C070794' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 2476135333,
-   'currency' => 'USD',
-   'date' => 1443724034,
-   'email' => 'lu...@yahoo.com',
-   'gateway' => 'amazon',
-   'gateway_txn_id' => 
'P01-4968629-7654321-C070794',
-   'gross' => 1.00,
-   'payment_method' => 'amazon',
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   $this->contact_id = $contribution['contact_id'];
-   $this->contribution_id = $contribution['id'];
-   }
-
-   public function tearDown() {
-   $api = civicrm_api_classapi();
-   $api->Contribution->Delete( array(
-   'id' => $this->contribution_id,
-   'version' => 3,
-   ) );
-   $api->Contact->Delete( array(
-   'id' => $this->contact_id,
-   'version' => 3,
-   ) );
-   parent::tearDown();
-   }
-
-   public function auditTestProvider() {
-   return array(
-   array( __DIR__ . '/data/Amazon/donation/', array(
-   'main' => array(
-   array(
-   'contribution_tracking_id' => 
'87654321',
-   'country' => 'US',
-   'currency' => 'USD',
-   'date' => 1443723034,
-   'email' => 
'nonchal...@gmail.com',
-   'fee' => '0.59',
-   'first_name' => 'Test',
-   'gateway' => 'amazon',
-   'gateway_txn_id' => 
'P01-1488694-1234567-C034811',
-   'gross' => '10.00',
-   'language' => 'en',
-   'last_name' => 'Person',
-   'payment_method' => 'amazon',
-

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-13 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

5ecd64e Change gateway report filters to date time
d71d820 Update triggers to reflect prospect fields

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

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




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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-13 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

5ecd64e Change gateway report filters to date time
d71d820 Update triggers to reflect prospect fields

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/00/298900/1


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-12 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

926c1f1 Set do_no_trade field to 0 for all contacts.
762616f Gift Information field is not view_only on live, don't make it so on dev
125a2a0 Fix for engage custom data not loading.

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


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


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-12 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

926c1f1 Set do_no_trade field to 0 for all contacts.
762616f Gift Information field is not view_only on live, don't make it so on dev
125a2a0 Fix for engage custom data not loading.

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

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




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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-11 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

ae1355a Block access to merge screen without a limit.

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

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




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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-11 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

ae1355a Block access to merge screen without a limit.

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/84/298384/1


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-08 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

fa42d06 Alter logic for calculating wmf_donor fields
c3ecfe2 CiviCRM Submodule update - merge permission issue
880f405 Merge payments init messages

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

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



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 07f43fb..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<<< HEAD   (bdf2af Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/wi)
-===
-imitateAdminUser();
-$contact = $this->callAPISuccess('Contact', 'create', array(
-  'contact_type' => 'Individual',
-  'first_name' => 'Donald',
-  'last_name' => 'Duck',
-  'email' => 'the_...@duckland.com',
-  wmf_civicrm_get_custom_field_name('do_not_solicit') => 0,
-));
-$this->contactID = $contact['id'];
-
-$contact = $this->callAPISuccess('Contact', 'create', array(
-  'contact_type' => 'Individual',
-  'first_name' => 'Donald',
-  'last_name' => 'Duck',
-  'email' => 'the_...@duckland.com',
-  wmf_civicrm_get_custom_field_name('do_not_solicit') => 1,
-));
-$this->contactID2 = $contact['id'];
-  }
-
-  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' => $this->contactID,
-  'sequential' => 1,
-  'return' => array(
-wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
-wmf_civicrm_get_custom_field_name('do_not_solicit'),
-wmf_civicrm_get_custom_field_name('last_donation_amount'),
-wmf_civicrm_get_custom_field_name('last_donation_currency'),
-wmf_civicrm_get_custom_field_name('last_donation_usd'),
-wmf_civicrm_get_custom_field_name('last_donation_date'),
-wmf_civicrm_get_custom_field_name('is_2011_donor'),
-wmf_civicrm_get_custom_field_name('is_2012_donor'),
-wmf_civicrm_get_custom_field_name('is_2013_donor'),
-wmf_civicrm_get_custom_field_name('is_2014_donor'),
-wmf_civicrm_get_custom_field_name('is_2015_donor'),
-wmf_civicrm_get_custom_field_name('is_2016_donor'),
-  ),
-

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-07 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

fa42d06 Alter logic for calculating wmf_donor fields
c3ecfe2 CiviCRM Submodule update - merge permission issue
880f405 Merge payments init messages

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/44/297944/1

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 07f43fb..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<<< HEAD   (bdf2af Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/wi)
-===
-imitateAdminUser();
-$contact = $this->callAPISuccess('Contact', 'create', array(
-  'contact_type' => 'Individual',
-  'first_name' => 'Donald',
-  'last_name' => 'Duck',
-  'email' => 'the_...@duckland.com',
-  wmf_civicrm_get_custom_field_name('do_not_solicit') => 0,
-));
-$this->contactID = $contact['id'];
-
-$contact = $this->callAPISuccess('Contact', 'create', array(
-  'contact_type' => 'Individual',
-  'first_name' => 'Donald',
-  'last_name' => 'Duck',
-  'email' => 'the_...@duckland.com',
-  wmf_civicrm_get_custom_field_name('do_not_solicit') => 1,
-));
-$this->contactID2 = $contact['id'];
-  }
-
-  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' => $this->contactID,
-  'sequential' => 1,
-  'return' => array(
-wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
-wmf_civicrm_get_custom_field_name('do_not_solicit'),
-wmf_civicrm_get_custom_field_name('last_donation_amount'),
-wmf_civicrm_get_custom_field_name('last_donation_currency'),
-wmf_civicrm_get_custom_field_name('last_donation_usd'),
-wmf_civicrm_get_custom_field_name('last_donation_date'),
-wmf_civicrm_get_custom_field_name('is_2011_donor'),
-wmf_civicrm_get_custom_field_name('is_2012_donor'),
-wmf_civicrm_get_custom_field_name('is_2013_donor'),
-wmf_civicrm_get_custom_field_name('is_2014_donor'),
-wmf_civicrm_get_custom_field_name('is_2015_donor'),
-

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

Merge the canary death

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

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




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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

Merge the canary death

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/35/297735/1


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

This includes the CiviCRM upgrade to 4.7.9 + drupal to 7.44

4e715d4 Drupal submodule update
5d42516 CiviCRM submodule update
69a432a Fix for regression in tests.
12c42a5 CiviCRM submodule update
787ff0c Add mysql to drop triggers to git and update trigger code for create.
747fdec Add prospecting custom fields
8b902db Remove unused merge function.
afd9d80 Temporarily remove line in test.
6eeddd1 Remove code to include our custom tables.
7d317c4 Update tests to ignore field revenue_recognition_date
314189b Per merge connection id
0b34d38 Fix merge hook to remove calculated fields from merge_conflicts
a322f7a Fix merge hook to remove calculated fields from merge_conflicts
81fbad6 Express Checkout is recorded as PayPal
769c905 Create civicrm_strip_non_numeric during test.
ca98b28 Import errors are logged and recoverable
d88af01 Send failmail and set no_thank_you on TY errors
346c9d3 Remove old email edit hook
758e75a Save sql to generate triggers against latest CiviCRM (4.7.8)
48bcdb8 Save sql to generate triggers against current CiviCRM (4.6.9)
a9c0142 Move test code to test support
38a961c We don't care to get failmail when banner history import fails

Change-Id: I674d45fbe344d2937872d240f98fc5411cfd4c65
---
D sites/all/modules/queue2civicrm/tests/includes/Message.php
D sites/all/modules/queue2civicrm/tests/includes/QueueConsumer.php
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
6 files changed, 0 insertions(+), 1,203 deletions(-)

Approvals:
  Eileen: 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 dfe028a..000
--- a/sites/all/modules/queue2civicrm/tests/includes/Message.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<<< HEAD   (bb9bf1 Revert "Express Checkout is recorded as PayPal")
-===
-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 )],
-'referrer' => 'http://example.com/' . mt_rand(),
-'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'

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

This includes the CiviCRM upgrade to 4.7.9 + drupal to 7.44

4e715d4 Drupal submodule update
5d42516 CiviCRM submodule update
69a432a Fix for regression in tests.
12c42a5 CiviCRM submodule update
787ff0c Add mysql to drop triggers to git and update trigger code for create.
747fdec Add prospecting custom fields
8b902db Remove unused merge function.
afd9d80 Temporarily remove line in test.
6eeddd1 Remove code to include our custom tables.
7d317c4 Update tests to ignore field revenue_recognition_date
314189b Per merge connection id
0b34d38 Fix merge hook to remove calculated fields from merge_conflicts
a322f7a Fix merge hook to remove calculated fields from merge_conflicts
81fbad6 Express Checkout is recorded as PayPal
769c905 Create civicrm_strip_non_numeric during test.
ca98b28 Import errors are logged and recoverable
d88af01 Send failmail and set no_thank_you on TY errors
346c9d3 Remove old email edit hook
758e75a Save sql to generate triggers against latest CiviCRM (4.7.8)
48bcdb8 Save sql to generate triggers against current CiviCRM (4.6.9)
a9c0142 Move test code to test support
38a961c We don't care to get failmail when banner history import fails

Change-Id: I674d45fbe344d2937872d240f98fc5411cfd4c65
---
D sites/all/modules/queue2civicrm/tests/includes/Message.php
D sites/all/modules/queue2civicrm/tests/includes/QueueConsumer.php
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
6 files changed, 0 insertions(+), 1,203 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/12/297712/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 dfe028a..000
--- a/sites/all/modules/queue2civicrm/tests/includes/Message.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<<< HEAD   (bb9bf1 Revert "Express Checkout is recorded as PayPal")
-===
-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 )],
-'referrer' => 'http://example.com/' . mt_rand(),
-'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' =>

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-05-12 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

d97685c Adjust hook in our CiviCRM to reflect name change in upstream QA
020a67d CiviCRM submodule update

Submodule contains

   9f1c855 CRM-17846 - Fixing lock name to be less than 64 characters for MySQL 
5.7 compatibility (#7984)
cef9be5 Remove wmf EntityTag.getdetails api
257b6de Merge "CRM-17846 - Fixing lock name to be less than 64 characters 
for MySQL 5.7 compatibility (#7984)"
ae9949b CRM-17984. Ensure input for subtype is valid; if not then do not 
use it to filter custom fields.
d855e2b CRM-17984 test to demonstrate breakage
308bb4a Fix the RC regrsision
39bb059 CRM-5507 CRM-17984 fix regression when subType var is not leaking
3b1180a Fix Strict warning discovered in testing
1df49e4  CRM-17983, CRM-18401. Input validation
7beaff4 CRM-17983 fix for contactRelationships query
1dcbcab Minimal check to validate relationship params.
9bb585f CRM-17983, CRM-18401. Input validation.
0513710 CRM-17983, CRM-18401 - Swap loose/strict escaping
2d77d18 CRM-18469, CRM-17984 - getTree - No more pass by reference
41dc4fb Further pass-by-ref fixes following on from customGroup signature 
change
edf07e4 CRM-18469, CRM-17984 - getTree regression on multiple integers 
separated by the cnrtl char
1e99c0d CRM-17983 Fix error in data type as found by Dave
a50f7ed Bare minimum patch for 4.6
bc73b07 Fixed 2 other issues.
2a0da1b Cleanup to have same behaviour as 4.7.
babc276 Typo fix.
d9957a9 Further custom tree regression fix, where the label does not match 
the name the name is the key to use
15b2cb2 Adjust hook in our CiviCRM to reflect name change in upstream QA

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

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




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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-05-12 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

d97685c Adjust hook in our CiviCRM to reflect name change in upstream QA
020a67d CiviCRM submodule update

Submodule contains

   9f1c855 CRM-17846 - Fixing lock name to be less than 64 characters for MySQL 
5.7 compatibility (#7984)
cef9be5 Remove wmf EntityTag.getdetails api
257b6de Merge "CRM-17846 - Fixing lock name to be less than 64 characters 
for MySQL 5.7 compatibility (#7984)"
ae9949b CRM-17984. Ensure input for subtype is valid; if not then do not 
use it to filter custom fields.
d855e2b CRM-17984 test to demonstrate breakage
308bb4a Fix the RC regrsision
39bb059 CRM-5507 CRM-17984 fix regression when subType var is not leaking
3b1180a Fix Strict warning discovered in testing
1df49e4  CRM-17983, CRM-18401. Input validation
7beaff4 CRM-17983 fix for contactRelationships query
1dcbcab Minimal check to validate relationship params.
9bb585f CRM-17983, CRM-18401. Input validation.
0513710 CRM-17983, CRM-18401 - Swap loose/strict escaping
2d77d18 CRM-18469, CRM-17984 - getTree - No more pass by reference
41dc4fb Further pass-by-ref fixes following on from customGroup signature 
change
edf07e4 CRM-18469, CRM-17984 - getTree regression on multiple integers 
separated by the cnrtl char
1e99c0d CRM-17983 Fix error in data type as found by Dave
a50f7ed Bare minimum patch for 4.6
bc73b07 Fixed 2 other issues.
2a0da1b Cleanup to have same behaviour as 4.7.
babc276 Typo fix.
d9957a9 Further custom tree regression fix, where the label does not match 
the name the name is the key to use
15b2cb2 Adjust hook in our CiviCRM to reflect name change in upstream QA

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


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


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-05-02 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

CiviCRM submodule commit

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

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




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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-05-02 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

CiviCRM submodule commit

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/78/286578/1


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-05-02 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

CiviCRM submodule update, country search fix

cc49c17 Fix for country search

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

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




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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-05-02 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

CiviCRM submodule update, country search fix

cc49c17 Fix for country search

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/36/286536/1


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-04-04 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

b60fd26 CiviCRM submodule update: improvements to support logging & reversal
1e09640 Store refund mismatch converted to USD
40070b7 Add hook to define log tables, specifying INNODB & indexing contact 
fields
c105217 Send failmail when TY job can't find contribution
23040b5 Enable setting to specify logging is handled offline
3f493ea Set filter = 1 on Contact Deleted By Merge activity type
7865f8e Also add 'Contact Deleted by Merge' on new installs
4b5f413 Fix opt out fields for Civi imports
b2fda2e Fix variable name error that I just added
752d06f Add debug on phone create api call

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

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



diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
deleted file mode 100644
index 81c6cc5..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<<< HEAD   (bfe563 Merge master into deployment)
-===
-callAPISuccess( 'contact', 'create', array(
-'contact_type' => 'Individual',
-'first_name' => 'Test',
-'last_name' => 'Es',
-'debug' => 1,
-) );
-$this->contact_id = $results['id'];
-
-$this->original_currency = 'EUR';
-$this->original_amount = '1.23';
-$this->gateway_txn_id = mt_rand();
-$time = time();
-$this->trxn_id = "TEST_GATEWAY {$this->gateway_txn_id} {$time}";
-
-$this->setExchangeRates( $time, array( 'USD' => 1, 'EUR' => 0.5 ) );
-
-$results = civicrm_api3( 'contribution', 'create', array(
-'contact_id' => $this->contact_id,
-'financial_type_id' => 'Cash',
-'total_amount' => $this->original_amount,
-'contribution_source' => $this->original_currency . ' ' . 
$this->original_amount,
-'receive_date' => wmf_common_date_unix_to_civicrm( $time ),
-'trxn_id' => $this->trxn_id,
-) );
-$this->original_contribution_id = $results['id'];
-
-$this->refund_contribution_id = null;
-}
-
-public function tearDown() {
-civicrm_api3('contribution', 'delete', array(
-'id' => $this->original_contribution_id,
-));
-
-if ($this->refund_contribution_id && $this->refund_contribution_id != 
$this->original_contribution_id) {
-  civicrm_api3('contribution', 'delete', array(
-'id' => $this->refund_contribution_id,
-  ));
-}
-
-civicrm_api3( 'contact', 'delete', array(
-'id' => $this->contact_id,
-) );
-
-parent::tearDown();
-}
-
-/**
- * Check chargeback status exists.
- */
-public function testStatuses() {
-  $options = $this->callAPISuccess('Contribution', 'getoptions', 
array('field' => 'contribution_status_id'));
-  $this->assertTrue(in_array('Chargeback', $options['values']));
-}
-
-/**
- * Covers wmf_civicrm_mark_refund.
- */
-public function testMarkRefund() {
-wmf_civicrm_mark_refund( $this->original_contribution_id, 'refund', 
false, '2015-09-09', 'my_special_ref');
-
-$contribution = civicrm_api3( 'contribution', 'getsingle', array(
-'id' => $this->original_contribution_id,
-) );
-
-$this->assertEquals( 'Refunded', $contribution['contribution_status'],
-'Refunded contribution has correct status' );
-
-$financialTransactions = civicrm_api3('EntityFinancialTrxn', 'get', 
array(
-'entity_id' => $this->original_contribution_id,
-'entity_table' => 'civicrm_contribution',
-'api.financial_trxn.get' => 1,
-'sequential' => TRUE,
-));
-$this->assertEquals(2, $financialTransactions['count']);
-$transaction1 = 
$financialTransactions['values']['0']['api.financial_trxn.get']['values'][0];
-$transaction2 = 
$financialTransactions['values']['1']['api.financial_trxn.get']['values'][0];
-
-$this->assertEquals($transaction1['trxn_id'], $this->trxn_id);
-$this->assertEquals(strtotime($transaction2['trxn_date']), 
strtotime('2015-09-09'));
-$this->assertEquals($transaction2['trxn_id'], 'my_special_ref');
-}
-
-  /**
-   * Check that marking a contribution as refunded updates custom data 
appropriately.
-   */
-  public function testMarkRefundCheckCustomData() {
-civicrm_api3('contribution',

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-04-04 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

b60fd26 CiviCRM submodule update: improvements to support logging & reversal
1e09640 Store refund mismatch converted to USD
40070b7 Add hook to define log tables, specifying INNODB & indexing contact 
fields
c105217 Send failmail when TY job can't find contribution
23040b5 Enable setting to specify logging is handled offline
3f493ea Set filter = 1 on Contact Deleted By Merge activity type
7865f8e Also add 'Contact Deleted by Merge' on new installs
4b5f413 Fix opt out fields for Civi imports
b2fda2e Fix variable name error that I just added
752d06f Add debug on phone create api call

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/84/281584/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
deleted file mode 100644
index 81c6cc5..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<<< HEAD   (bfe563 Merge master into deployment)
-===
-callAPISuccess( 'contact', 'create', array(
-'contact_type' => 'Individual',
-'first_name' => 'Test',
-'last_name' => 'Es',
-'debug' => 1,
-) );
-$this->contact_id = $results['id'];
-
-$this->original_currency = 'EUR';
-$this->original_amount = '1.23';
-$this->gateway_txn_id = mt_rand();
-$time = time();
-$this->trxn_id = "TEST_GATEWAY {$this->gateway_txn_id} {$time}";
-
-$this->setExchangeRates( $time, array( 'USD' => 1, 'EUR' => 0.5 ) );
-
-$results = civicrm_api3( 'contribution', 'create', array(
-'contact_id' => $this->contact_id,
-'financial_type_id' => 'Cash',
-'total_amount' => $this->original_amount,
-'contribution_source' => $this->original_currency . ' ' . 
$this->original_amount,
-'receive_date' => wmf_common_date_unix_to_civicrm( $time ),
-'trxn_id' => $this->trxn_id,
-) );
-$this->original_contribution_id = $results['id'];
-
-$this->refund_contribution_id = null;
-}
-
-public function tearDown() {
-civicrm_api3('contribution', 'delete', array(
-'id' => $this->original_contribution_id,
-));
-
-if ($this->refund_contribution_id && $this->refund_contribution_id != 
$this->original_contribution_id) {
-  civicrm_api3('contribution', 'delete', array(
-'id' => $this->refund_contribution_id,
-  ));
-}
-
-civicrm_api3( 'contact', 'delete', array(
-'id' => $this->contact_id,
-) );
-
-parent::tearDown();
-}
-
-/**
- * Check chargeback status exists.
- */
-public function testStatuses() {
-  $options = $this->callAPISuccess('Contribution', 'getoptions', 
array('field' => 'contribution_status_id'));
-  $this->assertTrue(in_array('Chargeback', $options['values']));
-}
-
-/**
- * Covers wmf_civicrm_mark_refund.
- */
-public function testMarkRefund() {
-wmf_civicrm_mark_refund( $this->original_contribution_id, 'refund', 
false, '2015-09-09', 'my_special_ref');
-
-$contribution = civicrm_api3( 'contribution', 'getsingle', array(
-'id' => $this->original_contribution_id,
-) );
-
-$this->assertEquals( 'Refunded', $contribution['contribution_status'],
-'Refunded contribution has correct status' );
-
-$financialTransactions = civicrm_api3('EntityFinancialTrxn', 'get', 
array(
-'entity_id' => $this->original_contribution_id,
-'entity_table' => 'civicrm_contribution',
-'api.financial_trxn.get' => 1,
-'sequential' => TRUE,
-));
-$this->assertEquals(2, $financialTransactions['count']);
-$transaction1 = 
$financialTransactions['values']['0']['api.financial_trxn.get']['values'][0];
-$transaction2 = 
$financialTransactions['values']['1']['api.financial_trxn.get']['values'][0];
-
-$this->assertEquals($transaction1['trxn_id'], $this->trxn_id);
-$this->assertEquals(strtotime($transaction2['trxn_date']), 
strtotime('2015-09-09'));
-$this->assertEquals($transaction2['trxn_id'], 'my_special_ref');
-}
-
-  /**
-   * Check that marking a contribution as refunded updates custom data 
appropriately.
-   */
-  public function

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-03-02 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

0255bd7 Re-queue damaged jobs via UI
8d6214c Fix code for MasterCard debit
b8abd08 Add more Latin American methods for AstroPay
427d474 Associate CiviMail record with the right contact
40d4f7e CiviCRM submodule update - export speed fixes

Change-Id: I828a9150706dd57ff862c9f972ea122adbf7dec2
---
D sites/all/modules/wmf_communication/tests/phpunit/CiviMailTest.php
1 file changed, 0 insertions(+), 104 deletions(-)

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



diff --git a/sites/all/modules/wmf_communication/tests/phpunit/CiviMailTest.php 
b/sites/all/modules/wmf_communication/tests/phpunit/CiviMailTest.php
deleted file mode 100644
index f250943..000
--- a/sites/all/modules/wmf_communication/tests/phpunit/CiviMailTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<<< HEAD   (ff0e0c Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
-mailStore->addMailing(
-   $this->source,
-   $name,
-   $this->body,
-   $this->subject,
-   $revision
-   );
-   $this->assertInstanceOf(
-   'wmf_communication\ICiviMailingRecord',
-   $storedMailing,
-   'addMailing should return an ICiviMailingRecord'
-   );
-   $this->assertTrue(
-   is_numeric( $storedMailing->getMailingID() ),
-   'CiviMailingRecord should have a numeric mailing ID'
-   );
-   }
-
-   public function testGetMailing() {
-   $name = 'test_mailing';
-   $revision = mt_rand();
-   $storedMailing = $this->mailStore->addMailing(
-   $this->source,
-   $name,
-   $this->body,
-   $this->subject,
-   $revision
-   );
-   $retrievedMailing = $this->mailStore->getMailing(
-   $this->source,
-   $name,
-   $revision
-   );
-   $this->assertEquals(
-   $storedMailing->getMailingID(),
-   $retrievedMailing->getMailingID(),
-   'Retrieved mailing has wrong MailingID'
-   );
-   $this->assertEquals(
-   $storedMailing->getJobID(),
-   $retrievedMailing->getJobID(),
-   'Retrieved mailing has wrong JobID'
-   );
-   }
-
-   /**
-* @expectedException wmf_communication\CiviMailingMissingException
-*/
-   public function testMissingMailing() {
-   $this->mailStore->getMailing( 'fakeSource', 'fakeName', 
mt_rand() );
-   }
-
-   public function testAddQueueRecord() {
-   $name = 'test_mailing';
-   $revision = mt_rand();
-   $storedMailing = $this->mailStore->addMailing(
-   $this->source,
-   $name,
-   $this->body,
-   $this->subject,
-   $revision
-   );
-   $queueRecord = $this->mailStore->addQueueRecord(
-   $storedMailing,
-   'generaltr...@hondo.mil',
-   $this->contactID
-   );
-   $this->assertInstanceOf(
-   'wmf_communication\ICiviMailQueueRecord',
-   $queueRecord,
-   'addQueueRecord should return an ICiviMailQueueRecord'
-   );
-   $this->assertTrue(
-   is_numeric( $queueRecord->getQueueID() ),
-   'CiviMailQueueRecord should have a numeric ID'
-   );
-   $this->assertEquals(
-   $this->contactID,
-   $queueRecord->getContactID(),
-   'CiviMailQueueRecord has wrong contact ID'
-   );
-   $this->assertEquals(
-   $this->emailID,
-   $queueRecord->getEmailID(),
-   'CiviMailQueueRecord has wrong email ID'
-   );
-   }
-}
->>> BRANCH (7e2eed Merge "CiviCRM submodule update - export speed fixes")

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I828a9150706dd57ff862c9f972ea122adbf7dec2
Gerrit-PatchSet: 1

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-03-02 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

0255bd7 Re-queue damaged jobs via UI
8d6214c Fix code for MasterCard debit
b8abd08 Add more Latin American methods for AstroPay
427d474 Associate CiviMail record with the right contact
40d4f7e CiviCRM submodule update - export speed fixes

Change-Id: I828a9150706dd57ff862c9f972ea122adbf7dec2
---
D sites/all/modules/wmf_communication/tests/phpunit/CiviMailTest.php
1 file changed, 0 insertions(+), 104 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/27/274627/1

diff --git a/sites/all/modules/wmf_communication/tests/phpunit/CiviMailTest.php 
b/sites/all/modules/wmf_communication/tests/phpunit/CiviMailTest.php
deleted file mode 100644
index f250943..000
--- a/sites/all/modules/wmf_communication/tests/phpunit/CiviMailTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<<< HEAD   (ff0e0c Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wiki)
-===
-mailStore->addMailing(
-   $this->source,
-   $name,
-   $this->body,
-   $this->subject,
-   $revision
-   );
-   $this->assertInstanceOf(
-   'wmf_communication\ICiviMailingRecord',
-   $storedMailing,
-   'addMailing should return an ICiviMailingRecord'
-   );
-   $this->assertTrue(
-   is_numeric( $storedMailing->getMailingID() ),
-   'CiviMailingRecord should have a numeric mailing ID'
-   );
-   }
-
-   public function testGetMailing() {
-   $name = 'test_mailing';
-   $revision = mt_rand();
-   $storedMailing = $this->mailStore->addMailing(
-   $this->source,
-   $name,
-   $this->body,
-   $this->subject,
-   $revision
-   );
-   $retrievedMailing = $this->mailStore->getMailing(
-   $this->source,
-   $name,
-   $revision
-   );
-   $this->assertEquals(
-   $storedMailing->getMailingID(),
-   $retrievedMailing->getMailingID(),
-   'Retrieved mailing has wrong MailingID'
-   );
-   $this->assertEquals(
-   $storedMailing->getJobID(),
-   $retrievedMailing->getJobID(),
-   'Retrieved mailing has wrong JobID'
-   );
-   }
-
-   /**
-* @expectedException wmf_communication\CiviMailingMissingException
-*/
-   public function testMissingMailing() {
-   $this->mailStore->getMailing( 'fakeSource', 'fakeName', 
mt_rand() );
-   }
-
-   public function testAddQueueRecord() {
-   $name = 'test_mailing';
-   $revision = mt_rand();
-   $storedMailing = $this->mailStore->addMailing(
-   $this->source,
-   $name,
-   $this->body,
-   $this->subject,
-   $revision
-   );
-   $queueRecord = $this->mailStore->addQueueRecord(
-   $storedMailing,
-   'generaltr...@hondo.mil',
-   $this->contactID
-   );
-   $this->assertInstanceOf(
-   'wmf_communication\ICiviMailQueueRecord',
-   $queueRecord,
-   'addQueueRecord should return an ICiviMailQueueRecord'
-   );
-   $this->assertTrue(
-   is_numeric( $queueRecord->getQueueID() ),
-   'CiviMailQueueRecord should have a numeric ID'
-   );
-   $this->assertEquals(
-   $this->contactID,
-   $queueRecord->getContactID(),
-   'CiviMailQueueRecord has wrong contact ID'
-   );
-   $this->assertEquals(
-   $this->emailID,
-   $queueRecord->getEmailID(),
-   'CiviMailQueueRecord has wrong email ID'
-   );
-   }
-}
->>> BRANCH (7e2eed Merge "CiviCRM submodule update - export speed fixes")

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

Gerrit-MessageType: newchange
Gerrit-Change-Id:

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-02-29 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

a61332b Drupal submodule update
d3a65a0 Drupal submodule update
4c89534 CiviCRM submodule updates
3bc176a Add index to civicrm_contribution.total_amount

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

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




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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-02-29 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

a61332b Drupal submodule update
d3a65a0 Drupal submodule update
4c89534 CiviCRM submodule updates
3bc176a Add index to civicrm_contribution.total_amount

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/07/274007/1


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-02-22 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

7a85e97 CiviCRM submodule update
0124d7c Output extra data when failing to create contact

CiviCRM updates:
dfade8f CRM-17837 Improve Lybunt report.
43202a1 Stop adding duplicate sql to developer tab

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

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




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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-02-22 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

7a85e97 CiviCRM submodule update
0124d7c Output extra data when failing to create contact

CiviCRM updates:
dfade8f CRM-17837 Improve Lybunt report.
43202a1 Stop adding duplicate sql to developer tab

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


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


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-02-17 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

0db4c8f Minor data tidy up spotted during refund spot-checking.
a3696be Follow up on adding missing Refund financial trxns
fc5b8aa Allow setting read timeouts per queue
350750c Fix financial_account.account_type_code to EXP (expense) for Refund 
andn Chargeback
b2f9f86 Get more info when contribution create fails
7568c2a Fix e-Notice due to some Option Values not having the 'name' field 
filled in.

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

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




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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-02-17 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

0db4c8f Minor data tidy up spotted during refund spot-checking.
a3696be Follow up on adding missing Refund financial trxns
fc5b8aa Allow setting read timeouts per queue
350750c Fix financial_account.account_type_code to EXP (expense) for Refund 
andn Chargeback
b2f9f86 Get more info when contribution create fails
7568c2a Fix e-Notice due to some Option Values not having the 'name' field 
filled in.

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


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


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-02-16 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

2d11ed2 CiviCRM security patches
ed309ff Add debug info for when option value is not found.
4008fb2 Enotice fix (indicating unset parameter)
d4f0a93 Fix type error in Refund logic.
74e041dd7a583126d851dfff0d84acea68f217df Ensure 'Gateway' option value exists

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

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




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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-02-16 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

2d11ed2 CiviCRM security patches
ed309ff Add debug info for when option value is not found.
4008fb2 Enotice fix (indicating unset parameter)
d4f0a93 Fix type error in Refund logic.
74e041dd7a583126d851dfff0d84acea68f217df Ensure 'Gateway' option value exists

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


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


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-02-16 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

CiviCRM submodule update

b165be3 Fix error when updating completed transaction.

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

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




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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-02-16 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

CiviCRM submodule update

b165be3 Fix error when updating completed transaction.

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/11/271011/1


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-01-22 Thread Ejegg (Code Review) 
Ejegg has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

b9ebf3d31aeab8120143cfbf6bc2df0f617341cf Fix static warning
4d88801b9936ce3e9a6a3121c6c752822e471590 Fix currency column format on 
Lybunt
2f573acde98b6911c9a76530d0fa39fc6b3fa00a Fix undefined variable warning
6bf0f2919bdea9c220e446d49b723ceacedd5197 Update CiviCRM submodule

CiviCRM updates:
   e7ce27df7b0080e1549ce71839083515339276fc (merged into 4.6.11) Backport 
FinancialTrxn api
f8b03b9b37e347c02768906c7a6fd55938459f1f (merged into 4.6.11) Backport 
EntityFinancialTrxn api
400df7cf5b5bd0e10e532181a2b60d7a87b18c8a (merged into 4.7) Whitespace 
only.
418ae85add790165aa43eb5a8a510f3a1425de88 (backport from 4.7) CRM-17394 
- Initialize DB slightly later. Fix query-log and redundant SET NAMES.
991012d81faa9914dc34577da7fbcac8dbd95144 Partial backport of DB 
initialisation fixes.
c2a81e24025840ef6183944e0cd71f960b3daff0 CRM-17806 Class-api: Check if 
constant is defined before defining it
9893bfc88816d1a576a4f712b1a651131228e016 (proposed for 4.7) CRM-17439 
layout changes for advanced search panes
38040d1c221788b22099124a8497c806d6cf0aa2 (patch already in 4.7) 
CRM-17640 Update contribution api to do a sensible query when getcount is being 
invoked

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a8efd6ec63d0f34a786ec29afef31311b34e307
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 
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] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-01-21 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

b9ebf3d31aeab8120143cfbf6bc2df0f617341cf Fix static warning
d93fc15685dc15f6c317f278170bc69deed33f53 Fix static warning
4d88801b9936ce3e9a6a3121c6c752822e471590 Fix currency column format on Lybunt
2f573acde98b6911c9a76530d0fa39fc6b3fa00a Fix undefined variable warning
6bf0f2919bdea9c220e446d49b723ceacedd5197 Update CiviCRM submodule

CiviCRM updates:
   e7ce27df7b0080e1549ce71839083515339276fc (merged into 4.6.11) Backport 
FinancialTrxn api
f8b03b9b37e347c02768906c7a6fd55938459f1f (merged into 4.6.11) Backport 
EntityFinancialTrxn api
400df7cf5b5bd0e10e532181a2b60d7a87b18c8a (merged into 4.7) Whitespace only.
418ae85add790165aa43eb5a8a510f3a1425de88 (backport from 4.7) CRM-17394 - 
Initialize DB slightly later. Fix query-log and redundant SET NAMES.
991012d81faa9914dc34577da7fbcac8dbd95144 Partial backport of DB 
initialisation fixes.
c2a81e24025840ef6183944e0cd71f960b3daff0 CRM-17806 Class-api: Check if 
constant is defined before defining it
9893bfc88816d1a576a4f712b1a651131228e016 (proposed for 4.7) CRM-17439 
layout changes for advanced search panes
38040d1c221788b22099124a8497c806d6cf0aa2 (patch already in 4.7) CRM-17640 
Update contribution api to do a sensible query when getcount is being invoked
b4ce0f0548d769e951db48e507e8b9b942e7f34c (merged into 4.7) CRM-17627 Set 
transaction date correctly for refunds
1124b1bfbc7d389fa0e0e0ed168315bce066cbc8 (merged 
in1124b1bfbc7d389fa0e0e0ed168315bce066cbc8 (merged ini
ce058b4b287510c28aeb2de1e0d08 (merged into 4.7) CRM-17700 allow 
contribution get to bypass permissions

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


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


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-01-21 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

b9ebf3d31aeab8120143cfbf6bc2df0f617341cf Fix static warning
4d88801b9936ce3e9a6a3121c6c752822e471590 Fix currency column format on 
Lybunt
2f573acde98b6911c9a76530d0fa39fc6b3fa00a Fix undefined variable warning
6bf0f2919bdea9c220e446d49b723ceacedd5197 Update CiviCRM submodule

CiviCRM updates:
   e7ce27df7b0080e1549ce71839083515339276fc (merged into 4.6.11) Backport 
FinancialTrxn api
f8b03b9b37e347c02768906c7a6fd55938459f1f (merged into 4.6.11) Backport 
EntityFinancialTrxn api
400df7cf5b5bd0e10e532181a2b60d7a87b18c8a (merged into 4.7) Whitespace 
only.
418ae85add790165aa43eb5a8a510f3a1425de88 (backport from 4.7) CRM-17394 
- Initialize DB slightly later. Fix query-log and redundant SET NAMES.
991012d81faa9914dc34577da7fbcac8dbd95144 Partial backport of DB 
initialisation fixes.
c2a81e24025840ef6183944e0cd71f960b3daff0 CRM-17806 Class-api: Check if 
constant is defined before defining it
9893bfc88816d1a576a4f712b1a651131228e016 (proposed for 4.7) CRM-17439 
layout changes for advanced search panes
38040d1c221788b22099124a8497c806d6cf0aa2 (patch already in 4.7) 
CRM-17640 Update contribution api to do a sensible query when getcount is being 
invoked

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/71/265671/1


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2015-12-17 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

54ff7673af73c202d83ed9eae2527b769cf78085 Remove unnecessary function from 
gateway report
4e4a87d6e6acb99bd3fcd67c6059f93975784d34 Add script to fill missing appeal data

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/59/259859/1


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2015-12-17 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

54ff7673af73c202d83ed9eae2527b769cf78085 Remove unnecessary function from 
gateway report
4e4a87d6e6acb99bd3fcd67c6059f93975784d34 Add script to fill missing appeal data

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

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




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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2015-12-15 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

db4f5d53bf737acfba9bccb6793ca93b96aeab5c Don't hardcode 'amazon' smashpig 
config node
65523040762e8670966efb7206a495be4fd73e0f Fix direct_mail field check
6e753507f2a812478e19350245364bce92710247 Update drupal submodule
4cb6f839e2eb905dc11e1e20db320d88d49288b6 Fix filter on receive_date in gateway 
report.
c81f5bed1b47242a45bd6f9d0d1ae0613d64e0d3 CiviCRM submodule update

CiviCRM update detail

fee8a30f5127391cd4cf569f20dd7b477e88e6f9 CRM-17675 set date AND time to 'now' 
when refunding contributions
4594ecf0e43288bb3becb08428ad5e3b6954a750 CRM-17641 backport Civi class in order 
to support other backports
d207120044bf40c64cddde1747decf01eb5e50c0 Fix generated SQL
b7ff5b68ec066f7e613609fabfc3dd9a2700e29e CRM-17691 do not use default return 
properties from search screen
f35f09d8ee5b26078525c798f20e8bdc03077988 Free the DAO, if it comes back it's 
yours
c47cae9c6d8597298c79cea5970c0d1de8e3ea32 CRM-17691 when doing a query to 
retrieve ids for export ... only retrieve the ids
8327424e320941707ca86e1a0c264a94cf9f9382 CRM-17691 add the campaign id to 
selector even though it ? is not used?

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

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




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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2015-12-15 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

db4f5d53bf737acfba9bccb6793ca93b96aeab5c Don't hardcode 'amazon' smashpig 
config node
65523040762e8670966efb7206a495be4fd73e0f Fix direct_mail field check
6e753507f2a812478e19350245364bce92710247 Update drupal submodule
4cb6f839e2eb905dc11e1e20db320d88d49288b6 Fix filter on receive_date in gateway 
report.
c81f5bed1b47242a45bd6f9d0d1ae0613d64e0d3 CiviCRM submodule update

CiviCRM update detail

fee8a30f5127391cd4cf569f20dd7b477e88e6f9 CRM-17675 set date AND time to 'now' 
when refunding contributions
4594ecf0e43288bb3becb08428ad5e3b6954a750 CRM-17641 backport Civi class in order 
to support other backports
d207120044bf40c64cddde1747decf01eb5e50c0 Fix generated SQL
b7ff5b68ec066f7e613609fabfc3dd9a2700e29e CRM-17691 do not use default return 
properties from search screen
f35f09d8ee5b26078525c798f20e8bdc03077988 Free the DAO, if it comes back it's 
yours
c47cae9c6d8597298c79cea5970c0d1de8e3ea32 CRM-17691 when doing a query to 
retrieve ids for export ... only retrieve the ids
8327424e320941707ca86e1a0c264a94cf9f9382 CRM-17691 add the campaign id to 
selector even though it ? is not used?

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


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


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2015-12-08 Thread Eileen (Code Review) 
Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

feed3b08f51bb275845b299f19c66d0ef257b784 CRM-17680 fix wmf_lybunt to order by 
last year's total
d3989778b7226b4fb6280869272317b3be1019ee CiviCRM submodule update (incl Lybunt 
changes)

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

Approvals:
  Eileen: Verified
  Awight: Looks good to me, approved




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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2015-12-07 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

feed3b08f51bb275845b299f19c66d0ef257b784 CRM-17680 fix wmf_lybunt to order by 
last year's total
d3989778b7226b4fb6280869272317b3be1019ee CiviCRM submodule update (incl Lybunt 
changes)

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


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


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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2015-10-28 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into HEAD
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into HEAD

Change-Id: I01f99783a3446a8eec34bee4db05c8993c4c83ac
---
M civicrm
M sites/all/modules/wmf_campaigns/WmfCampaign.php
M sites/all/modules/wmf_civicrm/bootstrap.inc
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
M sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
6 files changed, 107 insertions(+), 94 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/40/249640/1

diff --git a/civicrm b/civicrm
index 0e31ff7..9ba1816 16
--- a/civicrm
+++ b/civicrm
-Subproject commit 0e31ff753a9e05a63d92c08ea97db9f201ea795e
+Subproject commit 9ba18168d7943e126c902ea2aedd7ab8adf51b09
diff --git a/sites/all/modules/wmf_campaigns/WmfCampaign.php 
b/sites/all/modules/wmf_campaigns/WmfCampaign.php
index 2708032..d6d85f2 100644
--- a/sites/all/modules/wmf_campaigns/WmfCampaign.php
+++ b/sites/all/modules/wmf_campaigns/WmfCampaign.php
@@ -15,17 +15,11 @@
 ->condition( 'campaign_key', $key )
 ->execute()
 ->fetchAssoc();
-<<< HEAD   (299ef1 Revert "Revert commits on wrong branch")
 
if ( $result === false ) {
throw new CampaignNotFoundException( "Campaign {$key} 
is missing WMF Campaign info." );
}
 
-===
-   if ( $result === false ) {
-   throw new CampaignNotFoundException( "Campaign {$key} 
is missing WMF Campaign info." );
-   }
->>> BRANCH (78dee8 Fail gracefully if campaigns were added using the 
native Civ)
 return WmfCampaign::fromDbRecord( $result );
 }
 
diff --git a/sites/all/modules/wmf_civicrm/bootstrap.inc 
b/sites/all/modules/wmf_civicrm/bootstrap.inc
index f277d25..4bba64b 100644
--- a/sites/all/modules/wmf_civicrm/bootstrap.inc
+++ b/sites/all/modules/wmf_civicrm/bootstrap.inc
@@ -29,87 +29,131 @@
 return $api;
 }
 
-function wmf_civicrm_create_contribution_types($contribution_types)
+/**
+ * Ensure that a financial type exists for every item in the array.
+ *
+ * @param array $financial_types
+ *
+ * @return array
+ *   Financial types in th DB.
+ *
+ * @throws \CiviCRM_API3_Exception
+ */
+function wmf_civicrm_create_financial_types($financial_types)
 {
-foreach ($contribution_types as $type)
+$existingFinancialTypes = civicrm_api3('Contribution', 'getoptions', array(
+'field' => 'financial_type_id',
+));
+$missingTypes = array_diff($financial_types, 
$existingFinancialTypes['values']);
+foreach ($missingTypes  as $type)
 {
-$contribution_type_id = CRM_Utils_Array::key(
-$type,
-CRM_Contribute_PseudoConstant::contributionType()
-);
+$result = civicrm_api3('FinancialType', 'create', array(
+  'is_active' => 1,
+  'is_deductible' => 1,
+  'accounting_code' => strtoupper($type),
+  'name' => $type,
+));
+$existingFinancialTypes[$result['id']] = $type;
+}
+return $existingFinancialTypes;
+}
 
-if (!$contribution_type_id)
-{
-$params = array(
-'is_active' => 1,
-'is_deductible' => 1,
-'accounting_code' => strtoupper($type),
-'name' => $type,
-);
-$ids = array();
-CRM_Contribute_BAO_ContributionType::add($params, $ids);
-}
+/**
+ * Create option values in CiviCRM.
+ *
+ * For more control use the option_values_detailed function below.
+ *
+ * NB - encapsulated the detailed create function has a slight performance
+ * cost since group is resolved potentially multiple times - but this
+ * function seems like a rarely run function.
+ *
+ * @param string $group_name
+ * @param array $values
+ */
+function wmf_civicrm_create_option_values( $group_name, $values )
+{
+foreach ($values as $value) {
+wmf_civicrm_create_option_values_detailed($group_name, array(
+$value => array(
+'name' => $value,
+)));
 }
 }
 
-function wmf_civicrm_create_option_values( $group_name, $values )
+/**
+ * Create option values in CiviCRM with details.
+ *
+ * The previous other of this only permits a flat array. This allows a more
+ * nuanced option value create.
+ *
+ * This checks for an existing option value first.
+ *
+ * @param string $group_name
+ * @param array $values
+ */
+function wmf_civicrm_create_option_values_detailed($group_name, $values)
 {
 $api = wmf_civicrm_bootstrap_civi();
 
 $api->OptionGroup->Get(array(
-'name' => $group_name,
+  'name' =>