Changeset 2747

Timestamp:

03/14/2016 06:17:18 PM (10 years ago)

Author:

kovshenin

Message:

WordCamp Budgets: Add handlers for network dashboard actions.

Move "approve" and "set as pending payment" action link handlers
to the main network dashboard file, allow for reimbursement
requests too.

Location:

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

Files:

• payment-requests-dashboard.php (modified) (3 diffs)
• reimbursement-requests-dashboard.php (modified) (1 diff)
• reimbursement-requests-list-table.php (modified) (1 diff)
• wordcamp-budgets-dashboard.php (modified) (2 diffs)

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

@@ -20 +20 @@
         add_action( 'init', array( __CLASS__, 'upgrade' ) );
         add_action( 'init', array( __CLASS__, 'process_import_request' ) );
-
-        // Dashboard actions.
-        add_action( 'init', array( __CLASS__, 'process_action_approve' ) );
-        add_action( 'init', array( __CLASS__, 'process_action_set_pending_payment' ) );
 
         // Diff-based updates to the index.
@@ -245 +241 @@
             <h1>Vendor Payments</h1>
 
-            <?php do_action( 'admin_notices' ); ?>
             <?php settings_errors(); ?>
 
@@ -284 +279 @@
 
         <?php
-    }
-
-    /**
-     * Process Approve button in network admin
-     */
-    public static function process_action_approve() {
-        if ( ! current_user_can( 'manage_network' ) )
-            return;
-
-        if ( empty( $_GET['wcb-approve'] ) || empty( $_GET['_wpnonce'] ) )
-            return;
-
-        list( $blog_id, $post_id ) = explode( '-', $_GET['wcb-approve'] );
-
-        if ( ! wp_verify_nonce( $_GET['_wpnonce'], sprintf( 'wcb-approve-%d-%d', $blog_id, $post_id ) ) ) {
-            add_action( 'admin_notices', function() {
-                ?><div class="notice notice-error is-dismissible">
-                    <p><?php _e( 'Error! Could not verify nonce.', 'wordcamporg' ); ?></p>
-                </div><?php
-            });
-            return;
-        }
-
-        switch_to_blog( $blog_id );
-        $post = get_post( $post_id );
-        if ( $post->post_type == 'wcp_payment_request' ) {
-            $post->post_status = 'wcb-approved';
-            wp_insert_post( $post );
-
-            WordCamp_Budgets::log( $post->ID, get_current_user_id(), 'Request approved via Network Admin', array(
-                'action' => 'approved',
-            ) );
-
-            add_action( 'admin_notices', function() {
-                ?><div class="notice notice-success is-dismissible">
-                    <p><?php _e( 'Success! Request has been marked as approved.', 'wordcamporg' ); ?></p>
-                </div><?php
-            });
-        }
-        restore_current_blog();
-    }
-
-    /**
-     * Process "Set as Pending Payment" dashboard action.
-     */
-    public static function process_action_set_pending_payment() {
-        if ( ! current_user_can( 'manage_network' ) )
-            return;
-
-        if ( empty( $_GET['wcb-set-pending-payment'] ) || empty( $_GET['_wpnonce'] ) )
-            return;
-
-        list( $blog_id, $post_id ) = explode( '-', $_GET['wcb-set-pending-payment'] );
-
-        if ( ! wp_verify_nonce( $_GET['_wpnonce'], sprintf( 'wcb-set-pending-payment-%d-%d', $blog_id, $post_id ) ) ) {
-            add_action( 'admin_notices', function() {
-                ?><div class="notice notice-error is-dismissible">
-                    <p><?php _e( 'Error! Could not verify nonce.', 'wordcamporg' ); ?></p>
-                </div><?php
-            });
-            return;
-        }
-
-        switch_to_blog( $blog_id );
-        $post = get_post( $post_id );
-        if ( $post->post_type == 'wcp_payment_request' ) {
-            $post->post_status = 'wcb-pending-payment';
-            wp_insert_post( $post );
-
-            WordCamp_Budgets::log( $post->ID, get_current_user_id(), 'Request set as Pending Payment via Network Admin', array(
-                'action' => 'set-pending-payment',
-            ) );
-
-            add_action( 'admin_notices', function() {
-                ?><div class="notice notice-success is-dismissible">
-                    <p><?php _e( 'Success! Request has been marked as Pending Payment.', 'wordcamporg' ); ?></p>
-                </div><?php
-            });
-        }
-        restore_current_blog();
     }
 

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

@@ -10 +10 @@
     add_action( 'network_admin_menu',    __NAMESPACE__ . '\register_submenu_page' );
     add_action( 'init',                  __NAMESPACE__ . '\upgrade_database'      );
-
-} elseif ( is_admin() ) {
-    add_action( 'save_post',    __NAMESPACE__ . '\update_index_row', 11, 2 );   // See note in callback about priority
-    add_action( 'trashed_post', __NAMESPACE__ . '\delete_index_row'        );
-    add_action( 'delete_post',  __NAMESPACE__ . '\delete_index_row'        );
-    add_action( 'draft_wcb_reimbursement', __NAMESPACE__ . '\delete_index_row' );
-}
+}
+
+add_action( 'save_post',    __NAMESPACE__ . '\update_index_row', 11, 2 );   // See note in callback about priority
+add_action( 'trashed_post', __NAMESPACE__ . '\delete_index_row'        );
+add_action( 'delete_post',  __NAMESPACE__ . '\delete_index_row'        );
+add_action( 'draft_wcb_reimbursement', __NAMESPACE__ . '\delete_index_row' );
 
 /**

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

@@ -80 +80 @@
      */
     protected function column_request_title( $index_row ) {
-        $title = empty( $index_row->request_title ) ? '(no title)' : $index_row->request_title;
+        $blog_id = $index_row->blog_id;
+        switch_to_blog( $blog_id );
+        $post = get_post( $index_row->request_id );
+        $title = get_the_title( $post );
+        $title = empty( $title ) ? '(no title)' : $title;
+        $edit_post_link = add_query_arg( array( 'post' => $post->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=wcb_reimbursement' ) ) ),
+        );
 
-        $edit_url = get_admin_url(
-            $index_row->blog_id,
-            sprintf( 'post.php?post=%s&action=edit', $index_row->request_id )
-        );
+        if ( $post->post_status == 'wcb-pending-approval' ) {
+            $action_url = wp_nonce_url( add_query_arg( array(
+                'wcb-approve' => sprintf( '%d-%d', $blog_id, $post->ID ),
+            ) ), sprintf( 'wcb-approve-%d-%d', $blog_id, $post->ID ) );
+
+            $actions['wcb-approve'] = sprintf( '<a style="color: green;" onclick="return confirm(\'Approve this reimbursement request?\');" href="%s">Approve</a>', esc_url( $action_url ) );
+
+        } elseif ( $post->post_status == 'wcb-approved' ) {
+            $action_url = wp_nonce_url( add_query_arg( array(
+                'wcb-set-pending-payment' => sprintf( '%d-%d', $blog_id, $post->ID ),
+            ) ), sprintf( 'wcb-set-pending-payment-%d-%d', $blog_id, $post->ID ) );
+
+            $actions['wcb-set-pending-payment'] = sprintf( '<a style="color: green;" onclick="return confirm(\'Set this request as pending payment?\');" href="%s">Set as Pending Payment</a>', esc_url( $action_url ) );
+        }
 
         ob_start();
         ?>
 
-        <a href="<?php echo esc_url( $edit_url ); ?>">
+        <a href="<?php echo esc_url( $edit_post_link ); ?>" class="row-title" target="_blank">
             <?php echo esc_html( $title ); ?>
+            <?php echo $this->row_actions( $actions ); ?>
         </a>
 
         <?php
 
-        return ob_get_clean();
+        $output = ob_get_clean();
+        restore_current_blog();
+        return $output;
     }
 

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

@@ -14 +14 @@
 
 add_action( 'admin_init', __NAMESPACE__ . '\process_export_request' );
+add_action( 'admin_init', __NAMESPACE__ . '\process_action_approve', 11 );
+add_action( 'admin_init', __NAMESPACE__ . '\process_action_set_pending_payment', 11 );
 
 /**
@@ -536 +538 @@
     return $amount * $rate;
 }
+
+
+/**
+ * Approve a payment or reimbursement request.
+ */
+function process_action_approve() {
+    if ( ! current_user_can( 'manage_network' ) )
+        return;
+
+    if ( empty( $_GET['wcb-approve'] ) || empty( $_GET['_wpnonce'] ) )
+        return;
+
+    list( $blog_id, $post_id ) = explode( '-', $_GET['wcb-approve'] );
+
+    if ( ! wp_verify_nonce( $_GET['_wpnonce'], sprintf( 'wcb-approve-%d-%d', $blog_id, $post_id ) ) ) {
+        add_settings_error( 'wcb-dashboard', 'nonce_error', 'Could not verify nonce.', 'error' );
+        return;
+    }
+
+    switch_to_blog( $blog_id );
+    $post = get_post( $post_id );
+
+    if ( ! in_array( $post->post_type, array( 'wcp_payment_request', 'wcb_reimbursement' ) ) ) {
+        add_settings_error( 'wcb-dashboard', 'type_error', 'Invalid post type.', 'error' );
+        restore_current_blog();
+        return;
+    }
+
+    $post->post_status = 'wcb-approved';
+    wp_insert_post( $post );
+
+    \WordCamp_Budgets::log( $post->ID, get_current_user_id(), 'Request approved via Network Admin', array(
+        'action' => 'approved',
+    ) );
+
+    restore_current_blog();
+    add_settings_error( 'wcb-dashboard', 'success', 'Success! Request has been marked as Approved.', 'updated' );
+}
+
+/**
+ * Process "Set as Pending Payment" dashboard action.
+ */
+function process_action_set_pending_payment() {
+    if ( ! current_user_can( 'manage_network' ) )
+        return;
+
+    if ( empty( $_GET['wcb-set-pending-payment'] ) || empty( $_GET['_wpnonce'] ) )
+        return;
+
+    list( $blog_id, $post_id ) = explode( '-', $_GET['wcb-set-pending-payment'] );
+
+    if ( ! wp_verify_nonce( $_GET['_wpnonce'], sprintf( 'wcb-set-pending-payment-%d-%d', $blog_id, $post_id ) ) ) {
+        add_settings_error( 'wcb-dashboard', 'nonce_error', 'Could not verify nonce.', 'error' );
+        return;
+    }
+
+    switch_to_blog( $blog_id );
+    $post = get_post( $post_id );
+
+    if ( ! in_array( $post->post_type, array( 'wcp_payment_request', 'wcb_reimbursement' ) ) ) {
+        add_settings_error( 'wcb-dashboard', 'type_error', 'Invalid post type.', 'error' );
+        restore_current_blog();
+        return;
+    }
+
+    $post->post_status = 'wcb-pending-payment';
+    wp_insert_post( $post );
+
+    \WordCamp_Budgets::log( $post->ID, get_current_user_id(), 'Request set as Pending Payment via Network Admin', array(
+        'action' => 'set-pending-payment',
+    ) );
+
+    restore_current_blog();
+    add_settings_error( 'wcb-dashboard', 'success', 'Success! Request has been marked as Pending Payment.', 'updated' );
+}