Changeset 2632 for sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-list-table.php

Timestamp:

02/26/2016 12:56:15 AM (11 years ago)

Author:

kovshenin

Message:

WordCamp.org: Reintegrate branch into trunk (wordcamp-payments-network)

Location:

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

Files:

• . (modified) (1 prop)
• includes/payment-requests-list-table.php (modified) (3 diffs)

sites/trunk/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' ";
-                        $orderby = 'created';
+                        $where .= " AND `status` = 'wcb-paid' ";
+                        $orderby = 'updated';
                         $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' ) ";
                 }
 
@@ -136 +142 @@
          */
         public function column_payment( $request ) {
-                $title          = empty( $request->post_title ) ? '(no title)' : $request->post_title;
+                $blog_id = get_current_blog_id();
+                $title = empty( $request->post_title ) ? '(no title)' : $request->post_title;
                 $edit_post_link = add_query_arg( array( 'post' => $request->ID, 'action' => 'edit' ), admin_url( 'post.php' ) );
                 $actions = array(
                         'view-all' => sprintf( '<a href="%s" target="_blank">View All</a>', esc_url( admin_url( 'edit.php?post_type=wcp_payment_request' ) ) ),
                 );
+
+                if ( $request->post_status == 'wcb-pending-approval' ) {
+                        $approve_url = wp_nonce_url( add_query_arg( array(
+                                'wcb-approve' => sprintf( '%d-%d', $blog_id, $request->ID ),
+                        ) ), sprintf( 'wcb-approve-%d-%d', $blog_id, $request->ID ) );
+
+                        $actions['wcb-approve'] = sprintf( '<a style="color: green;" onclick="return confirm(\'Approve this payment request?\');" href="%s">Approve</a>', esc_url( $approve_url ) );
+                }
 
                 return sprintf( '<a href="%s" class="row-title" target="_blank">%s</a>%s',
@@ -153 +168 @@
          */
         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 );
         }