<!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>[2771] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network: WordCamp Budgets: Process imports from JPM export 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/2771">2771</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/2771","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-21 18:24:04 +0000 (Mon, 21 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: Process imports from JPM export files.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkcsswordcampbudgetsdashboardcss">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/css/wordcamp-budgets-dashboard.css</a></li>
<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_htmlwpcontentpluginswordcamppaymentsnetworkcsswordcampbudgetsdashboardcss"></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/css/wordcamp-budgets-dashboard.css</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/css/wordcamp-budgets-dashboard.css 2016-03-21 14:09:51 UTC (rev 2770)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/css/wordcamp-budgets-dashboard.css 2016-03-21 18:24:04 UTC (rev 2771)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,3 +20,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .wcbdsi-approve-invoice.hidden {
</span><span class="cx" style="display: block; padding: 0 10px"> display: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+.wcb-import-message svg {
+ width: 18px;
+ height: 18px;
+ float: left;
+}
+
+.wcb-import-message svg.sucess {
+ fill: #46b450;
+}
+
+.wcb-import-message svg.error {
+ fill: #dc3232;
+}
+
+.wcb-import-message span {
+ display: block;
+ margin-left: 24px;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<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-21 14:09:51 UTC (rev 2770)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php 2016-03-21 18:24:04 UTC (rev 2771)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,52 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( isset( WCB_Import_Results::$data ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2>Import Results</h2>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <pre><?php echo esc_html( print_r( WCB_Import_Results::$data, true ) ); ?></pre>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table class="wp-list-table widefat">
+ <thead>
+ <tr>
+ <th>Request</th>
+ <th>Amount</th>
+ <th>Blog ID</th>
+ <th>Post ID</th>
+ <th>Message</th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach ( WCB_Import_Results::$data as $entry ) : ?>
+ <tr>
+ <td><?php
+ $labels = array(
+ 'wcp_payment_request' => 'Vendor',
+ 'wcb_reimbursement' => 'Reimbursement',
+ );
+ $label = ! empty( $labels[ $entry['post_type'] ] ) ? $labels[ $entry['post_type'] ] : 'Unknown';
+ printf( '%s: %s', $label, esc_html( $entry['post_title'] ) );
+ ?></td>
+ <td><?php
+ printf( '%s %s', number_format( $entry['amount'], 2 ), esc_html( $entry['currency'] ) );
+ ?></td>
+ <td><?php
+ if ( ! empty( $entry['blog_id'] ) ) {
+ printf( '<a href="%s" target="_blank">%d</a>', esc_url( $entry['edit_all_url'] ), $entry['blog_id'] );
+ }
+ ?></td>
+ <td><?php
+ if ( ! empty( $entry['post_id'] ) ) {
+ printf( '<a href="%s" target="_blank">%d</a>', esc_url( $entry['edit_post_url'] ), $entry['post_id'] );
+ }
+ ?></td>
+ <td class="wcb-import-message">
+ <?php if ( $entry['processed'] ) : ?>
+ <svg class="success" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1472 930v318q0 119-84.5 203.5t-203.5 84.5h-832q-119 0-203.5-84.5t-84.5-203.5v-832q0-119 84.5-203.5t203.5-84.5h832q63 0 117 25 15 7 18 23 3 17-9 29l-49 49q-10 10-23 10-3 0-9-2-23-6-45-6h-832q-66 0-113 47t-47 113v832q0 66 47 113t113 47h832q66 0 113-47t47-113v-254q0-13 9-22l64-64q10-10 23-10 6 0 12 3 20 8 20 29zm231-489l-814 814q-24 24-57 24t-57-24l-430-430q-24-24-24-57t24-57l110-110q24-24 57-24t57 24l263 263 647-647q24-24 57-24t57 24l110 110q24 24 24 57t-24 57z"/></svg>
+ <?php else : ?>
+ <svg class="error" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M896 128q209 0 385.5 103t279.5 279.5 103 385.5-103 385.5-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103zm128 1247v-190q0-14-9-23.5t-22-9.5h-192q-13 0-23 10t-10 23v190q0 13 10 23t23 10h192q13 0 22-9.5t9-23.5zm-2-344l18-621q0-12-10-18-10-8-24-8h-220q-14 0-24 8-10 6-10 18l17 621q0 10 10 17.5t24 7.5h185q14 0 23.5-7.5t10.5-17.5z"/></svg>
+ <?php endif; ?>
+ <span><?php echo esc_html( $entry['message'] ); ?></span>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>Import payment results from JPM reports CSV.</p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,7 +518,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamp-budgets-dashboard',
</span><span class="cx" style="display: block; padding: 0 10px"> plugins_url( 'css/wordcamp-budgets-dashboard.css', __DIR__ ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 2
</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 ( $hook == 'budgets_page_wcb-import-export' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -671,13 +716,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $entry = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => strtolower( $line[11] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'status' => strtolower( $line[7] ),
- 'amount' => round( floatval( $line[13] ), 2 ),
- 'currency' => strtoupper( $line[14] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => null,
+ 'post_type' => null,
+ 'post_title' => null,
+ 'status' => null,
+ 'amount' => null,
+ 'currency' => null,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'processed' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'data' => null,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'message' => null,
+
+ 'edit_all_url' => null,
+ 'edit_post_url' => null,
</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"> switch ( $entry['type'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,17 +736,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $line[44] ) && preg_match( '#^wcb-([0-9]+)-([0-9]+)$#', $line[44], $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $entry['blog_id'] = $matches[1];
</span><span class="cx" style="display: block; padding: 0 10px"> $entry['post_id'] = $matches[2];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $entry['status'] = strtolower( $line[7] );
+ $entry['amount'] = round( floatval( $line[13] ), 2 );
+ $entry['currency'] = strtoupper( $line[14] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'ach':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $line[91] ) && preg_match( '#^([0-9]+)-([0-9]+)$#', $line[91], $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $entry['blog_id'] = $matches[1];
</span><span class="cx" style="display: block; padding: 0 10px"> $entry['post_id'] = $matches[2];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $entry['status'] = strtolower( $line[7] );
+ $entry['amount'] = round( floatval( $line[13] ), 2 );
+ $entry['currency'] = strtoupper( $line[14] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ default:
+ $entry['message'] = 'Unknown payment type.';
+ $results[] = $entry;
+ continue;
</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 ( empty( $entry['blog_id'] ) || empty( $entry['post_id'] ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $entry['message'] = 'Blog ID or post ID is empty.';
</ins><span class="cx" style="display: block; padding: 0 10px"> $results[] = $entry;
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -726,10 +788,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _import_process_entry( $entry ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $entry['post_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $post || ! in_array( $post->post_type, array( 'wcp_payment_request', 'wcb_reimbursement' ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $entry['data'] = 'Post not found or post type mismatch';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $entry['message'] = 'Post not found or post type mismatch';
</ins><span class="cx" style="display: block; padding: 0 10px"> return $entry;
</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">+ $entry['title'] = $post->post_title;
+ $entry['post_type'] = $post->post_type;
+ $entry['edit_all_url'] = admin_url( 'edit.php?post_type=' . $post->post_type );
+ $entry['edit_post_url'] = get_edit_post_link( $post->ID );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $currency = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $amout = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -748,7 +815,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $amount = round( $amount, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $entry['currency'] ) || $entry['currency'] != $currency ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $entry['data'] = 'Currency mismatch';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $entry['message'] = 'Currency mismatch';
</ins><span class="cx" style="display: block; padding: 0 10px"> return $entry;
</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">@@ -756,12 +823,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $entry['amount'] = round( $entry['amount'], 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $entry['amount'] !== $amount ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $entry['data'] = 'Payment amount mismatch';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $entry['message'] = 'Payment amount mismatch';
</ins><span class="cx" style="display: block; padding: 0 10px"> return $entry;
</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 Do some magic here.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $entry['type'] == 'wire' ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $entry['status'] != 'completed' ) {
+ $entry['message'] = 'Unknown wire status.';
+ return $entry;
+ }
+
+ $post->post_status = 'wcb-paid';
+ wp_insert_post( $post );
+ $entry['message'] = 'Wire request marked as paid.';
+
+ \WordCamp_Budgets::log( $post->ID, get_current_user_id(), 'Wire marked as paid via an import in Network Admin', array(
+ 'action' => 'paid-via-import',
+ ) );
+
+ } elseif ( $entry['type'] == 'ach' ) {
+
+ if ( $entry['status'] != 'delivered' ) {
+ $entry['message'] = 'Unknown ACH status.';
+ return $entry;
+ }
+
+ $post->post_status = 'wcb-paid';
+ wp_insert_post( $post );
+ $entry['message'] = 'ACH request marked as paid.';
+
+ \WordCamp_Budgets::log( $post->ID, get_current_user_id(), 'ACH marked as paid via an import in Network Admin', array(
+ 'action' => 'paid-via-import',
+ ) );
+
+ } else {
+ $entry['message'] = 'Unknown payment method.';
+ return $entry;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // All good.
</span><span class="cx" style="display: block; padding: 0 10px"> $entry['processed'] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> return $entry;
</span></span></pre>
</div>
</div>
</body>
</html>