diff --git a/app/views/campaigns/_campaigns_table.html.erb b/app/views/campaigns/_campaigns_table.html.erb index fadf215e..02168fd0 100644 --- a/app/views/campaigns/_campaigns_table.html.erb +++ b/app/views/campaigns/_campaigns_table.html.erb @@ -22,7 +22,7 @@ <% end %> <% if campaign.show_total_raised %> - $<%= print_currency campaign.total_raised, false %> raised + <%= print_currency campaign.total_raised, campaign.nonprofit.currency_symbol %> raised <% end %> diff --git a/app/views/charge_mailer/_payment_receipt.html.erb b/app/views/charge_mailer/_payment_receipt.html.erb index 98fcfcf7..2bfc9349 100644 --- a/app/views/charge_mailer/_payment_receipt.html.erb +++ b/app/views/charge_mailer/_payment_receipt.html.erb @@ -10,7 +10,7 @@ Total Amount - <%= print_currency(charge.amount) %> + <%= print_currency(charge.amount, charge.nonprofit.currency_symbol) %> <% if @event %> diff --git a/app/views/donation_mailer/_donation_changed_amount_table.html.erb b/app/views/donation_mailer/_donation_changed_amount_table.html.erb index 99b05844..9af8748d 100644 --- a/app/views/donation_mailer/_donation_changed_amount_table.html.erb +++ b/app/views/donation_mailer/_donation_changed_amount_table.html.erb @@ -18,12 +18,12 @@ New Amount - <%= print_currency(donation.amount) %> + <%= print_currency(donation.amount, donation.nonprofit.currency_symbol) %> Previous Amount - <%= print_currency(previous_amount) %> + <%= print_currency(previous_amount, donation.nonprofit.currency_symbol) %> <% if donation.campaign %> diff --git a/app/views/donation_mailer/_recurring_donation_table.html.erb b/app/views/donation_mailer/_recurring_donation_table.html.erb index bade4146..941abc9a 100644 --- a/app/views/donation_mailer/_recurring_donation_table.html.erb +++ b/app/views/donation_mailer/_recurring_donation_table.html.erb @@ -10,7 +10,7 @@ Recurring Amount - <%= print_currency(donation.amount) %> + <%= print_currency(donation.amount, donation.nonprofit.currency_symbol) %> diff --git a/app/views/nonprofit_mailer/_payout_table.html.erb b/app/views/nonprofit_mailer/_payout_table.html.erb index 41963435..4d103dba 100644 --- a/app/views/nonprofit_mailer/_payout_table.html.erb +++ b/app/views/nonprofit_mailer/_payout_table.html.erb @@ -2,11 +2,11 @@ - + - + diff --git a/app/views/nonprofit_mailer/invoice_payment_notification.html.erb b/app/views/nonprofit_mailer/invoice_payment_notification.html.erb index a4f30eb0..a9f4691f 100644 --- a/app/views/nonprofit_mailer/invoice_payment_notification.html.erb +++ b/app/views/nonprofit_mailer/invoice_payment_notification.html.erb @@ -20,7 +20,7 @@ Your invoice for the month of <%= @month_name %> has been paid and the receipt i - + diff --git a/app/views/nonprofits/payouts/_modal.html.erb b/app/views/nonprofits/payouts/_modal.html.erb index cc70e095..ab0e3076 100644 --- a/app/views/nonprofits/payouts/_modal.html.erb +++ b/app/views/nonprofits/payouts/_modal.html.erb @@ -5,7 +5,7 @@
-

Use this form to make a payout right now of your available balance (<%= print_currency @available_total %>).

+

Use this form to make a payout right now of your available balance (<%= print_currency @available_total, @nonprofit.currency_symbol %>).

You will receive a receipt of all donations after this payout.

Payouts usually take 1-3 days to complete.

@@ -20,7 +20,7 @@
- + - +
Gross Amount<%= print_currency(payout.gross_amount) %><%= print_currency(payout.gross_amount, payout.nonprofit.currency_symbol) %>
Net Amount<%= print_currency(payout.net_amount) %><%= print_currency(payout.net_amount, payout.nonprofit.currency_symbol) %>
Date
Total Amount <%= print_currency(@payment.gross_amount) %> <%= print_currency(@payment.gross_amount, @payment.nonprofit.currency_symbol) %>
Transaction Date
<%= print_currency @available_total %><%= print_currency @available_total, @nonprofit.currency_symbol %> <% if @nonprofit.bank_account %> diff --git a/app/views/nonprofits/payouts/index.html.erb b/app/views/nonprofits/payouts/index.html.erb index 94eed097..ce62150a 100644 --- a/app/views/nonprofits/payouts/index.html.erb +++ b/app/views/nonprofits/payouts/index.html.erb @@ -21,10 +21,10 @@
- Pending balance: <%= print_currency @pending_total %> + Pending balance: <%= print_currency @pending_total, @nonprofit.currency_symbol %> - Available balance: <%= print_currency @available_total %> + Available balance: <%= print_currency @available_total, @nonprofit.currency_symbol %> <% if @can_make_payouts %> @@ -70,7 +70,7 @@ <% @payouts.each do |payout| %>
<%= simple_date(payout.created_at) %><%= print_currency(payout.net_amount) %><%= print_currency(payout.net_amount, payout.nonprofit.currency_symbol) %> <%= payout.bank_name %> <% if payout.status == 'paid' || payout.status == 'succeeded' %> diff --git a/app/views/user_mailer/recurring_donation_cancelled.html.erb b/app/views/user_mailer/recurring_donation_cancelled.html.erb index bb3433d9..d6929a6b 100644 --- a/app/views/user_mailer/recurring_donation_cancelled.html.erb +++ b/app/views/user_mailer/recurring_donation_cancelled.html.erb @@ -1,6 +1,6 @@ <%- # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later -%>

-Your recurring donation of <%= print_currency(@recurring_donation.amount) %> towards <%= @recurring_donation.nonprofit.name %> is now cancelled. +Your recurring donation of <%= print_currency(@recurring_donation.amount, @recurring_donation.nonprofit.currency_symbol) %> towards <%= @recurring_donation.nonprofit.name %> is now cancelled.

<%= render :partial => 'emails/nonprofit_sig', :locals => {:nonprofit => @recurring_donation.nonprofit} %>