<!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>[2707] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php: WordCamp Budgets: Move default CSV export to payments/reimbursements classes/namespaces.</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/2707">2707</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/2707","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>kovshenin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-03-08 15:00:51 +0000 (Tue, 08 Mar 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: Move default CSV export to payments/reimbursements classes/namespaces.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludeswordcampbudgetsdashboardphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludeswordcampbudgetsdashboardphp"></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/wordcamp-budgets-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/wordcamp-budgets-dashboard.php 2016-03-08 13:48:04 UTC (rev 2706)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php 2016-03-08 15:00:51 UTC (rev 2707)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,10 +163,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th>Types</th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><input type="checkbox" name="wcb-export-types-vendor-payments"
- value="1" checked disabled /> Vendor Payments</label><br />
- <label><input type="checkbox" name="wcb-export-types-reimbursements"
- value="1" disabled /> Reimbursements</label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <select name="wcb-export-post-type">
+ <option value="wcp_payment_request">Vendor Payments</option>
+ <option value="wcb_reimbursement">Reimbursements</option>
+ </select>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th>Status</th>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,6 +216,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_POST['wcb-request-export'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_POST['wcb-export-post-type'] ) )
+ return;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_network' ) || ! check_admin_referer( 'export', 'wcb-request-export' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,11 +239,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = sprintf( $export_type['filename'], date( 'Ymd', $start_date ), date( 'Ymd', $end_date ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = sanitize_file_name( $filename );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type = $_POST['wcb-export-post-type'];
+ if ( ! in_array( $post_type, array( 'wcp_payment_request', 'wcb_reimbursement' ) ) ) {
+ add_settings_error( 'wcb-dashboard', 'bad_post_type', 'Invalid post type selected.' );
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $report = generate_payment_report( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => $status,
</span><span class="cx" style="display: block; padding: 0 10px"> 'start_date' => $start_date,
</span><span class="cx" style="display: block; padding: 0 10px"> 'end_date' => $end_date,
</span><span class="cx" style="display: block; padding: 0 10px"> 'export_type' => $export_type,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_type' => $post_type,
</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"> if ( is_wp_error( $report ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,19 +282,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'start_date' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'end_date' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'export_type' => '',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_type' => '',
</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"> if ( ! is_int( $args['start_date'] ) || ! is_int( $args['end_date'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'wcb-bad-dates', 'Invalid start or end date.' );
</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">- // todo: support other index tables.
- $table_name = $wpdb->get_blog_prefix(0) . 'wordcamp_payments_index';
- $date_type = 'updated';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $args['post_type'] == 'wcp_payment_request' ) {
+ $table_name = $wpdb->get_blog_prefix(0) . 'wordcamp_payments_index';
+ $date_type = $args['status'] == 'wcb-paid' ? 'paid' : 'updated';
+ } elseif ( $args['post_type'] == 'wcb_reimbursement' ) {
+ $table_name = $wpdb->get_blog_prefix(0) . 'wcbd_reimbursement_requests_index';
+ $date_type = $args['status'] == 'wcb-paid' ? 'date_paid' : 'date_requested'; // todo date_updated
+ } else {
+ return new \WP_Error( 'wcb-invalid-post-type', 'Invalid post type.' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $args['status'] == 'wcb-paid' )
- $date_type = 'paid';
-
</del><span class="cx" style="display: block; padding: 0 10px"> $request_indexes = $wpdb->get_results( $wpdb->prepare( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT *
</span><span class="cx" style="display: block; padding: 0 10px"> FROM `{$table_name}`
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_callable( $args['export_type']['callback'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return new \WP_Error( 'wcb-invalid-type', 'The export type is invalid.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['request_indexes'] = $request_indexes;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args['data'] = $request_indexes;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return call_user_func( $args['export_type']['callback'], $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,91 +324,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _generate_payment_report_default( $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'request_indexes' => array(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'data' => array(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'status' => '',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_type' => '',
</ins><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">- $column_headings = array(
- 'WordCamp', 'ID', 'Title', 'Status', 'Date Vendor was Paid', 'Creation Date', 'Due Date', 'Amount',
- 'Currency', 'Category', 'Payment Method','Vendor Name', 'Vendor Contact Person', 'Vendor Country',
- 'Check Payable To', 'URL', 'Supporting Documentation Notes',
- );
-
- ob_start();
- $report = fopen( 'php://output', 'w' );
-
- fputcsv( $report, $column_headings );
-
- foreach( $args['request_indexes'] as $index ) {
- switch_to_blog( $index->blog_id );
-
- $request = get_post( $index->post_id );
-
- $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 ];
- }
-
- if ( $args['status'] && $request->post_status != $args['status'] ) {
- restore_current_blog();
- continue;
- }
-
- $currency = get_post_meta( $index->post_id, '_camppayments_currency', true );
- $category = get_post_meta( $index->post_id, '_camppayments_payment_category', true );
- $date_vendor_paid = get_post_meta( $index->post_id, '_camppayments_date_vendor_paid', true );
-
- if ( $date_vendor_paid ) {
- $date_vendor_paid = date( 'Y-m-d', $date_vendor_paid );
- }
-
- if ( 'null-select-one' === $currency ) {
- $currency = '';
- }
-
- if ( 'null' === $category ) {
- $category = '';
- }
-
- $country_name = \WordCamp_Budgets::get_country_name(
- get_post_meta( $index->post_id, '_camppayments_vendor_country_iso3166', true )
- );
-
- $row = array(
- get_wordcamp_name(),
- sprintf( '%d-%d', $index->blog_id, $index->post_id ),
- html_entity_decode( $request->post_title ),
- $index->status,
- $date_vendor_paid,
- date( 'Y-m-d', $index->created ),
- date( 'Y-m-d', $index->due ),
- get_post_meta( $index->post_id, '_camppayments_payment_amount', true ),
- $currency,
- $category,
- get_post_meta( $index->post_id, '_camppayments_payment_method', true ),
- get_post_meta( $index->post_id, '_camppayments_vendor_name', true ),
- get_post_meta( $index->post_id, '_camppayments_vendor_contact_person', true ),
- $country_name,
- \WCP_Encryption::maybe_decrypt( get_post_meta( $index->post_id, '_camppayments_payable_to', true ) ),
- get_edit_post_link( $index->post_id ),
- get_post_meta( $index->post_id, '_camppayments_file_notes', true ),
- );
-
- restore_current_blog();
-
- if ( ! empty( $row ) ) {
- fputcsv( $report, $row );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $args['post_type'] == 'wcp_payment_request' ) {
+ return \WCP_Payment_Request::_generate_payment_report_default( $args );
+ } elseif ( $args['post_type'] == 'wcb_reimbursement' ) {
+ return \WordCamp\Budgets\Reimbursement_Requests\_generate_payment_report_default( $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- fclose( $report );
- return ob_get_clean();
</del><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></pre>
</div>
</div>
</body>
</html>