Changeset 2615

Timestamp:

02/25/2016 07:02:13 PM (11 years ago)

Author:

kovshenin

Message:

WordCamp.org: Better status flow for payment requests.

Network administrators (super deputies) can see and change
the current request status and add incomplete notes.

Regular users (admins) can only take the request from draft
to pending-approval, or from incomplete to draft/pending-approval.
After a request is pending approval or any further status, the
author can no longer edit it, unless a network admin explicitly
set it to draft or incomplete.

Location:

sites/branches/wcb-payment-request-statuses/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) (5 diffs)
• views/payment-request/metabox-status.php (modified) (6 diffs)

sites/branches/wcb-payment-request-statuses/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/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php

@@ -23 +23 @@
 
                 // Saving posts
-                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 );
@@ -288 +288 @@
                 }
 
-                $submit_text = 'auto-draft' == $post->post_status ? __( 'Submit', 'wordcamporg' ) : __( 'Update', 'wordcamporg' );
                 $editable_statuses = array( 'auto-draft', 'draft', 'wcb-incomplete' );
-                $current_user_can_edit_request = in_array( $post->post_status, $editable_statuses ) || current_user_can( 'manage_network' );
+                $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 );
@@ -300 +307 @@
 
                 $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' );
         }
@@ -585 +594 @@
 
         /**
-         * 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
@@ -594 +600 @@
          * @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'] ) {
                                 $post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
+                        }
+                }
+
+                // 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';
                         }
                 }

sites/branches/wcb-payment-request-statuses/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 ); ?>
@@ -41 +52 @@
                                                         <?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; ?>
@@ -46 +58 @@
                                 </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 esc_textarea( $incomplete_notes ); ?></textarea>
+                                        placeholder="Need to attach receipt, etc" <?php echo $incomplete_readonly; ?>><?php echo esc_textarea( $incomplete_notes ); ?></textarea>
                         </div>
 
@@ -73 +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>
 
@@ -80 +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; ?>