kaui 0.2.0 → 0.2.1

data/app/assets/javascripts/kaui/bootstrap-tweaks.js

@@ -18,7 +18,7 @@ function makeDataTable(tableObj) {
     }
   });
 
-  var numRows = 10;
+  var numRows = 25;
   var rowRegexp = /(\d+)rows/;
   var classes = (tableObj.attr('class') || "").split(/\s+/);
   for (var idx = 0; idx < classes.length; idx++) {

data/app/assets/stylesheets/kaui/analytics.css

@@ -1,3 +1,7 @@
+table.right-aligned th, table.right-aligned td {
+  text-align: right;
+}
+
 path {
   stroke: steelblue;
   stroke-width: 1;

data/app/controllers/kaui/analytics_controller.rb

@@ -19,6 +19,27 @@ module Kaui
       end
     end
 
+    def account_snapshot
+      # params[:account_id] can either be a uuid or an external key
+      begin
+        @account = Kaui::KillbillHelper::get_account_by_key(params[:account_id])
+        @snapshot = Kaui::KillbillHelper::get_account_snapshot(@account.account_id)
+      rescue => e
+        flash[:error] = "Error while retrieving account snapshot: #{as_string(e)}"
+        redirect_to :analytics
+      end
+    end
+
+    def refresh_account
+      begin
+        Kaui::KillbillHelper::refresh_account(params[:account_id])
+        flash[:notice] = "Account successfully refreshed!"
+      rescue => e
+        flash[:error] = "Error while refreshing account: #{as_string(e)}"
+      end
+      redirect_to account_snapshot_path(:account_id => params[:account_id])
+    end
+
     def accounts_over_time
       begin
         @accounts = Analytics.accounts_over_time
@@ -33,5 +54,14 @@ module Kaui
       @slug = params[:slug]
       @subscriptions = Analytics.subscriptions_over_time(@product_type, @slug)
     end
+
+    def sanity
+      begin
+        @sanity = Kaui::KillbillHelper::check_analytics_sanity
+      rescue => e
+        flash[:error] = "Error while checking Analytics sanity: #{as_string(e)}"
+        redirect_to :analytics
+      end
+    end
   end
 end

data/app/controllers/kaui/chargebacks_controller.rb

@@ -27,12 +27,14 @@ class Kaui::ChargebacksController < Kaui::EngineController
       @account = Kaui::KillbillHelper::get_account(@account_id)
       @payment = Kaui::KillbillHelper::get_payment(@payment_id)
       @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
-      @payment_method = Kaui::KillbillHelper::get_payment_method(@payment.payment_method_id)
     rescue => e
       flash[:error] = "Error while starting a new chargeback: #{as_string(e)}"
       redirect_to kaui_engine.account_timeline_path(:id => params[:account_id])
     end
 
+    # The payment method may have been deleted
+    @payment_method = Kaui::KillbillHelper::get_payment_method(@payment.payment_method_id) rescue nil
+
     @chargeback = Kaui::Chargeback.new("paymentId" => @payment_id,
                                        "chargebackAmount" => @payment.amount)
   end

data/app/controllers/kaui/invoices_controller.rb

@@ -13,6 +13,11 @@ class Kaui::InvoicesController < Kaui::EngineController
         if @invoice.present?
           @account = Kaui::KillbillHelper.get_account(@invoice.account_id)
           @payments = Kaui::KillbillHelper.get_payments(@invoice_id)
+          @payment_methods = {}
+          @payments.each do |payment|
+            # The payment method may have been deleted
+            @payment_methods[payment.payment_id] = Kaui::KillbillHelper::get_payment_method(payment.payment_method_id) rescue nil
+          end
 
           @subscriptions = {}
           @bundles = {}

data/app/helpers/kaui/killbill_helper.rb

@@ -552,6 +552,20 @@ module Kaui
 
     ############## ANALYTICS ##############
 
+    def self.get_account_snapshot(account_id)
+      data = call_killbill :get, "/1.0/kb/analytics/#{account_id}"
+      process_response(data, :single) { |json| Kaui::BusinessSnapshot.new(json) }
+    end
+
+    def self.refresh_account(account_id, current_user = nil, reason = nil, comment = nil)
+      call_killbill :put,
+                    "/1.0/kb/analytics/#{account_id}",
+                    nil,
+                    "X-Killbill-CreatedBy" => current_user,
+                    "X-Killbill-Reason" => "#{reason}",
+                    "X-Killbill-Comment" => "#{comment}"
+    end
+
     def self.get_accounts_created_over_time
       data = call_killbill :get, "/1.0/kb/analytics/accountsCreatedOverTime"
       process_response(data, :single) { |json| Kaui::TimeSeriesData.new(json) }
@@ -561,5 +575,10 @@ module Kaui
       data = call_killbill :get, "/1.0/kb/analytics/subscriptionsCreatedOverTime?productType=#{product_type}&slug=#{slug}"
       process_response(data, :single) { |json| Kaui::TimeSeriesData.new(json) }
     end
+
+    def self.check_analytics_sanity
+      data = call_killbill :get, "/1.0/kb/analytics/sanity"
+      process_response(data, :single) { |json| Kaui::AnalyticsSanity.new(json) }
+    end
   end
 end

data/app/models/kaui/analytics_sanity.rb

@@ -0,0 +1,7 @@
+class Kaui::AnalyticsSanity < Kaui::Base
+  define_attr :check_entitlement
+  define_attr :check_invoice
+  define_attr :check_payment
+  define_attr :check_tag
+  define_attr :check_consistency
+end

data/app/models/kaui/base.rb

@@ -14,6 +14,7 @@ class Kaui::Base
       @@attribute_names[self.name][attr_name.to_sym] = { :cardinality => :one }
     end
   end
+  define_attr :audit_logs
 
   def self.has_one(attr_name, type = nil)
     send("attr_accessor".to_sym, attr_name)

data/app/models/kaui/business_account.rb

@@ -0,0 +1,12 @@
+class Kaui::BusinessAccount < Kaui::Base
+  define_attr :external_key
+  define_attr :name
+  define_attr :currency
+  define_attr :balance
+  define_attr :last_invoice_date
+  define_attr :total_invoice_balance
+  define_attr :last_payment_status
+  define_attr :default_payment_method_type
+  define_attr :default_credit_card_type
+  define_attr :default_billing_address_country
+end

data/app/models/kaui/business_field.rb

@@ -0,0 +1,6 @@
+class Kaui::BusinessField < Kaui::Base
+  define_attr :object_type
+  define_attr :id
+  define_attr :name
+  define_attr :value
+end

data/app/models/kaui/business_invoice.rb

@@ -0,0 +1,31 @@
+class Kaui::BusinessInvoice < Kaui::Base
+  define_attr :invoice_id
+  define_attr :invoice_number
+  define_attr :account_id
+  define_attr :account_key
+  define_attr :invoice_date
+  define_attr :target_date
+  define_attr :currency
+  define_attr :balance
+  define_attr :amount_paid
+  define_attr :amount_charged
+  define_attr :amount_credited
+
+  has_many :invoice_items, Kaui::BusinessInvoiceItem
+
+  def balance_to_money
+    Kaui::Base.to_money(balance.abs, currency)
+  end
+
+  def amount_paid_to_money
+    Kaui::Base.to_money(amount_paid.abs, currency)
+  end
+
+  def amount_charged_to_money
+    Kaui::Base.to_money(amount_charged.abs, currency)
+  end
+
+  def amount_credited_to_money
+    Kaui::Base.to_money(amount_credited.abs, currency)
+  end
+end

data/app/models/kaui/business_invoice_item.rb

@@ -0,0 +1,17 @@
+class Kaui::BusinessInvoiceItem < Kaui::Base
+  define_attr :item_id
+  define_attr :invoice_id
+  define_attr :item_type
+  define_attr :external_key
+  define_attr :product_name
+  define_attr :product_type
+  define_attr :product_category
+  define_attr :slug
+  define_attr :phase
+  define_attr :billing_period
+  define_attr :start_date
+  define_attr :end_date
+  define_attr :amount
+  define_attr :currency
+  define_attr :linked_item_id
+end

data/app/models/kaui/business_invoice_payment.rb

@@ -0,0 +1,25 @@
+class Kaui::BusinessInvoicePayment < Kaui::Base
+  define_attr :payment_id
+  define_attr :ext_first_payment_ref_id
+  define_attr :ext_second_payment_ref_id
+  define_attr :account_key
+  define_attr :invoice_id
+  define_attr :invoice_number
+  define_attr :effective_date
+  define_attr :amount
+  define_attr :currency
+  define_attr :payment_error
+  define_attr :processing_status
+  define_attr :requested_amount
+  define_attr :plugin_name
+  define_attr :payment_type
+  define_attr :payment_method
+  define_attr :card_type
+  define_attr :card_country
+  define_attr :invoice_payment_type
+  define_attr :linked_invoice_payment_id
+
+  def amount_to_money
+    Kaui::Base.to_money(amount.abs, currency)
+  end
+end

data/app/models/kaui/business_overdue_status.rb

@@ -0,0 +1,8 @@
+class Kaui::BusinessOverdueStatus < Kaui::Base
+  define_attr :object_type
+  define_attr :id
+  define_attr :account_key
+  define_attr :status
+  define_attr :start_date
+  define_attr :end_date
+end

data/app/models/kaui/business_snapshot.rb

@@ -0,0 +1,9 @@
+class Kaui::BusinessSnapshot < Kaui::Base
+  has_one  :business_account, Kaui::BusinessAccount
+  has_many :business_subscription_transitions, Kaui::BusinessSubscriptionTransition
+  has_many :business_invoices, Kaui::BusinessInvoice
+  has_many :business_invoice_payments, Kaui::BusinessInvoicePayment
+  has_many :business_overdue_statuses, Kaui::BusinessOverdueStatus
+  has_many :business_tags, Kaui::BusinessTag
+  has_many :business_fields, Kaui::BusinessField
+end

data/app/models/kaui/business_subscription_transition.rb

@@ -0,0 +1,54 @@
+class Kaui::BusinessSubscriptionTransition < Kaui::Base
+  define_attr :total_ordering
+  define_attr :bundle_id
+  define_attr :external_key
+  define_attr :account_id
+  define_attr :account_key
+  define_attr :subscription_id
+
+  define_attr :requested_timestamp
+  define_attr :event_type
+  define_attr :category
+
+  define_attr :prev_product_name
+  define_attr :prev_product_type
+  define_attr :prev_product_category
+  define_attr :prev_slug
+  define_attr :prev_phase
+  define_attr :prev_billing_period
+  define_attr :prev_price
+  define_attr :prev_price_list
+  define_attr :prev_mrr
+  define_attr :prev_currency
+  define_attr :prev_start_date
+  define_attr :prev_state
+
+  define_attr :next_product_name
+  define_attr :next_product_type
+  define_attr :next_product_category
+  define_attr :next_slug
+  define_attr :next_phase
+  define_attr :next_billing_period
+  define_attr :next_price
+  define_attr :next_price_list
+  define_attr :next_mrr
+  define_attr :next_currency
+  define_attr :next_start_date
+  define_attr :next_state
+
+  def prev_price_to_money
+    Kaui::Base.to_money(prev_price.abs, prev_currency)
+  end
+
+  def prev_mrr_to_money
+    Kaui::Base.to_money(prev_mrr.abs, prev_currency)
+  end
+
+  def next_price_to_money
+    Kaui::Base.to_money(next_price.abs, next_currency)
+  end
+
+  def next_mrr_to_money
+    Kaui::Base.to_money(next_mrr.abs, next_currency)
+  end
+end

data/app/models/kaui/business_tag.rb

@@ -0,0 +1,5 @@
+class Kaui::BusinessTag < Kaui::Base
+  define_attr :object_type
+  define_attr :id
+  define_attr :name
+end

data/app/views/kaui/analytics/account_snapshot.html.erb

@@ -0,0 +1,211 @@
+<%= button_to "Refresh!", { :action => "refresh_account", :account_id => @account.account_id } %>
+
+<h2>Account</h2>
+<table class="table table-condensed table-striped right-aligned">
+  <thead>
+    <tr>
+      <th>External key</th>
+      <th>Name</th>
+      <th>Currency</th>
+      <th>Balance</th>
+      <th>Inv. balance</th>
+      <th>Last inv. date</th>
+      <th>Last payment status</th>
+      <th>Default payment method</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><%= link_to @snapshot.business_account.external_key, Kaui.account_home_path.call(@snapshot.business_account.external_key) %></td>
+      <td><%= @snapshot.business_account.name %></td>
+      <td><%= @snapshot.business_account.currency %></td>
+      <td><span <% if    @snapshot.business_account.balance > 0 %>class="alert-error"
+                <% elsif @snapshot.business_account.balance <= 0 %>class="alert-success"
+                <% end %>><%= @snapshot.business_account.balance %></td>
+      <td><span <% if    @snapshot.business_account.total_invoice_balance > 0 %>class="alert-error"
+                <% elsif @snapshot.business_account.total_invoice_balance <= 0 %>class="alert-success"
+                <% end %>><%= @snapshot.business_account.total_invoice_balance %></td>
+                <td><%= @snapshot.business_account.last_invoice_date %></td>
+      <td><span <% if    @snapshot.business_account.last_payment_status == 'FAILED' %>class="alert-error"
+                <% elsif @snapshot.business_account.last_payment_status == 'SUCCESS' %>class="alert-success"
+                <% end %>><%= @snapshot.business_account.last_payment_status %></td>
+      <td><%= @snapshot.business_account.default_payment_method_type %></td>
+    </tr>
+  </tbody>
+</table>
+
+<hr />
+
+<h2>Subscriptions</h2>
+<table class="table table-condensed table-striped data-table right-aligned">
+  <thead>
+    <tr>
+      <th>Bundle key</th>
+      <th>Requested date</th>
+      <th>Event</th>
+      <th>Next start date</th>
+      <th>Next slug</th>
+      <th>Next price</th>
+      <th>Next mrr</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @snapshot.business_subscription_transitions.each do |business_subscription_transition| %>
+      <tr <% if business_subscription_transition.event_type == 'ADD' %>class="success"
+          <% elsif business_subscription_transition.event_type == 'CHANGE' %>class="info"
+          <% elsif business_subscription_transition.event_type == 'CANCEL' %>class="warning"
+          <% elsif business_subscription_transition.event_type == 'SYSTEM_CANCEL' %>class="error"
+          <% end %>>
+        <td><%= link_to Kaui.bundle_key_display_string.call(business_subscription_transition.external_key), Kaui.bundle_home_path.call(business_subscription_transition.external_key) %></td>
+        <td><%= format_date(business_subscription_transition.requested_timestamp, @account.timezone).html_safe %></td>
+        <td><%= business_subscription_transition.event_type %></td>
+        <td><%= format_date(business_subscription_transition.next_start_date, @account.timezone).html_safe unless business_subscription_transition.next_start_date.nil? %></td>
+        <td><%= business_subscription_transition.next_slug %></td>
+        <td><%= humanized_money business_subscription_transition.next_price_to_money unless business_subscription_transition.next_price.nil? %></td>
+        <td><%= humanized_money business_subscription_transition.next_mrr_to_money unless business_subscription_transition.next_mrr.nil? %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<hr />
+
+<h2>Invoices</h2>
+<table class="table table-condensed table-striped data-table right-aligned">
+  <thead>
+    <tr>
+      <th>Invoice number</th>
+      <th>Invoice date</th>
+      <th>Target date</th>
+      <th>Currency</th>
+      <th>Balance</th>
+      <th>Amount paid</th>
+      <th>Amount charged</th>
+      <th>Amount credited</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @snapshot.business_invoices.each do |business_invoice| %>
+      <tr>
+        <td><%= link_to business_invoice.invoice_number, invoice_path(:id => business_invoice.invoice_id) %></td>
+        <td><%= business_invoice.invoice_date %></td>
+        <td><%= business_invoice.target_date %></td>
+        <td><%= business_invoice.currency %></td>
+        <td><span <% if    business_invoice.balance > 0 %>class="alert-error"
+                  <% elsif business_invoice.balance <= 0 %>class="alert-success"
+                  <% end %>><%= humanized_money business_invoice.balance_to_money %></td>
+        <td><%= humanized_money business_invoice.amount_paid_to_money %></td>
+        <td><%= humanized_money business_invoice.amount_charged_to_money %></td>
+        <td><%= humanized_money business_invoice.amount_credited_to_money %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<hr />
+
+<h2>Payments</h2>
+<table class="table table-condensed table-striped data-table right-aligned">
+  <thead>
+    <tr>
+      <th>Inv. number</th>
+      <th>Effective date</th>
+      <th>Currency</th>
+      <th>Amount</th>
+      <th>Error</th>
+      <th>Status</th>
+      <th>Payment type</th>
+      <th>Payment method</th>
+      <th>Card type</th>
+      <th>Invoice payment type</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @snapshot.business_invoice_payments.each do |business_invoice_payment| %>
+      <tr <% if business_invoice_payment.processing_status == 'SUCCESS' %>class="success"
+          <% else %>class="error"
+          <% end %>>
+        <td><%= link_to business_invoice_payment.invoice_number, invoice_path(:id => business_invoice_payment.invoice_id) %></td>
+        <td><%= format_date(business_invoice_payment.effective_date, @account.timezone).html_safe %></td>
+        <td><%= business_invoice_payment.currency %></td>
+        <td><%= humanized_money business_invoice_payment.amount_to_money %></td>
+        <td><%= business_invoice_payment.payment_error %></td>
+        <td><%= business_invoice_payment.processing_status %></td>
+        <td><%= business_invoice_payment.payment_type %></td>
+        <td><%= business_invoice_payment.payment_method %></td>
+        <td><%= business_invoice_payment.card_type %></td>
+        <td><%= business_invoice_payment.invoice_payment_type %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<hr />
+
+<h2>Tags</h2>
+<table class="table table-condensed table-striped data-table">
+  <thead>
+    <tr>
+      <th>Object type</th>
+      <th>Id</th>
+      <th>Name</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @snapshot.business_tags.each do |business_tag| %>
+      <tr>
+        <td><%= business_tag.object_type %></td>
+        <td>
+          <% if business_tag.object_type == 'ACCOUNT' %>
+            <%= link_to business_tag.id, account_path(:id => business_tag.id) %>
+          <% elsif business_tag.object_type == 'INVOICE' %>
+            <%= link_to business_tag.id, invoice_path(:id => business_tag.id) %>
+          <% elsif business_tag.object_type == 'PAYMENT' %>
+            <%= link_to business_tag.id, payment_path(:id => business_tag.id) %>
+          <% elsif business_tag.object_type == 'BUNDLE' %>
+            <%= link_to business_tag.id, bundle_path(:id => business_tag.id) %>
+          <% else %>
+            <%= business_field.id %>
+          <% end %>
+        </td>
+        <td><%= business_tag.name %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<hr />
+
+<h2>Custom fields</h2>
+<table class="table table-condensed table-striped data-table">
+  <thead>
+    <tr>
+      <th>Object type</th>
+      <th>Id</th>
+      <th>Name</th>
+      <th>Value</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @snapshot.business_fields.each do |business_field| %>
+      <tr>
+        <td><%= business_field.object_type %></td>
+        <td>
+          <% if business_field.object_type == 'ACCOUNT' %>
+            <%= link_to business_field.id, account_path(:id => business_field.id) %>
+          <% elsif business_field.object_type == 'INVOICE' %>
+            <%= link_to business_field.id, invoice_path(:id => business_field.id) %>
+          <% elsif business_field.object_type == 'PAYMENT' %>
+            <%= link_to business_field.id, payment_path(:id => business_field.id) %>
+          <% elsif business_field.object_type == 'BUNDLE' %>
+            <%= link_to business_field.id, bundle_path(:id => business_field.id) %>
+          <% else %>
+            <%= business_field.id %>
+          <% end %>
+        </td>
+        <td><%= business_field.name %></td>
+        <td><%= business_field.value %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/kaui/analytics/index.html.erb

@@ -1,12 +1,34 @@
-<h2>Analytics dashboards</h2>
-
-<ul>
-  <li><%= link_to 'Accounts over time', kaui_engine.analytics_accounts_over_time_path %></li>
-  <li>Subscriptions over time
-    <ul>
-      <% @slugs.each do |slug| %>
-        <li><%= link_to slug, kaui_engine.analytics_subscriptions_over_time_path(:slug => slug, :product_type => @product_type) %></li>
-      <% end %>
-    </ul>
-  </li>
-</ul>
+<div class="page-header">
+  <h1>Analytics dashboards and data</h1>
+</div>
+
+<div class="btn-group">
+  <%= link_to 'Accounts over time', kaui_engine.analytics_accounts_over_time_path, { :class => 'btn btn-mini' } %>
+  <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
+    Subscriptions over time
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu">
+    <% @slugs.each do |slug| %>
+      <li><%= link_to slug, kaui_engine.analytics_subscriptions_over_time_path(:slug => slug, :product_type => @product_type) %></li>
+    <% end %>
+  </ul>
+</div>
+
+<hr/>
+
+<%= form_tag account_snapshot_path, :class => "form-horizontal", :method => :get do %>
+  <fieldset>
+    <div class="control-group">
+      <label class="control-label" for="account_id"><%=t :account %></label>
+      <div class="controls">
+        <%= text_field_tag 'account_id', nil, :class => "input-xlarge", :id => "account_id" %>
+      </div>
+    </div>
+    <div class="form-actions">
+      <%= button_tag "Get account snapshot", :class =>"btn btn-primary" %>
+    </div>
+  </fieldset>
+<% end %>
+
+<%= button_to "Check sanity", { :action => "sanity" }, :method => :get %>

data/app/views/kaui/analytics/sanity.html.erb

@@ -0,0 +1,47 @@
+<h2>Accounts not passing sanity checks</h2>
+<table class="table table-condensed table-striped data-table right-aligned">
+  <thead>
+    <tr>
+      <th>Check</th>
+      <th>Account id</th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @sanity.check_entitlement.each do |account_id| %>
+      <tr class="error">
+        <td>Entitlement</td>
+        <td><%= link_to account_id, account_path(account_id) %></td>
+        <td><%= button_to "Refresh!", { :action => "refresh_account", :account_id => account_id } %></td>
+      </tr>
+    <% end %>
+    <% @sanity.check_invoice.each do |account_id| %>
+      <tr class="error">
+        <td>Invoice</td>
+        <td><%= link_to account_id, account_path(account_id) %></td>
+        <td><%= button_to "Refresh!", { :action => "refresh_account", :account_id => account_id } %></td>
+      </tr>
+    <% end %>
+    <% @sanity.check_payment.each do |account_id| %>
+      <tr class="error">
+        <td>Payment</td>
+        <td><%= link_to account_id, account_path(account_id) %></td>
+        <td><%= button_to "Refresh!", { :action => "refresh_account", :account_id => account_id } %></td>
+      </tr>
+    <% end %>
+    <% @sanity.check_tag.each do |account_id| %>
+      <tr class="error">
+        <td>Tag</td>
+        <td><%= link_to account_id, account_path(account_id) %></td>
+        <td><%= button_to "Refresh!", { :action => "refresh_account", :account_id => account_id } %></td>
+      </tr>
+    <% end %>
+    <% @sanity.check_consistency.each do |account_id| %>
+      <tr class="error">
+        <td>Consistency</td>
+        <td><%= link_to account_id, account_path(account_id) %></td>
+        <td><%= button_to "Refresh!", { :action => "refresh_account", :account_id => account_id } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -45,6 +45,8 @@
         <label class="checkbox">
           <% if @payment_method.present? %>
             <%= @payment_method.type %> <%= @payment_method.card_type %> <%= @payment_method.mask_number %>
+          <% else %>
+            <p class="text-error">DELETED</p>
           <% end %>
         </label>
       </div>

data/app/views/kaui/layouts/kaui_application.html.erb

@@ -7,7 +7,7 @@
     <%= csrf_meta_tags %>
   </head>
   <body>
-    <div class="navbar">
+    <div class="navbar navbar-inverse">
       <div class="navbar-inner">
         <div class="container">
           <ul class="nav">

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

@@ -22,7 +22,7 @@
           <td><%= format_date(payment.effective_date, @account.timezone).html_safe if payment.effective_date.present? %></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_methods[payment.payment_id].type} #{@payment_methods[payment.payment_id].card_type} #{@payment_methods[payment.payment_id].mask_number}" if @payment_methods.present? and @payment_methods[payment.payment_id].present? %></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>
           <td><%= payment.status %> <%=  payment.gateway_error_code unless payment.status == 'SUCCESS' %> <%= payment.gateway_error_msg %></td>