NPO-Accounting/houdini
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix some views that display currency

Browse source
This commit is contained in:
Eric Schultz 2018-07-23 16:35:27 -05:00 committed by Eric Schultz
parent 747c357c39
commit d18d4de307
9 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/campaigns/_campaigns_table.html.erb
View file

@ -22,7 +22,7 @@
<% end %>
<% if campaign.show_total_raised %>
<span class='pastelBox--white u-padding--3'>
$<%= print_currency campaign.total_raised, false %> <small>raised</small>
<%= print_currency campaign.total_raised, campaign.nonprofit.currency_symbol %> <small>raised</small>
</span>
<% end %>
</td>

2
app/views/charge_mailer/_payment_receipt.html.erb
View file

@ -10,7 +10,7 @@
<tbody>
<tr>
<td><strong>Total Amount</strong></td>
<td> <%= print_currency(charge.amount) %></td>
<td> <%= print_currency(charge.amount, charge.nonprofit.currency_symbol) %></td>
</tr>
<% if @event %>

4
app/views/donation_mailer/_donation_changed_amount_table.html.erb
View file

@ -18,12 +18,12 @@
</tr>
<tr>
<td><strong>New Amount</strong></td>
<td> <%= print_currency(donation.amount) %></td>
<td> <%= print_currency(donation.amount, donation.nonprofit.currency_symbol) %></td>
</tr>
<tr>
<td><strong>Previous Amount</strong></td>
<td> <%= print_currency(previous_amount) %></td>
<td> <%= print_currency(previous_amount, donation.nonprofit.currency_symbol) %></td>
</tr>
<% if donation.campaign %>

2
app/views/donation_mailer/_recurring_donation_table.html.erb
View file

@ -10,7 +10,7 @@
<tbody>
<tr>
<td><strong>Recurring Amount</strong></td>
<td> <%= print_currency(donation.amount) %></td>
<td> <%= print_currency(donation.amount, donation.nonprofit.currency_symbol) %></td>
</tr>
<tr>

4
app/views/nonprofit_mailer/_payout_table.html.erb
View file

@ -2,11 +2,11 @@
<table class='table'>
<tr>
<td><strong>Gross Amount</strong></td>
<td><%= print_currency(payout.gross_amount) %></td>
<td><%= print_currency(payout.gross_amount, payout.nonprofit.currency_symbol) %></td>
</tr>
<tr>
<td><strong>Net Amount</strong></td>
<td><%= print_currency(payout.net_amount) %></td>
<td><%= print_currency(payout.net_amount, payout.nonprofit.currency_symbol) %></td>
</tr>
<tr>
<td><strong>Date</strong></td>

2
app/views/nonprofit_mailer/invoice_payment_notification.html.erb
View file

@ -20,7 +20,7 @@ Your invoice for the month of <%= @month_name %> has been paid and the receipt i
<tbody>
<tr>
<td><strong>Total Amount</strong></td>
<td> <%= print_currency(@payment.gross_amount) %></td>
<td> <%= print_currency(@payment.gross_amount, @payment.nonprofit.currency_symbol) %></td>
</tr>
<tr>
<td><strong>Transaction Date</strong></td>

4
app/views/nonprofits/payouts/_modal.html.erb
View file

@ -5,7 +5,7 @@
<div class='modal-body'>
<p>Use this form to make a payout right now of your available balance (<strong><%= print_currency @available_total %></strong>).</p>
<p>Use this form to make a payout right now of your available balance (<strong><%= print_currency @available_total, @nonprofit.currency_symbol %></strong>).</p>
<p>You will receive a receipt of all donations after this payout.</p>
<p>Payouts usually take 1-3 days to complete.</p>
@ -20,7 +20,7 @@
<tbody>
<tr>
<td><%= print_currency @available_total %></td>
<td><%= print_currency @available_total, @nonprofit.currency_symbol %></td>
<td>
<% if @nonprofit.bank_account %>

6
app/views/nonprofits/payouts/index.html.erb
View file

@ -21,10 +21,10 @@
<section class='table-meta'>
<div class='container--wide'>
<span class='table-meta-metric'>
Pending balance: <%= print_currency @pending_total %>
Pending balance: <%= print_currency @pending_total, @nonprofit.currency_symbol %>
</span>
<span class='table-meta-metric'>
Available balance: <%= print_currency @available_total %>
Available balance: <%= print_currency @available_total, @nonprofit.currency_symbol %>
</span>
<% if @can_make_payouts %>
<span class='table-meta-metric--blue'>
@ -70,7 +70,7 @@
<% @payouts.each do |payout| %>
<tr>
<td><%= simple_date(payout.created_at) %></td>
<td class='table-bigNum'><%= print_currency(payout.net_amount) %></td>
<td class='table-bigNum'><%= print_currency(payout.net_amount, payout.nonprofit.currency_symbol) %></td>
<td><%= payout.bank_name %></td>
<td>
<% if payout.status == 'paid' || payout.status == 'succeeded' %>

2
app/views/user_mailer/recurring_donation_cancelled.html.erb
View file

@ -1,6 +1,6 @@
<%- # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later -%>
<p>
Your recurring donation of <strong><%= print_currency(@recurring_donation.amount) %></strong> towards <strong><%= @recurring_donation.nonprofit.name %></strong> is now cancelled.
Your recurring donation of <strong><%= print_currency(@recurring_donation.amount, @recurring_donation.nonprofit.currency_symbol) %></strong> towards <strong><%= @recurring_donation.nonprofit.name %></strong> is now cancelled.
</p>
<%= render :partial => 'emails/nonprofit_sig', :locals => {:nonprofit => @recurring_donation.nonprofit} %>