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

Timestamp:

01/24/2019 02:31:10 PM (8 years ago)

Author:

coreymckrill

Message:

WordCamp Payments: Prevent submission of requests that have no documentation

For both Payment Requests and Reimbursement Requests:

• Add a method to check and see if the request post can be submitted. Currently this just checks to see if the post has one or more files attached to it.
• When the post fails the check, show a note in the Status metabox that documentation must be attached first, and don't render the Submit for Review button.

File:

• sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php (modified) (3 diffs)

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

@@ -109 +109 @@
                         )
                 );
+        }
+
+        /**
+         * Get a list of statuses for which posts can be edited by non-admins.
+         *
+         * @return array
+         */
+        protected static function get_editable_statuses() {
+                return [ 'auto-draft', 'draft', 'wcb-incomplete' ];
         }
 
@@ -231 +240 @@
                 }
 
-                $editable_statuses = array( 'auto-draft', 'draft', 'wcb-incomplete' );
+                $editable_statuses = self::get_editable_statuses();
                 $current_user_can_edit_request = false;
                 $submit_text = esc_html_x( 'Update', 'payment request', 'wordcamporg' );
                 $submit_note = '';
+                $submit_note_class = 'warning';
 
                 if ( current_user_can( 'manage_network' ) ) {
                         $current_user_can_edit_request = true;
                 } elseif ( in_array( $post->post_status, $editable_statuses ) ) {
-                        $submit_text = esc_html__( 'Submit for Review', 'wordcamporg' );
-                        $submit_note = esc_html__( 'Once submitted for review, this request can not be edited.', 'wordcamporg' );
+                        if ( WordCamp_Budgets::can_submit_request( $post ) ) {
+                                $submit_text = __( 'Submit for Review', 'wordcamporg' );
+                                $submit_note = __( 'Once submitted for review, this request cannot be edited.', 'wordcamporg' );
+                        } else {
+                                $submit_note = __( 'Please add an invoice or other supporting documentation in the Files section and save the draft.', 'wordcamporg' );
+                                $submit_note_class = 'error';
+                        }
+
                         $current_user_can_edit_request = true;
                 }
@@ -584 +600 @@
                 // Submit for Review button was clicked.
                 if ( ! current_user_can( 'manage_network' ) ) {
-                        $editable_statuses = array( 'auto-draft', 'draft', 'wcb-incomplete' );
+                        $editable_statuses = self::get_editable_statuses();
                         if ( ! empty( $post_data_raw['wcb-update'] ) && in_array( $post_data['post_status'], $editable_statuses ) ) {
                                 $post_data['post_status'] = 'wcb-pending-approval';