Changeset 2622

Timestamp:

02/25/2016 11:15:39 PM (10 years ago)

Author:

kovshenin

Message:

WordCamp.org: Allow admins to export only approved payment requests.

Location:

sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network

Files:

• . (modified) (1 prop)
• includes/payment-requests-dashboard.php (modified) (14 diffs)

sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php

@@ -335 +335 @@
         }
 
+        $approved_only = ! empty( $_POST['wcpn_approved_only'] );
         $start_date = strtotime( $_POST['wcpn_export_start_date'] . ' 00:00:00' );
         $end_date   = strtotime( $_POST['wcpn_export_end_date']   . ' 23:59:59' );
@@ -340 +341 @@
         $filename = sanitize_file_name( $filename );
 
-        $report = self::generate_payment_report( $_POST['wcpn_date_type'], $start_date, $end_date, $export_type );
+        $report = self::generate_payment_report( $_POST['wcpn_date_type'], $start_date, $end_date, $export_type, $approved_only );
 
         if ( is_wp_error( $report ) ) {
@@ -366 +367 @@
      * @return string | WP_Error
      */
-    protected static function generate_payment_report( $date_type, $start_date, $end_date, $export_type ) {
+    protected static function generate_payment_report( $date_type, $start_date, $end_date, $export_type, $approved_only ) {
         global $wpdb;
 
@@ -396 +397 @@
             'end_date' => $end_date,
             'export_type' => $export_type,
+            'approved_only' => $approved_only,
         );
 
@@ -411 +413 @@
         $args = wp_parse_args( $args, array(
             'request_indexes' => array(),
+            'approved_only' => false,
         ) );
 
@@ -425 +428 @@
 
         foreach( $args['request_indexes'] as $index ) {
-            fputcsv( $report, self::get_report_row( $index ) );
+            $row = self::get_report_row( $index, $args );
+            if ( ! empty( $row ) ) {
+                fputcsv( $report, $row );
+            }
         }
 
@@ -442 +448 @@
         $args = wp_parse_args( $args, array(
             'request_indexes' => array(),
+            'approved_only' => false,
         ) );
 
@@ -463 +470 @@
             switch_to_blog( $index->blog_id );
             $post = get_post( $index->post_id );
+
+            if ( $args['approved_only'] && $post->post_status != 'wcb-approved' )
+                continue;
 
             if ( get_post_meta( $post->ID, '_camppayments_payment_method', true ) != 'Check' )
@@ -550 +560 @@
         $args = wp_parse_args( $args, array(
             'request_indexes' => array(),
+            'approved_only' => false,
         ) );
 
@@ -616 +627 @@
             $post = get_post( $index->post_id );
 
+            if ( $args['approved_only'] && $post->post_status != 'wcb-approved' )
+                continue;
+
             if ( get_post_meta( $post->ID, '_camppayments_payment_method', true ) != 'Direct Deposit' )
                 continue;
@@ -749 +763 @@
         $args = wp_parse_args( $args, array(
             'request_indexes' => array(),
+            'approved_only' => false,
         ) );
 
@@ -763 +778 @@
             switch_to_blog( $index->blog_id );
             $post = get_post( $index->post_id );
+
+            if ( $args['approved_only'] && $post->post_status != 'wcb-approved' )
+                continue;
 
             // Only wires here.
@@ -966 +984 @@
      *
      * @param stdClass $index
+     * @param array $args
      *
      * @return array
      */
-    protected static function get_report_row( $index ) {
+    protected static function get_report_row( $index, $args ) {
         switch_to_blog( $index->blog_id );
 
-        $request          = get_post( $index->post_id );
+        $request = get_post( $index->post_id );
+        if ( $args['approved_only'] && $request->post_status != 'wcb-approved' )
+            return null;
+
         $currency         = get_post_meta( $index->post_id, '_camppayments_currency',         true );
         $category         = get_post_meta( $index->post_id, '_camppayments_payment_category', true );
@@ -1043 +1065 @@
             <?php wp_nonce_field( 'export', 'wcpn_request_export' ); ?>
 
-            <p>
-                This form will supply a CSV file with payment requests matching the parameters you select below.
-                For example, all requests that were <code>paid</code> between <code><?php echo esc_html( $last_month ); ?></code> and <code><?php echo esc_html( $today ); ?></code>.
-            </p>
-
-            <p>
-                <label>
-                    Date type:
-                    <select name="wcpn_date_type">
-                        <option value="created">created</option>
-                        <option value="paid" selected>paid</option>
-                    </select>
-                </label>
-            </p>
-
-            <p>
-                <label>
-                    Start date:
-                    <input type="date" name="wcpn_export_start_date" class="medium-text" value="<?php echo esc_attr( $last_month ); ?>" />
-                </label>
-            </p>
-
-            <p>
-                <label>
-                    End date:
-                    <input type="date" name="wcpn_export_end_date" class="medium-text" value="<?php echo esc_attr( $today ); ?>" />
-                </label>
-            </p>
-
-            <p>
-                <label>Export Type:
-                    <select name="wcpn_export_type">
-                        <?php foreach ( self::get_export_types() as $key => $export_type ) : ?>
-                        <option value="<?php echo esc_attr( $key ); ?>"><?php echo esc_html( $export_type['label'] ); ?></option>
-                        <?php endforeach; ?>
-                    </select>
-                </label>
-
-            <?php submit_button( 'Export' ); ?>
+            <h2>Export Settings</h2>
+
+            <table class="form-table">
+                <tr>
+                    <th><label>Approved Only</label></th>
+                    <td><label><input type="checkbox" name="wcpn_approved_only" value="1" checked> Export only requests marked as approved</label></td>
+                </tr>
+                <tr>
+                    <th><label>Date Type</label></th>
+                    <td>
+                        <select name="wcpn_date_type">
+                            <option value="created" selected>created</option>
+                            <option value="paid">paid</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <th><label>Date Range</label></th>
+                    <td>
+                        <input type="date" name="wcpn_export_start_date" class="medium-text" value="<?php echo esc_attr( $last_month ); ?>" /> to
+                        <input type="date" name="wcpn_export_end_date" class="medium-text" value="<?php echo esc_attr( $today ); ?>" />
+                    </td>
+                </tr>
+                <tr>
+                    <th><label>Format</label></th>
+                    <td>
+                        <select name="wcpn_export_type">
+                            <?php foreach ( self::get_export_types() as $key => $export_type ) : ?>
+                            <option value="<?php echo esc_attr( $key ); ?>"><?php echo esc_html( $export_type['label'] ); ?></option>
+                            <?php endforeach; ?>
+                        </select>
+                    </td>
+                </tr>
+            </table>
+
+            <?php submit_button( 'Download Export' ); ?>
         </form>