kaui 0.1.12 → 0.1.14

data/app/views/kaui/account_timelines/show.html.erb

@@ -61,16 +61,16 @@
           </td>
           <td><%= "INVOICE" %></td>
           <td><span class="hide" title="<%= invoice.invoice_number %>"></span>
-              <%= "Amount:" %> <%= humanized_money_with_symbol invoice.amount_to_money(@account.currency) %><br/>
-              <%= "Balance:" %> <%= humanized_money_with_symbol invoice.balance_to_money(@account.currency) %><br/>
+              <%= "Amount:" %> <%= humanized_money_with_symbol invoice.amount_to_money(@account.currency) %>  (<%= @account.currency %>)<br/>
+              <%= "Balance:" %> <%= humanized_money_with_symbol invoice.balance_to_money(@account.currency) %>  (<%= @account.currency %>)<br/>
               <% if invoice.credit_adjustment.present? && invoice.credit_adjustment > 0  %>
-                <%= "Credit adjustment:" %> <%= humanized_money_with_symbol invoice.credit_adjustment_to_money(@account.currency) %><br/>
+                <%= "Credit adjustment:" %> <%= humanized_money_with_symbol invoice.credit_adjustment_to_money(@account.currency) %>  (<%= @account.currency %>)<br/>
               <% end %>
               <% if invoice.credit_balance_adjustment.present? && invoice.credit_balance_adjustment > 0  %>
-                <%= "Credit balance adjustment:" %> <%= humanized_money_with_symbol invoice.credit_balance_adjustment_to_money(@account.currency) %><br/>
+                <%= "Credit balance adjustment:" %> <%= humanized_money_with_symbol invoice.credit_balance_adjustment_to_money(@account.currency) %>  (<%= @account.currency %>)<br/>
               <% end %>
               <% if invoice.refund_adjustment.present? && invoice.refund_adjustment < 0  %>
-                <%= "Refund adjustment:" %> <%= humanized_money_with_symbol invoice.refund_adjustment_to_money(@account.currency) %><br/>
+                <%= "Refund adjustment:" %> <%= humanized_money_with_symbol invoice.refund_adjustment_to_money(@account.currency) %>  (<%= @account.currency %>)<br/>
               <% end %>
               <%= "Invoice #" %>
               <%= link_to invoice.invoice_number, invoice_path(:id => invoice.invoice_id) %>
@@ -131,7 +131,7 @@
             <td>
               <%= "Adjusted:" %> <% if refund.adjusted %>yes<% else %>no<% end %><br/>
               <%= "Payment id:" %> <%= refund.payment_id %><br/>
-              <%= "Refund Amount:" %> <%= humanized_money_with_symbol refund.amount_to_money %><br/>
+              <%= "Refund Amount:" %> <%= humanized_money_with_symbol refund.amount_to_money %> (<%= refund.currency %>)<br/>
             </td>
             <td>
               <% if refund.audit_logs.present? %>
@@ -168,7 +168,7 @@
           <td><%= "CHARGEBACK" %></td>
           <td>
             <%= "Payment id:" %> <%= chargeback.payment_id %><br/>
-            <%= "Chargeback Amount:" %> <%= humanized_money_with_symbol chargeback.chargeback_amount_to_money(@account.currency) %><br/>
+            <%= "Chargeback Amount:" %> <%= humanized_money_with_symbol chargeback.chargeback_amount_to_money(payment.currency) %> (<%= payment.currency %>)<br/>
           </td>
           <td>
             <% if chargeback.audit_logs.present? %>
@@ -211,8 +211,8 @@
           <td>
             <span class="hide" title="<%= invoice.invoice_number %>"></span>
             <%= "Payment id:" %> <%= payment.payment_id %><br/>
-            <%= "Total amount:" %> <%= humanized_money_with_symbol payment.amount_to_money %><br/>
-            <%= "Paid amount:" %> <%= humanized_money_with_symbol payment.paid_amount_to_money %><br/>
+            <%= "Total amount:" %> <%= humanized_money_with_symbol payment.amount_to_money %> (<%= payment.currency %>)<br/>
+            <%= "Paid amount:" %> <%= humanized_money_with_symbol payment.paid_amount_to_money %> (<%= payment.currency %>)<br/>
             <span <% if payment.status == 'FAILED' %>class="alert-error" <% elsif payment.status == 'SUCCESS' %>class="alert-success" <% end %>>
               <%= payment.status %>
             </span>

data/app/views/kaui/accounts/show.html.erb

@@ -34,9 +34,9 @@
     <% if @account.balance.nil? %>
         <dd>unknown
     <% elsif @account.balance <= 0  %>
-        <dd><span class="label label-success" ><%= humanized_money_with_symbol @account.balance_to_money %></span>
+        <dd><span class="label label-success" ><%= humanized_money_with_symbol @account.balance_to_money %> (<%= @account.currency %>)</span>
     <% else %>
-        <dd><span class="label label-important" ><%= humanized_money_with_symbol @account.balance_to_money %></span>
+        <dd><span class="label label-important" ><%= humanized_money_with_symbol @account.balance_to_money %> (<%= @account.currency %>)</span>
     <% end %>
         &nbsp;
         <nobr>
@@ -61,9 +61,9 @@
     <% if @account.cba.nil? %>
         <dd>unknown
     <% elsif @account.cba >= 0  %>
-        <dd><span class="label label-success" ><%= humanized_money_with_symbol @account.cba_to_money %></span>
+        <dd><span class="label label-success" ><%= humanized_money_with_symbol @account.cba_to_money %> (<%= @account.currency %>)</span>
     <% else %>
-        <dd><span class="label label-important" ><%= humanized_money_with_symbol @account.cba_to_money %></span>
+        <dd><span class="label label-important" ><%= humanized_money_with_symbol @account.cba_to_money %> (<%= @account.currency %>)</span>
     <% end %>
     </dd>
     <dt>Notified for inv?</dt>

data/app/views/kaui/invoices/show.html.erb

@@ -9,9 +9,9 @@
     <dt>Target date:</dt>
     <dd><%= format_date(@invoice.target_date).html_safe %>&nbsp;</dd>
     <dt>Amount:</dt>
-    <dd><%= humanized_money_with_symbol @invoice.amount_to_money(@account.currency) %>&nbsp;</dd>
+    <dd><%= humanized_money_with_symbol @invoice.amount_to_money(@account.currency) %> (<%= @account.currency %>)&nbsp;</dd>
     <dt>Balance:</dt>
-    <dd><%= humanized_money_with_symbol @invoice.balance_to_money(@account.currency) %>&nbsp;</dd>
+    <dd><%= humanized_money_with_symbol @invoice.balance_to_money(@account.currency) %> (<%= @account.currency %>)&nbsp;</dd>
   </dl>
   <div class="page-header">
     <h3>Invoice items</h3>
@@ -58,7 +58,7 @@
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= format_date(item.end_date).html_safe if item.end_date %></td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= format_date(sub.charged_through_date).html_safe if sub.present? %></td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= sub.price_list.downcase.capitalize if sub.present? and sub.price_list.present? %></td>
-          <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= humanized_money_with_symbol item.amount_to_money %></td>
+          <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= humanized_money_with_symbol item.amount_to_money %> (<%= item.currency %>)</td>
           <td>
             <nobr>
               <%= link_to "Adjust",
@@ -70,7 +70,7 @@
                           kaui_engine.invoice_item_path(item.invoice_item_id, :account_id => @invoice.account_id, :invoice_id => @invoice.invoice_id),
                           :confirm => 'Are you sure?',
                           :method => :delete,
-                          :class => "btn btn-mini #{"disabled" unless item.description =~ /account credit/ and item.amount > 0 and item.linked_invoice_item_id.nil? and !@cba_items_not_deleteable.include?(item.invoice_item_id)}" %>
+                          :class => "btn btn-mini #{"disabled" unless item.description =~ /account credit/ and item.amount > 0 and item.linked_invoice_item_id.nil? and !@cba_items_not_deleteable.include?(item.invoice_item_id) and @invoice.balance - item.amount >= 0}" %>
             </nobr>
           </td>
         </tr>

data/app/views/kaui/payments/_payments_table.html.erb

@@ -20,8 +20,8 @@
         <tr>
           <td><%= format_date(payment.requested_date).html_safe if payment.requested_date.present? %></td>
           <td><%= format_date(payment.effective_date).html_safe if payment.effective_date.present? %></td>
-          <td><%= humanized_money_with_symbol payment.amount_to_money %></td>
-          <td><%= humanized_money_with_symbol payment.paid_amount_to_money %></td>
+          <td><%= humanized_money_with_symbol payment.amount_to_money %> (<%= payment.currency %>)</td>
+          <td><%= humanized_money_with_symbol payment.paid_amount_to_money %> (<%= payment.currency %>)</td>
           <td></td>
           <td><%= payment.ext_first_payment_id_ref %> <%= " / " if payment.ext_second_payment_id_ref.present? %> <%= payment.ext_second_payment_id_ref %></td>
           <td><%= payment.retry_count %></td>

data/app/views/kaui/subscriptions/edit.html.erb

@@ -29,7 +29,7 @@
     </div>
   </div>
   <div class="control-group">
-    <%= label_tag :policy, "Policy (leave blank for default):", :class => "control-label" %>
+    <%= label_tag :policy, "Policy Override (leave blank for default; select an option to force plan change):", :class => "control-label" %>
     <div class="controls">
       <%= select_tag :policy, options_for_select(['', 'IMMEDIATE', 'END_OF_TERM']) %>
     </div>

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.1.12"
+  VERSION = "0.1.14"
 end