kaui 0.1.6 → 0.1.7

data/README.rdoc

@@ -17,6 +17,13 @@ You can run Kaui locally using the dummy app in the test directory:
 Kaui expects the container app to define the <tt>current_user</tt> method, which returns the
 name of the logged-in user. This is used by Killbill for auditing purposes.
 
+You also need to install validation.js into your asset pipeline.
+
+Gem dependencies:
+
+  gem 'rest-client', '~> 1.6.7'
+  gem 'money-rails', '~> 0.5.0'
+
 === Running tests
 
 Prepare a kaui_test database locally to be able to run the test suite:
@@ -26,4 +33,4 @@ Prepare a kaui_test database locally to be able to run the test suite:
 
 You can run tests using rake:
 
-  rake test
+  rake test

data/app/controllers/kaui/accounts_controller.rb

@@ -25,17 +25,21 @@ class Kaui::AccountsController < Kaui::EngineController
       end
 
       if @account.present? and @account.is_a? Kaui::Account
-        @tags = Kaui::KillbillHelper::get_tags_for_account(@account.account_id).sort
-        @account_emails = Kaui::AccountEmail.where(:account_id => @account.account_id)
-        @payment_methods = Kaui::KillbillHelper::get_payment_methods(@account.account_id)
-        @bundles = Kaui::KillbillHelper::get_bundles(@account.account_id)
-        @subscriptions_by_bundle_id = {}
+        begin
+          @tags = Kaui::KillbillHelper::get_tags_for_account(@account.account_id).sort
+          @account_emails = Kaui::AccountEmail.where(:account_id => @account.account_id)
+          @payment_methods = Kaui::KillbillHelper::get_payment_methods(@account.account_id)
+          @bundles = Kaui::KillbillHelper::get_bundles(@account.account_id)
+          @subscriptions_by_bundle_id = {}
 
-        @bundles.each do |bundle|
-          subscriptions = Kaui::KillbillHelper::get_subscriptions_for_bundle(bundle.bundle_id)
-          if subscriptions.present?
-            @subscriptions_by_bundle_id[bundle.bundle_id.to_s] = (@subscriptions_by_bundle_id[bundle.bundle_id.to_s] || []) + subscriptions
+          @bundles.each do |bundle|
+            subscriptions = Kaui::KillbillHelper::get_subscriptions_for_bundle(bundle.bundle_id)
+            if subscriptions.present?
+              @subscriptions_by_bundle_id[bundle.bundle_id.to_s] = (@subscriptions_by_bundle_id[bundle.bundle_id.to_s] || []) + subscriptions
+            end
           end
+        rescue => e
+          flash[:error] = "Error while retrieving account information for account: #{e.message} #{e.response}"
         end
       else
         flash[:error] = "Account #{@account_id} not found: #{@account}"

data/app/controllers/kaui/bundle_tags_controller.rb

@@ -11,18 +11,26 @@ class Kaui::BundleTagsController < Kaui::EngineController
 
   def edit
     @bundle_id = params[:bundle_id]
-    @available_tags = Kaui::KillbillHelper::get_tag_definitions.sort {|tag_a, tag_b| tag_a.name.downcase <=> tag_b.name.downcase }
+    begin
+      @available_tags = Kaui::KillbillHelper::get_tag_definitions.sort {|tag_a, tag_b| tag_a.name.downcase <=> tag_b.name.downcase }
 
-    @bundle = Kaui::KillbillHelper::get_bundle(@bundle_id)
-    @tags = Kaui::KillbillHelper::get_tags_for_bundle(@bundle_id)
+      @bundle = Kaui::KillbillHelper::get_bundle(@bundle_id)
+      @tags = Kaui::KillbillHelper::get_tags_for_bundle(@bundle_id)
+    rescue => e
+      flash[:error] = "Error while retrieving tags information: #{e.message} #{e.response}"
+    end
   end
 
   def update
-    bundle = Kaui::KillbillHelper::get_bundle(params[:bundle_id])
-    tags = params[:tags]
+    begin
+      bundle = Kaui::KillbillHelper::get_bundle(params[:bundle_id])
+      tags = params[:tags]
 
-    Kaui::KillbillHelper::set_tags_for_bundle(bundle.bundle_id, tags)
-    redirect_to Kaui.bundle_home_path.call(bundle.bundle_id)
+      Kaui::KillbillHelper::set_tags_for_bundle(bundle.bundle_id, tags)
+      redirect_to Kaui.bundle_home_path.call(bundle.bundle_id)
+    rescue => e
+      flash[:error] = "Error while updating tags: #{e.message} #{e.response}"
+    end
   end
 
 end

data/app/controllers/kaui/bundles_controller.rb

@@ -9,19 +9,18 @@ class Kaui::BundlesController < Kaui::EngineController
   def show
     key = params[:id]
     if key.present?
-      # support id (UUID) and external key search
-      if key =~ /[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}/
-        @bundle = Kaui::KillbillHelper.get_bundle(key)
-      else
-        @bundle = Kaui::KillbillHelper.get_bundle_by_external_key(key, params[:account_id])
-      end
+      begin
+        @bundle = Kaui::KillbillHelper::get_bundle_by_key(key, params[:account_id])
 
-      if @bundle.present?
-        @account = Kaui::KillbillHelper::get_account_by_bundle_id(@bundle.bundle_id)
-        @subscriptions = Kaui::KillbillHelper.get_subscriptions_for_bundle(@bundle.bundle_id)
-      else
-        flash[:error] = "Bundle #{key} not found"
-        render :action => :index
+        if @bundle.present?
+          @account = Kaui::KillbillHelper::get_account_by_bundle_id(@bundle.bundle_id)
+          @subscriptions = Kaui::KillbillHelper::get_subscriptions_for_bundle(@bundle.bundle_id)
+        else
+          flash[:error] = "Bundle #{key} not found"
+          render :action => :index
+        end
+      rescue => e
+        flash[:error] = "Error while retrieving bundle information for #{key}: #{e.message} #{e.response}"
       end
     else
       flash[:error] = "No id given"

data/app/controllers/kaui/credits_controller.rb

@@ -23,7 +23,8 @@ class Kaui::CreditsController < Kaui::EngineController
     @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id) unless @invoice_id.nil?
     credit_amount = @invoice.balance unless @invoice.nil?
 
-    @credit = Kaui::Credit.new("accountId" => @account_id, "invoiceId" => @invoice_id, "creditAmount" => credit_amount)
+    @credit = Kaui::Credit.new("accountId" => @account_id, "invoiceId" => @invoice_id,
+                               "creditAmount" => credit_amount, "effectiveDate" => Time.now.utc.iso8601)
   end
 
   def create

data/app/controllers/kaui/payments_controller.rb

@@ -11,9 +11,9 @@ class Kaui::PaymentsController < Kaui::EngineController
 
   def create
     payment = Kaui::Payment.new(params[:payment])
-
     if payment.present?
-      success = Kaui::KillbillHelper::create_payment(payment, params[:external], current_user, params[:reason], params[:comment])
+      payment.external = (payment.external == "1")
+      success = Kaui::KillbillHelper::create_payment(payment, payment.external, current_user, params[:reason], params[:comment])
       if success
         flash[:info] = "Payment created"
       end

data/app/controllers/kaui/subscriptions_controller.rb

@@ -18,13 +18,17 @@ class Kaui::SubscriptionsController < Kaui::EngineController
   def new
     bundle_id = params[:bundle_id]
     @base_subscription = params[:base_subscription]
-    @bundle = Kaui::KillbillHelper::get_bundle(bundle_id)
-    if @base_subscription.present?
-      @catalog = Kaui::KillbillHelper::get_available_addons(@base_subscription)
-    else
-      @catalog = Kaui::KillbillHelper::get_available_base_plans()
-    end
+    begin
+      @bundle = Kaui::KillbillHelper::get_bundle(bundle_id)
 
+      if @base_subscription.present?
+        @catalog = Kaui::KillbillHelper::get_available_addons(@base_subscription)
+      else
+        @catalog = Kaui::KillbillHelper::get_available_base_plans()
+      end
+    rescue => e
+      flash[:error] = "Error while trying to start new subscription creation: #{e.message} #{e.response}"
+    end
     @subscription = Kaui::Subscription.new("bundleId" => bundle_id)
   end
 
@@ -50,7 +54,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
       Kaui::KillbillHelper::create_subscription(@subscription, current_user)
       redirect_to Kaui.bundle_home_path.call(@bundle.bundle_id)
     rescue => e
-      flash[:error] = e.message
+      flash[:error] = "Error while creating the new subscription: #{e.message} #{e.response}"
       render :new
     end
   end
@@ -64,14 +68,18 @@ class Kaui::SubscriptionsController < Kaui::EngineController
     @billing_period = params[:billing_period]
     @price_list = params[:price_list]
 
-    @subscription = Kaui::Subscription.new(:bundle_id => @bundle_id,
-                                           :product_name => @product_name,
-                                           :product_category => @product_category,
-                                           :billing_period => @billing_period,
-                                           :price_list => @price_list)
-
-    @bundle = Kaui::KillbillHelper.get_bundle(subscription.bundle_id)
-    @available_plans = Kaui::KillbillHelper.get_available_addons(params[:base_product_name])
+    begin
+      @subscription = Kaui::Subscription.new(:bundle_id => @bundle_id,
+                                             :product_name => @product_name,
+                                             :product_category => @product_category,
+                                             :billing_period => @billing_period,
+                                             :price_list => @price_list)
+
+      @bundle = Kaui::KillbillHelper.get_bundle(subscription.bundle_id)
+      @available_plans = Kaui::KillbillHelper.get_available_addons(params[:base_product_name])
+    rescue => e
+      flash[:error] = "Error while adding an addon: #{e.message} #{e.response}"
+    end
   end
 
   def edit
@@ -95,21 +103,26 @@ class Kaui::SubscriptionsController < Kaui::EngineController
 
   def update
     if params.has_key?(:subscription) && params[:subscription].has_key?(:subscription_id)
-      subscription = Kaui::KillbillHelper::get_subscription(params[:subscription][:subscription_id])
-      bundle = Kaui::KillbillHelper::get_bundle(subscription.bundle_id)
-      catalog = Kaui::KillbillHelper::get_available_base_plans
 
-      plan = catalog[params[:plan_name]]
-      requested_date = params[:requested_date]
+      begin
+        subscription = Kaui::KillbillHelper::get_subscription(params[:subscription][:subscription_id])
+        bundle = Kaui::KillbillHelper::get_bundle(subscription.bundle_id)
+        catalog = Kaui::KillbillHelper::get_available_base_plans
 
-      subscription.billing_period = plan["billingPeriod"]
-      subscription.product_category = plan["productCategory"]
-      subscription.product_name = plan["productName"]
-      subscription.price_list = plan["priceListName"]
-      subscription.subscription_id = params[:subscription][:subscription_id]
+        plan = catalog[params[:plan_name]]
+        requested_date = params[:requested_date]
 
-      Kaui::KillbillHelper::update_subscription(subscription, requested_date, current_user)
-      redirect_to Kaui.bundle_home_path.call(bundle.bundle_id)
+        subscription.billing_period = plan["billingPeriod"]
+        subscription.product_category = plan["productCategory"]
+        subscription.product_name = plan["productName"]
+        subscription.price_list = plan["priceListName"]
+        subscription.subscription_id = params[:subscription][:subscription_id]
+
+        Kaui::KillbillHelper::update_subscription(subscription, requested_date, current_user)
+        redirect_to Kaui.bundle_home_path.call(bundle.bundle_id)
+      rescue => e
+        flash[:error] = "Error while updating subscription: #{e.message} #{e.response}"
+      end
     else
       flash[:error] = "No subscription given"
       redirect_to :back

data/app/helpers/kaui/killbill_helper.rb

@@ -105,7 +105,6 @@ module Kaui
                              "X-Killbill-Comment" => "#{comment}"
         return data[:code] < 300
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -121,77 +120,60 @@ module Kaui
                              "X-Killbill-Comment" => "#{comment}"
         return data[:code] = 200
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
     ############## BUNDLE ##############
 
-    def self.get_bundles(account_id)
-      begin
-        data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/bundles"
-        process_response(data, :multiple) {|json| Kaui::Bundle.new(json) }
-      rescue RestClient::BadRequest
-        []
-      rescue => e
+    def self.get_bundle_by_key(key, account_id)
+      # support id (UUID) and external key search
+      if key =~ /[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}/
+        @bundle = Kaui::KillbillHelper::get_bundle(key)
+      else
+        @bundle = Kaui::KillbillHelper::get_bundle_by_external_key(key, account_id)
       end
     end
 
+    def self.get_bundles(account_id)
+      data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/bundles"
+      process_response(data, :multiple) {|json| Kaui::Bundle.new(json) }
+    end
+
     def self.get_bundle_by_external_key(account_id, external_key)
-      begin
-        data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/bundles?externalKey=#{external_key}"
-        process_response(data, :single) {|json| Kaui::Bundle.new(json) }
-      rescue => e
-      end
+      data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/bundles?externalKey=#{external_key}"
+      process_response(data, :single) {|json| Kaui::Bundle.new(json) }
     end
 
     def self.get_bundle(bundle_id)
-      begin
-        data = call_killbill :get, "/1.0/kb/bundles/#{bundle_id}"
-        process_response(data, :single) {|json| Kaui::Bundle.new(json) }
-      rescue => e
-      end
+      data = call_killbill :get, "/1.0/kb/bundles/#{bundle_id}"
+      process_response(data, :single) {|json| Kaui::Bundle.new(json) }
     end
 
     def self.transfer_bundle(bundle_id, new_account_id, cancel_immediately = false, transfer_addons = true, current_user = nil, reason = nil, comment = nil)
-      begin
-        data = call_killbill :put,
-                             "/1.0/kb/bundles/#{bundle_id}?cancelImmediately=#{cancel_immediately}&transferAddOn=#{transfer_addons}",
-                             ActiveSupport::JSON.encode("accountId" => new_account_id),
-                             :content_type => :json,
-                             "X-Killbill-CreatedBy" => current_user,
-                             "X-Killbill-Reason" => "#{reason}",
-                             "X-Killbill-Comment" => "#{comment}"
-        return data[:code] < 300
-
-      rescue => e
-      end
+      data = call_killbill :put,
+                           "/1.0/kb/bundles/#{bundle_id}?cancelImmediately=#{cancel_immediately}&transferAddOn=#{transfer_addons}",
+                           ActiveSupport::JSON.encode("accountId" => new_account_id),
+                           :content_type => :json,
+                           "X-Killbill-CreatedBy" => current_user,
+                           "X-Killbill-Reason" => "#{reason}",
+                           "X-Killbill-Comment" => "#{comment}"
+      return data[:code] < 300
     end
 
     ############## SUBSCRIPTION ##############
 
     def self.get_subscriptions_for_bundle(bundle_id)
-      begin
-        data = call_killbill :get, "/1.0/kb/bundles/#{bundle_id}/subscriptions"
-        process_response(data, :multiple) {|json| Kaui::Subscription.new(json) }
-      rescue RestClient::BadRequest
-        []
-      rescue => e
-      end
+      data = call_killbill :get, "/1.0/kb/bundles/#{bundle_id}/subscriptions"
+      process_response(data, :multiple) {|json| Kaui::Subscription.new(json) }
     end
 
     def self.get_subscriptions(account_id)
-      begin
         subscriptions = []
         bundles = get_bundles(account_id)
         bundles.each do |bundle|
           subscriptions += get_subscriptions_for_bundle(bundle.bundle_id)
         end
         subscriptions
-      rescue RestClient::BadRequest
-        []
-      rescue => e
-      end
     end
 
     def self.get_subscription(subscription_id)
@@ -223,7 +205,8 @@ module Kaui
       begin
         subscription_data = Kaui::Subscription.camelize(subscription.to_hash)
         date_param = "?requestedDate=" + requested_date.to_s unless requested_date.blank?
-
+        # We don't want to pass events
+        subscription_data.delete(:events)
         data = call_killbill :put,
                              "/1.0/kb/subscriptions/#{subscription.subscription_id}#{date_param}",
                              ActiveSupport::JSON.encode(subscription_data, :root => false),
@@ -337,22 +320,16 @@ module Kaui
     ############## CATALOG ##############
 
     def self.get_available_addons(base_product_name)
-      begin
-        data = call_killbill :get, "/1.0/kb/catalog/availableAddons?baseProductName=#{base_product_name}"
-        if data.has_key?(:json)
-          data[:json].inject({}) {|catalog_hash, item| catalog_hash.merge!(item["planName"] => item) }
-        end
-      rescue => e
+      data = call_killbill :get, "/1.0/kb/catalog/availableAddons?baseProductName=#{base_product_name}"
+      if data.has_key?(:json)
+        data[:json].inject({}) {|catalog_hash, item| catalog_hash.merge!(item["planName"] => item) }
       end
     end
 
     def self.get_available_base_plans()
-      begin
-        data = call_killbill :get, "/1.0/kb/catalog/availableBasePlans"
-        if data.has_key?(:json)
-          data[:json].inject({}) {|catalog_hash, item| catalog_hash.merge!(item["planName"] => item) }
-        end
-      rescue => e
+      data = call_killbill :get, "/1.0/kb/catalog/availableBasePlans"
+      if data.has_key?(:json)
+        data[:json].inject({}) {|catalog_hash, item| catalog_hash.merge!(item["planName"] => item) }
       end
     end
 
@@ -381,6 +358,11 @@ module Kaui
         payment_data = Kaui::Payment.camelize(payment.to_hash)
 
         if payment.invoice_id.present?
+          # We should use different model for POST and GEt, this seems fragile...
+          payment_data.delete(:external)
+          payment_data.delete(:refunds)
+          payment_data.delete(:chargebacks)
+          payment_data.delete(:audit_logs)
           data = call_killbill :post,
                                "/1.0/kb/invoices/#{payment.invoice_id}/payments?externalPayment=#{external}",
                                ActiveSupport::JSON.encode(payment_data, :root => false),

data/app/models/kaui/account.rb

@@ -42,4 +42,8 @@ class Kaui::Account < Kaui::Base
   def to_param
     @account_id
   end
+
+  def balance_to_money
+    Kaui::Base.to_money(balance.abs, currency)
+  end
 end

data/app/models/kaui/base.rb

@@ -96,6 +96,14 @@ class Kaui::Base
     result
   end
 
+  def self.to_money(amount, currency)
+    begin
+      return Money.new(amount.to_f * 100, currency)
+    rescue => e
+    end if currency.present?
+    Money.new(amount.to_f * 100, "USD")
+  end
+
   def self.camelize(value)
     case value
       when Array

data/app/models/kaui/chargeback.rb

@@ -30,4 +30,8 @@ class Kaui::Chargeback < Kaui::Base
 
   has_many :audit_logs, Kaui::AuditLog
 
+  # TODO - fix chargeback json to return the currency
+  def chargeback_amount_to_money(currency)
+    Kaui::Base.to_money(chargeback_amount, currency)
+  end
 end

data/app/models/kaui/invoice.rb

@@ -33,4 +33,30 @@ class Kaui::Invoice < Kaui::Base
           :bundle_keys => data['bundleKeys'],
           :audit_logs => data['auditLogs'])
   end
+
+  # TODO - fix invoice json to return the currency
+
+  def amount_to_money(currency)
+    Kaui::Base.to_money(amount, currency)
+  end
+
+  def balance_to_money(currency)
+    Kaui::Base.to_money(balance, currency)
+  end
+
+  def payment_amount_to_money(currency)
+    Kaui::Base.to_money(payment_amount, currency)
+  end
+
+  def refund_adjustment_to_money(currency)
+    Kaui::Base.to_money(refund_adjustment, currency)
+  end
+
+  def credit_balance_adjustment_to_money(currency)
+    Kaui::Base.to_money(credit_balance_adjustment, currency)
+  end
+
+  def credit_adjustment_to_money(currency)
+    Kaui::Base.to_money(credit_adjustment, currency)
+  end
 end

data/app/models/kaui/invoice_item.rb

@@ -19,4 +19,8 @@ class Kaui::InvoiceItem < Kaui::Base
   define_attr :currency
   define_attr :linked_invoice_item_id
   define_attr :audit_logs
+
+  def amount_to_money
+    Kaui::Base.to_money(amount, currency)
+  end
 end

data/app/models/kaui/payment.rb

@@ -22,8 +22,17 @@ class Kaui::Payment < Kaui::Base
   define_attr :ext_second_payment_id_ref
   define_attr :gateway_error_code
   define_attr :gateway_error_msg
+  define_attr :external
 
   has_many :refunds, Kaui::Refund
   has_many :chargebacks, Kaui::Chargeback
   has_many :audit_logs, Kaui::AuditLog
+
+  def amount_to_money
+    Kaui::Base.to_money(amount, currency)
+  end
+
+  def paid_amount_to_money
+    Kaui::Base.to_money(paid_amount, currency)
+  end
 end

data/app/models/kaui/refund.rb

@@ -16,4 +16,8 @@ class Kaui::Refund < Kaui::Base
   define_attr :adjustments
 
   has_many :audit_logs, Kaui::AuditLog
+
+  def amount_to_money
+    Kaui::Base.to_money(amount, currency)
+  end
 end

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

@@ -62,16 +62,16 @@
             <% end %>
           </td>
           <td><%= "INVOICE" %></td>
-          <td><%= "Amount:" %> <%= invoice.amount %>  <%= @account.currency %><br/>
-              <%= "Balance:" %> <%= invoice.balance %> <%= @account.currency %><br/>
-              <% if invoice.credit_adjustment.present? &&  invoice.credit_adjustment > 0  %>
-                <%= "Credit adjustment:" %> <%= invoice.credit_adjustment %> <%= @account.currency %> <br/>
+          <td><%= "Amount:" %> <%= humanized_money_with_symbol invoice.amount_to_money(@account.currency) %><br/>
+              <%= "Balance:" %> <%= humanized_money_with_symbol invoice.balance_to_money(@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/>
               <% end %>
-              <% if invoice.credit_balance_adjustment.present? &&  invoice.credit_balance_adjustment > 0  %>
-                <%= "Credit balance adjustment:" %> <%= invoice.credit_balance_adjustment %>  <%= @account.currency %> <br/>
+              <% 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/>
               <% end %>
-              <% if invoice.refund_adjustment.present? &&  invoice.refund_adjustment < 0  %>
-                <%= "Refund adjustment:" %> <%= invoice.refund_adjustment %>  <%= @account.currency %> <br/>
+              <% if invoice.refund_adjustment.present? && invoice.refund_adjustment < 0  %>
+                <%= "Refund adjustment:" %> <%= humanized_money_with_symbol invoice.refund_adjustment_to_money(@account.currency) %><br/>
               <% end %>
               <%= "Invoice #" %>
               <%= link_to invoice.invoice_number, invoice_path(:id => invoice.invoice_id) %>
@@ -91,18 +91,10 @@
                                                                      :invoice_id => invoice.invoice_id }),
                             :class => "btn btn-mini" %>
               </nobr>
-              <nobr>
-                <%= link_to "External Payment",
-                            kaui_engine.new_payment_path(:params => { :account_id => invoice.account_id,
-                                                                      :invoice_id => invoice.invoice_id,
-                                                                      :external => "true" }),
-                            :class => "btn btn-mini" %>
-              </nobr>
               <nobr>
                 <%= link_to "Payment",
                             kaui_engine.new_payment_path(:params => { :account_id => invoice.account_id,
-                                                                      :invoice_id => invoice.invoice_id,
-                                                                      :external => "false" }),
+                                                                      :invoice_id => invoice.invoice_id }),
                             :class => "btn btn-mini" %>
               </nobr>
             <% end %>
@@ -144,7 +136,7 @@
             <td>
               <%= "Adjusted:" %> <% if refund.adjusted %>yes<% else %>no<% end %><br/>
               <%= "Payment id:" %> <%= refund.payment_id %><br/>
-              <%= "Refund Amount:" %> <%= refund.amount %><br/>
+              <%= "Refund Amount:" %> <%= humanized_money_with_symbol refund.amount_to_money %><br/>
             </td>
             <td>
               <% if refund.audit_logs.present? %>
@@ -183,7 +175,7 @@
           <td><%= "CHARGEBACK" %></td>
           <td>
             <%= "Payment id:" %> <%= chargeback.payment_id %><br/>
-            <%= "Chargeback Amount:" %> <%= chargeback.chargeback_amount %><br/>
+            <%= "Chargeback Amount:" %> <%= humanized_money_with_symbol chargeback.chargeback_amount_to_money(@account.currency) %><br/>
           </td>
           <td>
             <% if chargeback.audit_logs.present? %>
@@ -227,8 +219,8 @@
           <td><%= "PAYMENT" %></td>
           <td>
             <%= "Payment id:" %> <%= payment.payment_id %><br/>
-            <%= "Total amount:" %> <%= payment.amount %> <%= @account.currency if payment.amount.present? %><br/>
-            <%= "Paid amount:" %> <%= payment.paid_amount %> <%= @account.currency %><br/>
+            <%= "Total amount:" %> <%= humanized_money_with_symbol payment.amount_to_money %><br/>
+            <%= "Paid amount:" %> <%= humanized_money_with_symbol payment.paid_amount_to_money %><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

@@ -32,15 +32,26 @@
     <dd><%= @account.external_key %>&nbsp;</dd>
     <dt>Account balance:</dt>
     <% if @account.balance.nil? %>
-        <dd>unknown &nbsp;</dd>
+        <dd>unknown
     <% elsif @account.balance <= 0  %>
-        <dd><span class="label label-success" ><%= @account.balance %></span> &nbsp;</dd>
+        <dd><span class="label label-success" ><%= humanized_money_with_symbol @account.balance_to_money %></span>
     <% else %>
-        <dd><span class="label label-important" ><%= @account.balance %></span>&nbsp;</dd>
+        <dd><span class="label label-important" ><%= humanized_money_with_symbol @account.balance_to_money %></span>
     <% end %>
+        &nbsp;
+        <nobr>
+          <%= link_to 'Charge',
+                      kaui_engine.new_charge_path(:params => { :account_id => @account.account_id }),
+                      :class => "btn btn-mini" %>
+        </nobr>
+        <nobr>
+          <%= link_to 'Credit',
+                      kaui_engine.new_credit_path(:params => { :account_id => @account.account_id }),
+                      :class => "btn btn-mini" %>
+        </nobr>
+        </dd>
     <dt>Notified for inv?</dt>
     <dd><%= @account.is_notified_for_invoices %>&nbsp;<%= link_to "Toggle", kaui_engine.toggle_email_notifications_account_path(@account.account_id, :is_notified => !@account.is_notified_for_invoices), :method => :post, :class => 'btn btn-mini' %></dd>
-
     <%= render :partial => "kaui/tags/tags_table",
                :locals => { :tags => @tags, :tags_url_or_path => kaui_engine.edit_account_tags_path(:params => { :account_id => @account.account_id }) } %>
     <%= render :partial => "kaui/account_emails/account_emails_table",

data/app/views/kaui/chargebacks/new.html.erb

@@ -74,7 +74,7 @@
     <div class="control-group">
       <%= f.label :chargeback_amount, "Chargeback amount", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :chargeback_amount, :class => 'input-small' %>
+        <%= f.text_field :chargeback_amount, :id => 'chargeback_amount', :class => 'input-small' %>
         <p class="help-inline"><%= @account.currency %></p>
       </div>
     </div>
@@ -96,3 +96,10 @@
     </div>
   </fieldset>
 <% end %>
+<%= javascript_tag do %>
+  $(document).ready(function() {
+    $("#chargeback_amount").keydown(function(event) {
+      preventNonNumericValues(event);
+    });
+  });
+<% end %>