<!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>[7434] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports: WordCamp Reports: Update Ticket Revenue report, other minor changes</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 { white-space: pre-line; 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/7434">7434</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/7434","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coreymckrill</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-07-12 00:22:11 +0000 (Thu, 12 Jul 2018)</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 Reports: Update Ticket Revenue report, other minor changes
* Show ticket revenue results split out by payment method (instead of WPCS
vs non-WPCS).
* Minor HTML markup changes on several reports.
* Minor code cleanup changes on several reports.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsassetscssadmincommoncss">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/assets/css/admin-common.css</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsclassesreportclasspaymentactivityphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-payment-activity.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsclassesreportclasssponsorinvoicesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-sponsor-invoices.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsclassesreportclasssponsorshipgrantsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-sponsorship-grants.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsclassesreportclassticketrevenuephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-ticket-revenue.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsindexphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/index.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewshtmlpaymentactivityphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/html/payment-activity.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewshtmlsponsorinvoicesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/html/sponsor-invoices.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewshtmlsponsorshipgrantsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/html/sponsorship-grants.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewshtmlticketrevenuephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/html/ticket-revenue.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewsreportmeetupgroupsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/meetup-groups.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewsreportpaymentactivityphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/payment-activity.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewsreportsponsorinvoicesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/sponsor-invoices.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewsreportsponsorshipgrantsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/sponsorship-grants.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewsreportticketrevenuephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/ticket-revenue.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewsreportwordcampstatusphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/wordcamp-status.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsassetscssadmincommoncss"></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-reports/assets/css/admin-common.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-reports/assets/css/admin-common.css 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/assets/css/admin-common.css 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,13 +1,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** Tables **/
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.widefat.but-not-too-wide {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.report-results table {
+ margin: 1em 0;
+}
+
+.report-results .widefat.but-not-too-wide {
</ins><span class="cx" style="display: block; padding: 0 10px"> width: auto;
</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">-td.number {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.report-results td.number {
</ins><span class="cx" style="display: block; padding: 0 10px"> text-align: right;
</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">-td.total {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.report-results td.total {
</ins><span class="cx" style="display: block; padding: 0 10px"> font-weight: bold;
</span><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>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsclassesreportclasspaymentactivityphp"></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-reports/classes/report/class-payment-activity.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-reports/classes/report/class-payment-activity.php 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-payment-activity.php 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -517,10 +517,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return void
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function render_html() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = $this->compile_report_data( $this->get_data() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $now = new \DateTime();
+ $data = $this->compile_report_data( $this->get_data() );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $start_date = $this->start_date;
</span><span class="cx" style="display: block; padding: 0 10px"> $end_date = $this->end_date;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $xrt_date = ( $end_date > $now ) ? $now : $end_date;
</ins><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_name = ( $this->wordcamp_site_id ) ? get_wordcamp_name( $this->wordcamp_site_id ) : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $requests = $data['requests'];
</span><span class="cx" style="display: block; padding: 0 10px"> $payments = $data['payments'];
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsclassesreportclasssponsorinvoicesphp"></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-reports/classes/report/class-sponsor-invoices.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-reports/classes/report/class-sponsor-invoices.php 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-sponsor-invoices.php 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,10 +473,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return void
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function render_html() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = $this->compile_report_data( $this->get_data() );
- $start_date = $this->start_date;
- $end_date = $this->end_date;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $now = new \DateTime();
+ $data = $this->compile_report_data( $this->get_data() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $start_date = $this->start_date;
+ $end_date = $this->end_date;
+ $xrt_date = ( $end_date > $now ) ? $now : $end_date;
</ins><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_name = ( $this->wordcamp_site_id ) ? get_wordcamp_name( $this->wordcamp_site_id ) : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $invoices = $data['invoices'];
</span><span class="cx" style="display: block; padding: 0 10px"> $payments = $data['payments'];
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsclassesreportclasssponsorshipgrantsphp"></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-reports/classes/report/class-sponsorship-grants.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-reports/classes/report/class-sponsorship-grants.php 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-sponsorship-grants.php 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -315,12 +315,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return void
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function render_html() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = $this->get_data();
- $compiled_data = $this->compile_report_data( $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $now = new \DateTime();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $start_date = $this->start_date;
</span><span class="cx" style="display: block; padding: 0 10px"> $end_date = $this->end_date;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $xrt_date = ( $end_date > $now ) ? $now : $end_date;
</ins><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_name = ( $this->wordcamp_site_id ) ? get_wordcamp_name( $this->wordcamp_site_id ) : '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = $this->get_data();
+ $compiled_data = $this->compile_report_data( $data );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->error->get_error_messages() ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->render_error_html();
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsclassesreportclassticketrevenuephp"></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-reports/classes/report/class-ticket-revenue.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-reports/classes/report/class-ticket-revenue.php 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/classes/report/class-ticket-revenue.php 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li>Query the CampTix events log for attendee status changes to \"publish\" or \"refund\" during the specified date range.</li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>Query each WordCamp site with matched events and retrieve ticket data related to each event.</li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>Append the ticket data to the event data.</li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li>Group the events based on whether the transaction was handled by WPCS. Assume all transactions in a currency supported by PayPal were handled by WPCS.</li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li>Group the events by payment method.</li>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ol>
</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">@@ -318,8 +318,10 @@
</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"> foreach ( $ticket_ids as $ticket_id ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $method = get_post_meta( $ticket_id, 'tix_payment_method', true ) ?: 'none';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $ticket_details[ $blog_id . '_' . $ticket_id ] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'method' => get_post_meta( $ticket_id, 'tix_payment_method', true ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'method' => $method,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'currency' => $currency,
</span><span class="cx" style="display: block; padding: 0 10px"> 'full_price' => floatval( get_post_meta( $ticket_id, 'tix_ticket_price', true ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'discounted_price' => floatval( get_post_meta( $ticket_id, 'tix_ticket_discounted_price', true ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,67 +355,77 @@
</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"> $data_groups = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wpcs' => array_merge( $initial_data, array(
- 'label' => 'WPCS ticket revenue',
- 'description' => 'Transactions using a payment method for which WPCS has an established account.',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'total' => array_merge( $initial_data, array(
+ 'label' => 'Total ticket revenue',
+ 'description' => 'Not including transaction fees.',
</ins><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'non_wpcs' => array_merge( $initial_data, array(
- 'label' => 'Non-WPCS ticket revenue',
- 'description' => 'Transactions using a payment method for which WPCS does not have an established account.',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'stripe' => array_merge( $initial_data, array(
+ 'label' => 'Ticket transactions through Stripe',
+ 'description' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'none' => array_merge( $initial_data, array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'paypal' => array_merge( $initial_data, array(
+ 'label' => 'Ticket transactions through PayPal',
+ 'description' => '',
+ ) ),
+ 'instamojo' => array_merge( $initial_data, array(
+ 'label' => 'Ticket transactions through Instamojo',
+ 'description' => '',
+ ) ),
+ 'razorpay' => array_merge( $initial_data, array(
+ 'label' => 'Ticket transactions through Razorpay',
+ 'description' => '',
+ ) ),
+ 'none' => array_merge( $initial_data, array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => 'Ticket transactions with no payment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => 'Transactions for which no payment method was recorded.',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'total' => array_merge( $initial_data, array(
- 'label' => 'Total ticket revenue',
- 'description' => '',
- ) ),
</del><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">- // Assume that all transactions through a gateway for which WPCS has an account, used the WPCS account.
- $wpcs_payment_methods = array( 'paypal', 'stripe' );
</del><span class="cx" style="display: block; padding: 0 10px"> $currencies = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $events as $event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $currency = $event['currency'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $method = $event['method'];
+ $type = $event['type'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $event['method'] ) {
- $group = 'none';
- } elseif ( in_array( $event['method'], $wpcs_payment_methods, true ) ) {
- $group = 'wpcs';
- } else {
- $group = 'non_wpcs';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $data_groups[ $method ] ) ) {
+ $data_groups[ $method ] = array_merge( $initial_data, array(
+ 'label' => sprintf(
+ 'Ticket transactions through %s',
+ esc_html( $method )
+ ),
+ 'description' => '',
+ ) );
</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 ( ! in_array( $currency, $currencies, true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data_groups[ $group ]['gross_revenue_by_currency'][ $currency ] = 0;
- $data_groups[ $group ]['discounts_by_currency'][ $currency ] = 0;
- $data_groups[ $group ]['amount_refunded_by_currency'][ $currency ] = 0;
- $data_groups[ $group ]['net_revenue_by_currency'][ $currency ] = 0;
- $data_groups['total']['gross_revenue_by_currency'][ $currency ] = 0;
- $data_groups['total']['discounts_by_currency'][ $currency ] = 0;
- $data_groups['total']['amount_refunded_by_currency'][ $currency ] = 0;
- $data_groups['total']['net_revenue_by_currency'][ $currency ] = 0;
- $currencies[] = $currency;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data_groups[ $method ]['gross_revenue_by_currency'][ $currency ] = 0;
+ $data_groups[ $method ]['discounts_by_currency'][ $currency ] = 0;
+ $data_groups[ $method ]['amount_refunded_by_currency'][ $currency ] = 0;
+ $data_groups[ $method ]['net_revenue_by_currency'][ $currency ] = 0;
+ $data_groups['total']['gross_revenue_by_currency'][ $currency ] = 0;
+ $data_groups['total']['discounts_by_currency'][ $currency ] = 0;
+ $data_groups['total']['amount_refunded_by_currency'][ $currency ] = 0;
+ $data_groups['total']['net_revenue_by_currency'][ $currency ] = 0;
+ $currencies[] = $currency;
</ins><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">- switch ( $event['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switch ( $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'Purchase' :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data_groups[ $group ]['tickets_sold'] ++;
- $data_groups[ $group ]['gross_revenue_by_currency'][ $currency ] += $event['full_price'];
- $data_groups[ $group ]['discounts_by_currency'][ $currency ] += $event['full_price'] - $event['discounted_price'];
- $data_groups[ $group ]['net_revenue_by_currency'][ $currency ] += $event['discounted_price'];
- $data_groups['total']['tickets_sold'] ++;
- $data_groups['total']['gross_revenue_by_currency'][ $currency ] += $event['full_price'];
- $data_groups['total']['discounts_by_currency'][ $currency ] += $event['full_price'] - $event['discounted_price'];
- $data_groups['total']['net_revenue_by_currency'][ $currency ] += $event['discounted_price'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data_groups[ $method ]['tickets_sold'] ++;
+ $data_groups[ $method ]['gross_revenue_by_currency'][ $currency ] += $event['full_price'];
+ $data_groups[ $method ]['discounts_by_currency'][ $currency ] += $event['full_price'] - $event['discounted_price'];
+ $data_groups[ $method ]['net_revenue_by_currency'][ $currency ] += $event['discounted_price'];
+ $data_groups['total']['tickets_sold'] ++;
+ $data_groups['total']['gross_revenue_by_currency'][ $currency ] += $event['full_price'];
+ $data_groups['total']['discounts_by_currency'][ $currency ] += $event['full_price'] - $event['discounted_price'];
+ $data_groups['total']['net_revenue_by_currency'][ $currency ] += $event['discounted_price'];
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'Refund' :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data_groups[ $group ]['tickets_refunded'] ++;
- $data_groups[ $group ]['amount_refunded_by_currency'][ $currency ] += $event['discounted_price'];
- $data_groups[ $group ]['net_revenue_by_currency'][ $currency ] -= $event['discounted_price'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data_groups[ $method ]['tickets_refunded'] ++;
+ $data_groups[ $method ]['amount_refunded_by_currency'][ $currency ] += $event['discounted_price'];
+ $data_groups[ $method ]['net_revenue_by_currency'][ $currency ] -= $event['discounted_price'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $data_groups['total']['tickets_refunded'] ++;
</span><span class="cx" style="display: block; padding: 0 10px"> $data_groups['total']['amount_refunded_by_currency'][ $currency ] += $event['discounted_price'];
</span><span class="cx" style="display: block; padding: 0 10px"> $data_groups['total']['net_revenue_by_currency'][ $currency ] -= $event['discounted_price'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,14 +472,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return void
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function render_html() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = $this->compile_report_data( $this->get_data() );
- $start_date = $this->start_date;
- $end_date = $this->end_date;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $now = new \DateTime();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $start_date = $this->start_date;
+ $end_date = $this->end_date;
+ $xrt_date = ( $end_date > $now ) ? $now : $end_date;
</ins><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_name = ( $this->wordcamp_site_id ) ? get_wordcamp_name( $this->wordcamp_site_id ) : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpcs = $data['wpcs'];
- $non_wpcs = $data['non_wpcs'];
- $none = $data['none'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = $this->compile_report_data( $this->get_data() );
</ins><span class="cx" style="display: block; padding: 0 10px"> $total = $data['total'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->error->get_error_messages() ) ) {
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsindexphp"></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-reports/index.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-reports/index.php 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/index.php 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Get the path for the includes directory.
</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 Path with trailing slash
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Path with trailing slash.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_classes_dir_path() {
</span><span class="cx" style="display: block; padding: 0 10px"> return trailingslashit( PLUGIN_DIR ) . 'classes/';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Get the path for the views directory.
</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 Path with trailing slash
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Path with trailing slash.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_views_dir_path() {
</span><span class="cx" style="display: block; padding: 0 10px"> return trailingslashit( PLUGIN_DIR ) . 'views/';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,6 +40,15 @@
</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 path for the assets directory.
+ *
+ * @return string Path with trailing slash.
+ */
+function get_assets_dir_path() {
+ return trailingslashit( PLUGIN_DIR ) . 'assets/';
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Get the URL for the assets directory.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string URL with trailing slash.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +211,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'admin-common',
</span><span class="cx" style="display: block; padding: 0 10px"> get_assets_url() . 'css/admin-common.css',
</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">- CSS_VERSION
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ filemtime( get_assets_dir_path() . 'css/admin-common.css' )
</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"> $report = filter_input( INPUT_GET, 'report', FILTER_SANITIZE_STRING );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewshtmlpaymentactivityphp"></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-reports/views/html/payment-activity.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-reports/views/html/payment-activity.php 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/html/payment-activity.php 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,10 +8,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var \DateTime $start_date */
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var \DateTime $end_date */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** @var string $wordcamp_name */
-/** @var array $requests */
-/** @var array $payments */
-/** @var array $failures */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** @var \DateTime $xrt_date */
+/** @var string $wordcamp_name */
+/** @var array $requests */
+/** @var array $payments */
+/** @var array $failures */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $asterisk2 = false;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,14 +30,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </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">- <ul>
- <?php if ( $requests['vendor_payment_count'] ) : ?>
- <li>Vendor payments: <?php echo number_format_i18n( $requests['vendor_payment_count'] ) ?></li>
- <?php endif; ?>
- <?php if ( $requests['reimbursement_count'] ) : ?>
- <li>Reimbursements: <?php echo number_format_i18n( $requests['reimbursement_count'] ) ?></li>
- <?php endif; ?>
- </ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table class="striped widefat but-not-too-wide">
+ <tbody>
+ <tr>
+ <td>Vendor payments:</td>
+ <td class="number"><?php echo number_format_i18n( $requests['vendor_payment_count'] ) ?></td>
+ </tr>
+ <tr>
+ <td>Reimbursements:</td>
+ <td class="number"><?php echo number_format_i18n( $requests['reimbursement_count'] ) ?></td>
+ </tr>
+ </tbody>
+ </table>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="striped widefat but-not-too-wide">
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,20 +86,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </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">- <ul>
- <?php if ( $payments['vendor_payment_count'] ) : ?>
- <li>Vendor payments: <?php echo number_format_i18n( $payments['vendor_payment_count'] ) ?></li>
- <?php endif; ?>
- <?php if ( $payments['reimbursement_count'] ) : ?>
- <li>Reimbursements: <?php echo number_format_i18n( $payments['reimbursement_count'] ) ?></li>
- <?php endif; ?>
- </ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table class="striped widefat but-not-too-wide">
+ <tbody>
+ <tr>
+ <td>Vendor payments:</td>
+ <td class="number"><?php echo number_format_i18n( $payments['vendor_payment_count'] ) ?></td>
+ </tr>
+ <tr>
+ <td>Reimbursements:</td>
+ <td class="number"><?php echo number_format_i18n( $payments['reimbursement_count'] ) ?></td>
+ </tr>
+ </tbody>
+ </table>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="striped widefat but-not-too-wide">
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>Currency</td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td>Total Amount Requested</td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td>Total Amount Paid</td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td>Estimated Value in USD *</td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </thead>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,14 +142,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </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">- <ul>
- <?php if ( $failures['vendor_payment_count'] ) : ?>
- <li>Vendor payments: <?php echo number_format_i18n( $failures['vendor_payment_count'] ) ?></li>
- <?php endif; ?>
- <?php if ( $failures['reimbursement_count'] ) : ?>
- <li>Reimbursements: <?php echo number_format_i18n( $failures['reimbursement_count'] ) ?></li>
- <?php endif; ?>
- </ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table class="striped widefat but-not-too-wide">
+ <tbody>
+ <tr>
+ <td>Vendor payments:</td>
+ <td class="number"><?php echo number_format_i18n( $failures['vendor_payment_count'] ) ?></td>
+ </tr>
+ <tr>
+ <td>Reimbursements:</td>
+ <td class="number"><?php echo number_format_i18n( $failures['reimbursement_count'] ) ?></td>
+ </tr>
+ </tbody>
+ </table>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="striped widefat but-not-too-wide">
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,10 +186,12 @@
</span><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"> <?php if ( $requests['vendor_payment_count'] || $requests['reimbursement_count'] || $payments['vendor_payment_count'] || $payments['reimbursement_count'] || $failures['vendor_payment_count'] || $failures['reimbursement_count'] ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="description">* Estimate based on exchange rates for <?php echo esc_html( $end_date->format( 'M jS, Y' ) ); ?></p>
- <?php if ( $asterisk2 ) : ?>
- <p class="description">** Currency exchange rate not available.</p>
- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="description">
+ * Estimate based on exchange rates for <?php echo esc_html( $xrt_date->format( 'M jS, Y' ) ); ?>.
+ <?php if ( $asterisk2 ) : ?>
+ <br />** Currency exchange rate not available.
+ <?php endif; ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> No data
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewshtmlsponsorinvoicesphp"></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-reports/views/html/sponsor-invoices.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-reports/views/html/sponsor-invoices.php 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/html/sponsor-invoices.php 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,9 +8,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var \DateTime $start_date */
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var \DateTime $end_date */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** @var string $wordcamp_name */
-/** @var array $invoices */
-/** @var array $payments */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** @var \DateTime $xrt_date */
+/** @var string $wordcamp_name */
+/** @var array $invoices */
+/** @var array $payments */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $asterisk2 = false;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,9 +29,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </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">- <ul>
- <li>Invoices sent: <?php echo number_format_i18n( $invoices['total_count'] ); ?></li>
- </ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table class="striped widefat but-not-too-wide">
+ <tbody>
+ <tr>
+ <td>Invoices sent:</td>
+ <td class="number"><?php echo number_format_i18n( $invoices['total_count'] ); ?></td>
+ </tr>
+ </tbody>
+ </table>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="striped widefat but-not-too-wide">
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,9 +81,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </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">- <ul>
- <li>Payments received: <?php echo number_format_i18n( $payments['total_count'] ); ?></li>
- </ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table class="striped widefat but-not-too-wide">
+ <tbody>
+ <tr>
+ <td>Payments received:</td>
+ <td class="number"><?php echo number_format_i18n( $payments['total_count'] ); ?></td>
+ </tr>
+ </tbody>
+ </table>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="striped widefat but-not-too-wide">
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,10 +121,12 @@
</span><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"> <?php if ( $invoices['total_count'] > 0 || $payments['total_count'] > 0 ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="description">* Estimate based on exchange rates for <?php echo esc_html( $end_date->format( 'M jS, Y' ) ); ?></p>
- <?php if ( $asterisk2 ) : ?>
- <p class="description">** Currency exchange rate not available.</p>
- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="description">
+ * Estimate based on exchange rates for <?php echo esc_html( $xrt_date->format( 'M jS, Y' ) ); ?>.
+ <?php if ( $asterisk2 ) : ?>
+ <br />** Currency exchange rate not available.
+ <?php endif; ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> No data
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewshtmlsponsorshipgrantsphp"></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-reports/views/html/sponsorship-grants.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-reports/views/html/sponsorship-grants.php 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/html/sponsorship-grants.php 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,9 +8,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var \DateTime $start_date */
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var \DateTime $end_date */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** @var string $wordcamp_name */
-/** @var array $data */
-/** @var array $compiled_data */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** @var \DateTime $xrt_date */
+/** @var string $wordcamp_name */
+/** @var array $data */
+/** @var array $compiled_data */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $asterisk2 = false;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +29,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </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">- <h4>Grants awarded: <?php echo number_format_i18n( $compiled_data['grant_count'] ) ?></h4>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table class="striped widefat but-not-too-wide">
+ <tbody>
+ <tr>
+ <td>Grants awarded:</td>
+ <td class="number"><?php echo number_format_i18n( $compiled_data['grant_count'] ) ?></td>
+ </tr>
+ </tbody>
+ </table>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="striped widefat but-not-too-wide">
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,10 +67,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="description">* Estimate based on exchange rates for <?php echo esc_html( $end_date->format( 'M jS, Y' ) ); ?></p>
- <?php if ( $asterisk2 ) : ?>
- <p class="description">** Currency exchange rate not available.</p>
- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="description">
+ * Estimate based on exchange rates for <?php echo esc_html( $xrt_date->format( 'M jS, Y' ) ); ?>.
+ <?php if ( $asterisk2 ) : ?>
+ <br />** Currency exchange rate not available.
+ <?php endif; ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h4>Grant details:</h4>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewshtmlticketrevenuephp"></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-reports/views/html/ticket-revenue.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-reports/views/html/ticket-revenue.php 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/html/ticket-revenue.php 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,16 +8,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var \DateTime $start_date */
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var \DateTime $end_date */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** @var string $wordcamp_name */
-/** @var array $data */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** @var \DateTime $xrt_date */
+/** @var string $wordcamp_name */
+/** @var array $data */
+/** @var array $total */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $asterisk2 = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$groups = 0;
</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"> <?php foreach ( $data as $key => $group ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( empty( $group['gross_revenue_by_currency'] ) ) continue; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'total' === $key && $groups < 2 ) continue; ?>
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $group['label'] ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,10 +35,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description"><?php echo wp_kses_post( $group['description'] ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <ul>
- <li>Tickets sold: <?php echo number_format_i18n( $group['tickets_sold'] ); ?></li>
- <li>Tickets refunded: <?php echo number_format_i18n( $group['tickets_refunded'] ); ?></li>
- </ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table class="striped widefat but-not-too-wide">
+ <tbody>
+ <tr>
+ <td>Tickets sold:</td>
+ <td class="number"><?php echo number_format_i18n( $group['tickets_sold'] ); ?></td>
+ </tr>
+ <tr>
+ <td>Tickets refunded:</td>
+ <td class="number"><?php echo number_format_i18n( $group['tickets_refunded'] ); ?></td>
+ </tr>
+ </tbody>
+ </table>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="striped widefat but-not-too-wide">
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,12 +90,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $groups ++; ?>
</del><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $total['net_revenue_by_currency'] ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Estimate based on exchange rates for <?php echo esc_html( $end_date->format( 'M jS, Y' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Estimate based on exchange rates for <?php echo esc_html( $xrt_date->format( 'M jS, Y' ) ); ?>.
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $asterisk2 ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <br />** Currency exchange rate not available.
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewsreportmeetupgroupsphp"></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-reports/views/report/meetup-groups.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-reports/views/report/meetup-groups.php 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/meetup-groups.php 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +52,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $report instanceof Report\Meetup_Groups ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $report->render_html(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="report-results">
+ <?php $report->render_html(); ?>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewsreportpaymentactivityphp"></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-reports/views/report/payment-activity.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-reports/views/report/payment-activity.php 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/payment-activity.php 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,6 +57,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $report instanceof Report\Payment_Activity ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $report->render_html(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="report-results">
+ <?php $report->render_html(); ?>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewsreportsponsorinvoicesphp"></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-reports/views/report/sponsor-invoices.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-reports/views/report/sponsor-invoices.php 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/sponsor-invoices.php 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,6 +57,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $report instanceof Report\Sponsor_Invoices ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $report->render_html(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="report-results">
+ <?php $report->render_html(); ?>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewsreportsponsorshipgrantsphp"></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-reports/views/report/sponsorship-grants.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-reports/views/report/sponsorship-grants.php 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/sponsorship-grants.php 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,6 +57,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $report instanceof Report\Sponsorship_Grants ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $report->render_html(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="report-results">
+ <?php $report->render_html(); ?>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewsreportticketrevenuephp"></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-reports/views/report/ticket-revenue.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-reports/views/report/ticket-revenue.php 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/ticket-revenue.php 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,6 +57,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $report instanceof Report\Ticket_Revenue ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $report->render_html(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="report-results">
+ <?php $report->render_html(); ?>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampreportsviewsreportwordcampstatusphp"></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-reports/views/report/wordcamp-status.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-reports/views/report/wordcamp-status.php 2018-07-12 00:15:20 UTC (rev 7433)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-reports/views/report/wordcamp-status.php 2018-07-12 00:22:11 UTC (rev 7434)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,6 +65,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $report instanceof Report\WordCamp_Status ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $report->render_html(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="report-results">
+ <?php $report->render_html(); ?>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>