Ejegg has submitted this change and it was merged.
Change subject: JP Morgan: don't allow empty rows; update filename detection
......................................................................
JP Morgan: don't allow empty rows; update filename detection
Change-Id: I5400d27050b58a016ba447fe8025ed93d97768d2
---
M sites/all/modules/offline2civicrm/JpMorganFile.php
M sites/all/modules/offline2civicrm/upload_form.js
2 files changed, 2 insertions(+), 10 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/offline2civicrm/JpMorganFile.php
b/sites/all/modules/offline2civicrm/JpMorganFile.php
index 84f97f3..c1802dd 100644
--- a/sites/all/modules/offline2civicrm/JpMorganFile.php
+++ b/sites/all/modules/offline2civicrm/JpMorganFile.php
@@ -55,21 +55,13 @@
);
}
- protected function parseRow( $data ) {
- // Empty rows are acceptable for this file
- if ( empty( $data['ACCOUNT NAME'] ) and empty( $data['REFERENCE'] ) ) {
- throw new EmptyRowException();
- }
-
- return parent::parseRow( $data );
- }
-
protected function mungeMessage( &$msg ) {
// Approximate value in USD
$msg['gross'] = exchange_rate_convert(
$msg['original_currency'], $msg['original_gross'],
$msg['settlement_date']
);
+ // TODO: We can remove this once MG uses smart groups instead of this
label.
// Flag as big-time if over $1000
if ( $msg['gross'] > 1000 ) {
$msg['gift_source'] = 'Benefactor Gift';
diff --git a/sites/all/modules/offline2civicrm/upload_form.js
b/sites/all/modules/offline2civicrm/upload_form.js
index ead0b43..166e6b4 100644
--- a/sites/all/modules/offline2civicrm/upload_form.js
+++ b/sites/all/modules/offline2civicrm/upload_form.js
@@ -13,7 +13,7 @@
if ( /Coinbase|Orders-Report|\(Orders\)/.test( uploadFile ) ) {
fileType = "coinbase";
- } else if ( /JPMorgan/.test( uploadFile ) ) {
+ } else if ( /JPM/.test( uploadFile ) ) {
fileType = "jpmorgan";
} else if ( /Paypal/.test( uploadFile ) ) {
fileType = "paypal";
--
To view, visit https://gerrit.wikimedia.org/r/198085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5400d27050b58a016ba447fe8025ed93d97768d2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: AndyRussG <andrew.green...@gmail.com>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Katie Horn <kh...@wikimedia.org>
Gerrit-Reviewer: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
