jenkins-bot has submitted this change and it was merged.
Change subject: Set up import for Major Gifts events payment/invitation tool
......................................................................
Set up import for Major Gifts events payment/invitation tool
Added import tool for getting Trilogy's data file into CiviCRM.
Fixed whitespace issues
Added Trilogy to GatewayReconciliation.php drop down.
Changed setting default values to override the proper function.
Bug: T101191
Change-Id: Id325d66df9c2d3a5c267a8d51399be4f6a571c17
---
A sites/all/modules/offline2civicrm/TrilogyFile.php
M sites/all/modules/offline2civicrm/offline2civicrm.info
M sites/all/modules/offline2civicrm/offline2civicrm.module
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
M
sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
6 files changed, 69 insertions(+), 0 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/offline2civicrm/TrilogyFile.php
b/sites/all/modules/offline2civicrm/TrilogyFile.php
new file mode 100644
index 0000000..7a5544b
--- /dev/null
+++ b/sites/all/modules/offline2civicrm/TrilogyFile.php
@@ -0,0 +1,46 @@
+<?php
+
+class TrilogyFile extends ChecksFile {
+ protected function getRequiredColumns() {
+ return array(
+ 'Address1',
+ 'City',
+ 'contrib_Date',
+ 'contrib_Account',
+ 'contrib_Amount',
+ 'contrib_Batch',
+ 'contrib_Check',
+ 'contrib_referenceNumber',
+ 'Email',
+ 'FirstName',
+ 'LastName',
+ 'State',
+ 'Zip',
+ );
+ }
+
+protected function getFieldMapping() {
+ return array(
+ 'Address1' => 'street_address',
+ 'City' => 'city',
+ 'contrib_Account' => 'raw_contribution_type',
+ 'contrib_Amount' => 'gross',
+ 'contrib_Batch' => 'import_batch_number',
+ 'contrib_Check' => 'payment_submethod',
+ 'contrib_Date' => 'date',
+ 'contrib_referenceNumber' => 'gateway_txn_id',
+ 'Email' => 'email',
+ 'FirstName' => 'first_name',
+ 'LastName' => 'last_name',
+ 'State' => 'state_province',
+ 'Zip' => 'postal_code',
+ );
+ }
+
+ protected function getDefaultValues() {
+ return parent::getDefaultValues() + array(
+ 'gateway' => 'trilogy',
+ 'currency' => 'USD',
+ );
+ }
+}
diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.info
b/sites/all/modules/offline2civicrm/offline2civicrm.info
index 6bfddf3..d11034b 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.info
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.info
@@ -20,6 +20,8 @@
files[] = JpMorganFile.php
files[] = PayPalChecksFile.php
files[] = SquareFile.php
+files[] = TrilogyFile.php
files[] = WmfImportFile.php
files[] = WmfOrgImportFile.php
files[] = tests/includes/BaseChecksFileTest.php
+
diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.module
b/sites/all/modules/offline2civicrm/offline2civicrm.module
index 9c53422..292d5e9 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.module
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.module
@@ -107,6 +107,7 @@
'jpmorgan' => t( 'JP Morgan' ),
'paypal' => t( 'PayPal EFT' ),
'square' => t( 'Square' ),
+ 'trilogy' => t( 'Trilogy' ),
),
);
$form['log'] = array(
@@ -158,6 +159,9 @@
case 'square':
$importer = new SquareFile( $file->uri );
break;
+ case 'trilogy':
+ $importer = new TrilogyFile( $file->uri );
+ break;
default:
throw new Exception( 'Bad file format selection' );
}
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 8166fa5..bffae6a 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -38,6 +38,7 @@
wmf_civicrm_update_7031();
wmf_civicrm_update_7032();
wmf_civicrm_update_7033();
+ wmf_civicrm_update_7034();
}
/**
@@ -1439,3 +1440,12 @@
wmf_civicrm_create_option_values( 'payment_instrument', array('Square
Cash') );
return array();
}
+
+/**
+ * Add "Trilogy" payment instrument.
+ */
+function wmf_civicrm_update_7034() {
+ wmf_civicrm_bootstrap_civi();
+ wmf_civicrm_create_option_values( 'payment_instrument', array('Trilogy') );
+ return array();
+}
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 6946dc6..6a49470 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -687,6 +687,12 @@
watchdog( 'wmf_civicrm', 'payment_method constraint violated:
gateway Square, but method=@method ; gateway_txn_id=@id', array( '@method' =>
$msg['payment_method'], '@id' => $msg['gateway_txn_id'] ), WATCHDOG_DEBUG );
}
break;
+ case 'trilogy':
+ $payment_instrument = 'Trilogy';
+ if ( array_key_exists( 'payment_method', $msg ) and strtolower(
$msg['payment_method'] ) !== 'trilogy' ) {
+ watchdog( 'wmf_civicrm', 'payment_method constraint violated:
gateway Trilogy, but method=@method ; gateway_txn_id=@id', array( '@method' =>
$msg['payment_method'], '@id' => $msg['gateway_txn_id'] ), WATCHDOG_DEBUG );
+ }
+ break;
}
}
diff --git
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
index 7a18bb1..3bef952 100644
---
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
+++
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
@@ -18,6 +18,7 @@
'JPMORGAN' => 'JP Morgan',
'PAYPAL' => 'PayPal',
'SQUARE' => 'Square',
+ 'TRILOGY' => 'Trilogy',
'WORLDPAY' => 'Worldpay',
);
--
To view, visit https://gerrit.wikimedia.org/r/237864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id325d66df9c2d3a5c267a8d51399be4f6a571c17
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: XenoRyet <dkozlow...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: XenoRyet <dkozlow...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
