Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/249558
Change subject: Merge master into civi-4.6.9
......................................................................
Merge master into civi-4.6.9
a1b45739e790884b9a6f5515587ae14210cec882 Explain some disablement
d7d3409ec84c036c87d72b289a69172d4e201962 Revert commits on wrong branch
cb6248e1a8dd2f55a600336263d3e2d7a71f95bd Use Civi method to cancel recurring
via qc
7ff9bcf2c2e8b8875df1b3a20693e71437ed8687 Revert "4.6 upgrade preparation,
replace contribution_type with financial_type"
795d4b6df437ac6fd48e840759819d73a8ae9f3b Import refund data from CSV
b769102f1e844fd31801bd034b5b2eea2f068580 Update drupal and ctools
4e57ae2b4e09b615fcd3b42d51f071ded9a0de8e T99836 remove trailing spaces
df58a9b5fe1478bf79ef3cb481a318c0851df365 Update SmashPig lib; disable Lynx
reconciliation test
22c0e8553a6fc444c0349332020595dcd03b3c7c Add Direct Mail Appeal column to
Trilogy Importer
8fc9f90a5c7955d1f5dd1ad664fc620459cf20cd Fix JPMorgan Importer
ef3e8edd6df5115ce953711307ff60648bf93ceb Remove recurring clause from Bengali
thank-you letter
2bc597c5d4839afcf555f81cec35cf92b6967efb Remove unused recurring info template
partial
eefac4db9fddeeda6ff3019aae503ef734884b28 Refactor BaseAuditProcessor main loop
dec4d59257ebc60fc02d8b1d2a01f67fedf3f0d4 Fix audit error handling
5e6066eac771ddd24eb339509e9dd0e46097914e Amazon audit processor
420866cd36fd1795d80d4649bff1947c8274ecc5 Set subscr_id on Amazon recurring if
missing
d7c9f695fc992759dd8f1e6157c52635872ae1d4 Make smashpig settings file optional,
fix comment
53f91225edfcf41d6d91c61364caf1772bddd720 WPG RECON
cf603880dd9b81b189fd86d11e4d1370320330a3 Allow for multiple audit files per date
8012daebfcde1ec811d664f5b85a6bc18388ee7e Respect individual gateway test_mode
settings
3059cffad5a42a346de8a91ce0bf1bd9180e7518 Audit: stop prepending 'RFD ' to
gateway refund IDs
a22765f610476857e8f07a9998b2d8cdfd334f1f Lean on the convenience fn even more
bb32d7a79e9838258b1cbcaf3fcb44ebdb8e5a56 Update name pattern for Amazon audit
to find logs
21e29380dcf3a6c4cbea8ccd8bc174c022631daa Make refund import logic reusable
066f49b65d28e294ae1454525b9efa2f69feaef9 Use random temp dirs in unit tests
e9813040055c00d4177fe063afdc5475c069d410 Update French thank-you
18f0231bf8386516cfe2b3ba48969bd37bcbda9d Tests for Amazon audit processor
f0fd42843dd843d12aca4fa60ccfb3cb07e4fdeb Don't move "empty" recon files in test
mode
5d44202237a10f14b089f1ead56570fb41ad0cf8 update SmashPig to ignore blank lines
in worldpay audit
c468e58cb823f5c3a52ee50521490af15f366d53 File-extension-proof WP audit filename
parsing.
f3117d9390ff81b5e681dc6c00813effa49668ef Tighten worldpay®ex_for_recon for
WPG
c47f484b34683f4d702be304dd45eb1c18bd1b14 More updates to the French thank-you
template
5b448e6c69608cc437b448be18ad3f42ea8a67ed Update civicrm submodule
b355361889009c3fd6bdfc3464afd8026aafe83f Move Context/Logger init to
wmf_audit_main
17bdda51576ac9523be38148365fad992c896cb0 Update SmashPig lib
0054ed2f4a0f87064b06108fb32c59460cb1103b Update DonationInterface lib
ff8dd92f9be4455bad03a26dd48c9c4136078586 Remove bad code
78dee8f09e1cd7ec11fdab4cbeaef6bd6f419022 Fail gracefully if campaigns were
added using the native Civi interface
Conflicts:
civicrm
composer.lock
sites/all/modules/offline2civicrm/import_refunds.drush.inc
sites/all/modules/queue2civicrm/recurring/recurring.module
sites/all/modules/wmf_campaigns/WmfCampaign.php
sites/all/modules/wmf_civicrm/bootstrap.inc
sites/all/modules/wmf_civicrm/wmf_civicrm.install
sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
Change-Id: I1a60fe92f93f5e4ad409a397b7b08795146cd22e
---
M civicrm
M composer.lock
M sites/all/modules/offline2civicrm/import_refunds.drush.inc
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_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
7 files changed, 1 insertion(+), 98 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/58/249558/1
diff --git a/civicrm b/civicrm
index 0e31ff7..7ce9941 160000
--- a/civicrm
+++ b/civicrm
-Subproject commit 0e31ff753a9e05a63d92c08ea97db9f201ea795e
+Subproject commit 7ce9941c0ffda84f1415b8ff5a855bc37c21b27a
diff --git a/composer.lock b/composer.lock
index b8a8e75..8f45207 100644
--- a/composer.lock
+++ b/composer.lock
@@ -770,11 +770,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git";,
-<<<<<<< HEAD (0a981c increment CiviCRM submodule version)
- "reference": "1f370943983373b2aaa3c89e8262c8790b51703b"
-=======
- "reference": "60c9f5e68784e077b04f73757d12682020df1a72"
->>>>>>> BRANCH (78dee8 Fail gracefully if campaigns were added using the
native Civ)
+ "reference": "24c6a96fe3763bdfe431f1eeb6af3795c530ab82"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
diff --git a/sites/all/modules/offline2civicrm/import_refunds.drush.inc
b/sites/all/modules/offline2civicrm/import_refunds.drush.inc
index de03ef2..80e3d0c 100644
--- a/sites/all/modules/offline2civicrm/import_refunds.drush.inc
+++ b/sites/all/modules/offline2civicrm/import_refunds.drush.inc
@@ -39,86 +39,9 @@
function drush_import_refunds( $processor = null, $filename = null ) {
-<<<<<<< HEAD (0a981c increment CiviCRM submodule version)
- if ( !file_exists( $filename ) ) {
- watchdog(
- 'offline2civicrm',
- "Import refunds: File does not exist: $filename",
- null,
- WATCHDOG_ERROR
- );
- return;
- }
-
- $file = fopen( $filename, 'r' );
- if ( $file === false ) {
- watchdog(
- 'offline2civicrm',
- "Import refunds: Could not open file for reading:
$filename",
- null,
- WATCHDOG_ERROR
- );
- return;
- }
-
- try {
- $headers = _load_headers( fgetcsv( $file, 0, ',' ) );
- $rowCount = 0;
- civicrm_initialize();
- while ( ( $row = fgetcsv( $file, 0, ',' ) ) !== FALSE ) {
- $rowCount += 1;
- $orderid = _get_value( 'Order ID', $row, $headers );
- $refundid = _get_value( 'Refund ID', $row, $headers,
null );
- $currency = _get_value( 'Currency', $row, $headers );
- $amount = _get_value( 'Amount', $row, $headers );
- $date = _get_value( 'Date', $row, $headers );
- $refundType = _get_value( 'Type', $row, $headers,
'refund' );
-
- if ( $orderid == '' ) {
- watchdog(
- 'offline2civicrm',
- "Invalid OrderID for refund on row
$rowCount",
- $row,
- WATCHDOG_INFO
- );
- continue;
- }
-
- $contributions =
wmf_civicrm_get_contributions_from_gateway_id( $processor, $orderid );
- if ( $contributions ) {
- $contribution = array_shift( $contributions );
- } else {
- watchdog(
- 'offline2civicrm',
- "Could not find transaction matching
trxn_id: $orderid",
- NULL,
- WATCHDOG_ERROR
- );
- continue;
- }
-
- // execute the refund
- wmf_civicrm_mark_refund(
- $contribution['id'],
- $refundType,
- true,
- $date,
- $refundid,
- $currency,
- $amount
- );
- watchdog(
- 'offline2civicrm',
- "Marked $processor transaction $orderid
refunded",
- null,
- WATCHDOG_INFO
- );
- }
-=======
try{
$importer = new RefundFile( $processor, $filename );
$importer->import();
->>>>>>> BRANCH (78dee8 Fail gracefully if campaigns were added using the
native Civ)
} catch ( Exception $e ) {
watchdog( 'offline2civicrm', 'Import refunds: Exception thrown
during refund processing: ' .
print_r( $e, true ), array(), WATCHDOG_ERROR );
diff --git a/sites/all/modules/wmf_campaigns/WmfCampaign.php
b/sites/all/modules/wmf_campaigns/WmfCampaign.php
index 6f0fca3..13b5db7 100644
--- a/sites/all/modules/wmf_campaigns/WmfCampaign.php
+++ b/sites/all/modules/wmf_campaigns/WmfCampaign.php
@@ -15,15 +15,9 @@
->condition( 'campaign_key', $key )
->execute()
->fetchAssoc();
-<<<<<<< HEAD (0a981c increment CiviCRM submodule version)
- if ( !$result ) {
- return null;
- }
-=======
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 04b818f..104ee48 100644
--- a/sites/all/modules/wmf_civicrm/bootstrap.inc
+++ b/sites/all/modules/wmf_civicrm/bootstrap.inc
@@ -71,16 +71,12 @@
$result = $api->values();
if (empty($result))
{
-<<<<<<< HEAD (0a981c increment CiviCRM submodule version)
- $api->OptionValue->Create($params);
-=======
$api->OptionValue->Create(array(
'option_group_id' => $option_group->id,
'name' => $value,
'label' => $value,
'is_active' => 1,
));
->>>>>>> BRANCH (78dee8 Fail gracefully if campaigns were added using the
native Civ)
}
}
}
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index e7a8c70..212e010 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -1449,7 +1449,6 @@
* Add "Trilogy" payment instrument.
*/
function wmf_civicrm_update_7034() {
-<<<<<<< HEAD (0a981c increment CiviCRM submodule version)
wmf_civicrm_bootstrap_civi();
wmf_civicrm_create_option_values( 'payment_instrument', array('Trilogy') );
return array();
@@ -1464,8 +1463,6 @@
* in master before this is merged.
*/
function wmf_civicrm_update_7060() {
-=======
->>>>>>> BRANCH (78dee8 Fail gracefully if campaigns were added using the
native Civ)
wmf_civicrm_bootstrap_civi();
wmf_civicrm_create_option_values_detailed('tag_used_for', array(
'Contributions' => array('value' => 'civicrm_contribution'),
diff --git
a/sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
b/sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
index 6e46ccb..5d1a58c 100644
---
a/sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
+++
b/sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
@@ -28,7 +28,6 @@
}
}
-<<<<<<< HEAD (0a981c increment CiviCRM submodule version)
/**
* API wrapper function from core (more or less).
*
@@ -88,7 +87,6 @@
$this->assertEquals(0, $apiResult['is_error'], $prefix .
$errorMessage);
}
-=======
/**
* Create a temporary directory and return the name
* @return string|boolean directory path if creation was successful, or
false
@@ -104,5 +102,4 @@
}
return false;
}
->>>>>>> BRANCH (78dee8 Fail gracefully if campaigns were added using the
native Civ)
}
--
To view, visit https://gerrit.wikimedia.org/r/249558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a60fe92f93f5e4ad409a397b7b08795146cd22e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: civi-4.6.9
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
