<!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>[2709] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php: WordCamp Budgets: Move check exports to vendor/reimbursement files.</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/2709">2709</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/2709","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 16:46: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 check exports to vendor/reimbursement files.</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 15:01:52 UTC (rev 2708)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php 2016-03-08 16:46:52 UTC (rev 2709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -345,126 +345,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_jpm_checks( $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">- $options = apply_filters( 'wcb_payment_req_check_options', array(
- 'pws_customer_id' => '',
- 'account_number' => '',
- 'contact_email' => '',
- 'contact_phone' => '',
- ) );
-
- $report = fopen( 'php://output', 'w' );
- ob_start();
-
- // File Header
- fputcsv( $report, array( 'FILHDR', 'PWS', $options['pws_customer_id'], date( 'm/d/Y' ), date( 'Hi' ) ), ',', '|' );
-
- $total = 0;
- $count = 0;
-
- if ( false !== get_site_transient( '_wcb_jpm_checks_counter_lock' ) ) {
- wp_die( 'JPM Checks Export is locked. Please try again later or contact support.' );
</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_jpm_checks( $args );
+ } elseif ( $args['post_type'] == 'wcb_reimbursement' ) {
+ return \WordCamp\Budgets\Reimbursement_Requests\_generate_payment_report_jpm_checks( $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">-
- // Avoid at least *some* race conditions.
- set_site_transient( '_wcb_jpm_checks_counter_lock', 1, 30 );
- $start = absint( get_site_option( '_wcb_jpm_checks_counter', 0 ) );
-
- foreach ( $args['request_indexes'] as $index ) {
- switch_to_blog( $index->blog_id );
- $post = get_post( $index->post_id );
-
- if ( $args['status'] && $post->post_status != $args['status'] ) {
- restore_current_blog();
- continue;
- }
-
- if ( get_post_meta( $post->ID, '_camppayments_payment_method', true ) != 'Check' ) {
- restore_current_blog();
- continue;
- }
-
- $count++;
- $amount = round( floatval( get_post_meta( $post->ID, '_camppayments_payment_amount', true ) ), 2 );
- $total += $amount;
-
- $payable_to = \WCP_Encryption::maybe_decrypt( get_post_meta( $post->ID, '_camppayments_payable_to', true ) );
- $payable_to = html_entity_decode( $payable_to ); // J&J to J&J
- $countries = \WordCamp_Budgets::get_valid_countries_iso3166();
- $vendor_country_code = get_post_meta( $post->ID, '_camppayments_vendor_country_iso3166', true );
- if ( ! empty( $countries[ $vendor_country_code ] ) ) {
- $vendor_country_code = $countries[ $vendor_country_code ]['alpha3'];
- }
-
- $description = sanitize_text_field( get_post_meta( $post->ID, '_camppayments_description', true ) );
- $description = html_entity_decode( $description );
- $invoice_number = get_post_meta( $post->ID, '_camppayments_invoice_number', true );
- if ( ! empty( $invoice_number ) ) {
- $description = sprintf( 'Invoice %s. %s', $invoice_number, $description );
- }
-
- // Payment Header
- fputcsv( $report, array(
- 'PMTHDR',
- 'USPS',
- 'QKCHECKS',
- date( 'm/d/Y' ),
- number_format( $amount, 2, '.', '' ),
- $options['account_number'],
- $start + $count, // must be globally unique?
- $options['contact_email'],
- $options['contact_phone'],
- ), ',', '|' );
-
- // Payee Name Record
- fputcsv( $report, array(
- 'PAYENM',
- substr( $payable_to, 0, 35 ),
- '',
- sprintf( '%d-%d', $index->blog_id, $index->post_id ),
- ), ',', '|' );
-
- // Payee Address Record
- fputcsv( $report, array(
- 'PYEADD',
- substr( get_post_meta( $post->ID, '_camppayments_vendor_street_address', true ), 0, 35 ),
- '',
- ), ',', '|' );
-
- // Additional Payee Address Record
- fputcsv( $report, array( 'ADDPYE', '', '' ), ',', '|' );
-
- // Payee Postal Record
- fputcsv( $report, array(
- 'PYEPOS',
- substr( get_post_meta( $post->ID, '_camppayments_vendor_city', true ), 0, 35 ),
- substr( get_post_meta( $post->ID, '_camppayments_vendor_state', true ), 0, 35 ),
- substr( get_post_meta( $post->ID, '_camppayments_vendor_zip_code', true ), 0, 10 ),
- substr( $vendor_country_code, 0, 3 ),
- ), ',', '|' );
-
- // Payment Description
- fputcsv( $report, array(
- 'PYTDES',
- substr( $description, 0, 122 ),
- ), ',', '|' );
-
- restore_current_blog();
- }
-
- // File Trailer
- fputcsv( $report, array( 'FILTRL', $count * 6 + 2 ), ',', '|' );
-
- // Update counter and unlock
- $start = absint( get_site_option( '_wcb_jpm_checks_counter', 0 ) );
- update_site_option( '_wcb_jpm_checks_counter', $start + $count );
- delete_site_transient( '_wcb_jpm_checks_counter_lock' );
-
- 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>