<!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>[2526] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network: WordCamp Budgets Dashboard: Store the corresponding QBO ID for an invoice.</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/2526">2526</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/2526","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-18 22:22:32 +0000 (Thu, 18 Feb 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 Dashboard: Store the corresponding QBO ID for an invoice.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludessponsorinvoicesdashboardphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/sponsor-invoices-dashboard.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkjavascriptsponsorinvoicesjs">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/javascript/sponsor-invoices.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludessponsorinvoicesdashboardphp"></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/sponsor-invoices-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/sponsor-invoices-dashboard.php 2016-02-18 21:59:38 UTC (rev 2525)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/sponsor-invoices-dashboard.php 2016-02-18 22:22:32 UTC (rev 2526)
</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 = 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+const LATEST_DATABASE_VERSION = 2;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'DOING_AJAX' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_ajax_wcbdsi_approve_invoice', __NAMESPACE__ . '\handle_approve_invoice_request' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,6 +164,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE $table_name (
</span><span class="cx" style="display: block; padding: 0 10px"> blog_id int( 11 ) unsigned NOT NULL default '0',
</span><span class="cx" style="display: block; padding: 0 10px"> invoice_id int( 11 ) unsigned NOT NULL default '0',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ qbo_invoice_id int( 11 ) unsigned NOT NULL default '0',
</ins><span class="cx" style="display: block; padding: 0 10px"> invoice_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">@@ -213,15 +214,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( array( 'error' => 'Permission denied.' ) );
</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">+ switch_to_blog( $site_id );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $quickbooks_result = send_invoice_to_quickbooks( $site_id, $invoice_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'sent' === $quickbooks_result ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_int( $quickbooks_result ) ) {
+ update_post_meta( $invoice_id, '_wcbsi_qbo_invoice_id', absint( $quickbooks_result ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_invoice_status( $site_id, $invoice_id, 'approved' );
</span><span class="cx" style="display: block; padding: 0 10px"> notify_organizer_status_changed( $site_id, $invoice_id, 'approved' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_send_json_success( array( 'message' => 'The invoice has been approved.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $result = array( 'success' => 'The invoice has been approved and e-mailed to the sponsor.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_send_json_error( array( 'error' => $quickbooks_result ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = array( 'error' => $quickbooks_result );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ restore_current_blog();
+
+ if ( isset( $result['success'] ) ) {
+ wp_send_json_success( $result );
+ } else {
+ wp_send_json_error( $result );
+ }
</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">@@ -230,7 +243,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $site_id
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $invoice_id
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return int|string
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function send_invoice_to_quickbooks( $site_id, $invoice_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $site_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,7 +274,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"> $sent = 'QuickBooks integration is not complete yet.';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // todo return 'sent' (string) on success, or an error message string on failure
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // todo return QBO invoice ID on success, or an error message string on failure
</ins><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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,6 +432,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $index_row = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => get_current_blog_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'invoice_id' => $invoice_id,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'qbo_invoice_id' => get_post_meta( $invoice_id, '_wcbsi_qbo_invoice_id', true ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'invoice_title' => $invoice->post_title,
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => $invoice->post_status,
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamp_name' => get_wordcamp_name(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,7 +443,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'amount' => get_post_meta( $invoice_id, '_wcbsi_amount', true ),
</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">- $formats = array( '%d', '%d', '%s', '%s', '%s', '%s', '%s', '%s', '%d', '%f' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $formats = array( '%d', '%d', '%d', '%s', '%s', '%s', '%s', '%s', '%s', '%d', '%f' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->replace( get_index_table_name(), $index_row, $formats );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkjavascriptsponsorinvoicesjs"></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/javascript/sponsor-invoices.js</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/javascript/sponsor-invoices.js 2016-02-18 21:59:38 UTC (rev 2525)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/javascript/sponsor-invoices.js 2016-02-18 22:22:32 UTC (rev 2526)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( response.hasOwnProperty( 'success' ) && true === response.success ) {
</span><span class="cx" style="display: block; padding: 0 10px"> statusMessage.addClass( 'notice notice-success' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- statusMessage.html( _.escape( response.data.message ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ statusMessage.html( _.escape( response.data.success ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> statusMessage.addClass( 'notice notice-error' );
</span><span class="cx" style="display: block; padding: 0 10px"> statusMessage.html( _.escape( 'ERROR: ' + response.data.error ) );
</span></span></pre>
</div>
</div>
</body>
</html>