Changeset 3105

Timestamp:

05/10/2016 04:12:06 PM (10 years ago)

Author:

iandunn

Message:

WordCamp Budgets: Make fields optional when setting status to incomplete.

Location:

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

Files:

• javascript/wordcamp-budgets.js (modified) (1 diff)
• views/payment-request/metabox-status.php (modified) (1 diff)
• views/reimbursement-request/metabox-status.php (modified) (1 diff)

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

@@ -23 +23 @@
                         needsIntermediaryBank.trigger( 'change' ); // Set the initial state
 
-                        $( '#wcb-save-draft' ).click( app.makeFieldsOptionalForDrafts );
-                },
-
-                /**
-                 * Make all required input field optional when saving a draft.
-                 *
-                 * Otherwise the user would have to potentially fill out dozens of fields when they're not ready to.
-                 *
-                 * @param {object} event
-                 */
-                makeFieldsOptionalForDrafts : function( event ) {
+                        $( '#wcb-save-draft' ).click( app.makeFieldsOptional      );
+                        $( '#wcb-update'     ).click( app.maybeMakeFieldsOptional );
+                },
+
+                /**
+                 * Make all required fields optional under certain circumstances.
+                 */
+                maybeMakeFieldsOptional : function() {
+                        var status = $( '#wcb_status' ).val();
+
+                        if ( 'draft' === status || 'wcb-incomplete' === status ) {
+                                app.makeFieldsOptional();
+
+                                if ( 'wcb-incomplete' === status ) {
+                                        $( '#wcp_mark_incomplete_notes' ).prop( 'required', true );
+                                }
+                        }
+                },
+
+                /**
+                 * Make all required input field optional.
+                 *
+                 * This is used when saving drafts, setting posts to the Incomplete status, etc. Otherwise the user would
+                 * have to potentially fill out dozens of fields when they're not ready to.
+                 *
+                 * @param {object} event
+                 */
+                makeFieldsOptional : function( event ) {
                         $( '#poststuff' ).find( ':input[required]' ).each( function( fieldIndex, inputField ) {
                                 $( inputField ).prop( 'required', false );

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

@@ -39 +39 @@
                                                 <?php if ( current_user_can( 'manage_network' ) ) : ?>
 
-                                                        <select name="post_status">
+                                                        <select id="wcb_status" name="post_status">
                                                                 <?php foreach ( self::get_post_statuses() as $status ) : ?>
                                                                         <?php $status = get_post_status_object( $status ); ?>

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

@@ -43 +43 @@
                                                 <?php if ( current_user_can( 'manage_network' ) ) : ?>
 
-                                                        <select name="post_status">
+                                                        <select id="wcb_status" name="post_status">
                                                                 <?php foreach ( get_post_statuses() as $status ) : ?>
                                                                         <?php $status = get_post_status_object( $status ); ?>