<!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>[2617] sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network: WordCamp.org: Add new payment requests statuses/flow to the network dashboard.</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/2617">2617</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/2617","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-25 19:34:11 +0000 (Thu, 25 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: Add new payment requests statuses/flow to the network dashboard.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkbootstrapphp">sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/bootstrap.php</a></li>
<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>
<li><a href="#sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludespaymentrequestslisttablephp">sites/branches/wcb-payment-request-statuses/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="#sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetwork">sites/branches/wcb-payment-request-statuses/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/branches/wcb-payment-request-statuses/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/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network 2016-02-25 19:02:46 UTC (rev 2616)
</del><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 2016-02-25 19:34:11 UTC (rev 2617)
</ins><a id="sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetwork"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: sites/branches/wcb-payment-request-statuses/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/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network:2603-2616
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkbootstrapphp"></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/bootstrap.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/bootstrap.php 2016-02-25 19:02:46 UTC (rev 2616)
+++ sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/bootstrap.php 2016-02-25 19:34:11 UTC (rev 2617)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,15 +20,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * needs, but this plugin also needs some of them to be active during cron jobs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( WP_PLUGIN_DIR . '/wordcamp-payments/includes/wordcamp-budgets.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'WPORG_PROXIED_REQUEST' ) && WPORG_PROXIED_REQUEST ) {
- require_once( WP_PLUGIN_DIR . '/wordcamp-payments/includes/sponsor-invoice.php' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once( WP_PLUGIN_DIR . '/wordcamp-payments/includes/sponsor-invoice.php' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( __DIR__ . '/includes/wordcamp-budgets-dashboard.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( __DIR__ . '/includes/payment-requests-dashboard.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'WPORG_PROXIED_REQUEST' ) && WPORG_PROXIED_REQUEST ) {
- require_once( __DIR__ . '/includes/sponsor-invoices-dashboard.php' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once( __DIR__ . '/includes/sponsor-invoices-dashboard.php' );
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( __DIR__ . '/includes/reimbursement-requests-dashboard.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['Payment_Requests_Dashboard'] = new \Payment_Requests_Dashboard();
</span></span></pre></div>
<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-25 19:02:46 UTC (rev 2616)
+++ sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php 2016-02-25 19:34:11 UTC (rev 2617)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,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,6 +141,17 @@
</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 ];
+ }
+
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1229,10 +1240,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 +1266,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="sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludespaymentrequestslisttablephp"></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-list-table.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-list-table.php 2016-02-25 19:02:46 UTC (rev 2616)
+++ sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-list-table.php 2016-02-25 19:34:11 UTC (rev 2617)
</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' ";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND `status` = 'wcb-paid' ";
</ins><span class="cx" style="display: block; padding: 0 10px"> $orderby = 'created';
</span><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">@@ -152,7 +158,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>