<!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>[2641] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes: WordCamp Budgets: Allow network admins to mark requests as pending payment via the 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/2641">2641</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/2641","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 18:17:34 +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: Allow network admins to mark requests as pending payment via the dashboard.</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludespaymentrequestsdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php 2016-02-26 07:52:43 UTC (rev 2640)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php 2016-02-26 18:17:34 UTC (rev 2641)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,10 +19,13 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'init', array( __CLASS__, 'process_approval' ) );
</del><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Dashboard actions.
+ add_action( 'init', array( __CLASS__, 'process_action_approve' ) );
+ add_action( 'init', array( __CLASS__, 'process_action_set_pending_payment' ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Diff-based updates to the index.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'save_post', array( __CLASS__, 'save_post' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,8 +305,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Process Approve button in network admin
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function process_approval() {
- if ( ! current_user_can( 'network_admin' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function process_action_approve() {
+ if ( ! current_user_can( 'manage_network' ) )
</ins><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"> if ( empty( $_GET['wcb-approve'] ) || empty( $_GET['_wpnonce'] ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,6 +343,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 "Set as Pending Payment" dashboard action.
+ */
+ public static function process_action_set_pending_payment() {
+ if ( ! current_user_can( 'manage_network' ) )
+ return;
+
+ if ( empty( $_GET['wcb-set-pending-payment'] ) || empty( $_GET['_wpnonce'] ) )
+ return;
+
+ list( $blog_id, $post_id ) = explode( '-', $_GET['wcb-set-pending-payment'] );
+
+ if ( ! wp_verify_nonce( $_GET['_wpnonce'], sprintf( 'wcb-set-pending-payment-%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-pending-payment';
+ wp_insert_post( $post );
+
+ WordCamp_Budgets::log( $post->ID, get_current_user_id(), 'Request set as Pending Payment via Network Admin', array(
+ 'action' => 'set-pending-payment',
+ ) );
+
+ add_action( 'admin_notices', function() {
+ ?><div class="notice notice-success is-dismissible">
+ <p><?php _e( 'Success! Request has been marked as Pending Payment.', '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></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 07:52:43 UTC (rev 2640)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-list-table.php 2016-02-26 18:17:34 UTC (rev 2641)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,11 +149,18 @@
</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"> if ( $request->post_status == 'wcb-pending-approval' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $approve_url = wp_nonce_url( add_query_arg( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $action_url = wp_nonce_url( add_query_arg( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wcb-approve' => sprintf( '%d-%d', $blog_id, $request->ID ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) ), sprintf( 'wcb-approve-%d-%d', $blog_id, $request->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">- $actions['wcb-approve'] = sprintf( '<a style="color: green;" onclick="return confirm(\'Approve this payment request?\');" href="%s">Approve</a>', esc_url( $approve_url ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actions['wcb-approve'] = sprintf( '<a style="color: green;" onclick="return confirm(\'Approve this payment request?\');" href="%s">Approve</a>', esc_url( $action_url ) );
+
+ } elseif ( $request->post_status == 'wcb-approved' ) {
+ $action_url = wp_nonce_url( add_query_arg( array(
+ 'wcb-set-pending-payment' => sprintf( '%d-%d', $blog_id, $request->ID ),
+ ) ), sprintf( 'wcb-set-pending-payment-%d-%d', $blog_id, $request->ID ) );
+
+ $actions['wcb-set-pending-payment'] = sprintf( '<a style="color: green;" onclick="return confirm(\'Set this request as pending payment?\');" href="%s">Set as Pending Payment</a>', esc_url( $action_url ) );
</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 sprintf( '<a href="%s" class="row-title" target="_blank">%s</a>%s',
</span></span></pre>
</div>
</div>
</body>
</html>