<!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>[2601] sites/trunk/wordcamp.org/public_html/wp-content/plugins: WordCamp Budgets: Partially remove the Due Date field.</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/2601">2601</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/2601","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-24 23:46:55 +0000 (Wed, 24 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: Partially remove the Due Date field.
It's no longer being used, so it can be removed everywhere. I didn't remove it from the index yet, though, because I ran into a problem with `dbDelta` updating the primary keys on the table, and fixing that isn't a blocker for the launch. We should come back and fix that next week.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludessponsorinvoicephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-invoice.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewssponsorinvoicemetaboxgeneralphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/sponsor-invoice/metabox-general.php</a></li>
<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_htmlwpcontentpluginswordcamppaymentsnetworkincludessponsorinvoiceslisttablephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/sponsor-invoices-list-table.php</a></li>
<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_htmlwpcontentpluginswordcamppaymentsincludessponsorinvoicephp"></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/includes/sponsor-invoice.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/includes/sponsor-invoice.php 2016-02-24 23:21:30 UTC (rev 2600)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-invoice.php 2016-02-24 23:46:55 UTC (rev 2601)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,14 +288,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $selected_sponsor_id = get_post_meta( $post->ID, '_wcbsi_sponsor_id', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $selected_class_id = get_post_meta( $post->ID, '_wcbsi_qbo_class_id', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $selected_currency = get_post_meta( $post->ID, '_wcbsi_currency', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $due_date = get_post_meta( $post->ID, '_wcbsi_due_date', true );
</del><span class="cx" style="display: block; padding: 0 10px"> $description = get_post_meta( $post->ID, '_wcbsi_description', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $amount = get_post_meta( $post->ID, '_wcbsi_amount', true );
</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 ( $due_date ) {
- $due_date = date( 'Y-m-d', $due_date );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( 'add' === $current_screen->action && isset( $_GET['sponsor_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $selected_sponsor_id = absint( $_GET['sponsor_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,7 +337,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sponsor_fields_complete = 'true' === $sponsor['data_attributes']['required-fields-complete'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $required_invoice_fields = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '_wcbsi_sponsor_id', '_wcbsi_due_date', '_wcbsi_description', '_wcbsi_currency', '_wcbsi_amount',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '_wcbsi_sponsor_id', '_wcbsi_description', '_wcbsi_currency', '_wcbsi_amount',
</ins><span class="cx" style="display: block; padding: 0 10px"> '_wcbsi_qbo_class_id',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $invoice_fields_complete = required_fields_complete( $post_data_raw, $required_invoice_fields );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,16 +380,12 @@
</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"> // Sanitize and save the field values
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fields = array( 'sponsor_id', 'qbo_class_id', 'currency', 'due_date', 'description', 'amount' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fields = array( 'sponsor_id', 'qbo_class_id', 'currency', 'description', 'amount' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( $fields as $field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_key = "_wcbsi_$field";
</span><span class="cx" style="display: block; padding: 0 10px"> $value = sanitize_text_field( wp_unslash( $_POST[ $meta_key ] ) );
</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 ( 'due_date' == $field ) {
- $value = strtotime( $value );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( 'amount' == $field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = \WordCamp_Budgets::validate_amount( $value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,7 +410,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'author' => __( 'Author' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => $_columns['title'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => $_columns['date'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'due_date' => __( 'Due Date', 'wordcamporg' ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'sponsor_name' => __( 'Sponsor', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'payment_amount' => __( 'Amount', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -435,12 +425,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function render_columns( $column, $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $column ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'due_date':
- if ( $date = get_post_meta( $post_id, '_wcbsi_due_date', true ) ) {
- echo date( 'Y-m-d', $date );
- }
- break;
-
</del><span class="cx" style="display: block; padding: 0 10px"> case 'sponsor_name':
</span><span class="cx" style="display: block; padding: 0 10px"> // todo could reuse get_sponsor_name() from dashboard if made some minor modifications
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewssponsorinvoicemetaboxgeneralphp"></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/views/sponsor-invoice/metabox-general.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/views/sponsor-invoice/metabox-general.php 2016-02-24 23:21:30 UTC (rev 2600)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/sponsor-invoice/metabox-general.php 2016-02-24 23:46:55 UTC (rev 2601)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,21 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- <li>
- <label for="_wcbsi_due_date">
- <?php _e( 'Due Date:', 'wordcamporg' ); ?>
- </label>
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input
- type="date"
- class="regular-text"
- id="_wcbsi_due_date"
- name="_wcbsi_due_date"
- value="<?php echo esc_attr( $due_date ); ?>"
- />
- </li>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="_wcbsi_description">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Description:', 'wordcamporg' ); ?>
</span></span></pre></div>
<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-24 23:21:30 UTC (rev 2600)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/sponsor-invoices-dashboard.php 2016-02-24 23:46:55 UTC (rev 2601)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -404,7 +404,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'sponsor_name' => get_sponsor_name( $invoice_id ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => get_post_meta( $invoice_id, '_wcbsi_description', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'currency' => get_post_meta( $invoice_id, '_wcbsi_currency', true ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'due_date' => get_post_meta( $invoice_id, '_wcbsi_due_date', true ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'due_date' => 0, // todo remove this field from index
</ins><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></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludessponsorinvoiceslisttablephp"></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-list-table.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-list-table.php 2016-02-24 23:21:30 UTC (rev 2600)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/sponsor-invoices-list-table.php 2016-02-24 23:46:55 UTC (rev 2601)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamp_name' => 'WordCamp',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sponsor_name' => 'Sponsor',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'Description',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'due_date' => 'Due Date',
</del><span class="cx" style="display: block; padding: 0 10px"> 'amount' => 'Amount',
</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">@@ -57,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT *
</span><span class="cx" style="display: block; padding: 0 10px"> FROM $table_name
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE status = %s
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ORDER BY due_date ASC
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ORDER BY blog_id, invoice_id ASC
</ins><span class="cx" style="display: block; padding: 0 10px"> LIMIT %d
</span><span class="cx" style="display: block; padding: 0 10px"> OFFSET %d",
</span><span class="cx" style="display: block; padding: 0 10px"> $status,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,15 +118,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $index_row
</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 function column_due_date( $index_row ) {
- return esc_html( date( 'Y-m-d', $index_row->due_date ) );
- }
-
- /**
- * Render the value for the Due Date column
- *
- * @param object $index_row
- */
</del><span class="cx" style="display: block; padding: 0 10px"> protected function column_amount( $index_row ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return wp_kses(
</span><span class="cx" style="display: block; padding: 0 10px"> \WordCamp\Budgets_Dashboard\format_amount( $index_row->amount, $index_row->currency ),
</span></span></pre></div>
<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-02-24 23:21:30 UTC (rev 2600)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo/wordcamp-qbo.php 2016-02-24 23:46:55 UTC (rev 2601)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,7 +303,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->get_param( 'invoice_title' ),
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request->get_param( 'due_date' ),
</del><span class="cx" style="display: block; padding: 0 10px"> $request->get_param( 'statement_memo' )
</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">@@ -332,12 +331,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $invoice_title
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $due_date
</del><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( $sponsor, $currency_code, $class_id, $invoice_title, $amount, $description, $due_date, $statement_memo ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static function create_invoice( $sponsor, $currency_code, $class_id, $invoice_title, $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"> $sponsor,
</span><span class="cx" style="display: block; padding: 0 10px"> $currency_code,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -345,7 +343,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $invoice_title,
</span><span class="cx" style="display: block; padding: 0 10px"> $amount,
</span><span class="cx" style="display: block; padding: 0 10px"> $description,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $due_date,
</del><span class="cx" style="display: block; padding: 0 10px"> $sponsor['email-address'],
</span><span class="cx" style="display: block; padding: 0 10px"> $statement_memo
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,13 +379,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $invoice_title
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $due_date
</del><span class="cx" style="display: block; padding: 0 10px"> * @param string $customer_email
</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 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( $sponsor, $currency_code, $class_id, $invoice_title, $amount, $description, $due_date, $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( $sponsor, $currency_code, $class_id, $invoice_title, $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">@@ -399,7 +395,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $invoice_title = sanitize_text_field( $invoice_title );
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $due_date = sanitize_text_field( $due_date );
</del><span class="cx" style="display: block; padding: 0 10px"> $statement_memo = sanitize_text_field( $statement_memo );
</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">@@ -420,7 +415,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $customer_email = is_email( $customer_email );
</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">- foreach ( array( 'amount', 'due_date', 'customer_id', 'customer_email' ) as $field ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( array( 'amount', 'customer_id', 'customer_email' ) as $field ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $$field ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'required_field_empty', "$field cannot be empty." );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -481,8 +476,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => 1, // Due on receipt
</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">- 'DueDate' => $due_date,
-
</del><span class="cx" style="display: block; padding: 0 10px"> 'BillEmail' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Address' => $customer_email,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</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-02-24 23:21:30 UTC (rev 2600)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-qbo-client/wordcamp-qbo-client.php 2016-02-24 23:46:55 UTC (rev 2601)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,18 +308,12 @@
</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><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $due_date = new \DateTime(
- date( 'Y-m-d', $invoice_meta['_wcbsi_due_date'][0] ),
- new \DateTimeZone( get_option('timezone_string') )
- );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $payload = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'invoice_title' => sanitize_text_field( $invoice->post_title ),
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'due_date' => $due_date->format( 'Y-m-dP' ),
</del><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></pre>
</div>
</div>
</body>
</html>