<!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>[2629] sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php: WordCamp.org: Payment requests exports and statuses.</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/2629">2629</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/2629","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-26 00:52:02 +0000 (Fri, 26 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: Payment requests exports and statuses.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludespaymentrequestsdashboardphp">sites/branches/wcb-payment-request-statuses/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="sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludespaymentrequestsdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/wcb-payment-request-statuses/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/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php 2016-02-26 00:41:21 UTC (rev 2628)
+++ sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php 2016-02-26 00:52:02 UTC (rev 2629)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,13 +393,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $export_type = $export_types['default'];
</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">- $approved_only = ! empty( $_POST['wcpn_approved_only'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status = $_POST['wcpn_export_status'];
+ if ( ! in_array( $status, array( 'wcb-approved', 'wcb-paid' ) ) )
+ $status = 'wcb-approved';
+
</ins><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 = sprintf( $export_type['filename'], date( 'Ymd', $start_date ), date( 'Ymd', $end_date ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = sanitize_file_name( $filename );
</span><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, $export_type, $approved_only );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $report = self::generate_payment_report( $status, $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="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,19 +428,19 @@
</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, $export_type, $approved_only ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static function generate_payment_report( $status, $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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $date_type, array( 'paid', 'created' ), true ) ) {
- return new WP_Error( 'wcpn_bad_date_type', 'Invalid date type.' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_int( $start_date ) || ! is_int( $end_date ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'wcpn_bad_dates', 'Invalid start or end date.' );
</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"> $table_name = self::get_table_name();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $date_type = 'updated';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $status == 'wcb-paid' )
+ $date_type = 'paid';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $request_indexes = $wpdb->get_results( $wpdb->prepare( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT *
</span><span class="cx" style="display: block; padding: 0 10px"> FROM `{$table_name}`
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,11 +454,10 @@
</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="cx" style="display: block; padding: 0 10px"> 'request_indexes' => $request_indexes,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'date_type' => $date_type,
</del><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><span class="cx" style="display: block; padding: 0 10px"> 'export_type' => $export_type,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'approved_only' => $approved_only,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'status' => $status,
</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"> return call_user_func( $export_type['callback'], $args );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,7 +473,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static function _generate_payment_report_default( $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'request_indexes' => array(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'approved_only' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'status' => '',
</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"> $column_headings = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,7 +508,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static function _generate_payment_report_jpm_checks( $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'request_indexes' => array(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'approved_only' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'status' => '',
</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"> $options = apply_filters( 'wcb_payment_req_check_options', array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -529,7 +531,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $index->blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $index->post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $args['approved_only'] && $post->post_status != 'wcb-approved' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $args['status'] && $post->post_status != $args['status'] )
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_post_meta( $post->ID, '_camppayments_payment_method', true ) != 'Check' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,7 +620,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static function _generate_payment_report_jpm_ach( $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'request_indexes' => array(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'approved_only' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'status' => '',
</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"> $ach_options = apply_filters( 'wcb_payment_req_ach_options', array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,7 +687,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $index->blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $index->post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $args['approved_only'] && $post->post_status != 'wcb-approved' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $args['status'] && $post->post_status != $args['status'] )
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_post_meta( $post->ID, '_camppayments_payment_method', true ) != 'Direct Deposit' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -821,7 +823,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static function _generate_payment_report_jpm_wires( $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'request_indexes' => array(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'approved_only' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'status' => '',
</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"> ob_start();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -837,7 +839,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $index->blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $index->post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $args['approved_only'] && $post->post_status != 'wcb-approved' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $args['status'] && $post->post_status != $args['status'] )
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only wires here.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1050,8 +1052,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $index->blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = get_post( $index->post_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $args['approved_only'] && $request->post_status != 'wcb-approved' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $back_compat_statuses = array(
+ 'unpaid' => 'draft',
+ 'incomplete' => 'wcb-incomplete',
+ 'paid' => 'wcb-paid',
+ );
+
+ // Map old statuses to new statuses.
+ if ( array_key_exists( $request->post_status, $back_compat_statuses ) ) {
+ $request->post_status = $back_compat_statuses[ $request->post_status ];
+ }
+
+ if ( $args['status'] && $request->post_status != $args['status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return null;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $currency = get_post_meta( $index->post_id, '_camppayments_currency', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $category = get_post_meta( $index->post_id, '_camppayments_payment_category', true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1127,15 +1142,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th><label>Approved Only</label></th>
- <td><label><input type="checkbox" name="wcpn_approved_only" value="1" checked> Export only requests marked as approved</label></td>
- </tr>
- <tr>
- <th><label>Date Type</label></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th><label>Status</label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <select name="wcpn_date_type">
- <option value="created" selected>created</option>
- <option value="paid">paid</option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <select name="wcpn_export_status">
+ <option value="wcb-approved"><?php _e( 'Approved', 'wordcamporg' ); ?></option>
+ <option value="wcb-paid"><?php _e( 'Paid', 'wordcamporg' ); ?></option>
</ins><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span></span></pre>
</div>
</div>
</body>
</html>