Changeset 2617

Timestamp:

02/25/2016 07:34:11 PM (9 years ago)

Author:

kovshenin

Message:

WordCamp.org: Add new payment requests statuses/flow to the network dashboard.

Location:

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

Files:

• . (modified) (1 prop)
• bootstrap.php (modified) (1 diff)
• includes/payment-requests-dashboard.php (modified) (4 diffs)
• includes/payment-requests-list-table.php (modified) (2 diffs)

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

@@ -21 +21 @@
      */
     require_once( WP_PLUGIN_DIR . '/wordcamp-payments/includes/wordcamp-budgets.php' );
-    if ( defined( 'WPORG_PROXIED_REQUEST' ) && WPORG_PROXIED_REQUEST ) {
-        require_once( WP_PLUGIN_DIR . '/wordcamp-payments/includes/sponsor-invoice.php' );
-    }
+    require_once( WP_PLUGIN_DIR . '/wordcamp-payments/includes/sponsor-invoice.php' );
 
     require_once( __DIR__ . '/includes/wordcamp-budgets-dashboard.php' );
     require_once( __DIR__ . '/includes/payment-requests-dashboard.php' );
-    if ( defined( 'WPORG_PROXIED_REQUEST' ) && WPORG_PROXIED_REQUEST ) {
-        require_once( __DIR__ . '/includes/sponsor-invoices-dashboard.php' );
-    }
+    require_once( __DIR__ . '/includes/sponsor-invoices-dashboard.php' );
     require_once( __DIR__ . '/includes/reimbursement-requests-dashboard.php' );
 

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

@@ -99 +99 @@
             while ( $requests = get_posts( array(
                 'paged' => $paged++,
-                'post_status' => array( 'paid', 'unpaid', 'incomplete' ),
+                'post_status' => 'any',
                 'post_type' => 'wcp_payment_request',
                 'posts_per_page' => 20,
@@ -140 +140 @@
         if ( ! empty( $amount) ) {
             $keywords[] = $amount;
+        }
+
+        $back_compat_statuses = array(
+            'unpaid' => 'draft',
+            'incomplete' => 'wcb-incomplete',
+            'paid' => 'wcb-paid',
+        );
+
+        // Map old statuses to new statuses.
+        if ( array_key_exists( $request->post_status, $back_compat_statuses ) ) {
+            $request->post_status = $back_compat_statuses[ $request->post_status ];
         }
 
@@ -1230 +1241 @@
         $tab = 'overdue';
         $tabs = array(
-            'pending',
             'overdue',
+
+            'pending-approval',
+            'approved',
+            'pending-payment',
             'paid',
+            'cancelled-failed',
             'incomplete',
+
             'export',
             'import',
@@ -1251 +1267 @@
         $current_section = self::get_current_tab();
         $sections = array(
-            'overdue' => 'Overdue',
-            'pending' => 'Pending',
-            'paid'    => 'Paid',
-            'incomplete' => __( 'Incomplete', 'wordcamporg' ),
-            'export'     => __( 'Export', 'wordcamporg' ),
-            'import'     => __( 'Import', 'wordcamporg' ),
+            'overdue'          => __( 'Overdue', 'wordcamporg' ), // pending-approval + after due date
+            'pending-approval' => __( 'Pending Approval', 'wordcamporg' ),
+            'approved'         => __( 'Approved', 'wordcamporg' ),
+            'pending-payment'  => __( 'Pending Payment', 'wordcamporg' ),
+            'paid'             => __( 'Paid', 'wordcamporg' ),
+            'cancelled-failed' => __( 'Cancelled/Failed', 'wordcamporg' ),
+            'incomplete'       => __( 'Incomplete', 'wordcamporg' ),
+            'export'           => __( 'Export', 'wordcamporg' ),
+            'import'           => __( 'Import', 'wordcamporg' ),
         );
 

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

@@ -77 +77 @@
 
         if ( 'overdue' == $view ) {
-            $where .= $wpdb->prepare( " AND `status` = 'unpaid' AND `due` > 0 AND `due` <= %d ", time() );
-        } elseif ( 'pending' == $view ) {
-            $where .= " AND `status` = 'unpaid' ";
+            $where .= $wpdb->prepare( " AND `status` = 'wcb-pending-approval' AND `due` > 0 AND `due` <= %d ", time() );
+        } elseif ( 'pending-approval' == $view ) {
+            $where .= " AND `status` = 'wcb-pending-approval' ";
+        } elseif ( 'approved' == $view ) {
+            $where .= " AND `status` = 'wcb-approved' ";
+        } elseif ( 'pending-payment' == $view ) {
+            $where .= " AND `status` = 'wcb-pending-payment' ";
         } elseif ( 'paid' == $view ) {
-            $where .= " AND `status` = 'paid' ";
+            $where .= " AND `status` = 'wcb-paid' ";
             $orderby = 'created';
             $order = 'desc';
-        } elseif( 'incomplete' == $view ) {
-            $where .= " AND `status` = 'incomplete' ";
+        } elseif ( 'incomplete' == $view ) {
+            $where .= " AND `status` = 'wcb-incomplete' ";
+        } elseif ( 'cancelled-failed' == $view ) {
+            $where .= " AND `status` IN ( 'wcb-failed', 'wcb-cancelled' ) ";
         }
 
@@ -153 +159 @@
      */
     public function column_status( $request ) {
-        return esc_html( ucwords( $request->post_status ) );
+        $status = get_post_status_object( $request->post_status );
+        return esc_html( $status->label );
     }