Changeset 3305

Timestamp:

06/06/2016 09:20:12 PM (9 years ago)

Author:

iandunn

Message:

WordCamp Budgets: Include vendor payments with empty dates in CSV export.

Location:

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

Files:

• wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php (modified) (1 diff)
• wordcamp-payments/includes/payment-request.php (modified) (2 diffs)

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

@@ -363 +363 @@
     }
 
+    // We don't want to export items with empty dates to JPM, etc
+    if ( 'Regular CSV' === $args['export_type']['label'] ) {
+        $include_empty_dates = " OR `{$date_type}` = 0";
+    } else {
+        $include_empty_dates = '';
+    }
+
     $request_indexes = $wpdb->get_results( $wpdb->prepare( "
         SELECT *
         FROM   `{$table_name}`
-        WHERE  `{$date_type}` BETWEEN %d AND %d",
+        WHERE  `{$date_type}` BETWEEN %d AND %d $include_empty_dates",
         $args['start_date'],
         $args['end_date']

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

@@ -981 +981 @@
             }
 
+            $due_date = get_post_meta( $post->ID, '_camppayments_due_by', true );
+
+            if ( $due_date ) {
+                $due_date = date( 'Y-m-d', absint( $due_date ) );
+            }
+
             if ( 'null-select-one' === $currency ) {
                 $currency = '';
@@ -1002 +1008 @@
                 $date_vendor_paid,
                 date( 'Y-m-d', get_post_time( 'U', true, $post->ID ) ),
-                date( 'Y-m-d', absint( get_post_meta( $post->ID, '_camppayments_due_by', true ) ) ),
+                $due_date,
                 get_post_meta( $post->ID, '_camppayments_payment_amount', true ),
                 $currency,