Ejegg has submitted this change and it was merged.
Change subject: WPG RECON
......................................................................
WPG RECON
Change-Id: I9f1596a82f6c76bfe7e09ea75c68b960718cee95
---
M composer.lock
M sites/all/modules/wmf_audit/worldpay/WorldpayAuditProcessor.php
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/composer.lock b/composer.lock
index d7efc28..97ef9ab 100644
--- a/composer.lock
+++ b/composer.lock
@@ -768,7 +768,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git";,
- "reference": "b5ff2a7d5f17aaaa33a169ca101cbea639769c90"
+ "reference": "c7133276607f63d5601c7eddc367a77beccc45e8"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
diff --git a/sites/all/modules/wmf_audit/worldpay/WorldpayAuditProcessor.php
b/sites/all/modules/wmf_audit/worldpay/WorldpayAuditProcessor.php
index 94ee210..78d1ca8 100644
--- a/sites/all/modules/wmf_audit/worldpay/WorldpayAuditProcessor.php
+++ b/sites/all/modules/wmf_audit/worldpay/WorldpayAuditProcessor.php
@@ -16,7 +16,7 @@
// MA.PISCESSW.#M.RECON.WIKI.D280514
// or
// TranDetVer2_530860_11-26-2014_8'27'08 AM.csv
- return '/\.RECON\.WIKI\.|TranDetVer2/';
+ return '/\.RECON\.WIKI\.|TranDetVer2|WPG_AUDIT/';
}
/**
@@ -44,6 +44,9 @@
$dateParts = explode( '-', $dateStr );
$date = $dateParts[2] . str_pad( $dateParts[0], 2, '0'
) . str_pad( $dateParts[1], 2, '0' );
return $date;
+ } elseif ( preg_match( '/WPG_AUDIT/', $file ) ) {
+ // WPG audit files look like WPG_AUDIT_YYYYMMDDhhmm.csv
+ return substr( $file, 10, -8 );
}
throw new Exception( "Cannot parse date in surprise file
{$file}" );
}
--
To view, visit https://gerrit.wikimedia.org/r/244484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f1596a82f6c76bfe7e09ea75c68b960718cee95
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Cdentinger <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
