<!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>[2770] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes: WordCamp Budgets: A couple of improvements to payment requests and reimbursements.</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/2770">2770</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/2770","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 14:09:51 +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: A couple of improvements to payment requests and reimbursements.
* Add an updated timestamp and index column for reimbursements.
* Move import form and handler to the Import/Export network admin menu.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludespaymentrequestsdashboardphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php</a></li>
<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_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_htmlwpcontentpluginswordcamppaymentsnetworkincludespaymentrequestsdashboardphp"></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/payment-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/payment-requests-dashboard.php 2016-03-18 05:21:27 UTC (rev 2769)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-dashboard.php 2016-03-21 14:09:51 UTC (rev 2770)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Payment_Requests_Dashboard {
</span><span class="cx" style="display: block; padding: 0 10px"> public static $list_table;
</span><span class="cx" style="display: block; padding: 0 10px"> public static $db_version = 7;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static $import_results = null;
</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"> * Runs during plugins_loaded, doh.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +17,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wordcamp_payments_aggregate', array( __CLASS__, 'aggregate' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'network_admin_menu', array( __CLASS__, 'network_admin_menu' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', array( __CLASS__, 'upgrade' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'init', array( __CLASS__, 'process_import_request' ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Diff-based updates to the index.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'save_post', array( __CLASS__, 'save_post' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,14 +245,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 class="nav-tab-wrapper"><?php self::render_dashboard_tabs(); ?></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
- if ( 'import' == self::get_current_tab() ) {
- self::render_import_tab();
- }
- else {
- self::render_table_tabs();
- }
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php self::render_table_tabs(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div> <!-- /wrap -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,145 +275,6 @@
</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">- * Renders the import tab.
- */
- public static function render_import_tab() {
- ?>
- <?php if ( isset( self::$import_results ) ) : ?>
- <h2>Import Results</h2>
- <pre><?php echo esc_html( print_r( self::$import_results, true ) ); ?></pre>
- <?php endif; ?>
-
- <p>Import payment results from JPM reports CSV.</p>
- <form method="post" enctype="multipart/form-data">
- <?php wp_nonce_field( 'import', 'wcpn_request_import' ); ?>
- <label>Import File:</label>
- <input type="file" name="wcpn_import_file" />
- <?php submit_button( 'Import' ); ?>
- </form>
- <?php
- }
-
- /**
- * Process a payments import, runs during init.
- */
- public static function process_import_request() {
- if ( empty( $_POST['submit'] ) || 'import' != self::get_current_tab() ) {
- return;
- }
-
- if ( ! current_user_can( 'manage_network' ) || ! check_admin_referer( 'import', 'wcpn_request_import' ) ) {
- return;
- }
-
- if ( empty( $_FILES['wcpn_import_file'] ) ) {
- wp_die( 'Please select a file to import.' );
- }
-
- $file = $_FILES['wcpn_import_file'];
- if ( $file['type'] != 'text/csv' ) {
- wp_die( 'Please upload a text/csv file.' );
- }
-
- if ( $file['size'] < 1 ) {
- wp_die( 'Please upload a file that is not empty.' );
- }
-
- if ( $file['error'] ) {
- wp_die( 'Some other error has occurred. Sorry.' );
- }
-
- $handle = fopen( $file['tmp_name'], 'r' );
- $count = 0;
- $header = array();
- $results = array();
-
- while ( ( $line = fgetcsv( $handle ) ) !== false ) {
- // Skip first line.
- if ( ++$count == 1 ) {
- continue;
- }
-
- $entry = array(
- 'type' => strtolower( $line[11] ),
- 'status' => strtolower( $line[7] ),
- 'amount' => round( floatval( $line[13] ), 2 ),
- 'currency' => strtoupper( $line[14] ),
- 'blog_id' => null,
- 'post_id' => null,
- 'processed' => false,
- 'data' => null,
- );
-
- switch ( $entry['type'] ) {
- case 'wire':
- if ( ! empty( $line[44] ) && preg_match( '#^wcb-([0-9]+)-([0-9]+)$#', $line[44], $matches ) ) {
- $entry['blog_id'] = $matches[1];
- $entry['post_id'] = $matches[2];
- }
- break;
- case 'ach':
- if ( ! empty( $line[91] ) && preg_match( '#^([0-9]+)-([0-9]+)$#', $line[91], $matches ) ) {
- $entry['blog_id'] = $matches[1];
- $entry['post_id'] = $matches[2];
- }
- break;
- }
-
- if ( empty( $entry['blog_id'] ) || empty( $entry['post_id'] ) ) {
- $results[] = $entry;
- continue;
- }
-
- // Don't consume memory.
- wp_suspend_cache_addition( true );
- switch_to_blog( $entry['blog_id'] );
-
- $results[] = self::_import_process_entry( $entry );
-
- restore_current_blog();
- wp_suspend_cache_addition( false );
- }
-
- fclose( $handle );
- self::$import_results = $results;
- }
-
- /**
- * Process a single import entry.
- *
- * Runs in a switch_to_blog() context.
- *
- * @param $entry Array
- * @return Array
- */
- private static function _import_process_entry( $entry ) {
- $post = get_post( $entry['post_id'] );
- if ( ! $post || $post->post_type != 'wcp_payment_request' ) {
- $entry['data'] = 'Post not found or post type mismatch';
- return $entry;
- }
-
- if ( $entry['currency'] != get_post_meta( $post->ID, '_camppayments_currency', true ) ) {
- $entry['data'] = 'Currency mismatch';
- return $entry;
- }
-
- $amount_orig = floatval( get_post_meta( $post->ID, '_camppayments_payment_amount', true ) );
- $amount_orig = round( $amount_orig, 2 );
- if ( (string) $entry['amount'] != (string) $amount_orig ) {
- $entry['data'] = 'Payment amount mismatch';
- return $entry;
- }
-
- // @todo Do some magic here.
-
- // All good.
- $entry['processed'] = true;
- return $entry;
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Loads and initializes the list table object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function pre_render_dashboard() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -446,8 +298,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'paid',
</span><span class="cx" style="display: block; padding: 0 10px"> 'cancelled-failed',
</span><span class="cx" style="display: block; padding: 0 10px"> 'incomplete',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- 'import',
</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"> if ( isset( $_REQUEST['wcp-section'] ) && in_array( $_REQUEST['wcp-section'], $tabs ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,7 +321,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'paid' => __( 'Paid', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'cancelled-failed' => __( 'Cancelled/Failed', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'incomplete' => __( 'Incomplete', 'wordcamporg' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'import' => __( 'Import', 'wordcamporg' ),
</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"> foreach ( $sections as $section_key => $section_caption ) {
</span></span></pre></div>
<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-03-18 05:21:27 UTC (rev 2769)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/reimbursement-requests-dashboard.php 2016-03-21 14:09:51 UTC (rev 2770)
</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 = 2;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const LATEST_DATABASE_VERSION = 3;
</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">@@ -153,6 +153,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> request_id int( 11 ) unsigned NOT NULL default '0',
</span><span class="cx" style="display: block; padding: 0 10px"> date_requested int( 11 ) unsigned NOT NULL default '0',
</span><span class="cx" style="display: block; padding: 0 10px"> date_paid int( 11 ) unsigned NOT NULL default '0',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ date_updated int( 11 ) unsigned NOT NULL default '0',
</ins><span class="cx" style="display: block; padding: 0 10px"> request_title varchar( 75 ) NOT NULL default '',
</span><span class="cx" style="display: block; padding: 0 10px"> status varchar( 30 ) NOT NULL default '',
</span><span class="cx" style="display: block; padding: 0 10px"> wordcamp_name varchar( 75 ) NOT NULL default '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +198,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"> // Update the timestamp and logs.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_post_meta( $request_id, '_wcb_updated_timestamp', time() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_post_meta( $request->ID, '_wcb_updated_timestamp', time() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Back-compat.
</span><span class="cx" style="display: block; padding: 0 10px"> $back_compat_statuses = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,6 +227,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'request_id' => $request_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_requested' => strtotime( $request->post_date_gmt ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_paid' => get_post_meta( $request_id, '_wcbrr_date_paid', true ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'date_updated' => absint( get_post_meta( $request->ID, '_wcb_updated_timestamp', time() ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'request_title' => $request->post_title,
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => $request->post_status,
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamp_name' => get_wordcamp_name(),
</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-18 05:21:27 UTC (rev 2769)
+++ 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)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,6 +16,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_init', __NAMESPACE__ . '\process_action_approve', 11 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_init', __NAMESPACE__ . '\process_action_set_pending_payment', 11 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'admin_init', __NAMESPACE__ . '\process_import_request', 11 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Register the Budgets Dashboard menu
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +130,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Render the Import tab
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function render_import_tab() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<p>Move along, nothing to see here.</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ <?php if ( isset( WCB_Import_Results::$data ) ) : ?>
+ <h2>Import Results</h2>
+ <pre><?php echo esc_html( print_r( WCB_Import_Results::$data, true ) ); ?></pre>
+ <?php endif; ?>
+
+ <p>Import payment results from JPM reports CSV.</p>
+ <form method="post" enctype="multipart/form-data">
+ <input type="hidden" name="wcpn-request-import" value="1" />
+ <?php wp_nonce_field( 'import', 'wcpn-request-import' ); ?>
+ <label>Import File:</label>
+ <input type="file" name="wcpn-import-file" />
+ <?php submit_button( 'Import' ); ?>
+ </form>
+ <?php
</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">@@ -611,4 +627,146 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> add_settings_error( 'wcb-dashboard', 'success', 'Success! Request has been marked as Pending Payment.', 'updated' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
+
+/**
+ * Process a payments import, runs during init.
+ */
+function process_import_request() {
+ if ( empty( $_POST['wcpn-request-import'] ) ) {
+ return;
+ }
+
+ if ( ! current_user_can( 'manage_network' ) || ! check_admin_referer( 'import', 'wcpn-request-import' ) ) {
+ return;
+ }
+
+ if ( empty( $_FILES['wcpn-import-file'] ) ) {
+ wp_die( 'Please select a file to import.' );
+ }
+
+ $file = $_FILES['wcpn-import-file'];
+ if ( $file['type'] != 'text/csv' ) {
+ wp_die( 'Please upload a text/csv file.' );
+ }
+
+ if ( $file['size'] < 1 ) {
+ wp_die( 'Please upload a file that is not empty.' );
+ }
+
+ if ( $file['error'] ) {
+ wp_die( 'Some other error has occurred. Sorry.' );
+ }
+
+ $handle = fopen( $file['tmp_name'], 'r' );
+ $count = 0;
+ $header = array();
+ $results = array();
+
+ while ( ( $line = fgetcsv( $handle ) ) !== false ) {
+ // Skip first line.
+ if ( ++$count == 1 ) {
+ continue;
+ }
+
+ $entry = array(
+ 'type' => strtolower( $line[11] ),
+ 'status' => strtolower( $line[7] ),
+ 'amount' => round( floatval( $line[13] ), 2 ),
+ 'currency' => strtoupper( $line[14] ),
+ 'blog_id' => null,
+ 'post_id' => null,
+ 'processed' => false,
+ 'data' => null,
+ );
+
+ switch ( $entry['type'] ) {
+ case 'wire':
+ if ( ! empty( $line[44] ) && preg_match( '#^wcb-([0-9]+)-([0-9]+)$#', $line[44], $matches ) ) {
+ $entry['blog_id'] = $matches[1];
+ $entry['post_id'] = $matches[2];
+ }
+ break;
+ case 'ach':
+ if ( ! empty( $line[91] ) && preg_match( '#^([0-9]+)-([0-9]+)$#', $line[91], $matches ) ) {
+ $entry['blog_id'] = $matches[1];
+ $entry['post_id'] = $matches[2];
+ }
+ break;
+ }
+
+ if ( empty( $entry['blog_id'] ) || empty( $entry['post_id'] ) ) {
+ $results[] = $entry;
+ continue;
+ }
+
+ // Don't consume memory.
+ wp_suspend_cache_addition( true );
+ switch_to_blog( $entry['blog_id'] );
+
+ $results[] = _import_process_entry( $entry );
+
+ restore_current_blog();
+ wp_suspend_cache_addition( false );
+ }
+
+ fclose( $handle );
+
+ WCB_Import_Results::$data = $results;
+}
+
+/**
+ * Process a single import entry.
+ *
+ * Runs in a switch_to_blog() context.
+ *
+ * @param $entry Array
+ * @return Array
+ */
+function _import_process_entry( $entry ) {
+ $post = get_post( $entry['post_id'] );
+ if ( ! $post || ! in_array( $post->post_type, array( 'wcp_payment_request', 'wcb_reimbursement' ) ) ) {
+ $entry['data'] = 'Post not found or post type mismatch';
+ return $entry;
+ }
+
+ $currency = false;
+ $amout = false;
+
+ if ( $post->post_type == 'wcb_reimbursement' ) {
+ $currency = get_post_meta( $post->ID, '_wcbrr_currency', true );
+ $expenses = get_post_meta( $post->ID, '_wcbrr_expenses', true );
+ foreach ( $expenses as $expense ) {
+ if ( ! empty( $expense['_wcbrr_amount'] ) ) {
+ $amount += floatval( $expense['_wcbrr_amount'] );
+ }
+ }
+ } elseif ( $post->post_type == 'wcp_payment_request' ) {
+ $currency = get_post_meta( $post->ID, '_camppayments_currency', true );
+ $amount = floatval( get_post_meta( $post->ID, '_camppayments_payment_amount', true ) );
+ }
+ $amount = round( $amount, 2 );
+
+ if ( empty( $entry['currency'] ) || $entry['currency'] != $currency ) {
+ $entry['data'] = 'Currency mismatch';
+ return $entry;
+ }
+
+ $entry['amount'] = floatval( $entry['amount'] );
+ $entry['amount'] = round( $entry['amount'], 2 );
+
+ if ( $entry['amount'] !== $amount ) {
+ $entry['data'] = 'Payment amount mismatch';
+ return $entry;
+ }
+
+ // @todo Do some magic here.
+
+ // All good.
+ $entry['processed'] = true;
+ return $entry;
+}
+
+class WCB_Import_Results {
+ public static $data;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>