<!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>[2647] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes: WordCamp Budgets: New post statuses/flow compatibily for reimbursement requests.</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/2647">2647</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/2647","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 23:34:08 +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 Budgets: New post statuses/flow compatibily for reimbursement requests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludesreimbursementrequestsdashboardphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/reimbursement-requests-dashboard.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludesreimbursementrequestslisttablephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/reimbursement-requests-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludesreimbursementrequestsdashboardphp"></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/reimbursement-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/reimbursement-requests-dashboard.php 2016-02-26 23:17:32 UTC (rev 2646)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/reimbursement-requests-dashboard.php 2016-02-26 23:34:08 UTC (rev 2647)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,25 +41,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sections = get_submenu_page_sections();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $list_table->prepare_items();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $section_explanation = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( get_current_section() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'submitted':
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'wcb-pending-approval':
</ins><span class="cx" style="display: block; padding: 0 10px"> $section_explanation = 'These requests have been completed by the organizer, and need to be reviewed by a deputy.';
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'info_requested':
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'wcb-incomplete':
</ins><span class="cx" style="display: block; padding: 0 10px"> $section_explanation = 'These requests have been reviewed by a deputy, and sent back to the organizer because they lacked some required information.';
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'rejected':
- $section_explanation = 'These requests have been reviewed by a deputy and rejected.';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'wcb-cancelled':
+ $section_explanation = 'These requests have been reviewed by a deputy and cancelled/rejected.';
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'in_process':
- $section_explanation = "These requests have been reviewed by a deputy and payment is pending.";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'wcb-approved':
+ $section_explanation = "These requests have been reviewed and approved by a deputy and payment is pending.";
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'paid':
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'wcb-pending-payment':
+ $section_explanation = 'These requests have been exported to our banking software, pending release.';
+ break;
+
+ case 'wcb-paid':
</ins><span class="cx" style="display: block; padding: 0 10px"> $section_explanation = 'These requests have been paid and closed.';
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,13 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_section_slugs() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slugs = array_keys( \WordCamp\Budgets\Reimbursement_Requests\get_custom_statuses() );
-
- foreach( $slugs as & $slug ) {
- $slug = str_replace( 'wcbrr_', '', $slug );
- }
-
- return $slugs;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return \WordCamp\Budgets\Reimbursement_Requests\get_post_statuses();
</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">@@ -104,30 +103,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_submenu_page_sections() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $statuses = \WordCamp\Budgets\Reimbursement_Requests\get_custom_statuses();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $statuses = \WordCamp\Budgets\Reimbursement_Requests\get_post_statuses();
</ins><span class="cx" style="display: block; padding: 0 10px"> $sections = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $current_section = get_current_section();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $statuses as $status_slug => $status_name ) {
- $status_slug = str_replace( 'wcbrr_', '', $status_slug ); // make the URL easier to read
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $statuses as $status ) {
+ $status = get_post_status_object( $status );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = 'nav-tab';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $status_slug === $current_section ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $status->name === $current_section ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes .= ' nav-tab-active';
</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"> $href = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 'reimbursement-requests-dashboard',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'section' => $status_slug,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'section' => $status->name,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> network_admin_url( 'admin.php' )
</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">- $sections[ $status_slug ] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sections[ $status->name ] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'classes' => $classes,
</span><span class="cx" style="display: block; padding: 0 10px"> 'href' => $href,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'text' => $status_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'text' => $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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,8 +196,22 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Back-compat.
+ $back_compat_statuses = array(
+ 'wcbrr_submitted' => 'pending-approval',
+ 'wcbrr_info_requested' => 'wcb-incomplete',
+ 'wcbrr_rejected' => 'wcb-failed',
+ 'wcbrr_in_process' => 'pending-payment',
+ 'wcbrr_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"> // Drafts, etc aren't displayed in the list table, so there's no reason to index them
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ignored_statuses = array( 'auto-draft', 'draft', 'trash' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ignored_statuses = array( 'auto-draft', 'trash' );
</ins><span class="cx" style="display: block; padding: 0 10px"> // todo also `inherit`. should switch to whitelist instead of blacklist
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $request->post_status, $ignored_statuses, true ) ) {
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludesreimbursementrequestslisttablephp"></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/reimbursement-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/reimbursement-requests-list-table.php 2016-02-26 23:17:32 UTC (rev 2646)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/reimbursement-requests-list-table.php 2016-02-26 23:34:08 UTC (rev 2647)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@
</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 = get_index_table_name();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status = 'wcbrr_' . get_current_section();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status = get_current_section();
</ins><span class="cx" style="display: block; padding: 0 10px"> $paged = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $limit = 30;
</span><span class="cx" style="display: block; padding: 0 10px"> $offset = $limit * ( $paged - 1 );
</span></span></pre>
</div>
</div>
</body>
</html>