<!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>[1816] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments: WordCamp Payments: Allow requests to be marked as incomplete.</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/1816">1816</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/1816","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-08-06 23:05:20 +0000 (Thu, 06 Aug 2015)</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 Payments: Allow requests to be marked as incomplete.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsclassespaymentrequestphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/classes/payment-request.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsjavascriptwordcamppaymentsjs">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/wordcamp-payments.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxstatusphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxmarkincompletephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-mark-incomplete.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsclassespaymentrequestphp"></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/classes/payment-request.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/classes/payment-request.php 2015-08-06 16:46:41 UTC (rev 1815)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/classes/payment-request.php 2015-08-06 23:05:20 UTC (rev 1816)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,9 +87,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</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">+
+ register_post_status(
+ 'incomplete',
+ array(
+ 'label' => _x( 'Incomplete', 'post', 'wordcamporg' ),
+ 'label_count' => _nx_noop( 'Incomplete<span class="count">(%s)</span>', 'Incomplete <span class="count">(%s)</span>', 'wordcamporg' ),
+ 'public' => true,
+ 'publicly_queryable' => false,
+ )
+ );
</ins><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">+ /**
+ * Register meta boxes
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function init_meta_boxes() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @var $post WP_Post */
+ global $post;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // We're build our own Publish box, thankyouverymuch
</span><span class="cx" style="display: block; padding: 0 10px"> remove_meta_box( 'submitdiv', self::POST_TYPE, 'side' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,6 +118,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'high'
</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 ( 'incomplete' != $post->post_status && current_user_can( 'manage_network' ) ) {
+ add_meta_box(
+ 'wcp_mark_incomplete',
+ __( 'Mark as Incomplete', 'wordcamporg' ),
+ array( $this, 'render_mark_incomplete_metabox' ),
+ self::POST_TYPE,
+ 'side',
+ 'high'
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_meta_box(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcp_general_info',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'General Information', 'wordcamporg' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,6 +182,17 @@
</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">+ * Render the Mark as Incomplete metabox
+ *
+ * @param WP_Post $post
+ */
+ public function render_mark_incomplete_metabox( $post ) {
+ wp_nonce_field( 'mark_incomplete', 'mark_incomplete_nonce' );
+
+ require_once( dirname( __DIR__ ) . '/views/payment-request/metabox-mark-incomplete.php' );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Render the General Information metabox
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -538,6 +576,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $states['unpaid'] = __( 'Unpaid', 'camptix' );
</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 ( 'incomplete' == $post->post_status && 'incomplete' != get_query_var( 'post_status' ) ) {
+ $states['incomplete'] = __( 'Incomplete', 'wordcamporg' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $states;
</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">@@ -594,11 +636,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function update_request_status( $post_data, $post_data_raw ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->post_edit_is_actionable( $post_data ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $previous_status = $post_data['post_status'];
- $post_data['post_status'] = strtotime( sanitize_text_field( $_POST['date_vendor_paid'] ) ) ? 'paid' : 'unpaid';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'paid' != $previous_status && 'paid' == $post_data['post_status'] ) {
- $this->notify_requester_payment_made( $post_data_raw['ID'], $post_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'on' == $_POST['wcp_mark_incomplete_checkbox'] && ! empty( $_POST['wcp_mark_incomplete_notes'] ) ) {
+ $post_data['post_status'] = 'incomplete';
+ $this->notify_requester_request_incomplete( $post_data_raw['ID'], $post_data, $post_data_raw );
+ } else {
+ $previous_status = $post_data['post_status'];
+ $post_data['post_status'] = strtotime( sanitize_text_field( $_POST['date_vendor_paid'] ) ) ? 'paid' : 'unpaid';
+
+ if ( 'paid' != $previous_status && 'paid' == $post_data['post_status'] ) {
+ $this->notify_requester_payment_made( $post_data_raw['ID'], $post_data );
+ }
</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">@@ -636,6 +684,40 @@
</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">+ * Notify the payment requester that it has been marked as paid.
+ *
+ * @param int $request_id
+ * @param array $post_data
+ * @param array $post_data_raw
+ */
+ protected function notify_requester_request_incomplete( $request_id, $post_data, $post_data_raw ) {
+ if ( ! $to = $this->get_requester_formatted_email( $post_data['post_author'] ) ) {
+ return;
+ }
+
+ $subject = sprintf( '`%s` is incomplete', $post_data['post_title'] );
+ $headers = array( 'Reply-To: support@wordcamp.org' );
+
+ $message = sprintf(
+ "The request for `%s` has been marked as incomplete by WordCamp Central.
+
+ The reason for this is: %s
+
+ You can complete the request at:
+
+ %s
+
+ If you have any questions, please reply to let us know.",
+ $post_data['post_title'],
+ sanitize_text_field( $post_data_raw['wcp_mark_incomplete_notes'] ),
+ admin_url( sprintf( 'post.php?post=%s&action=edit', $request_id ) )
+ );
+ $message = str_replace( "\t", '', $message );
+
+ wp_mail( $to, $subject, $message, $headers );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Save the post's data
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_id
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -647,7 +729,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"> // Verify nonces
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nonces = array( 'status_nonce', 'general_info_nonce', 'payment_details_nonce', 'vendor_details_nonce' ); // todo add prefix to all of these
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nonces = array( 'status_nonce', 'mark_incomplete_nonce', 'general_info_nonce', 'payment_details_nonce', 'vendor_details_nonce' ); // todo add prefix to all of these
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $nonces as $nonce ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_POST[ $nonce ] ) || ! wp_verify_nonce( $_POST[ $nonce ], str_replace( '_nonce', '', $nonce ) ) ) {
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsjavascriptwordcamppaymentsjs"></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/javascript/wordcamp-payments.js</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/javascript/wordcamp-payments.js 2015-08-06 16:46:41 UTC (rev 1815)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/wordcamp-payments.js 2015-08-06 23:05:20 UTC (rev 1816)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,6 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#wcp_payment_details' ).find( 'input[name=payment_method]' ).change( $.wordcampPayments.togglePaymentMethodFields );
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#payment_category' ).change( $.wordcampPayments.toggleOtherCategoryDescription );
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#wcp_files' ).find( 'a.wcp-insert-media' ).click( $.wordcampPayments.showUploadModal );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#wcp_mark_incomplete_checkbox' ).click( $.wordcampPayments.requireNotes );
</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">@@ -108,6 +109,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> changeYear : true
</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">+ },
+
+ /**
+ * Require notes when the request is being marked as incomplete
+ */
+ requireNotes : function() {
+ var notes = $( '#wcp_mark_incomplete_notes' );
+
+ if ( 'checked' === $( '#wcp_mark_incomplete_checkbox' ).attr( 'checked' ) ) {
+ notes.attr( 'required', true );
+ } else {
+ notes.attr( 'required', false );
+ }
</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>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxmarkincompletephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-mark-incomplete.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/views/payment-request/metabox-mark-incomplete.php (rev 0)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-mark-incomplete.php 2015-08-06 23:05:20 UTC (rev 1816)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,17 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div id="wcp_mark_incomplete">
+ <p>
+ <?php _e( 'Marking a payment as incomplete will notify the requester that they need to come back and give
+ you more information before you can process the request.', 'wordcamporg' ); ?>
+ </p>
+
+ <p>
+ <input type="checkbox" id="wcp_mark_incomplete_checkbox" name="wcp_mark_incomplete_checkbox" />
+ <label for="wcp_mark_incomplete_checkbox">Mark as Incomplete</label>
+ </p>
+
+ <p>
+ <label for="wcp_mark_incomplete_notes">Note for Requester:</label>
+ <textarea id="wcp_mark_incomplete_notes" name="wcp_mark_incomplete_notes" class="large-text"
+ placeholder="Need to attach receipt, etc"></textarea>
+ </p>
+</div> <!-- #wco_mark_incomplete -->
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxstatusphp"></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/views/payment-request/metabox-status.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/views/payment-request/metabox-status.php 2015-08-06 16:46:41 UTC (rev 1815)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php 2015-08-06 23:05:20 UTC (rev 1816)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="post_status"><?php _e( 'Status:' ) ?></label>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <span id="post-status-display">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'paid' == $post->post_status ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'incomplete' == $post->post_status ) : ?>
+ <?php _e( 'Incomplete', 'wordcamporg' ); ?>
+ <?php elseif ( 'paid' == $post->post_status ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Paid' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Not Paid' ); ?>
</span></span></pre>
</div>
</div>
</body>
</html>