<!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>[6067] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments: WordCamp Payments: Add missing ISO 4217 currencies.</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/6067">6067</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/6067","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>2017-11-01 16:33:47 +0000 (Wed, 01 Nov 2017)</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 Payments: Add missing ISO 4217 currencies.
This also cleans up and normalizes the dropdown rendering across payments modules.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludesbudgettoolphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/budget-tool.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludesreimbursementrequestphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php</a></li>
<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_htmlwpcontentpluginswordcamppaymentsincludessponsorpaymentstripephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-payment-stripe.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludeswordcampbudgetsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsbudgettoolmainphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/budget-tool/main.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputselectphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-select.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsreimbursementrequestmetaboxgeneralinformationphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-general-information.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsreimbursementrequesttemplateexpensephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/template-expense.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_htmlwpcontentpluginswordcamppaymentsviewssponsorpaymentmainphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/sponsor-payment/main.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludesbudgettoolphp"></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/budget-tool.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/budget-tool.php 2017-11-01 16:04:14 UTC (rev 6066)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/budget-tool.php 2017-11-01 16:33:47 UTC (rev 6067)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,8 +171,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( substr( $key, 0, 4 ) == 'null' )
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $currencies[ $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">- ksort( $currencies );
-
</del><span class="cx" style="display: block; padding: 0 10px"> require( dirname( __DIR__ ) . '/views/budget-tool/main.php' );
</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_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp"></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/payment-request.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/payment-request.php 2017-11-01 16:04:14 UTC (rev 6066)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php 2017-11-01 16:33:47 UTC (rev 6067)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -864,7 +864,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $column ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'payment_amount':
</span><span class="cx" style="display: block; padding: 0 10px"> $currency = get_post_meta( $post_id, '_camppayments_currency', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $currency, 'null' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $currency && false === strpos( $currency, 'null' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo esc_html( $currency ) . ' ';
</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">@@ -995,7 +995,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $due_date = date( 'Y-m-d', absint( $due_date ) );
</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">- if ( 'null-select-one' === $currency ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== strpos( $currency, 'null' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $currency = '';
</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_htmlwpcontentpluginswordcamppaymentsincludesreimbursementrequestphp"></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/reimbursement-request.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/reimbursement-request.php 2017-11-01 16:04:14 UTC (rev 6066)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php 2017-11-01 16:33:47 UTC (rev 6067)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -894,7 +894,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $amount = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = array();
</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 ( strpos( $currency, 'null' ) === 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== strpos( $currency, 'null' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $currency = '';
</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_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 2017-11-01 16:04:14 UTC (rev 6066)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-invoice.php 2017-11-01 16:33:47 UTC (rev 6067)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,7 +459,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'payment_amount':
</span><span class="cx" style="display: block; padding: 0 10px"> $currency = get_post_meta( $post_id, '_wcbsi_currency', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $currency, 'null' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $currency && false === strpos( $currency, 'null' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo esc_html( $currency ) . ' ';
</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_htmlwpcontentpluginswordcamppaymentsincludessponsorpaymentstripephp"></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-payment-stripe.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-payment-stripe.php 2017-11-01 16:04:14 UTC (rev 6066)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-payment-stripe.php 2017-11-01 16:33:47 UTC (rev 6067)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> const STEP_SELECT_INVOICE = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> const STEP_PAYMENT_DETAILS = 2;
</span><span class="cx" style="display: block; padding: 0 10px"> const STEP_PAYMENT_SUCCESS = 3;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> const CSS_VERSION = 1;
</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">@@ -109,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $currency = $_POST['currency'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! array_key_exists( $currency, $data['currencies'] ) or strpos( $currency, 'null' ) === 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! array_key_exists( $currency, $data['currencies'] ) || false !== strpos( $currency, 'null' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['errors'][] = 'Invalid currency.';
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludeswordcampbudgetsphp"></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/wordcamp-budgets.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/wordcamp-budgets.php 2017-11-01 16:04:14 UTC (rev 6066)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php 2017-11-01 16:33:47 UTC (rev 6067)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -601,135 +601,181 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Get a list of all world currencies, with the most frequently used at the top.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get a list of ISO 4217 currencies, sorted by name.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @todo Bring this in line with ISO 4217
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @todo Move this to helper-functions.php so it can be more cleanly reused, and update calls to it.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_currencies() {
</span><span class="cx" style="display: block; padding: 0 10px"> $currencies = array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'null-most-frequently-used' => 'Most Frequently Used:',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'EUR' => 'European Zone Euro',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'USD' => 'United States Dollar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'EUR' => 'Euro Member Countries',
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'null-separator2' => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '' => '',
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'null-all' => 'All:',
- 'ALL' => 'Albania Lek',
- 'AFN' => 'Afghanistan Afghani',
- 'ARS' => 'Argentina Peso',
- 'AWG' => 'Aruba Guilder',
- 'AUD' => 'Australia Dollar',
- 'AZN' => 'Azerbaijan New Manat',
- 'BSD' => 'Bahamas Dollar',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'AFN' => 'Afghan Afghani',
+ 'ALL' => 'Albanian Lek',
+ 'DZD' => 'Algerian Dinar',
+ 'AOA' => 'Angolan Kwanza',
+ 'ARS' => 'Argentine Peso',
+ 'AMD' => 'Armenian Dram',
+ 'AWG' => 'Aruban Florin',
+ 'AUD' => 'Australian Dollar',
+ 'AZN' => 'Azerbaijan Manat',
+ 'BSD' => 'Bahamian Dollar',
+ 'BHD' => 'Bahraini Dinar',
+ 'BDT' => 'Bangladeshi Taka',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'BBD' => 'Barbados Dollar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'BDT' => 'Bangladeshi taka',
- 'BYR' => 'Belarus Ruble',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'BYN' => 'Belarusian Ruble',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'BZD' => 'Belize Dollar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'BMD' => 'Bermuda Dollar',
- 'BOB' => 'Bolivia Boliviano',
- 'BAM' => 'Bosnia and Herzegovina Convertible Marka',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'BMD' => 'Bermudian Dollar',
+ 'BTN' => 'Bhutanese Ngultrum',
+ 'BOB' => 'Bolivian Boliviano',
+ 'BOV' => 'Bolivian Mvdol',
+ 'BAM' => 'Bosnia and Herzegovina Convertible Mark',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'BWP' => 'Botswana Pula',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'BGN' => 'Bulgaria Lev',
- 'BRL' => 'Brazil Real',
- 'BND' => 'Brunei Darussalam Dollar',
- 'KHR' => 'Cambodia Riel',
- 'CAD' => 'Canada Dollar',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'BRL' => 'Brazilian Real',
+ 'BND' => 'Bruneian Dollar',
+ 'BGN' => 'Bulgarian Lev',
+ 'MMK' => 'Burmese (Myanmar) Kyat',
+ 'BIF' => 'Burundian Franc',
+ 'CVE' => 'Cabo Verde Escudo',
+ 'KHR' => 'Cambodian Riel',
+ 'CAD' => 'Canadian Dollar',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'KYD' => 'Cayman Islands Dollar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'XAF' => 'Central African CFA Franc',
- 'CLP' => 'Chile Peso',
- 'CNY' => 'China Yuan Renminbi',
- 'COP' => 'Colombia Peso',
- 'CRC' => 'Costa Rica Colon',
- 'HRK' => 'Croatia Kuna',
- 'CUP' => 'Cuba Peso',
- 'CZK' => 'Czech Republic Koruna',
- 'DKK' => 'Denmark Krone',
- 'DOP' => 'Dominican Republic Peso',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'XAF' => 'Central African CFA Franc BEAC',
+ 'XPF' => 'Change Franc Pacifique (CFP) Franc',
+ 'CLP' => 'Chilean Peso',
+ 'CNY' => 'Chinese Yuan Renminbi',
+ 'COP' => 'Colombian Peso',
+ 'KMF' => 'Comorian Franc ',
+ 'CDF' => 'Congolese Franc',
+ 'NIO' => 'Cordoba Oro',
+ 'CRC' => 'Costa Rican Colon',
+ 'HRK' => 'Croatian Kuna',
+ 'CUC' => 'Cuban Convertible Peso',
+ 'CUP' => 'Cuban Peso',
+ 'CZK' => 'Czech Koruna',
+ 'DKK' => 'Danish Krone',
+ 'DJF' => 'Djibouti Franc',
+ 'DOP' => 'Dominican Peso',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'XCD' => 'East Caribbean Dollar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'EGP' => 'Egypt Pound',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'XSU' => 'Ecuadorian Sucre',
+ 'EGP' => 'Egyptian Pound',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'SVC' => 'El Salvador Colon',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'EEK' => 'Estonia Kroon',
- 'FKP' => 'Falkland Islands (Malvinas) Pound',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ERN' => 'Eritrean Nakfa',
+ 'ETB' => 'Ethiopian Birr',
+ 'FKP' => 'Falkland Islands Pound',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'FJD' => 'Fiji Dollar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'GHC' => 'Ghana Cedis',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'GMD' => 'Gambian Dalasi',
+ 'GEL' => 'Georgian Lari',
+ 'GHS' => 'Ghana Cedi',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'GIP' => 'Gibraltar Pound',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'GTQ' => 'Guatemala Quetzal',
- 'GGP' => 'Guernsey Pound',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'GTQ' => 'Guatemalan Quetzal',
+ 'GNF' => 'Guinean Franc',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'GYD' => 'Guyana Dollar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'HNL' => 'Honduras Lempira',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'HTG' => 'Haitian Gourde',
+ 'HNL' => 'Honduran Lempira',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'HKD' => 'Hong Kong Dollar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'HUF' => 'Hungary Forint',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'HUF' => 'Hungarian Forint',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ISK' => 'Iceland Krona',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'INR' => 'India Rupee',
- 'IDR' => 'Indonesia Rupiah',
- 'IRR' => 'Iran Rial',
- 'IMP' => 'Isle of Man Pound',
- 'ILS' => 'Israel Shekel',
- 'JMD' => 'Jamaica Dollar',
- 'JPY' => 'Japan Yen',
- 'JEP' => 'Jersey Pound',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'INR' => 'Indian Rupee',
+ 'IDR' => 'Indonesian Rupiah',
+ 'IRR' => 'Iranian Rial',
+ 'IQD' => 'Iraqi Dinar',
+ 'JMD' => 'Jamaican Dollar',
+ 'JPY' => 'Japanese Yen',
+ 'JOD' => 'Jordanian Dinar',
+ 'KZT' => 'Kazakhstani Tenge',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'KES' => 'Kenyan Shilling',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'KZT' => 'Kazakhstan Tenge',
- 'KPW' => 'Korea (North) Won',
- 'KRW' => 'Korea (South) Won',
- 'KGS' => 'Kyrgyzstan Som',
- 'LAK' => 'Laos Kip',
- 'LVL' => 'Latvia Lat',
- 'LBP' => 'Lebanon Pound',
- 'LRD' => 'Liberia Dollar',
- 'LTL' => 'Lithuania Litas',
- 'MKD' => 'Macedonia Denar',
- 'MYR' => 'Malaysia Ringgit',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'KWD' => 'Kuwaiti Dinar',
+ 'KGS' => 'Kyrgystani Som',
+ 'LAK' => 'Lao Kip',
+ 'LBP' => 'Lebanese Pound',
+ 'LSL' => 'Lesotho Loti',
+ 'LRD' => 'Liberian Dollar',
+ 'LYD' => 'Libyan Dinar',
+ 'MOP' => 'Macanese Pataca',
+ 'MKD' => 'Macedonian Denar',
+ 'MGA' => 'Malagasy Ariary',
+ 'MWK' => 'Malawi Kwacha',
+ 'MYR' => 'Malaysian Ringgit',
+ 'MVR' => 'Maldivian Rufiyaa',
+ 'MRO' => 'Mauritanian Ouguiya',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'MUR' => 'Mauritius Rupee',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'MXN' => 'Mexico Peso',
- 'MNT' => 'Mongolia Tughrik',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'MXN' => 'Mexican Peso',
+ 'MXV' => 'Mexican Unidad de Inversion (UDI)',
+ 'MDL' => 'Moldovan Leu',
+ 'MNT' => 'Mongolian Tugrik',
+ 'MAD' => 'Moroccan Dirham',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'MZN' => 'Mozambique Metical',
</span><span class="cx" style="display: block; padding: 0 10px"> 'NAD' => 'Namibia Dollar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'NPR' => 'Nepal Rupee',
- 'ANG' => 'Netherlands Antilles Guilder',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'NPR' => 'Nepalese Rupee',
+ 'ANG' => 'Netherlands Antillean Guilder',
+ 'ILS' => 'New Israeli Sheqel',
+ 'TWD' => 'New Taiwan Dollar',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'NZD' => 'New Zealand Dollar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'NIO' => 'Nicaragua Cordoba',
- 'NGN' => 'Nigeria Naira',
- 'NOK' => 'Norway Krone',
- 'OMR' => 'Oman Rial',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'NGN' => 'Nigerian Naira',
+ 'KPW' => 'North Korean Won',
+ 'NOK' => 'Norwegian Krone',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'PKR' => 'Pakistan Rupee',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'PAB' => 'Panama Balboa',
- 'PYG' => 'Paraguay Guarani',
- 'PEN' => 'Peru Nuevo Sol',
- 'PHP' => 'Philippines Peso',
- 'PLN' => 'Poland Zloty',
- 'QAR' => 'Qatar Riyal',
- 'RON' => 'Romania New Leu',
- 'RUB' => 'Russia Ruble',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'PAB' => 'Panamanian Balboa',
+ 'PGK' => 'Papua New Guinean Kina',
+ 'PYG' => 'Paraguayan Guarani',
+ 'PEN' => 'Peruvian Sol',
+ 'UYU' => 'Peso Uruguayo',
+ 'PHP' => 'Philippine Piso',
+ 'PLN' => 'Polish Zloty',
+ 'QAR' => 'Qatari Rial',
+ 'OMR' => 'Rial Omani',
+ 'RON' => 'Romanian Leu',
+ 'RUB' => 'Russian Ruble',
+ 'RWF' => 'Rwanda Franc',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'SHP' => 'Saint Helena Pound',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'SAR' => 'Saudi Arabia Riyal',
- 'RSD' => 'Serbia Dinar',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'WST' => 'Samoan Tala',
+ 'SAR' => 'Saudi Riyal',
+ 'RSD' => 'Serbian Dinar',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'SCR' => 'Seychelles Rupee',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'SLL' => 'Sierra Leonean Leone',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'SGD' => 'Singapore Dollar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'SBD' => 'Solomon Islands Dollar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'SOS' => 'Somalia Shilling',
- 'ZAR' => 'South Africa Rand',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'SOS' => 'Somali Shilling',
+ 'ZAR' => 'South African Rand',
+ 'KRW' => 'South Korean Won',
+ 'SSP' => 'South Sudanese Pound',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'LKR' => 'Sri Lanka Rupee',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'SEK' => 'Sweden Krona',
- 'CHF' => 'Switzerland Franc',
- 'SRD' => 'Suriname Dollar',
- 'SYP' => 'Syria Pound',
- 'TWD' => 'Taiwan New Dollar',
- 'THB' => 'Thailand Baht',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'SDG' => 'Sudanese Pound',
+ 'SRD' => 'Surinam Dollar',
+ 'SZL' => 'Swazi Lilangeni',
+ 'SEK' => 'Swedish Krona',
+ 'CHF' => 'Swiss Franc',
+ 'SYP' => 'Syrian Pound',
+ 'STD' => 'São Tomé & Príncipe Dobra',
+ 'TJS' => 'Tajikistani Somoni',
+ 'TZS' => 'Tanzanian Shilling',
+ 'THB' => 'Thai Baht',
+ 'TOP' => 'Tongan Paʻanga',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'TTD' => 'Trinidad and Tobago Dollar',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'TRY' => 'Turkey Lira',
- 'TRL' => 'Turkey Lira',
- 'TVD' => 'Tuvalu Dollar',
- 'UAH' => 'Ukraine Hryvna',
- 'GBP' => 'United Kingdom Pound',
- 'UYU' => 'Uruguay Peso',
- 'UZS' => 'Uzbekistan Som',
- 'VEF' => 'Venezuela Bolivar',
- 'VND' => 'Viet Nam Dong',
- 'YER' => 'Yemen Rial',
- 'ZWD' => 'Zimbabwe Dollar'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'TND' => 'Tunisian Dinar',
+ 'TRY' => 'Turkish Lira',
+ 'TMT' => 'Turkmenistan New Manat',
+ 'UGX' => 'Uganda Shilling',
+ 'UAH' => 'Ukrainian Hryvnia',
+ 'CLF' => 'Unidad de Fomento',
+ 'COU' => 'Unidad de Valor Real',
+ 'AED' => 'United Arab Emirates Dirham',
+ 'GBP' => 'United Kingdom Pound Sterling',
+ 'UZS' => 'Uzbekistan Sum',
+ 'VUV' => 'Vanuatu Vatu',
+ 'VEF' => 'Venezuelan Bolívar',
+ 'VND' => 'Vietnamese Dong',
+ 'CHE' => 'WIR Euro',
+ 'CHW' => 'WIR Franc',
+ 'XOF' => 'West African CFA Franc',
+ 'YER' => 'Yemeni Rial',
+ 'ZMW' => 'Zambian Kwacha',
+ 'ZWL' => 'Zimbabwe Dollar',
</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"> return $currencies;
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsbudgettoolmainphp"></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/budget-tool/main.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/budget-tool/main.php 2017-11-01 16:04:14 UTC (rev 6066)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/budget-tool/main.php 2017-11-01 16:33:47 UTC (rev 6067)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,9 +178,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if (data.name == 'currency') { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <select class="value">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# _.each(wcb.currencies, function(v, k) { #>
- <option value="{{k}}" <#if(k==data.value){#>selected<#}#>>{{k}} - {{v}}</option>
- <# }); #>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value="">
+ <?php _e( '-- Select a Currency --', 'wordcamporg' ); ?>
+ </option>
+
+ <option value=""></option>
+
+ <# _.each( wcb.currencies, function( value, key ) { #>
+ <option value="{{key}}" <# if( key === data.value ) { #> selected <# } #> >
+ {{value}}
+
+ <# if ( key ) { #>
+ ({{key}})
+ <# } #>
+ </option>
+ <# }); #>
</ins><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <input class="value" type="text" value="{{data.value}}" />
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputselectphp"></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/payment-request/input-select.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/payment-request/input-select.php 2017-11-01 16:04:14 UTC (rev 6066)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-select.php 2017-11-01 16:33:47 UTC (rev 6067)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,14 +11,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> name="<?php echo esc_attr( $name ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> <?php __checked_selected_helper( $required, true, true, 'required' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> >
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="null-select-one">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value="">
+ <?php // translators: %s is a label in a dropdown. For example, "Select a currency", or "Select a category". ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php printf( esc_html__( '-- Select a %s --', 'wordcamporg' ), $label ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="null-separator1"></option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value=""></option>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $options as $value => $option_label ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, $selected ); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $option_label ); ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'currency' === $name && $value ) : ?>
+ (<?php echo esc_html( $value ); ?>)
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsreimbursementrequestmetaboxgeneralinformationphp"></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/reimbursement-request/metabox-general-information.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/reimbursement-request/metabox-general-information.php 2017-11-01 16:04:14 UTC (rev 6066)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-general-information.php 2017-11-01 16:33:47 UTC (rev 6067)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,6 +3,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\Budgets\Reimbursement_Requests;
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) or die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** @var \WP_Post $post */
+/** @var string $name_of_payer */
+/** @var array $available_currencies */
+/** @var string $selected_currency */
+/** @var array $available_reasons */
+/** @var string $selected_reason */
+/** @var string $other_reason */
+/** @var int $date_paid */
+
</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"> <fieldset <?php disabled( user_can_edit_request( $post ), false ); ?> >
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,15 +39,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <select id="_wcbrr_currency" name="_wcbrr_currency">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="null-select-one">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value="">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( '-- Select a Currency --', 'wordcamporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="null-separator1"></option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value=""></option>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $available_currencies as $currency_key => $currency_name ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="<?php echo esc_attr( $currency_key ); ?>" <?php selected( $currency_key, $selected_currency ); ?> >
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $currency_name ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php // todo - For better UX, prepend the code to the name (USD - United States Dollar), and sort by the code. Updating the sorting in get_currencies(). Also make this change other places this is used ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $currency_key ) : ?>
+ (<?php echo esc_html( $currency_key ); ?>)
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,10 +63,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <select id="_wcbrr_reason" name="_wcbrr_reason">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="null-select-one">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value="">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( '-- Select a Reason --', 'wordcamporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="null-separator1"></option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value=""></option>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $available_reasons as $reason_key => $reason_name ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="<?php echo esc_attr( $reason_key ); ?>" <?php selected( $reason_key, $selected_reason ); ?> >
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsreimbursementrequesttemplateexpensephp"></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/reimbursement-request/template-expense.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/reimbursement-request/template-expense.php 2017-11-01 16:04:14 UTC (rev 6066)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/template-expense.php 2017-11-01 16:33:47 UTC (rev 6067)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,10 +17,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <select id="_wcbrr_category_{{data.id}}" name="_wcbrr_category_{{data.id}}">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="null-select-one">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value="">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( '-- Select a Category --', 'wordcamporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="null-separator1"></option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value=""></option>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <# _.each( wcbPaymentCategories, function( categoryName, categoryKey ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <# selected = data._wcbrr_category === categoryKey ? 'selected' : ''; #>
</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 2017-11-01 16:04:14 UTC (rev 6066)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/sponsor-invoice/metabox-general.php 2017-11-01 16:33:47 UTC (rev 6067)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,6 +108,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $available_currencies as $currency_key => $currency_name ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="<?php echo esc_attr( $currency_key ); ?>" <?php selected( $currency_key, $selected_currency ); ?> >
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $currency_name ); ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $currency_key ) : ?>
+ (<?php echo esc_html( $currency_key ); ?>)
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewssponsorpaymentmainphp"></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-payment/main.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-payment/main.php 2017-11-01 16:04:14 UTC (rev 6066)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/sponsor-payment/main.php 2017-11-01 16:33:47 UTC (rev 6067)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,10 +42,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="control">
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="currency">
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="" disabled selected><?php esc_html_e( 'Select a Currency', 'wordcamporg' ); ?></option>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value=""></option>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $data['currencies'] as $currency_key => $currency_name ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="<?php echo esc_attr( $currency_key ); ?>">
- <?php echo esc_html( $currency_name ); ?>
- </option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value="<?php echo esc_attr( $currency_key ); ?>">
+ <?php echo esc_html( $currency_name ); ?>
+ </option>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>