<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2552] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php: WordCamp.org: Move available export types and data to its own method.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/2552">2552</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/2552","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>kovshenin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-23 00:55:35 +0000 (Tue, 23 Feb 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp.org: Move available export types and data to its own method.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludespaymentrequestsdashboardphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludespaymentrequestsdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php 2016-02-23 00:26:04 UTC (rev 2551)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php 2016-02-23 00:55:35 UTC (rev 2552)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,6 +265,40 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get available export options.
+ *
+ * @return array
+ */
+ public static function get_export_types() {
+ return array(
+ 'default' => array(
+ 'label' => 'Default',
+ 'mime_type' => 'text/csv',
+ 'ext' => 'csv',
+ 'callback' => array( __CLASS__, '_generate_payment_report_default' ),
+ ),
+ 'jpm_wires' => array(
+ 'label' => 'JP Morgan Access - Wire Payments',
+ 'mime_type' => 'text/csv',
+ 'ext' => 'csv',
+ 'callback' => array( __CLASS__, '_generate_payment_report_jpm_wires' ),
+ ),
+ 'jpm_ach' => array(
+ 'label' => 'JP Morgan - NACHA',
+ 'mime_type' => 'text/plain',
+ 'ext' => 'ach',
+ 'callback' => array( __CLASS__, '_generate_payment_report_jpm_ach' ),
+ ),
+ 'jpm_checks' => array(
+ 'label' => 'JP Morgan - Quick Checks',
+ 'mime_type' => 'text/csv',
+ 'ext' => 'csv',
+ 'callback' => array( __CLASS__, '_generate_payment_report_jpm_checks' ),
+ ),
+ );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Process export requests
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function process_export_request() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,26 +310,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type = in_array( $_POST['wcpn_export_type'], array( 'default', 'jpm_wires', 'jpm_ach', 'jpm_checks' ) ) ? $_POST['wcpn_export_type'] : 'default';
- $mime_type = 'text/csv';
- $ext = 'csv';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $export_types = self::get_export_types();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $type == 'jpm_ach' ) {
- $mime_type = 'text/plain';
- $ext = 'ach';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( array_key_exists( $_POST['wcpn_export_type'], $export_types ) ) {
+ $export_type = $export_types[ $_POST['wcpn_export_type'] ];
+ } else {
+ $export_type = $export_types['default'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $start_date = strtotime( $_POST['wcpn_export_start_date'] . ' 00:00:00' );
</span><span class="cx" style="display: block; padding: 0 10px"> $end_date = strtotime( $_POST['wcpn_export_end_date'] . ' 23:59:59' );
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = sanitize_file_name( sprintf( 'wordcamp-payments-%s-to-%s.%s',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- date( 'Y-m-d', $start_date ), date( 'Y-m-d', $end_date ), $ext ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ date( 'Y-m-d', $start_date ), date( 'Y-m-d', $end_date ), $export_type['ext'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $report = self::generate_payment_report( $_POST['wcpn_date_type'], $start_date, $end_date, $type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $report = self::generate_payment_report( $_POST['wcpn_date_type'], $start_date, $end_date, $export_type );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $report ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_settings_error( 'wcp-dashboard', $report->get_error_code(), $report->get_error_message() );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- header( sprintf( 'Content-Type: %s', $mime_type ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ header( sprintf( 'Content-Type: %s', $export_type['mime_type'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> header( sprintf( 'Content-Disposition: attachment; filename="%s"', $filename ) );
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Cache-control: private' );
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Pragma: private' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,7 +349,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string | WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected static function generate_payment_report( $date_type, $start_date, $end_date, $type = 'default' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static function generate_payment_report( $date_type, $start_date, $end_date, $export_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $date_type, array( 'paid', 'created' ), true ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,8 +370,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $end_date
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $method_name = '_generate_payment_report_' . $type;
- if ( ! is_callable( array( __CLASS__, $method_name ) ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_callable( $export_type['callback'] ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'wcpn_invalid_type', 'The export type is invalid.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,10 +378,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_type' => $date_type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'start_date' => $start_date,
</span><span class="cx" style="display: block; padding: 0 10px"> 'end_date' => $end_date,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type' => $type,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'export_type' => $export_type,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return call_user_func( array( __CLASS__, $method_name ), $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return call_user_func( $export_type['callback'], $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -987,10 +1019,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label>Export Type:
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="wcpn_export_type">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="default">Default</option>
- <option value="jpm_wires">JP Morgan Access - Wire Payments</option>
- <option value="jpm_ach">JP Morgan - NACHA</option>
- <option value="jpm_checks">JP Morgan - Quick Checks</option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php foreach ( self::get_export_types() as $key => $export_type ) : ?>
+ <option value="<?php echo esc_attr( $key ); ?>"><?php echo esc_html( $export_type['label'] ); ?></option>
+ <?php endforeach; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>