<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[3299] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network: WordCamp Budgets: Add search functionality for Reimbursement Requests.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/3299">3299</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3299","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-03 23:05:55 +0000 (Fri, 03 Jun 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp Budgets: Add search functionality for Reimbursement Requests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludesreimbursementrequestsdashboardphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/reimbursement-requests-dashboard.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludesreimbursementrequestslisttablephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/reimbursement-requests-list-table.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkviewsreimbursementrequestspagereimbursementrequestsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/views/reimbursement-requests/page-reimbursement-requests.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludesreimbursementrequestsdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/reimbursement-requests-dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/reimbursement-requests-dashboard.php 2016-06-03 19:11:43 UTC (rev 3298)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/reimbursement-requests-dashboard.php 2016-06-03 23:05:55 UTC (rev 3299)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) or die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-const LATEST_DATABASE_VERSION = 3;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const LATEST_DATABASE_VERSION = 4;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_network_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'network_admin_menu', __NAMESPACE__ . '\register_submenu_page' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,6 +159,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wordcamp_name varchar( 75 ) NOT NULL default '',
</span><span class="cx" style="display: block; padding: 0 10px"> currency varchar( 3 ) NOT NULL default '',
</span><span class="cx" style="display: block; padding: 0 10px"> amount numeric( 10, 2 ) unsigned NOT NULL default '0',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ keywords text NOT NULL default '',
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> PRIMARY KEY (blog_id, request_id),
</span><span class="cx" style="display: block; padding: 0 10px"> KEY status (status)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,6 +234,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamp_name' => get_wordcamp_name(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'currency' => get_post_meta( $request_id, '_wcbrr_currency', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'amount' => get_amount( $request_id ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'keywords' => wp_json_encode( get_search_keywords( $request ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,7 +247,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $formats = array( '%d', '%d', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%f' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $formats = array( '%d', '%d', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%f', '%s' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->replace( get_index_table_name(), $index_row, $formats );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,6 +273,53 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Delete a row from the index
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $request_id
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludesreimbursementrequestslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/reimbursement-requests-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/reimbursement-requests-list-table.php 2016-06-03 19:11:43 UTC (rev 3298)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/reimbursement-requests-list-table.php 2016-06-03 23:05:55 UTC (rev 3299)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,19 +51,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $paged = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $limit = 30;
</span><span class="cx" style="display: block; padding: 0 10px"> $offset = $limit * ( $paged - 1 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $search = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->items = $wpdb->get_results( $wpdb->prepare( "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_REQUEST['s'] ) ) {
+ $search = $wpdb->prepare(
+ "AND `keywords` LIKE '%%%s%%'",
+ $wpdb->esc_like( wp_unslash( $_REQUEST['s'] ) )
+ );
+ }
+
+ $query = "
</ins><span class="cx" style="display: block; padding: 0 10px"> SELECT *
</span><span class="cx" style="display: block; padding: 0 10px"> FROM $table_name
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- WHERE status = %s
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WHERE
+ status = %s
+ {{search}}
</ins><span class="cx" style="display: block; padding: 0 10px"> ORDER BY date_requested ASC
</span><span class="cx" style="display: block; padding: 0 10px"> LIMIT %d
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- OFFSET %d",
- $status,
- $limit,
- $offset
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ OFFSET %d
+ ";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query = $wpdb->prepare( $query, $status, $limit, $offset );
+ $query = str_replace( '{{search}}', $search, $query );
+
+ $this->items = $wpdb->get_results( $query );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // A second query is faster than using SQL_CALC_FOUND_ROWS during the first query
</span><span class="cx" style="display: block; padding: 0 10px"> $total_items = $wpdb->get_var( $wpdb->prepare( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT count(blog_id)
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkviewsreimbursementrequestspagereimbursementrequestsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/views/reimbursement-requests/page-reimbursement-requests.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/views/reimbursement-requests/page-reimbursement-requests.php 2016-06-03 19:11:43 UTC (rev 3298)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/views/reimbursement-requests/page-reimbursement-requests.php 2016-06-03 23:05:55 UTC (rev 3299)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,5 +25,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </h3>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $list_table->display(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <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>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>