Changeset 2770

Timestamp:

03/21/2016 02:09:51 PM (10 years ago)

Author:

kovshenin

Message:

WordCamp Budgets: A couple of improvements to payment requests and reimbursements.

• Add an updated timestamp and index column for reimbursements.
• Move import form and handler to the Import/Export network admin menu.

Location:

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

Files:

• payment-requests-dashboard.php (modified) (6 diffs)
• reimbursement-requests-dashboard.php (modified) (4 diffs)
• wordcamp-budgets-dashboard.php (modified) (3 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php

@@ -4 +4 @@
         public static $list_table;
         public static $db_version = 7;
-        public static $import_results = null;
 
         /**
@@ -19 +18 @@
                 add_action( 'network_admin_menu', array( __CLASS__, 'network_admin_menu' ) );
                 add_action( 'init', array( __CLASS__, 'upgrade' ) );
-                add_action( 'init', array( __CLASS__, 'process_import_request' ) );
 
                 // Diff-based updates to the index.
@@ -248 +246 @@
                         <h3 class="nav-tab-wrapper"><?php self::render_dashboard_tabs(); ?></h3>
 
-                        <?php
-                                if ( 'import' == self::get_current_tab() ) {
-                                        self::render_import_tab();
-                                }
-                                else {
-                                        self::render_table_tabs();
-                                }
-                        ?>
+                        <?php self::render_table_tabs(); ?>
 
                 </div> <!-- /wrap -->
@@ -285 +276 @@
 
         /**
-         * Renders the import tab.
-         */
-        public static function render_import_tab() {
-                ?>
-                <?php if ( isset( self::$import_results ) ) : ?>
-                <h2>Import Results</h2>
-                <pre><?php echo esc_html( print_r( self::$import_results, true ) ); ?></pre>
-                <?php endif; ?>
-
-                <p>Import payment results from JPM reports CSV.</p>
-                <form method="post" enctype="multipart/form-data">
-                        <?php wp_nonce_field( 'import', 'wcpn_request_import' ); ?>
-                        <label>Import File:</label>
-                        <input type="file" name="wcpn_import_file" />
-                        <?php submit_button( 'Import' ); ?>
-                </form>
-                <?php
-        }
-
-        /**
-         * Process a payments import, runs during init.
-         */
-        public static function process_import_request() {
-                if ( empty( $_POST['submit'] ) || 'import' != self::get_current_tab() ) {
-                        return;
-                }
-
-                if ( ! current_user_can( 'manage_network' ) || ! check_admin_referer( 'import', 'wcpn_request_import' ) ) {
-                        return;
-                }
-
-                if ( empty( $_FILES['wcpn_import_file'] ) ) {
-                        wp_die( 'Please select a file to import.' );
-                }
-
-                $file = $_FILES['wcpn_import_file'];
-                if ( $file['type'] != 'text/csv' ) {
-                        wp_die( 'Please upload a text/csv file.' );
-                }
-
-                if ( $file['size'] < 1 ) {
-                        wp_die( 'Please upload a file that is not empty.' );
-                }
-
-                if ( $file['error'] ) {
-                        wp_die( 'Some other error has occurred. Sorry.' );
-                }
-
-                $handle = fopen( $file['tmp_name'], 'r' );
-                $count = 0;
-                $header = array();
-                $results = array();
-
-                while ( ( $line = fgetcsv( $handle ) ) !== false ) {
-                        // Skip first line.
-                        if ( ++$count == 1 ) {
-                                continue;
-                        }
-
-                        $entry = array(
-                                'type' => strtolower( $line[11] ),
-                                'status' => strtolower( $line[7] ),
-                                'amount' => round( floatval( $line[13] ), 2 ),
-                                'currency' => strtoupper( $line[14] ),
-                                'blog_id' => null,
-                                'post_id' => null,
-                                'processed' => false,
-                                'data' => null,
-                        );
-
-                        switch ( $entry['type'] ) {
-                                case 'wire':
-                                        if ( ! empty( $line[44] ) && preg_match( '#^wcb-([0-9]+)-([0-9]+)$#', $line[44], $matches ) ) {
-                                                $entry['blog_id'] = $matches[1];
-                                                $entry['post_id'] = $matches[2];
-                                        }
-                                        break;
-                                case 'ach':
-                                        if ( ! empty( $line[91] ) && preg_match( '#^([0-9]+)-([0-9]+)$#', $line[91], $matches ) ) {
-                                                $entry['blog_id'] = $matches[1];
-                                                $entry['post_id'] = $matches[2];
-                                        }
-                                        break;
-                        }
-
-                        if ( empty( $entry['blog_id'] ) || empty( $entry['post_id'] ) ) {
-                                $results[] = $entry;
-                                continue;
-                        }
-
-                        // Don't consume memory.
-                        wp_suspend_cache_addition( true );
-                        switch_to_blog( $entry['blog_id'] );
-
-                        $results[] = self::_import_process_entry( $entry );
-
-                        restore_current_blog();
-                        wp_suspend_cache_addition( false );
-                }
-
-                fclose( $handle );
-                self::$import_results = $results;
-        }
-
-        /**
-         * Process a single import entry.
-         *
-         * Runs in a switch_to_blog() context.
-         *
-         * @param $entry Array
-         * @return Array
-         */
-        private static function _import_process_entry( $entry ) {
-                $post = get_post( $entry['post_id'] );
-                if ( ! $post || $post->post_type != 'wcp_payment_request' ) {
-                        $entry['data'] = 'Post not found or post type mismatch';
-                        return $entry;
-                }
-
-                if ( $entry['currency'] != get_post_meta( $post->ID, '_camppayments_currency', true ) ) {
-                        $entry['data'] = 'Currency mismatch';
-                        return $entry;
-                }
-
-                $amount_orig = floatval( get_post_meta( $post->ID, '_camppayments_payment_amount', true ) );
-                $amount_orig = round( $amount_orig, 2 );
-                if ( (string) $entry['amount'] != (string) $amount_orig ) {
-                        $entry['data'] = 'Payment amount mismatch';
-                        return $entry;
-                }
-
-                // @todo Do some magic here.
-
-                // All good.
-                $entry['processed'] = true;
-                return $entry;
-        }
-
-        /**
          * Loads and initializes the list table object.
          */
@@ -447 +299 @@
                         'cancelled-failed',
                         'incomplete',
-
-                        'import',
                 );
 
@@ -472 +322 @@
                         'cancelled-failed' => __( 'Cancelled/Failed', 'wordcamporg' ),
                         'incomplete'       => __( 'Incomplete', 'wordcamporg' ),
-                        'import'           => __( 'Import', 'wordcamporg' ),
                 );
 

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/reimbursement-requests-dashboard.php

@@ -5 +5 @@
 defined( 'WPINC' ) or die();
 
-const LATEST_DATABASE_VERSION = 2;
+const LATEST_DATABASE_VERSION = 3;
 
 if ( is_network_admin() ) {
@@ -154 +154 @@
                         date_requested int( 11 )        unsigned NOT NULL default '0',
                         date_paid      int( 11 )        unsigned NOT NULL default '0',
+                        date_updated   int( 11 )        unsigned NOT NULL default '0',
                         request_title  varchar( 75 )             NOT NULL default '',
                         status         varchar( 30 )             NOT NULL default '',
@@ -198 +199 @@
 
         // Update the timestamp and logs.
-        update_post_meta( $request_id, '_wcb_updated_timestamp', time() );
+        update_post_meta( $request->ID, '_wcb_updated_timestamp', time() );
 
         // Back-compat.
@@ -227 +228 @@
                 'date_requested' => strtotime( $request->post_date_gmt ),
                 'date_paid'      => get_post_meta( $request_id, '_wcbrr_date_paid', true ),
+                'date_updated'   => absint( get_post_meta( $request->ID, '_wcb_updated_timestamp', time() ) ),
                 'request_title'  => $request->post_title,
                 'status'         => $request->post_status,

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php

@@ -16 +16 @@
 add_action( 'admin_init', __NAMESPACE__ . '\process_action_approve', 11 );
 add_action( 'admin_init', __NAMESPACE__ . '\process_action_set_pending_payment', 11 );
+
+add_action( 'admin_init', __NAMESPACE__ . '\process_import_request', 11 );
 
 /**
@@ -129 +131 @@
  */
 function render_import_tab() {
-        echo '<p>Move along, nothing to see here.</p>';
+        ?>
+        <?php if ( isset( WCB_Import_Results::$data ) ) : ?>
+        <h2>Import Results</h2>
+        <pre><?php echo esc_html( print_r( WCB_Import_Results::$data, true ) ); ?></pre>
+        <?php endif; ?>
+
+        <p>Import payment results from JPM reports CSV.</p>
+        <form method="post" enctype="multipart/form-data">
+                <input type="hidden" name="wcpn-request-import" value="1" />
+                <?php wp_nonce_field( 'import', 'wcpn-request-import' ); ?>
+                <label>Import File:</label>
+                <input type="file" name="wcpn-import-file" />
+                <?php submit_button( 'Import' ); ?>
+        </form>
+        <?php
 }
 
@@ -613 +629 @@
         add_settings_error( 'wcb-dashboard', 'success', 'Success! Request has been marked as Pending Payment.', 'updated' );
 }
+
+/**
+ * Process a payments import, runs during init.
+ */
+function process_import_request() {
+        if ( empty( $_POST['wcpn-request-import'] ) ) {
+                return;
+        }
+
+        if ( ! current_user_can( 'manage_network' ) || ! check_admin_referer( 'import', 'wcpn-request-import' ) ) {
+                return;
+        }
+
+        if ( empty( $_FILES['wcpn-import-file'] ) ) {
+                wp_die( 'Please select a file to import.' );
+        }
+
+        $file = $_FILES['wcpn-import-file'];
+        if ( $file['type'] != 'text/csv' ) {
+                wp_die( 'Please upload a text/csv file.' );
+        }
+
+        if ( $file['size'] < 1 ) {
+                wp_die( 'Please upload a file that is not empty.' );
+        }
+
+        if ( $file['error'] ) {
+                wp_die( 'Some other error has occurred. Sorry.' );
+        }
+
+        $handle = fopen( $file['tmp_name'], 'r' );
+        $count = 0;
+        $header = array();
+        $results = array();
+
+        while ( ( $line = fgetcsv( $handle ) ) !== false ) {
+                // Skip first line.
+                if ( ++$count == 1 ) {
+                        continue;
+                }
+
+                $entry = array(
+                        'type' => strtolower( $line[11] ),
+                        'status' => strtolower( $line[7] ),
+                        'amount' => round( floatval( $line[13] ), 2 ),
+                        'currency' => strtoupper( $line[14] ),
+                        'blog_id' => null,
+                        'post_id' => null,
+                        'processed' => false,
+                        'data' => null,
+                );
+
+                switch ( $entry['type'] ) {
+                        case 'wire':
+                                if ( ! empty( $line[44] ) && preg_match( '#^wcb-([0-9]+)-([0-9]+)$#', $line[44], $matches ) ) {
+                                        $entry['blog_id'] = $matches[1];
+                                        $entry['post_id'] = $matches[2];
+                                }
+                                break;
+                        case 'ach':
+                                if ( ! empty( $line[91] ) && preg_match( '#^([0-9]+)-([0-9]+)$#', $line[91], $matches ) ) {
+                                        $entry['blog_id'] = $matches[1];
+                                        $entry['post_id'] = $matches[2];
+                                }
+                                break;
+                }
+
+                if ( empty( $entry['blog_id'] ) || empty( $entry['post_id'] ) ) {
+                        $results[] = $entry;
+                        continue;
+                }
+
+                // Don't consume memory.
+                wp_suspend_cache_addition( true );
+                switch_to_blog( $entry['blog_id'] );
+
+                $results[] = _import_process_entry( $entry );
+
+                restore_current_blog();
+                wp_suspend_cache_addition( false );
+        }
+
+        fclose( $handle );
+
+        WCB_Import_Results::$data = $results;
+}
+
+/**
+ * Process a single import entry.
+ *
+ * Runs in a switch_to_blog() context.
+ *
+ * @param $entry Array
+ * @return Array
+ */
+function _import_process_entry( $entry ) {
+        $post = get_post( $entry['post_id'] );
+        if ( ! $post || ! in_array( $post->post_type, array( 'wcp_payment_request', 'wcb_reimbursement' ) ) ) {
+                $entry['data'] = 'Post not found or post type mismatch';
+                return $entry;
+        }
+
+        $currency = false;
+        $amout = false;
+
+        if ( $post->post_type == 'wcb_reimbursement' ) {
+                $currency = get_post_meta( $post->ID, '_wcbrr_currency', true );
+                $expenses = get_post_meta( $post->ID, '_wcbrr_expenses', true );
+                foreach ( $expenses as $expense ) {
+                        if ( ! empty( $expense['_wcbrr_amount'] ) ) {
+                                $amount += floatval( $expense['_wcbrr_amount'] );
+                        }
+                }
+        } elseif ( $post->post_type == 'wcp_payment_request' ) {
+                $currency = get_post_meta( $post->ID, '_camppayments_currency', true );
+                $amount = floatval( get_post_meta( $post->ID, '_camppayments_payment_amount', true ) );
+        }
+        $amount = round( $amount, 2 );
+
+        if ( empty( $entry['currency'] ) || $entry['currency'] != $currency ) {
+                $entry['data'] = 'Currency mismatch';
+                return $entry;
+        }
+
+        $entry['amount'] = floatval( $entry['amount'] );
+        $entry['amount'] = round( $entry['amount'], 2 );
+
+        if ( $entry['amount'] !== $amount ) {
+                $entry['data'] = 'Payment amount mismatch';
+                return $entry;
+        }
+
+        // @todo Do some magic here.
+
+        // All good.
+        $entry['processed'] = true;
+        return $entry;
+}
+
+class WCB_Import_Results {
+        public static $data;
+}