Changeset 2416

Timestamp:

01/28/2016 11:43:02 PM (10 years ago)

Author:

iandunn

Message:

WordCamp Budgets: Merge vendor payment files into the general metabox.

• The list of attached files was merged into the General metabox
• The file notes field was combined with the general notes field in a backwards-compatible way
• The supporting documentation metabox was removed

Location:

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

Files:

• includes/payment-request.php (modified) (6 diffs)
• views/payment-request/input-textarea.php (modified) (1 diff)
• views/payment-request/metabox-files.php (deleted)
• views/payment-request/metabox-general.php (modified) (1 diff)

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

@@ -163 +163 @@
         );
 
-        add_meta_box(
-            'wcp_files',
-            __( 'Attach Supporting Documentation', 'wordcamporg' ),
-            array( $this, 'render_files_metabox' ),
-            self::POST_TYPE,
-            'normal',
-            'high'
-        );
-
         add_meta_box( 'wcp_log', __( 'Log', 'wordcamporg' ), array( $this, 'render_log_metabox' ),
             self::POST_TYPE, 'normal', 'high' );
@@ -289 +280 @@
 
     /**
-     * Render the Vendor Details metabox
-     *
-     * @param WP_Post $post
-     */
-    public function render_files_metabox( $post ) {
-        wp_nonce_field( 'wcp_files', 'wcp_files_nonce' );
-
-        require_once( dirname( __DIR__ ) . '/views/payment-request/metabox-files.php' );
-    }
-
-    /**
      * Render the Log metabox
      *
@@ -331 +311 @@
      */
     protected function render_textarea_input( $post, $label, $name, $description = '' ) {
-        $date = get_post_meta( $post->ID, '_camppayments_' . $name, true );
+        $text = $this->get_field_value( $name, $post );
 
         require( dirname( __DIR__ ) . '/views/payment-request/input-textarea.php' );
@@ -442 +422 @@
                 break;
 
+            case 'general_notes':
+                // The files_notes field was removed from the UI, so combine its value with general notes
+                $file_notes    = get_post_meta( $post->ID, "_{$this->meta_key_prefix}_" . 'file_notes',    true );
+                $general_notes = get_post_meta( $post->ID, "_{$this->meta_key_prefix}_" . 'general_notes', true );
+
+                if ( $file_notes ) {
+                    $general_notes .= ' ' . $file_notes;
+                    update_post_meta( $post->ID, "_{$this->meta_key_prefix}_" . 'general_notes', $general_notes );
+                    delete_post_meta( $post->ID, "_{$this->meta_key_prefix}_" . 'file_notes' );
+                }
+
+                $value = $general_notes;
+                break;
+
             default:
                 $value = get_post_meta( $post->ID, "_{$this->meta_key_prefix}_" . $name, true );
@@ -603 +597 @@
 
         // Verify nonces
-        $nonces = array( 'status_nonce', 'general_info_nonce', 'payment_details_nonce', 'vendor_details_nonce', 'wcp_files_nonce' );    // todo add prefix to all of these
+        $nonces = array( 'status_nonce', 'general_info_nonce', 'payment_details_nonce', 'vendor_details_nonce' );    // todo add prefix to all of these
 
         foreach ( $nonces as $nonce ) {
@@ -629 +623 @@
                 case 'description':
                 case 'general_notes':
-                case 'file_notes':
                 case 'vendor_requested_payment_method':
                     $safe_value = wp_kses( $unsafe_value, wp_kses_allowed_html( 'strip' ) );

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

@@ -7 +7 @@
 
     <td>
-        <textarea id="<?php echo esc_attr( $name ); ?>" name="<?php echo esc_attr( $name ); ?>" class="large-text"><?php echo esc_html( $date ); ?></textarea>
+        <textarea id="<?php echo esc_attr( $name ); ?>" name="<?php echo esc_attr( $name ); ?>" class="large-text"><?php
+            echo esc_html( $text );
+        ?></textarea>
 
         <?php if ( ! empty( $description ) ) : ?>

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

@@ -32 +32 @@
     ?>
 
+    <?php $this->render_files_input( $post, 'Files', 'files', __( 'Attach supporting documentation including invoices, contracts, or other vendor correspondence. If no supporting documentation is available, please indicate the reason in the notes below.', 'wordcamporg' ) ); ?>
     <?php $this->render_textarea_input( $post, 'Notes', 'general_notes', 'Any other details you want to share.' ); ?>
 </table>