<!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>[3111] sites/trunk/wordcamp.org/public_html/wp-content/plugins: WordCamp QBO: Replace invoice title with sponsorship level in line description.</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/3111">3111</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/3111","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-05-10 20:43:48 +0000 (Tue, 10 May 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 QBO: Replace invoice title with sponsorship level in line description.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampqbowordcampqbophp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo/wordcamp-qbo.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampqboclientwordcampqboclientphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo-client/wordcamp-qbo-client.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampqbowordcampqbophp"></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-qbo/wordcamp-qbo.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-qbo/wordcamp-qbo.php 2016-05-10 19:18:15 UTC (rev 3110)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo/wordcamp-qbo.php 2016-05-10 20:43:48 UTC (rev 3111)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,10 +301,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->get_param( 'sponsor' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $request->get_param( 'currency_code' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $request->get_param( 'qbo_class_id' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request->get_param( 'invoice_title' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request->get_param( 'sponsorship_level' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $request->get_param( 'amount' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $request->get_param( 'description' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $request->get_param( 'statement_memo' )
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // todo realign
</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 ( is_wp_error( $invoice_id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,20 +331,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $sponsor
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $currency_code
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $class_id
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $invoice_title
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $sponsorship_level
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param float $amount
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $description
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $statement_memo
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error Invoice ID on success; error on failure
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected static function create_invoice( $wordcamp_name, $sponsor, $currency_code, $class_id, $invoice_title, $amount, $description, $statement_memo ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static function create_invoice( $wordcamp_name, $sponsor, $currency_code, $class_id, $sponsorship_level, $amount, $description, $statement_memo ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $qbo_request = self::build_qbo_create_invoice_request(
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_name,
</span><span class="cx" style="display: block; padding: 0 10px"> $sponsor,
</span><span class="cx" style="display: block; padding: 0 10px"> $currency_code,
</span><span class="cx" style="display: block; padding: 0 10px"> $class_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $invoice_title,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sponsorship_level,
</ins><span class="cx" style="display: block; padding: 0 10px"> $amount,
</span><span class="cx" style="display: block; padding: 0 10px"> $description,
</span><span class="cx" style="display: block; padding: 0 10px"> $sponsor['email-address'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,13 +375,13 @@
</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">- * Build the requset to create an invoice in QuickBooks
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Build the request to create an invoice in QuickBooks
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $wordcamp_name
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $sponsor
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $currency_code
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $class_id
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $invoice_title
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $sponsorship_level
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param float $amount
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $description
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $customer_email
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,7 +389,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected static function build_qbo_create_invoice_request( $wordcamp_name, $sponsor, $currency_code, $class_id, $invoice_title, $amount, $description, $customer_email, $statement_memo ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static function build_qbo_create_invoice_request( $wordcamp_name, $sponsor, $currency_code, $class_id, $sponsorship_level, $amount, $description, $customer_email, $statement_memo ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $customer_id = self::probably_get_customer_id( $sponsor, $currency_code );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $customer_id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,11 +398,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_name = sanitize_text_field( $wordcamp_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $class_id = sanitize_text_field( $class_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $invoice_title = sanitize_text_field( $invoice_title );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sponsorship_level = sanitize_text_field( $sponsorship_level );
</ins><span class="cx" style="display: block; padding: 0 10px"> $amount = floatval( $amount );
</span><span class="cx" style="display: block; padding: 0 10px"> $description = sanitize_text_field( $description );
</span><span class="cx" style="display: block; padding: 0 10px"> $statement_memo = sanitize_text_field( $statement_memo );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ //todo realign
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $line_description = $wordcamp_name;
+ if ( $sponsorship_level ) {
+ $line_description .= " - $sponsorship_level";
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * The currency code only needs to be sanitized, not validated, because QBO will reject the invoice if
</span><span class="cx" style="display: block; padding: 0 10px"> * an invalid code is passed. We don't have to worry about an invoice being assigned the the home currency
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,7 +462,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Line' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Amount' => $amount,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Description' => sprintf( '%s - %s', $wordcamp_name, $invoice_title ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Description' => $line_description,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'DetailType' => 'SalesItemLineDetail',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'SalesItemLineDetail' => array(
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampqboclientwordcampqboclientphp"></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-qbo-client/wordcamp-qbo-client.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-qbo-client/wordcamp-qbo-client.php 2016-05-10 19:18:15 UTC (rev 3110)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo-client/wordcamp-qbo-client.php 2016-05-10 20:43:48 UTC (rev 3111)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,14 +307,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $invoice = get_post( $invoice_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $invoice_meta = get_post_custom( $invoice_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $sponsor_meta = get_post_custom( $invoice_meta['_wcbsi_sponsor_id'][0] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sponsorship_level = self::get_sponsorship_level( $invoice_meta['_wcbsi_sponsor_id'][0] );
+ // todo realign
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $payload = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamp_name' => sanitize_text_field( get_wordcamp_name() ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'invoice_title' => sanitize_text_field( $invoice->post_title ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sponsorship_level' => sanitize_text_field( $sponsorship_level ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'currency_code' => sanitize_text_field( $invoice_meta['_wcbsi_currency' ][0] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'qbo_class_id' => sanitize_text_field( $invoice_meta['_wcbsi_qbo_class_id' ][0] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'amount' => floatval( $invoice_meta['_wcbsi_amount' ][0] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => sanitize_text_field( $invoice_meta['_wcbsi_description' ][0] ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // todo realign
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'statement_memo' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'WordCamp.org Invoice: %s',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,6 +362,24 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get the sponsorship level name assigned to a sponsor
+ *
+ * @param int $sponsor_id
+ *
+ * @return false|string
+ */
+ public static function get_sponsorship_level( $sponsor_id ) {
+ $sponsorship_level = false;
+ $sponsorship_levels = wp_get_object_terms( $sponsor_id, 'wcb_sponsor_level' );
+
+ if ( isset( $sponsorship_levels[0]->name ) ) {
+ $sponsorship_level = $sponsorship_levels[0]->name;
+ }
+
+ return $sponsorship_level;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Get the paid invoices from the given set of sent invoices
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $sent_invoices
</span></span></pre>
</div>
</div>
</body>
</html>