<!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>[2632] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network: WordCamp.org: Reintegrate branch into trunk (wordcamp-payments-network)</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/2632">2632</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/2632","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:56:15 +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: Reintegrate branch into trunk (wordcamp-payments-network)</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>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludespaymentrequestslisttablephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-list-table.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetwork">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network 2016-02-26 00:53:25 UTC (rev 2631)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network 2016-02-26 00:56:15 UTC (rev 2632)
</ins><a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetwork"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:mergeinfo</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network:2603-2631
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><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-26 00:53:25 UTC (rev 2631)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php 2016-02-26 00:56:15 UTC (rev 2632)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class Payment_Requests_Dashboard {
</span><span class="cx" style="display: block; padding: 0 10px"> public static $list_table;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static $db_version = 6;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static $db_version = 7;
</ins><span class="cx" style="display: block; padding: 0 10px"> public static $import_results = null;
</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">@@ -19,6 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_enqueue_scripts', array( __CLASS__, 'enqueue_assets' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'network_admin_menu', array( __CLASS__, 'network_admin_menu' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', array( __CLASS__, 'upgrade' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'init', array( __CLASS__, 'process_approval' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', array( __CLASS__, 'process_export_request' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', array( __CLASS__, 'process_import_request' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,6 +61,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> blog_id int(11) unsigned NOT NULL default '0',
</span><span class="cx" style="display: block; padding: 0 10px"> post_id int(11) unsigned NOT NULL default '0',
</span><span class="cx" style="display: block; padding: 0 10px"> created int(11) unsigned NOT NULL default '0',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updated int(11) unsigned NOT NULL default '0',
</ins><span class="cx" style="display: block; padding: 0 10px"> paid int(11) unsigned NOT NULL default '0',
</span><span class="cx" style="display: block; padding: 0 10px"> category varchar(255) NOT NULL default '',
</span><span class="cx" style="display: block; padding: 0 10px"> method varchar(255) NOT NULL default '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $paged = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $requests = get_posts( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'paged' => $paged++,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_status' => array( 'paid', 'unpaid', 'incomplete' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_status' => 'any',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wcp_payment_request',
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 20,
</span><span class="cx" style="display: block; padding: 0 10px"> ) ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,10 +143,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $keywords[] = $amount;
</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">+ $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 ];
+ }
+
+ // One of these timestamps.
+ while ( true ) {
+ $updated_timestamp = absint( get_post_meta( $request->ID, '_wcb_updated_timestamp', time() ) );
+ if ( $updated_timestamp ) break;
+
+ $updated_timestamp = strtotime( $request->post_modified_gmt );
+ if ( $updated_timestamp ) break;
+
+ $updated_timestamp = strtotime( $request->post_date_gmt );
+ if ( $updated_timestamp ) break;
+
+ $updated_timestamp = strtotime( $request->post_date );
+ break;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => get_current_blog_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => $request->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'created' => get_post_time( 'U', true, $request->ID ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'updated' => $updated_timestamp,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'paid' => absint( get_post_meta( $request->ID, '_camppayments_date_vendor_paid', true ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'due' => absint( get_post_meta( $request->ID, '_camppayments_due_by', true ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => $request->post_status,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -227,6 +256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1>Vendor Payments</h1>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php do_action( 'admin_notices' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php settings_errors(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 class="nav-tab-wrapper"><?php self::render_dashboard_tabs(); ?></h3>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,6 +300,46 @@
</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">+ * Process Approve button in network admin
+ */
+ public static function process_approval() {
+ if ( ! current_user_can( 'network_admin' ) )
+ return;
+
+ if ( empty( $_GET['wcb-approve'] ) || empty( $_GET['_wpnonce'] ) )
+ return;
+
+ list( $blog_id, $post_id ) = explode( '-', $_GET['wcb-approve'] );
+
+ if ( ! wp_verify_nonce( $_GET['_wpnonce'], sprintf( 'wcb-approve-%d-%d', $blog_id, $post_id ) ) ) {
+ add_action( 'admin_notices', function() {
+ ?><div class="notice notice-error is-dismissible">
+ <p><?php _e( 'Error! Could not verify nonce.', 'wordcamporg' ); ?></p>
+ </div><?php
+ });
+ return;
+ }
+
+ switch_to_blog( $blog_id );
+ $post = get_post( $post_id );
+ if ( $post->post_type == 'wcp_payment_request' ) {
+ $post->post_status = 'wcb-approved';
+ wp_insert_post( $post );
+
+ WordCamp_Budgets::log( $post->ID, get_current_user_id(), 'Request approved via Network Admin', array(
+ 'action' => 'approved',
+ ) );
+
+ add_action( 'admin_notices', function() {
+ ?><div class="notice notice-success is-dismissible">
+ <p><?php _e( 'Success! Request has been marked as approved.', 'wordcamporg' ); ?></p>
+ </div><?php
+ });
+ }
+ restore_current_blog();
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Get available export options.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,12 +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><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 );
</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">@@ -354,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 ) {
</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">@@ -380,10 +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><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">@@ -399,6 +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><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">@@ -413,7 +488,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> fputcsv( $report, $column_headings );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( $args['request_indexes'] as $index ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fputcsv( $report, self::get_report_row( $index ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row = self::get_report_row( $index, $args );
+ if ( ! empty( $row ) ) {
+ fputcsv( $report, $row );
+ }
</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"> fclose( $report );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,6 +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><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">@@ -452,6 +531,9 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $args['status'] && $post->post_status != $args['status'] )
+ continue;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( get_post_meta( $post->ID, '_camppayments_payment_method', true ) != 'Check' )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -538,6 +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><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">@@ -604,6 +687,9 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $args['status'] && $post->post_status != $args['status'] )
+ continue;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( get_post_meta( $post->ID, '_camppayments_payment_method', true ) != 'Direct Deposit' )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,6 +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><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">@@ -752,6 +839,9 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $args['status'] && $post->post_status != $args['status'] )
+ continue;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Only wires here.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_post_meta( $post->ID, '_camppayments_payment_method', true ) != 'Wire' )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -954,13 +1044,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Gather all the request details needed for a row in the export file
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param stdClass $index
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $args
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</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 get_report_row( $index ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static function get_report_row( $index, $args ) {
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request = get_post( $index->post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request = get_post( $index->post_id );
+
+ $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'] ) {
+ return null;
+ }
+
</ins><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="cx" style="display: block; padding: 0 10px"> $date_vendor_paid = get_post_meta( $index->post_id, '_camppayments_date_vendor_paid', true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1031,45 +1138,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <form id="wcpn_export" method="POST">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'export', 'wcpn_request_export' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>
- This form will supply a CSV file with payment requests matching the parameters you select below.
- For example, all requests that were <code>paid</code> between <code><?php echo esc_html( $last_month ); ?></code> and <code><?php echo esc_html( $today ); ?></code>.
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2>Export Settings</h2>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>
- <label>
- Date type:
- <select name="wcpn_date_type">
- <option value="created">created</option>
- <option value="paid" selected>paid</option>
- </select>
- </label>
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table class="form-table">
+ <tr>
+ <th><label>Status</label></th>
+ <td>
+ <select name="wcpn_export_status">
+ <option value="wcb-approved"><?php _e( 'Approved', 'wordcamporg' ); ?></option>
+ <option value="wcb-paid"><?php _e( 'Paid', 'wordcamporg' ); ?></option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <th><label>Date Range</label></th>
+ <td>
+ <input type="date" name="wcpn_export_start_date" class="medium-text" value="<?php echo esc_attr( $last_month ); ?>" /> to
+ <input type="date" name="wcpn_export_end_date" class="medium-text" value="<?php echo esc_attr( $today ); ?>" />
+ </td>
+ </tr>
+ <tr>
+ <th><label>Format</label></th>
+ <td>
+ <select name="wcpn_export_type">
+ <?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; ?>
+ </select>
+ </td>
+ </tr>
+ </table>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>
- <label>
- Start date:
- <input type="date" name="wcpn_export_start_date" class="medium-text" value="<?php echo esc_attr( $last_month ); ?>" />
- </label>
- </p>
-
- <p>
- <label>
- End date:
- <input type="date" name="wcpn_export_end_date" class="medium-text" value="<?php echo esc_attr( $today ); ?>" />
- </label>
- </p>
-
- <p>
- <label>Export Type:
- <select name="wcpn_export_type">
- <?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; ?>
- </select>
- </label>
-
- <?php submit_button( 'Export' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( 'Download Export' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1229,10 +1329,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_current_tab() {
</span><span class="cx" style="display: block; padding: 0 10px"> $tab = 'overdue';
</span><span class="cx" style="display: block; padding: 0 10px"> $tabs = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'pending',
</del><span class="cx" style="display: block; padding: 0 10px"> 'overdue',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 'pending-approval',
+ 'approved',
+ 'pending-payment',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'paid',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'cancelled-failed',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'incomplete',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'export',
</span><span class="cx" style="display: block; padding: 0 10px"> 'import',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1250,12 +1355,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function render_dashboard_tabs() {
</span><span class="cx" style="display: block; padding: 0 10px"> $current_section = self::get_current_tab();
</span><span class="cx" style="display: block; padding: 0 10px"> $sections = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'overdue' => 'Overdue',
- 'pending' => 'Pending',
- 'paid' => 'Paid',
- 'incomplete' => __( 'Incomplete', 'wordcamporg' ),
- 'export' => __( 'Export', 'wordcamporg' ),
- 'import' => __( 'Import', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'overdue' => __( 'Overdue', 'wordcamporg' ), // pending-approval + after due date
+ 'pending-approval' => __( 'Pending Approval', 'wordcamporg' ),
+ 'approved' => __( 'Approved', 'wordcamporg' ),
+ 'pending-payment' => __( 'Pending Payment', 'wordcamporg' ),
+ 'paid' => __( 'Paid', 'wordcamporg' ),
+ 'cancelled-failed' => __( 'Cancelled/Failed', 'wordcamporg' ),
+ 'incomplete' => __( 'Incomplete', 'wordcamporg' ),
+ 'export' => __( 'Export', 'wordcamporg' ),
+ 'import' => __( 'Import', 'wordcamporg' ),
</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"> foreach ( $sections as $section_key => $section_caption ) {
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludespaymentrequestslisttablephp"></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-list-table.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-list-table.php 2016-02-26 00:53:25 UTC (rev 2631)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-list-table.php 2016-02-26 00:56:15 UTC (rev 2632)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,15 +76,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $order = 'asc';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'overdue' == $view ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= $wpdb->prepare( " AND `status` = 'unpaid' AND `due` > 0 AND `due` <= %d ", time() );
- } elseif ( 'pending' == $view ) {
- $where .= " AND `status` = 'unpaid' ";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= $wpdb->prepare( " AND `status` = 'wcb-pending-approval' AND `due` > 0 AND `due` <= %d ", time() );
+ } elseif ( 'pending-approval' == $view ) {
+ $where .= " AND `status` = 'wcb-pending-approval' ";
+ } elseif ( 'approved' == $view ) {
+ $where .= " AND `status` = 'wcb-approved' ";
+ } elseif ( 'pending-payment' == $view ) {
+ $where .= " AND `status` = 'wcb-pending-payment' ";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'paid' == $view ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND `status` = 'paid' ";
- $orderby = 'created';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND `status` = 'wcb-paid' ";
+ $orderby = 'updated';
</ins><span class="cx" style="display: block; padding: 0 10px"> $order = 'desc';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif( 'incomplete' == $view ) {
- $where .= " AND `status` = 'incomplete' ";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'incomplete' == $view ) {
+ $where .= " AND `status` = 'wcb-incomplete' ";
+ } elseif ( 'cancelled-failed' == $view ) {
+ $where .= " AND `status` IN ( 'wcb-failed', 'wcb-cancelled' ) ";
</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"> if ( ! empty( $_REQUEST['s'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,12 +141,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Note: runs in a switch_to_blog() context.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_payment( $request ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = empty( $request->post_title ) ? '(no title)' : $request->post_title;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = get_current_blog_id();
+ $title = empty( $request->post_title ) ? '(no title)' : $request->post_title;
</ins><span class="cx" style="display: block; padding: 0 10px"> $edit_post_link = add_query_arg( array( 'post' => $request->ID, 'action' => 'edit' ), admin_url( 'post.php' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'view-all' => sprintf( '<a href="%s" target="_blank">View All</a>', esc_url( admin_url( 'edit.php?post_type=wcp_payment_request' ) ) ),
</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">+ if ( $request->post_status == 'wcb-pending-approval' ) {
+ $approve_url = wp_nonce_url( add_query_arg( array(
+ 'wcb-approve' => sprintf( '%d-%d', $blog_id, $request->ID ),
+ ) ), sprintf( 'wcb-approve-%d-%d', $blog_id, $request->ID ) );
+
+ $actions['wcb-approve'] = sprintf( '<a style="color: green;" onclick="return confirm(\'Approve this payment request?\');" href="%s">Approve</a>', esc_url( $approve_url ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return sprintf( '<a href="%s" class="row-title" target="_blank">%s</a>%s',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $edit_post_link ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( $title ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +167,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Note: runs in a switch_to_blog() context.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_status( $request ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return esc_html( ucwords( $request->post_status ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status = get_post_status_object( $request->post_status );
+ return esc_html( $status->label );
</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></pre>
</div>
</div>
</body>
</html>