Changeset 2633

Timestamp:

02/26/2016 12:57:40 AM (9 years ago)

Author:

kovshenin

Message:

WordCamp.org: Reintegrate branch into trunk (wordcamp-payments)

Location:

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments

Files:

• . (modified) (1 prop)
• css/wordcamp-budgets.css (modified) (1 diff)
• includes/payment-request.php (modified) (13 diffs)
• javascript/payment-requests.js (modified) (3 diffs)
• views/payment-request/metabox-mark-incomplete.php (deleted)
• views/payment-request/metabox-status.php (modified) (6 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/css/wordcamp-budgets.css

@@ -12 +12 @@
 #submitpost.wcb .misc-pub-section input {
     width: 100%;
+}
+
+#submitpost.wcb .misc-pub-section select {
+    font-weight: normal;
+}
+
+#wcb-save-draft {
+    float: left;
 }
 

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php

@@ -8 +8 @@
 
     const POST_TYPE = 'wcp_payment_request';
+
+    // @see https://core.trac.wordpress.org/ticket/19074
+    public static $transition_post_status = array();
 
     public function __construct() {
@@ -20 +23 @@
 
         // Saving posts
-        add_filter( 'wp_insert_post_data',    array( $this, 'update_request_status' ), 10, 2 );
-        add_filter( 'wp_insert_post_data',    array( $this, 'ensure_post_date_gmt_set' ), 10, 2 );
+        add_filter( 'wp_insert_post_data',    array( $this, 'wp_insert_post_data' ), 10, 2 );
         add_action( 'save_post',              array( $this, 'save_payment' ), 10, 2 );
         add_filter( 'map_meta_cap',           array( $this, 'modify_capabilities' ), 10, 4 );
@@ -75 +77 @@
      */
     public static function register_post_statuses() {
+        // Uses core's draft status.
+
+        register_post_status( 'wcb-incomplete', array (
+            'label' => _x( 'Incomplete', 'payment request', 'wordcamporg' ),
+            'public' => false,
+            'protected' => true,
+            'label_count' => _nx_noop(
+                'Incomplete <span class="count">(%s)</span>',
+                'Incomplete <span class="count">(%s)</span>',
+                'wordcamporg'
+            ),
+        ) );
+
+        register_post_status( 'wcb-pending-approval', array (
+            'label' => _x( 'Pending Approval', 'payment request', 'wordcamporg' ),
+            'public' => false,
+            'protected' => true,
+            'label_count' => _nx_noop(
+                'Pending Approval <span class="count">(%s)</span>',
+                'Pending Approval <span class="count">(%s)</span>',
+                'wordcamporg'
+            ),
+        ) );
+
+        register_post_status( 'wcb-approved', array (
+            'label' => _x( 'Approved', 'payment request', 'wordcamporg' ),
+            'public' => false,
+            'protected' => true,
+            'label_count' => _nx_noop(
+                'Approved <span class="count">(%s)</span>',
+                'Approved <span class="count">(%s)</span>',
+                'wordcamporg'
+            ),
+        ) );
+
+        register_post_status( 'wcb-pending-payment', array (
+            'label' => _x( 'Pending Payment', 'payment request', 'wordcamporg' ),
+            'public' => false,
+            'protected' => true,
+            'label_count' => _nx_noop(
+                'Pending Payment <span class="count">(%s)</span>',
+                'Pending Payment <span class="count">(%s)</span>',
+                'wordcamporg'
+            ),
+        ) );
+
+        register_post_status( 'wcb-paid', array (
+            'label' => _x( 'Paid', 'payment request', 'wordcamporg' ),
+            'public' => false,
+            'protected' => true,
+            'label_count' => _nx_noop(
+                'Paid <span class="count">(%s)</span>',
+                'Paid <span class="count">(%s)</span>',
+                'wordcamporg'
+            ),
+        ) );
+
+        register_post_status( 'wcb-failed', array (
+            'label' => _x( 'Failed', 'payment request', 'wordcamporg' ),
+            'public' => false,
+            'protected' => true,
+            'label_count' => _nx_noop(
+                'Failed <span class="count">(%s)</span>',
+                'Failed <span class="count">(%s)</span>',
+                'wordcamporg'
+            ),
+        ) );
+
+        register_post_status( 'wcb-cancelled', array (
+            'label' => _x( 'Cancelled', 'payment request', 'wordcamporg' ),
+            'public' => false,
+            'protected' => true,
+            'label_count' => _nx_noop(
+                'Cancelled <span class="count">(%s)</span>',
+                'Cancelled <span class="count">(%s)</span>',
+                'wordcamporg'
+            ),
+        ) );
+
+        // Legacy statuses
         register_post_status(
             'paid',
@@ -125 +207 @@
         );
 
-        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'
-            );
-        }
-
         add_meta_box(
             'wcp_general_info',
@@ -206 +277 @@
         wp_nonce_field( 'status', 'status_nonce' );
 
-        $delete_text                   = EMPTY_TRASH_DAYS ? __( 'Move to Trash' ) : __( 'Delete Permanently' );
-        $submit_text                   = 'auto-draft' == $post->post_status ? __( 'Submit Request', 'wordcamporg' ) : __( 'Update Request', 'wordcamporg' );
-        $current_user_can_edit_request = 'paid' != $post->post_status || current_user_can( 'manage_network' );
+        $back_compat_statuses = array(
+            'unpaid' => 'draft',
+            'incomplete' => 'wcb-incomplete',
+            'paid' => 'wcb-paid',
+        );
+
+        // Map old statuses to new statuses.
+        if ( array_key_exists( $post->post_status, $back_compat_statuses ) ) {
+            $post->post_status = $back_compat_statuses[ $post->post_status ];
+        }
+
+        $editable_statuses = array( 'auto-draft', 'draft', 'wcb-incomplete' );
+        $current_user_can_edit_request = false;
+        $submit_text = _x( 'Update', 'payment request', 'wordcamporg' );
+
+        if ( current_user_can( 'manage_network' ) ) {
+            $current_user_can_edit_request = true;
+        } elseif ( in_array( $post->post_status, $editable_statuses ) ) {
+            $submit_text = __( 'Submit for Review', 'wordcamporg' );
+            $current_user_can_edit_request = true;
+        }
 
         $date_vendor_paid = get_post_meta( $post->ID, '_camppayments_date_vendor_paid', true );
@@ -217 +306 @@
         }
 
+        $incomplete_notes = get_post_meta( $post->ID, '_wcp_incomplete_notes', true );
+        $incomplete_readonly = ! current_user_can( 'manage_network' ) ? 'readonly' : '';
+
         require_once( dirname( __DIR__ ) . '/views/payment-request/metabox-status.php' );
     }
 
-    /**
-     * 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' );
+    public static function get_post_statuses() {
+        return array(
+            'draft',
+            'wcb-incomplete',
+            'wcb-pending-approval',
+            'wcb-approved',
+            'wcb-pending-payment',
+            'wcb-paid',
+            'wcb-failed',
+            'wcb-cancelled',
+        );
     }
 
@@ -476 +570 @@
         global $post;
 
-        if ( 'paid' == $post->post_status && 'paid' != get_query_var( 'post_status' ) ) {
-            $states['paid'] = __( 'Paid', 'wordcamporg' );
-        }
-
-        if ( 'unpaid' == $post->post_status && 'unpaid' != get_query_var( 'post_status' ) ) {
-            $states['unpaid'] = __( 'Unpaid', 'wordcamporg' );
-        }
-
-        if ( 'incomplete' == $post->post_status && 'incomplete' != get_query_var( 'post_status' ) ) {
-            $states['incomplete'] = __( 'Incomplete', 'wordcamporg' );
+        if ( $post->post_type != self::POST_TYPE )
+            return $states;
+
+        // Back-compat
+        $back_compat_statuses = array(
+            'unpaid' => 'draft',
+            'incomplete' => 'wcb-incomplete',
+            'paid' => 'wcb-paid',
+        );
+
+        // Map old statuses to new statuses.
+        if ( array_key_exists( $post->post_status, $back_compat_statuses ) ) {
+            $post->post_status = $back_compat_statuses[ $post->post_status ];
+        }
+
+        $status = get_post_status_object( $post->post_status );
+        if ( get_query_var( 'post_status' ) != $post->post_status ) {
+            $states[ $status->name ] = $status->label;
         }
 
@@ -492 +594 @@
 
     /**
-     * Set the request's status based on whether the vendor has been paid.
      *
      * @param array $post_data
      * @param array $post_data_raw
+     *
      * @return array
      */
-    public function update_request_status( $post_data, $post_data_raw ) {
-        if ( WordCamp_Budgets::post_edit_is_actionable( $post_data, self::POST_TYPE ) ) {
-            if ( $this->should_mark_request_incomplete() ) {
-                $post_data['post_status'] = 'incomplete';
-                $this->notify_requester_request_incomplete( $post_data_raw['ID'], $post_data, $post_data_raw );
-
-                update_post_meta( $post_data_raw['ID'], '_wcp_incomplete_notes', sanitize_text_field( $post_data_raw['wcp_mark_incomplete_notes'] ) );
-            } else {
-                $previous_status          = $post_data['post_status'];
-                $valid_paid_date          = false !== strtotime( sanitize_text_field( $_POST['date_vendor_paid'] ) );
-                // todo realign
-
-                if ( current_user_can( 'manage_network' ) && $valid_paid_date ) {
-                    $post_data['post_status'] = 'paid';
-                } else {
-                    $post_data['post_status'] = 'unpaid';
-                }
-
-                if ( 'paid' != $previous_status && 'paid' == $post_data['post_status'] ) {
-                    $this->notify_requester_payment_made( $post_data_raw['ID'], $post_data );
-                }
-            }
-        }
-
-        return $post_data;
-    }
-
-    /**
-     * Ensure that new posts have the `post_date_gmt` field populated.
-     *
-     * Core only handles this for post types that use the `draft` status (see r8636).
-     *
-     * @param array $post_data
-     * @param array $post_data_raw
-     *
-     * @return array
-     */
-    public function ensure_post_date_gmt_set( $post_data, $post_data_raw ) {
+    public function wp_insert_post_data( $post_data, $post_data_raw ) {
+        if ( $post_data['post_type'] != self::POST_TYPE )
+            return $post_data;
+
+        // Ensure that new posts have the `post_date_gmt` field populated.
         if ( 'auto-draft' !== $post_data['post_status'] ) {
             if ( '0000-00-00 00:00:00' === $post_data['post_date_gmt'] ) {
@@ -542 +611 @@
         }
 
+        // Save Draft button was clicked.
+        if ( ! empty( $post_data_raw['wcb-save-draft'] ) ) {
+            $post_data['post_status'] = 'draft';
+        }
+
+        // Submit for Review button was clicked.
+        if ( ! current_user_can( 'manage_network' ) ) {
+            $editable_statuses = array( 'auto-draft', 'draft', 'wcb-incomplete' );
+            if ( ! empty( $post_data_raw['wcb-update'] ) && in_array( $post_data['post_status'], $editable_statuses ) ) {
+                $post_data['post_status'] = 'wcb-pending-approval';
+            }
+        }
+
         return $post_data;
     }
 
     /**
-     * Determine if the user wants to mark a vendor payment as incomplete, and if that is valid
-     *
-     * @return bool
-     */
-    protected function should_mark_request_incomplete() {
-        $mark_incomplete = false;
-
-        if ( isset( $_POST['wcp_mark_incomplete_checkbox'] ) && 'on' == $_POST['wcp_mark_incomplete_checkbox'] && ! empty( $_POST['wcp_mark_incomplete_notes'] ) ) {
-            if ( isset( $_POST['mark_incomplete_nonce'] ) && wp_verify_nonce( $_POST['mark_incomplete_nonce'], 'mark_incomplete' ) ) {
-                if ( current_user_can( 'manage_network' ) ) {
-                    $mark_incomplete = true;
+     * Notify the payment requester that it has been marked as paid.
+     *
+     * @param int|WP_Post $post
+     */
+    protected function notify_requester_payment_made( $post ) {
+        $post = get_post( $post );
+
+        if ( ! $to = WordCamp_Budgets::get_requester_formatted_email( $post->post_author ) ) {
+            return;
+        }
+
+        $subject = sprintf( '"%s" has been paid', $post->post_title );
+        $headers = array( 'Reply-To: support@wordcamp.org' );
+
+        $message = sprintf(
+            "The request for \"%s\" has been marked as paid by WordCamp Central.
+
+            You can view the request at:
+
+            %s
+
+            If you have any questions, please reply to let us know.",
+            $post->post_title,
+            admin_url( sprintf( 'post.php?post=%s&action=edit', $post->ID ) )
+        );
+        $message = str_replace( "\t", '', $message );
+
+        wp_mail( $to, $subject, $message, $headers );
+    }
+
+    /**
+     * Notify the payment requester that it has been marked as paid.
+     *
+     * @param int|WP_Post $post
+     */
+    protected function notify_requester_request_incomplete( $post ) {
+        $post = get_post( $post );
+
+        if ( ! $to = WordCamp_Budgets::get_requester_formatted_email( $post->post_author ) ) {
+            return;
+        }
+
+        $subject = sprintf( '"%s" is incomplete', $post->post_title );
+        $headers = array( 'Reply-To: support@wordcamp.org' );
+        $notes = get_post_meta( $post->ID, '_wcp_incomplete_notes', true );
+
+        $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->post_title,
+            esc_html( $notes ),
+            admin_url( sprintf( 'post.php?post=%s&action=edit', $post->ID ) )
+        );
+        $message = str_replace( "\t", '', $message );
+
+        wp_mail( $to, $subject, $message, $headers );
+    }
+
+    /**
+     * Save the post's data
+     *
+     * @param int     $post_id
+     * @param WP_Post $post
+     */
+    public function save_payment( $post_id, $post ) {
+
+        // Update the timestamp and logs either way.
+        if ( $post->post_type == self::POST_TYPE && $post_id ) {
+            update_post_meta( $post_id, '_wcb_updated_timestamp', time() );
+
+            $user = get_user_by( 'id', get_current_user_id() );
+
+            // Look at post status transitions.
+            foreach ( self::$transition_post_status as $data ) {
+                list( $new, $old, $transition_post ) = $data;
+
+                // Transitioning a different post.
+                if ( $transition_post->ID != $post->ID )
+                    continue;
+
+                if ( $new == 'incomplete' || $new == 'wcb-incomplete' ) {
+                    $incomplete_text = get_post_meta( $post->ID, '_wcp_incomplete_notes', true );
+                    $incomplete_text = preg_replace( '#\.$#', '', $incomplete_text ); // trailing-undot-it.
+                    WordCamp_Budgets::log( $post->ID, $user->ID, sprintf( 'Marked as incomplete: %s', $incomplete_text ), array(
+                        'action' => 'marked-incomplete',
+                        'reason' => 'maybe notes',
+                    ) );
+
+                    $this->notify_requester_request_incomplete( $post->ID );
+                    WordCamp_Budgets::log( $post->ID, $user->ID, 'Incomplete notification e-mail sent.', array(
+                        'action' => 'incomplete-notification-sent',
+                    ) );
+
+                } elseif ( $new == 'paid' || $new == 'wcb-paid' ) {
+                    WordCamp_Budgets::log( $post->ID, $user->ID, 'Marked as paid', array(
+                        'action' => 'marked-paid',
+                    ) );
+
+                    $this->notify_requester_payment_made( $post->ID );
+                    WordCamp_Budgets::log( $post->ID, $user->ID, 'Paid notification e-mail sent.', array(
+                        'action' => 'paid-notification-sent',
+                    ) );
+
+                } elseif ( $old == 'auto-draft' ) {
+                    WordCamp_Budgets::log( $post->ID, $user->ID, 'Request created', array(
+                        'action' => 'updated',
+                    ) );
                 }
             }
-        }
-
-        return $mark_incomplete;
-    }
-
-    /**
-     * Notify the payment requester that it has been marked as paid.
-     *
-     * @param int   $request_id
-     * @param array $post_data
-     */
-    protected function notify_requester_payment_made( $request_id, $post_data ) {
-        if ( ! $to = WordCamp_Budgets::get_requester_formatted_email( $post_data['post_author'] ) ) {
-            return;
-        }
-
-        $subject = sprintf( '`%s` has been paid', $post_data['post_title'] );
-        $headers = array( 'Reply-To: support@wordcamp.org' );
-
-        $message = sprintf(
-            "The request for `%s` has been marked as paid by WordCamp Central.
-
-            You can view the request at:
-
-            %s
-
-            If you have any questions, please reply to let us know.",
-            $post_data['post_title'],
-            admin_url( sprintf( 'post.php?post=%s&action=edit', $request_id ) )
-        );
-        $message = str_replace( "\t", '', $message );
-
-        wp_mail( $to, $subject, $message, $headers );
-    }
-
-    /**
-     * 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 = WordCamp_Budgets::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( stripslashes( $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 );
-    }
-
-    /**
-     * Save the post's data
-     *
-     * @param int     $post_id
-     * @param WP_Post $post
-     */
-    public function save_payment( $post_id, $post ) {
+
+            WordCamp_Budgets::log( $post->ID, $user->ID, 'Request updated', array(
+                'action' => 'updated',
+            ) );
+        }
+
+        // The rest only if triggered by a user submitting a form.
         if ( ! WordCamp_Budgets::post_edit_is_actionable( $post, self::POST_TYPE ) ) {
             return;
@@ -651 +767 @@
         $this->sanitize_save_normal_fields( $post_id );
         WordCamp_Budgets::validate_save_payment_method_fields( $post_id, 'camppayments' );
-        $this->sanitize_save_misc_fields(   $post_id );
+        $this->sanitize_save_misc_fields( $post_id );
     }
 
@@ -716 +832 @@
      */
     protected function sanitize_save_misc_fields( $post_id ) {
+        $post = get_post( $post_id );
+
         // Status
         if ( current_user_can( 'manage_network' ) ) {
@@ -722 +840 @@
         }
 
+        if ( isset( $_POST['wcp_mark_incomplete_notes'] ) ) {
+            $safe_value = '';
+            if ( $post->post_status == 'wcb-incomplete' ) {
+                $safe_value = wp_kses( $_POST['wcp_mark_incomplete_notes'], wp_kses_allowed_html( 'strip' ) );
+            }
+
+            update_post_meta( $post_id, '_wcp_incomplete_notes', $safe_value );
+        }
+
         // Attach existing files
         remove_action( 'save_post', array( $this, 'save_payment' ), 10 ); // avoid infinite recursion
@@ -739 +866 @@
             return;
 
-        $user = get_user_by( 'id', get_current_user_id() );
-        if ( $new == 'auto-draft' )
+        if ( $new == 'auto-draft' || $new == $old )
             return;
 
-        if ( $new == 'incomplete' && $old != 'incomplete' ) {
-            $incomplete_text = get_post_meta( $post->ID, '_wcp_incomplete_notes', true );
-            $incomplete_text = preg_replace( '#\.$#', '', $incomplete_text ); // trailing-undot-it.
-            WordCamp_Budgets::log( $post->ID, $user->ID, sprintf( 'Marked as incomplete: %s', $incomplete_text ), array(
-                'action' => 'marked-incomplete',
-                'reason' => 'maybe notes',
-            ) );
-        } elseif ( $new == 'paid' && $old != 'paid' ) {
-            WordCamp_Budgets::log( $post->ID, $user->ID, 'Marked as paid', array(
-                'action' => 'marked-paid',
-            ) );
-        } elseif ( $old == 'auto-draft' && $new != 'auto-draft' ) {
-            WordCamp_Budgets::log( $post->ID, $user->ID, 'Request created', array(
-                'action' => 'updated',
-            ) );
-        } else {
-            WordCamp_Budgets::log( $post->ID, $user->ID, 'Request updated', array(
-                'action' => 'updated',
-            ) );
-        }
+        // Move logging to save_post because transitions are fired before save_post.
+        self::$transition_post_status[] = array( $new, $old, $post );
     }
 

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/payment-requests.js

@@ -4 +4 @@
     var wcb = window.WordCampBudgets;
     var app = wcb.PaymentRequests = {
-        
+
         /**
          * Main entry point
@@ -32 +32 @@
             currency.trigger( 'change' );   // Set the initial state
             $( '#row-files' ).find( 'a.wcb-insert-media' ).click( wcb.showUploadModal );
-            $( '#wcp_mark_incomplete_checkbox' ).click( app.requireNotes );
+
+            $('[name="post_status"]').on('change', function() {
+                var $notes = $('.wcb-mark-incomplete-notes'),
+                    state = $(this).val() == 'wcb-incomplete';
+
+                $notes.toggle(state);
+                $notes.find('textarea').attr('required', state);
+            }).trigger('change');
         },
 
@@ -54 +61 @@
                 wcb.log( exception );
             }
-        },
-
-        /**
-         * Require notes when the request is being marked as incomplete
-         *
-         * @param {object} event
-         */
-        requireNotes : function( event ) {
-            try {
-                var notes = $( '#wcp_mark_incomplete_notes' );
-
-                if ( 'checked' === $( '#wcp_mark_incomplete_checkbox' ).attr( 'checked' ) ) {
-                    notes.attr( 'required', true );
-                } else {
-                    notes.attr( 'required', false );
-                }
-            } catch ( exception ) {
-                wcb.log( exception );
-            }
         }
     };

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php

@@ -1 +1 @@
 <div id="submitpost" class="wcb submitbox">
     <div id="minor-publishing">
+
+        <?php if ( $current_user_can_edit_request && ! current_user_can( 'manage_network' ) ) : ?>
+        <div id="minor-publishing-actions">
+            <div id="save-action">
+                <?php submit_button( __( 'Save Draft', 'wordcamporg' ), 'button', 'wcb-save-draft', false ); ?>
+                <span class="spinner"></span>
+            </div>
+            <div class="clear"></div>
+        </div>
+        <?php endif; ?>
+
         <div id="misc-publishing-actions">
-
             <div class="misc-pub-section">
                 <?php _e( 'ID:', 'wordcamporg' ); ?>
@@ -17 +27 @@
             </div>
 
+            <?php if ( $post->post_status != 'auto-draft' ) : ?>
             <div class="misc-pub-section">
                 <?php $this->render_text_input( $post, 'Date Vendor was Paid', 'date_vendor_paid', '', 'date', array(), $date_vendor_paid_readonly ); ?>
@@ -22 +33 @@
 
             <div class="misc-pub-section misc-pub-post-status">
-                <label for="post_status"><?php _e( 'Status:' ) ?></label>
+                <label>
+                    <?php _e( 'Status:' ) ?>
 
-                <span id="post-status-display">
-                    <?php if ( 'incomplete' == $post->post_status ) : ?>
-                        <?php _e( 'Incomplete', 'wordcamporg' ); ?>
-                    <?php elseif ( 'paid' == $post->post_status ) : ?>
-                        <?php _e( 'Paid' ); ?>
-                    <?php else : ?>
-                        <?php _e( 'Not Paid' ); ?>
-                    <?php endif; ?>
-                </span>
-            </div> <!-- .misc-pub-section -->
+                    <span id="post-status-display">
+                        <?php if ( current_user_can( 'manage_network' ) ) : ?>
+
+                            <select name="post_status">
+                                <?php foreach ( self::get_post_statuses() as $status ) : ?>
+                                    <?php $status = get_post_status_object( $status ); ?>
+                                    <option value="<?php echo esc_attr( $status->name ); ?>" <?php selected( $post->post_status, $status->name ); ?> >
+                                        <?php echo esc_html( $status->label ); ?>
+                                    </option>
+                                <?php endforeach; ?>
+                            </select>
+
+                        <?php else : ?>
+
+                            <?php $status = get_post_status_object( $post->post_status ); ?>
+                            <?php echo esc_html( $status->label ); ?>
+                            <input type="hidden" name="post_status" value="<?php echo esc_attr( $post->post_status ); ?>" />
+
+                        <?php endif; ?>
+                    </span>
+                </label>
+            </div>
+            <?php endif; ?>
+
+            <div class="misc-pub-section hide-if-js wcb-mark-incomplete-notes">
+                <label for="wcp_mark_incomplete_notes">What information is needed?</label>
+                <textarea id="wcp_mark_incomplete_notes" name="wcp_mark_incomplete_notes" class="large-text" rows="5"
+                    placeholder="Need to attach receipt, etc" <?php echo $incomplete_readonly; ?>><?php echo esc_textarea( $incomplete_notes ); ?></textarea>
+            </div>
 
             <div class="clear"></div>
@@ -48 +79 @@
                 <?php if ( current_user_can( 'delete_post', $post->ID ) ) : ?>
                     <a class="submitdelete deletion" href="<?php echo get_delete_post_link( $post->ID ); ?>">
-                        <?php echo $delete_text; ?>
+                        <?php _e( 'Delete', 'wordcamporg' ); ?>
                     </a>
                 <?php endif; ?>
@@ -55 +86 @@
             <div id="publishing-action">
                 <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr( $submit_text ) ?>" />
-                <?php submit_button( $submit_text, 'primary button-large', 'save', false, array( 'accesskey' => 'p' ) ); ?>
+                <?php submit_button( $submit_text, 'primary button-large', 'wcb-update', false, array( 'accesskey' => 'p' ) ); ?>
             </div>
 
@@ -62 +93 @@
         <?php else : ?>
 
-            <p><?php _e( 'Paid requests are closed and cannot be edited.', 'wordcamporg' ); ?></p>
+            <?php _e( 'This request can not be edited.', 'wordcamporg' ); ?>
 
         <?php endif; ?>