Changeset 3299

Timestamp:

06/03/2016 11:05:55 PM (9 years ago)

Author:

iandunn

Message:

WordCamp Budgets: Add search functionality for Reimbursement Requests.

Location:

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

Files:

• includes/reimbursement-requests-dashboard.php (modified) (5 diffs)
• includes/reimbursement-requests-list-table.php (modified) (1 diff)
• views/reimbursement-requests/page-reimbursement-requests.php (modified) (1 diff)

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

@@ -5 +5 @@
 defined( 'WPINC' ) or die();
 
-const LATEST_DATABASE_VERSION = 3;
+const LATEST_DATABASE_VERSION = 4;
 
 if ( is_network_admin() ) {
@@ -160 +160 @@
             currency       varchar( 3  )             NOT NULL default '',
             amount         numeric( 10, 2 ) unsigned NOT NULL default '0',
+            keywords       text                      NOT NULL default '',
 
             PRIMARY KEY  (blog_id, request_id),
@@ -234 +235 @@
         'currency'       => get_post_meta( $request_id, '_wcbrr_currency', true ),
         'amount'         => get_amount( $request_id ),
+        'keywords'       => wp_json_encode( get_search_keywords( $request ) ),
     );
 
@@ -246 +248 @@
     }
 
-    $formats = array( '%d', '%d', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%f' );
+    $formats = array( '%d', '%d', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%f', '%s' );
 
     $wpdb->replace( get_index_table_name(), $index_row, $formats );
@@ -269 +271 @@
 
     return $amount;
+}
+
+/**
+ * Get the search keywords for a Reimbursement Request
+ *
+ * @param \WP_Post $request
+ *
+ * @return array
+ */
+function get_search_keywords( $request ) {
+    $keywords   = array();
+    $expenses   = get_post_meta( $request->ID, '_wcbrr_expenses', true );
+    $categories = \WordCamp_Budgets::get_payment_categories();
+
+    if ( ! empty( $request->post_title ) ) {
+        $keywords[] = $request->post_title;
+    }
+
+    $payer_name = get_post_meta( $request->ID, '_wcbrr_name_of_payer', true );
+    if ( ! empty( $payer_name ) ) {
+        $keywords[] = $payer_name;
+    }
+
+    $payment_method = get_post_meta( $request->ID, '_wcbrr_payment_method', true );
+    if ( ! empty( $payment_method ) ) {
+        $keywords[] = $payment_method;
+    }
+
+    if ( is_array( $expenses ) ) {
+        $keywords[] = get_amount( $request->ID );
+
+        foreach ( $expenses as $expense ) {
+            if ( array_key_exists( $expense['_wcbrr_category'], $categories ) ) {
+                $keywords[] = $expense['_wcbrr_category'];  // Use the category key, because the category value is localized
+            }
+
+            if ( ! empty( $expense['_wcbrr_vendor_name'] ) ) {
+                $keywords[] = $expense['_wcbrr_vendor_name'];
+            }
+
+            if ( ! empty( $expense['_wcbrr_amount'] ) ) {
+                $keywords[] = $expense['_wcbrr_amount'];
+            }
+        }
+    }
+
+    return $keywords;
 }
 

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

@@ -52 +52 @@
         $limit      = 30;
         $offset     = $limit * ( $paged - 1 );
-
-        $this->items = $wpdb->get_results( $wpdb->prepare( "
+        $search     = '';
+
+        if ( ! empty( $_REQUEST['s'] ) ) {
+            $search = $wpdb->prepare(
+                "AND `keywords` LIKE '%%%s%%'",
+                $wpdb->esc_like( wp_unslash( $_REQUEST['s'] ) )
+            );
+        }
+
+        $query = "
             SELECT *
             FROM $table_name
-            WHERE status = %s
+            WHERE
+                status = %s
+                {{search}}
             ORDER BY date_requested ASC
             LIMIT %d
-            OFFSET %d",
-            $status,
-            $limit,
-            $offset
-        ) );
+            OFFSET %d
+        ";
+
+        $query = $wpdb->prepare( $query, $status, $limit, $offset );
+        $query = str_replace( '{{search}}', $search, $query );
+
+        $this->items = $wpdb->get_results( $query );
 
         // A second query is faster than using SQL_CALC_FOUND_ROWS during the first query

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

@@ -26 +26 @@
     </h3>
 
-    <?php $list_table->display(); ?>
+    <div id="wcp-list-table">
+        <form id="posts-filter" action="" method="get">
+            <input type="hidden" name="page"    value="reimbursement-requests-dashboard" />
+            <input type="hidden" name="section" value="<?php echo esc_attr( get_current_section() ); ?>" />
+            
+            <?php $list_table->search_box( __( 'Search Reimbursements', 'wordcamporg' ), 'wcp' ); ?>
+            <?php $list_table->display(); ?>
+        </form>
+    </div>
 </div>