<!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>[2708] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes: 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/2708">2708</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/2708","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:01:52 +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. (Part 2)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludesreimbursementrequestphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp"></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/includes/payment-request.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/includes/payment-request.php 2016-03-08 15:00:51 UTC (rev 2707)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php 2016-03-08 15:01:52 UTC (rev 2708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -938,4 +938,93 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $required_capabilities;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ public static function _generate_payment_report_default( $args ) {
+ $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['data'] as $entry ) {
+ switch_to_blog( $entry->blog_id );
+
+ $post = get_post( $entry->post_id );
+
+ $back_compat_statuses = array(
+ 'unpaid' => 'draft',
+ 'incomplete' => 'wcb-incomplete',
+ 'paid' => 'wcb-paid',
+ );
+
+ // Map old statuses to new statuses.
+ if ( array_key_exists( $post->post_status, $back_compat_statuses ) ) {
+ $post->post_status = $back_compat_statuses[ $post->post_status ];
+ }
+
+ if ( $args['status'] && $post->post_status != $args['status'] ) {
+ restore_current_blog();
+ continue;
+ } elseif ( $post->post_type != self::POST_TYPE ) {
+ restore_current_blog();
+ continue;
+ }
+
+ $currency = get_post_meta( $post->ID, '_camppayments_currency', true );
+ $category = get_post_meta( $post->ID, '_camppayments_payment_category', true );
+ $date_vendor_paid = get_post_meta( $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( $post->ID, '_camppayments_vendor_country_iso3166', true )
+ );
+
+ $status = get_post_status_object( $post->post_status );
+
+ $row = array(
+ get_wordcamp_name(),
+ sprintf( '%d-%d', $entry->blog_id, $entry->post_id ),
+ html_entity_decode( $post->post_title ),
+ $status->label,
+ $date_vendor_paid,
+ date( 'Y-m-d', get_post_time( 'U', true, $post->ID ) ),
+ date( 'Y-m-d', absint( get_post_meta( $post->ID, '_camppayments_due_by', true ) ) ),
+ get_post_meta( $post->ID, '_camppayments_payment_amount', true ),
+ $currency,
+ $category,
+ get_post_meta( $post->ID, '_camppayments_payment_method', true ),
+ get_post_meta( $post->ID, '_camppayments_vendor_name', true ),
+ get_post_meta( $post->ID, '_camppayments_vendor_contact_person', true ),
+ $country_name,
+ WCP_Encryption::maybe_decrypt( get_post_meta( $post->ID, '_camppayments_payable_to', true ) ),
+ get_edit_post_link( $post->ID ),
+ get_post_meta( $post->ID, '_camppayments_file_notes', true ),
+ );
+
+ restore_current_blog();
+
+ if ( ! empty( $row ) ) {
+ fputcsv( $report, $row );
+ }
+ }
+
+ fclose( $report );
+ return ob_get_clean();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludesreimbursementrequestphp"></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/includes/reimbursement-request.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/includes/reimbursement-request.php 2016-03-08 15:00:51 UTC (rev 2707)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php 2016-03-08 15:01:52 UTC (rev 2708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,11 +256,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'status', 'status_nonce' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $back_compat_statuses = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wcbrr_submitted' => 'pending-approval',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wcbrr_submitted' => 'wcb-pending-approval',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wcbrr_info_requested' => 'wcb-incomplete',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wcbrr_rejected' => 'wcb-failed',
- 'wcbrr_in_process' => 'pending-payment',
- 'wcbrr_paid' => 'wcb-paid',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wcbrr_rejected' => 'wcb-failed',
+ 'wcbrr_in_process' => 'wcb-pending-payment',
+ 'wcbrr_paid' => 'wcb-paid',
</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"> // Map old statuses to new statuses.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -711,3 +711,96 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $required_capabilities;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+function _generate_payment_report_default( $args ) {
+ $column_headings = array(
+ 'WordCamp', 'ID', 'Title', 'Status', 'Paid', 'Requested', 'Amount',
+ 'Reason', 'Categories', 'Payment Method', 'Name',
+ 'Check Payable To', 'URL',
+ );
+
+ ob_start();
+ $report = fopen( 'php://output', 'w' );
+
+ fputcsv( $report, $column_headings );
+
+ foreach( $args['data'] as $entry ) {
+ switch_to_blog( $entry->blog_id );
+
+ $post = get_post( $entry->request_id );
+
+ $back_compat_statuses = array(
+ 'wcbrr_submitted' => 'wcb-pending-approval',
+ 'wcbrr_info_requested' => 'wcb-incomplete',
+ 'wcbrr_rejected' => 'wcb-failed',
+ 'wcbrr_in_process' => 'wcb-pending-payment',
+ 'wcbrr_paid' => 'wcb-paid',
+ );
+
+ // Map old statuses to new statuses.
+ if ( array_key_exists( $post->post_status, $back_compat_statuses ) ) {
+ $post->post_status = $back_compat_statuses[ $post->post_status ];
+ }
+
+ if ( $args['status'] && $post->post_status != $args['status'] ) {
+ restore_current_blog();
+ continue;
+ } elseif ( $post->post_type != POST_TYPE ) {
+ restore_current_blog();
+ continue;
+ }
+
+ $currency = get_post_meta( $post->ID, '_wcbrr_currency', true );
+ $reason = get_post_meta( $post->ID, '_wcbrr_reason', true );
+ $expenses = get_post_meta( $post->ID, '_wcbrr_expenses', true );
+
+ $amount = 0;
+ $categories = array();
+
+ if ( strpos( $currency, 'null' ) === 0 ) {
+ $currency = '';
+ }
+
+ if ( strpos( $reason, 'null' ) === 0 ) {
+ $reason = '';
+ }
+
+ foreach ( $expenses as $expense ) {
+ if ( ! empty( $expense['_wcbrr_amount'] ) ) {
+ $amount += floatval( $expense['_wcbrr_amount'] );
+ }
+
+ if ( ! empty( $expense['_wcbrr_category'] ) ) {
+ $categories[] = $expense['_wcbrr_category'];
+ }
+ }
+
+ $amount = number_format( $amount, 2, '.', '' );
+ $status = get_post_status_object( $post->post_status );
+
+ $row = array(
+ get_wordcamp_name(),
+ sprintf( '%d-%d', $entry->blog_id, $entry->request_id ),
+ html_entity_decode( $post->post_title ),
+ $status->label,
+ date( 'Y-m-d', absint( get_post_meta( $post->ID, '_wcbrr_date_paid', true ) ) ),
+ date( 'Y-m-d', strtotime( $post->post_date_gmt ) ),
+ $amount,
+ $currency,
+ implode( ',', $categories ),
+ get_post_meta( $post->ID, '_wcbrr_payment_method', true ),
+ get_post_meta( $post->ID, '_wcbrr_name_of_payer', true ),
+ \WCP_Encryption::maybe_decrypt( get_post_meta( $post->ID, '_wcbrr_payable_to', true ) ),
+ get_edit_post_link( $post->ID ),
+ );
+
+ restore_current_blog();
+
+ if ( ! empty( $row ) ) {
+ fputcsv( $report, $row );
+ }
+ }
+
+ fclose( $report );
+ return ob_get_clean();
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>