kaui 0.2.5 → 0.2.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f9dda6885d003eff4164274878c7dd5e0781cf4d
+  data.tar.gz: a19b25d1af270e4b3355df0a5ac33d117e5e1a95
+SHA512:
+  metadata.gz: 0c22f0940c23cb17f5afa93c937da47ced42edd855b218b14de02eb4cb4d8ed3e9ff6996075e8ce8a53f51f1a08aadc8f72e51da69f748ceda923c0b298de51d
+  data.tar.gz: 5fbcc849e2de8d1125b903f259a11df802dc5aba6597d9c744267ead7b80cf39896694f43a48712e4433c04e0ebd1e99c17efe5144a0651843c45fc39067e526

data/.travis.yml

@@ -28,3 +28,6 @@ matrix:
 
 env:
   - MYSQL_PASSWORD=''
+
+#force travis to use only 'bundle install' instead of 'bundle install --deployments'
+bundler_args: ''

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    kaui (0.2.5)
+    kaui (0.2.6)
       d3_rails (~> 2.10.3)
       jquery-rails (~> 2.0)
-      killbill-client (~> 0.1.1)
+      killbill-client (~> 0.1.3)
       money-rails (~> 0.5.0)
       rails (~> 3.2.3)
       rest-client (~> 1.6.7)
@@ -12,48 +12,47 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
-      mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionmailer (3.2.14)
+      actionpack (= 3.2.14)
+      mail (~> 2.5.4)
+    actionpack (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
+    activeresource (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
     d3_rails (2.10.3)
       railties (>= 3.1.0)
     erubis (2.7.0)
-    hike (1.2.1)
+    hike (1.2.3)
     i18n (0.6.4)
     journey (1.0.4)
-    jquery-rails (2.2.0)
+    jquery-rails (2.3.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.0)
-    killbill-client (0.1.1)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    killbill-client (0.1.3)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.23)
@@ -64,8 +63,8 @@ GEM
       activesupport (~> 3.0)
       money (~> 5.0.0)
       railties (~> 3.0)
-    multi_json (1.7.6)
-    mysql2 (0.3.11)
+    multi_json (1.7.9)
+    mysql2 (0.3.13)
     polyglot (0.3.3)
     rack (1.4.5)
     rack-cache (1.2)
@@ -74,22 +73,22 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    rails (3.2.14)
+      actionmailer (= 3.2.14)
+      actionpack (= 3.2.14)
+      activerecord (= 3.2.14)
+      activeresource (= 3.2.14)
+      activesupport (= 3.2.14)
       bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+      railties (= 3.2.14)
+    railties (3.2.14)
+      actionpack (= 3.2.14)
+      activesupport (= 3.2.14)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
+    rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
     rest-client (1.6.7)
@@ -101,13 +100,12 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     thor (0.18.1)
     tilt (1.4.1)
-    treetop (1.4.12)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES

data/app/controllers/kaui/account_timelines_controller.rb

@@ -57,6 +57,7 @@ class Kaui::AccountTimelinesController < Kaui::EngineController
           @bundle_names[bundle.external_key] = Kaui.bundle_key_display_string.call(bundle.external_key)
         end
       end
+
       if params.has_key?(:external_key)
         @selected_bundle = @bundle_names[params[:external_key]]
       end

data/app/controllers/kaui/accounts_controller.rb

@@ -25,6 +25,7 @@ class Kaui::AccountsController < Kaui::EngineController
         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_non_external_payment_methods(@account.account_id)
           @bundles = Kaui::KillbillHelper::get_bundles(@account.account_id)
 
@@ -108,18 +109,20 @@ class Kaui::AccountsController < Kaui::EngineController
     payment_method = KillBillClient::Model::PaymentMethod.new
     payment_method.account_id = account_id
     payment_method.plugin_name = params[:plugin_name] || Kaui.creditcard_plugin_name.call
+
     payment_method.plugin_info = {
-        'type' => 'CreditCard',
-        'cardType' => @card_type,
-        'cardHolderName' => @card_holder_name,
-        'expirationDate' => "#{@expiration_year}-#{@expiration_month}",
-        'maskNumber' => @credit_card_number,
-        'address1' => @address1,
-        'address2' => @address2,
-        'city' => @city,
-        'country' => @country,
-        'postalCode' => @postal_code,
-        'state' => @state
+      'type' => 'CreditCard',
+      'ccType' => @card_type,
+      'ccName' => @card_holder_name,
+      'ccExpirationMonth' => @expiration_month,
+      'ccExpirationYear' => @expiration_year,
+      'ccLast4' => @credit_card_number[-4,4],
+      'address1' => @address1,
+      'address2' => @address2,
+      'city' => @city,
+      'country' => @country,
+      'zip' => @postal_code,
+      'state' => @state
     }
 
     begin

data/app/controllers/kaui/invoices_controller.rb

@@ -6,17 +6,22 @@ class Kaui::InvoicesController < Kaui::EngineController
   end
 
   def show
-    @invoice_id = params[:id]
-    if @invoice_id.present?
+    invoice_id_or_number = params[:id]
+    if invoice_id_or_number.present?
+
       begin
-        @invoice = Kaui::KillbillHelper.get_invoice(@invoice_id)
+        @invoice = Kaui::KillbillHelper.get_invoice(invoice_id_or_number)
         if @invoice.present?
+          @invoice_id = @invoice.invoice_id
           @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
+
+            #get the refunds for the payment
+            payment.refunds = Kaui::KillbillHelper::get_refunds_for_payment(payment.payment_id) rescue []
           end
 
           @subscriptions = {}
@@ -37,11 +42,11 @@ class Kaui::InvoicesController < Kaui::EngineController
             flash[:error] = "Invoice items for #{@invoice_id} not found"
           end
         else
-          flash[:error] = "Invoice #{@invoice_id} not found"
+          flash[:error] = "Invoice #{invoice_id_or_number} not found"
           render :action => :index
         end
       rescue => e
-        flash[:error] = "Error while getting information for invoice #{@invoice_id}: #{as_string(e)}"
+        flash[:error] = "Error while getting information for invoice #{invoice_id_or_number}: #{as_string(e)}"
       end
     else
       flash[:error] = "No id given"

data/app/controllers/kaui/payment_methods_controller.rb

@@ -2,12 +2,13 @@ require 'kaui/killbill_helper'
 
 class Kaui::PaymentMethodsController < Kaui::EngineController
   def index
-    if params[:account_id]
+    if params[:key]
+      params[:key].strip!
       begin
-        @payment_methods = Kaui::KillbillHelper.get_payment_methods params[:account_id]
+        @payment_methods = Kaui::KillbillHelper.get_payment_methods params[:key]
         render :show
       rescue => e
-        flash.now[:error] = "Error while retrieving payment method for account #{params[:id]}: #{as_string(e)}"
+        flash.now[:error] = "Error while retrieving payment method for account: #{params[:key]}: #{as_string(e)}"
       end
     end
   end

data/app/helpers/kaui/killbill_helper.rb

@@ -52,9 +52,8 @@ module Kaui
       end
     end
 
-    def self.get_account_timeline(account_id)
-      data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/timeline?audit=MINIMAL"
-      process_response(data, :single) { |json| Kaui::AccountTimeline.new(json) }
+    def self.get_account_timeline(account_id, audit = "MINIMAL")
+      KillBillClient::Model::AccountTimeline.find_by_account_id account_id, audit
     end
 
     def self.get_account(account_id, with_balance = false, with_balance_and_cba = false)
@@ -235,9 +234,8 @@ module Kaui
 
     ############## INVOICE ##############
 
-    def self.get_invoice(invoice_id)
-      data = call_killbill :get, "/1.0/kb/invoices/#{invoice_id}?withItems=true"
-      process_response(data, :single) { |json| Kaui::Invoice.new(json) }
+    def self.get_invoice id_or_number, with_items = true
+      KillBillClient::Model::Invoice.find_by_id_or_number id_or_number, with_items
     end
 
     def self.get_invoice_item(invoice_id, invoice_item_id)
@@ -372,8 +370,14 @@ module Kaui
       self.get_payment_methods(account_id).reject { |x| x.plugin_name == '__EXTERNAL_PAYMENT__' }
     end
 
-    def self.get_payment_methods(account_id)
-      KillBillClient::Model::PaymentMethod.find_all_by_account_id account_id, true
+    def self.get_payment_methods key
+      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}/
+        #looks like its account_id
+        KillBillClient::Model::PaymentMethod.find_all_by_account_id key, true
+      else
+        #any search key
+        KillBillClient::Model::PaymentMethod.find_all_by_search_key key, true
+      end
     end
 
     def self.get_payment_method(payment_method_id)

data/app/models/kaui/audit_log.rb

@@ -13,16 +13,17 @@ class Kaui::AuditLog < Kaui::Base
           :reason_code => data['reasonCode'])
   end
 
-  def description
-    if changed_by.present?
-      changed_str = "Performed by #{changed_by} on #{ActionController::Base.helpers.format_date(change_date)}"
-      if reason_code.blank? && comments.blank?
+  def self.description(log)
+    if log.changed_by.present?
+      changed_str = "Performed by #{log.changed_by} on #{ActionController::Base.helpers.format_date(log.change_date)}"
+      if log.reason_code.blank? && log.comments.blank?
         changed_str
-      elsif reason_code.blank?
-        "#{changed_str}: #{comments}"
+      elsif log.reason_code.blank?
+        "#{changed_str}: #{log.comments}"
       else
-        "#{changed_str} (#{reason_code} #{comments})"
+        "#{changed_str} (#{log.reason_code} #{log.comments})"
       end
     end
   end
+
 end

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

@@ -8,6 +8,12 @@
     <div class="controls">
       <%= select_tag "bundles", options_for_select([ "" ] + @bundle_names.values.sort, @selected_bundle || 'all') %>
     </div>
+
+    <label for="events" class="control-label">Filter by event type</label>
+    <div class="controls">
+      <%= select_tag "event_types", options_for_select('<option value="all">ALL</option><option value="invoice">INVOICE</option><option value="payment">PAYMENT</option><option value="refund">REFUND</option><option value="chargeback">CHARGEBACK</option><option value="entitlement">ENTITLEMENTS</option>'.html_safe) %>
+    </div>
+
     <dl class="dl-horizontal">
       <dt>Billing timezone:</dt>
       <dd><%= @account.timezone %></dd>
@@ -38,7 +44,7 @@
         <% else %>
           <% invoice = invoice_stub %>
         <% end %>
-        <tr title="<%= bundles %>">
+        <tr title="<%= bundles %>" data-event_type="INVOICE">
           <td>
             <% if invoice.invoice_date.present? %>
               <%= invoice.invoice_date %>
@@ -61,16 +67,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) %>  (<%= @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) %>  (<%= @account.currency %>)<br/>
+              <%= "Amount:" %> <%= humanized_money_with_symbol Kaui::Base.to_money(invoice.amount, @account.currency) %>  (<%= @account.currency %>)<br/>
+              <%= "Balance:" %> <%= humanized_money_with_symbol Kaui::Base.to_money(invoice.amount, @account.currency) %>  (<%= @account.currency %>)<br/>
+              <% if invoice.credit_adj.present? && invoice.credit_adj > 0  %>
+                <%= "Credit adjustment:" %> <%= humanized_money_with_symbol Kaui::Base.to_money(invoice.credit_adj, @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) %>  (<%= @account.currency %>)<br/>
+              <% if invoice.credits.present? && invoice.credits > 0  %>
+                <%= "Credit balance adjustment:" %> <%= humanized_money_with_symbol Kaui::Base.to_money(invoice.credits, @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) %>  (<%= @account.currency %>)<br/>
+              <% if invoice.refund_adj.present? && invoice.refund_adj < 0  %>
+                <%= "Refund adjustment:" %> <%= humanized_money_with_symbol Kaui::Base.to_money(invoice.refund_adj, @account.currency) %>  (<%= @account.currency %>)<br/>
               <% end %>
               <%= "Invoice #" %>
               <%= link_to invoice.invoice_number, invoice_path(:id => invoice.invoice_id) %>
@@ -78,7 +84,7 @@
           <td>
             <% if invoice_stub.audit_logs.present? %>
               <% invoice_stub.audit_logs.each do |entry| %>
-                <%= entry.description unless entry.changed_by == 'Transition' %><br/>
+                <%= Kaui::AuditLog.description(entry) unless entry.changed_by == 'Transition' %><br/>
               <% end %>
             <% end %>
           </td>
@@ -107,7 +113,7 @@
       <% @timeline.payments.each do |payment| %>
         <% payment.refunds.each do |refund| %>
           <% bundles = payment.bundle_keys.split(",").map {|bundle_key| @bundle_names[bundle_key] }.join(",") %>
-          <tr title="<%= bundles %>">
+          <tr title="<%= bundles %>" data-event_type="REFUND">
             <td>
               <% if refund.requested_date.present? %>
                 <%= format_date(refund.requested_date, @account.timezone).html_safe %>
@@ -131,11 +137,11 @@
             <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 %> (<%= refund.currency %>)<br/>
+              <%= "Refund Amount:" %> <%= humanized_money_with_symbol Kaui::Base.to_money(refund.amount, refund.currency) %> (<%= refund.currency %>)<br/>
             </td>
             <td>
               <% if refund.audit_logs.present? %>
-              <%= refund.audit_logs[0].description %><br/>
+              <%= Kaui::AuditLog.description(refund.audit_logs[0])%><br/>
               <% end %>
             </td>
             <td></td>
@@ -145,7 +151,7 @@
       <% @timeline.payments.each do |payment| %>
         <% payment.chargebacks.each do |chargeback| %>
         <% bundles = payment.bundle_keys.split(",").map {|bundle_key| @bundle_names[bundle_key] }.join(",") %>
-        <tr title="<%= bundles %>">
+        <tr title="<%= bundles %>" data-event_type="CHARGEBACK">
           <td>
             <% if chargeback.effective_date.present? %>
               <%= format_date(chargeback.effective_date, @account.timezone).html_safe %>
@@ -168,11 +174,11 @@
           <td><%= "CHARGEBACK" %></td>
           <td>
             <%= "Payment id:" %> <%= chargeback.payment_id %><br/>
-            <%= "Chargeback Amount:" %> <%= humanized_money_with_symbol chargeback.chargeback_amount_to_money(payment.currency) %> (<%= payment.currency %>)<br/>
+            <%= "Chargeback Amount:" %> <%= humanized_money_with_symbol Kaui::Base.to_money(chargeback.chargeback_amount, payment.currency) %> (<%= payment.currency %>)<br/>
           </td>
           <td>
             <% if chargeback.audit_logs.present? %>
-              <%= chargeback.audit_logs[0].description %><br/>
+              <%= Kaui::AuditLog.description(chargeback.audit_logs[0]) %><br/>
             <% end %>
           </td>
           <td></td>
@@ -187,7 +193,7 @@
         <% else %>
           <% invoice = nil %>
         <% end %>
-        <tr title="<%= bundles %>">
+        <tr title="<%= bundles %>" data-event_type="PAYMENT">
           <td>
             <% if payment.requested_date.present? %>
               <%= format_date(payment.requested_date, @account.timezone).html_safe %>
@@ -211,8 +217,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 %> (<%= payment.currency %>)<br/>
-            <%= "Paid amount:" %> <%= humanized_money_with_symbol payment.paid_amount_to_money %> (<%= payment.currency %>)<br/>
+            <%= "Total amount:" %> <%= humanized_money_with_symbol Kaui::Base.to_money(payment.amount, payment.currency) %> (<%= payment.currency %>)<br/>
+            <%= "Paid amount:" %> <%= humanized_money_with_symbol Kaui::Base.to_money(payment.paid_amount, payment.currency) %> (<%= payment.currency %>)<br/>
             <span <% if payment.status == 'FAILED' %>class="alert-error" <% elsif payment.status == 'SUCCESS' %>class="alert-success" <% end %>>
               <%= payment.status %>
             </span>
@@ -222,7 +228,7 @@
           <td>
             <% if payment.audit_logs.present? %>
               <% payment.audit_logs.each do |entry| %>
-                <%= entry.description unless entry.changed_by == 'PaymentRequestProcessor' %><br/>
+                <%= Kaui::AuditLog.description(entry) unless entry.changed_by == 'PaymentRequestProcessor' %><br/>
               <% end %>
             <% end %>
           </td>
@@ -231,7 +237,7 @@
               <%= link_to 'Refund', kaui_engine.new_refund_path(:params => { :payment_id => payment.payment_id,
                                                                              :account_id => @account.account_id,
                                                                              :invoice_id => payment.invoice_id }),
-                                                                :class => "btn btn-mini #{"disabled" unless payment.payment_id.present? and payment.status == 'SUCCESS' and !payment.is_fully_refunded?}" %>
+                                                                :class => "btn btn-mini #{"disabled" unless payment.payment_id.present? and payment.status == 'SUCCESS' and !(0 == payment.paid_amount)}" %>
             </nobr>
             <nobr>
               <%= link_to 'Chargeback', kaui_engine.new_chargeback_path(:params => { :payment_id => payment.payment_id,
@@ -247,7 +253,7 @@
           <% sub.events.each do |event| %>
             <!-- SKIP UNCANCEL SINCE MATCHING CANCEL EVENT IS NOT RETURNED AS IT WAS INVALIDED -->
             <% next if event.event_type == 'UNCANCEL' %>
-            <tr title="<%= @bundle_names[bundle.external_key] %>">
+            <tr title="<%= @bundle_names[bundle.external_key] %>" data-event_type="<%= event.event_type %>">
               <td>
                 <% if event.requested_date.present? %>
                   <%= format_date(event.requested_date, @account.timezone).html_safe %>
@@ -270,7 +276,7 @@
               <td>
                 <% if event.audit_logs.present? %>
                   <% event.audit_logs.each do |entry| %>
-                  <%= entry.description %><br/>
+                  <%= Kaui::AuditLog.description(entry) %><br/>
                   <% end %>
                 <% end %>
               </td>
@@ -337,7 +343,7 @@
        "iDisplayLength": 100,
        "bRetrieve": true,
        // Force a predictive order for event types, invoices and payments
-       "aaSortingFixed": [[1, 'desc'], [4, 'desc'], [3, 'desc']],
+       "aaSorting": [[1, 'desc'], [4, 'desc'], [3, 'desc']],
        "aoColumns": [
            { "sType": 'date' },
            { "sType": 'date' },
@@ -350,32 +356,76 @@
     });
   }
 
-  function filterBundles() {
+function filterEachNode(rows) {
     var bundle = $("#bundles").val();
+    var event_to_filter = $('#event_types').val().toUpperCase();
 
-    var dataTable = initTable();
-    $(dataTable.fnGetNodes()).each(function() {
-      var tr = $(this);
-      if (bundle == "" || tr.attr("title").split(",").indexOf(bundle) >= 0) {
-        tr.removeClass("hide");
-      }
-      else {
+    for (i = 0; i < rows.length; i++)
+    {
+        tr = $(rows[i]);
+
+        //filter bundles
+        if (bundle == "" || tr.attr("title").split(",").indexOf(bundle) >= 0) {
+            //first level filtering, so can remove hide
+            tr.removeClass("hide");
+        }
+        else {
+            //remove tr's not under this filter mode
+            tr.addClass("hide");
+        }
+
+        //filter events
+        if ("ALL" != event_to_filter)
+            filterEvents(tr, event_to_filter);
+
+        //add more filters here
+        //do not unhide any rows
+    }
+
+}
+
+function filterEvents(tr, event_to_filter) {
+    tr_event_type = tr.data().event_type;
+    
+    core_events = ["INVOICE", "PAYMENT", "REFUND", "CHARGEBACK"]; //events which are not entitlements
+
+    //is tr event not an event in question
+    tr_event_does_not_match_filter = ("ENTITLEMENT" != event_to_filter && 
+                                   tr_event_type != event_to_filter);
+
+    //tr event is not an entitlement
+    tr_event_is_not_entitlement = ("ENTITLEMENT" == event_to_filter && 
+                                core_events.indexOf(tr_event_type) >= 0);
+
+    if ( tr_event_does_not_match_filter || tr_event_is_not_entitlement )
+    {
+        //add hide to all who dont deserve the filter
         tr.addClass("hide");
-      }
-    });
+    }
+}
+
+function filterTable()
+{
+    var dataTable = initTable();
+    var all_nodes = dataTable.fnGetNodes();
+    
+    filterEachNode(all_nodes);
+    
+    //my rows are filtered, draw table
     dataTable.fnDraw();
-  }
+}
+
 
-  $(document).ready(function() {
+$(document).ready(function() {
     disableLinks();
     // When going through the pages of the table, disable links as needed
     $('#timeline-table').bind('draw', function (e) {
-      disableLinks();
+        disableLinks();
     });
 
     initTable();
 
-    $("#bundles").change(filterBundles);
-    filterBundles();
-  });
+    $("#bundles, #event_types").change(filterTable);
+    filterTable();
+});
 <% end %>

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

@@ -4,7 +4,7 @@
     <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" %>
+        <%= text_field_tag 'account_id', nil, :class => "input-xlarge", :id => "account_id", :placeholder => "accountId, screenName" %>
       </div>
     </div>
     <div class="form-actions">

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

@@ -4,7 +4,7 @@
     <div class="control-group">
       <label class="control-label" for="invoice_id">Invoice</label>
       <div class="controls">
-        <%= text_field_tag 'invoice_id', nil, :class => "input-xlarge", :id => "invoice_id" %>
+        <%= text_field_tag 'invoice_id', nil, :class => "input-xlarge", :id => "invoice_id", :placeholder => "InvoiceId, InvoiceNumber" %>
       </div>
     </div>
     <div class="form-actions">

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

@@ -9,9 +9,9 @@
     <dt>Target date:</dt>
     <dd><%= @invoice.target_date.html_safe %>&nbsp;</dd>
     <dt>Amount:</dt>
-    <dd><%= humanized_money_with_symbol @invoice.amount_to_money(@account.currency) %> (<%= @account.currency %>)&nbsp;</dd>
+    <dd><%= humanized_money_with_symbol Kaui::Base.to_money(@invoice.amount, @account.currency) %> (<%= @account.currency %>)&nbsp;</dd>
     <dt>Balance:</dt>
-    <dd><%= humanized_money_with_symbol @invoice.balance_to_money(@account.currency) %> (<%= @account.currency %>)&nbsp;</dd>
+    <dd><%= humanized_money_with_symbol Kaui::Base.to_money(@invoice.balance, @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;"><%= 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, @account.timezone).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 %> (<%= item.currency %>)</td>
+          <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= humanized_money_with_symbol Kaui::Base.to_money(item.amount, item.currency) %> (<%= item.currency %>)</td>
           <td>
             <nobr>
               <%= link_to "Adjust",
@@ -82,6 +82,13 @@
       <%= render :partial => "kaui/payments/payments_table" %>
     <% end %>
   </div>
+
+  <div class="page-header">
+    <% if @payments.present? %>
+      <%= render :partial => "kaui/refunds/refunds_table" %>
+    <% end %>
+  </div>
+
 <% else %>
   <p>Invoice not found</p>
 <% end %>

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

@@ -18,6 +18,7 @@
             <li <%= "class='active'" if params[:controller] == 'chargebacks' %>><%= link_to "Chargebacks", kaui_engine.chargebacks_path %></li>
             <li <%= "class='active'" if params[:controller] == 'credits' %>><%= link_to "Credits", kaui_engine.credits_path %></li>
             <li <%= "class='active'" if params[:controller] == 'external_payments' %>><%= link_to "External payments", kaui_engine.external_payments_path %></li>
+            <li <%= "class='active'" if params[:controller] == 'payment_methods' %>><%= link_to "Payment methods", kaui_engine.payment_methods_path %></li>
             <li <%= "class='active'" if params[:controller] == 'refunds' %>><%= link_to "Refunds", kaui_engine.refunds_path %></li>
             <li <%= "class='active'" if params[:controller] == 'invoices' %>><%= link_to "Invoices", kaui_engine.invoices_path %></li>
             <li <%= "class='active'" if params[:controller] == 'invoice_items' %>><%= link_to "Invoice items", kaui_engine.invoice_items_path %></li>

data/app/views/kaui/payment_methods/_payment_methods_table.html.erb

@@ -41,6 +41,7 @@
               <% else %>
                   <%= link_to "Delete", kaui_engine.payment_method_path(payment_method.payment_method_id), :method => :delete, :confirm => "Are you sure you want to delete this payment method?", :class => "btn btn-mini" %>
               <% end %>
+              <%= link_to "Details", kaui_engine.payment_method_path(payment_method.payment_method_id), :class => "btn btn-mini" %>
             </td>
           </tr>
       <% end %>

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

@@ -1,11 +1,11 @@
 <%= form_tag payment_methods_path, :class => "form-horizontal", :method => :get do %>
     <fieldset>
-      <legend>Please enter account id</legend>
+      <legend>Payment Methods</legend>
       <div class="control-group">
-        <label class="control-label" for="account_id">Account</label>
+        <label class="control-label" for="key">Account</label>
 
         <div class="controls">
-          <%= text_field_tag 'account_id', nil, :class => "input-xlarge", :id => "account_id" %>
+          <%= text_field_tag 'key', nil, :class => "input-xlarge", :id => "key", :placeholder => "accountId, PayPalEmail, BAID, Last4cc" %>
         </div>
       </div>
       <div class="form-actions">

data/app/views/kaui/refunds/_refunds_table.html.erb

@@ -0,0 +1,31 @@
+<div class="page-header">
+  <h3>Refunds</h3>
+</div>
+<table class="table table-condensed table-striped data-table">
+  <thead>
+    <tr>
+      <th>Requested date</th>
+      <th>Effective date</th>
+      <th>Amount Refunded</th>
+      <th>Adjusted</th>
+      <th>Refund ID</th>
+      <th>Payment ID</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% if @payments.present? %>
+      <% @payments.each do |payment| %>
+        <% payment.refunds.each do |refund| %>
+        <tr>
+          <td><%= format_date(refund.requested_date, @account.timezone).html_safe if refund.requested_date.present? %></td>
+          <td><%= format_date(refund.effective_date, @account.timezone).html_safe if refund.effective_date.present? %></td>
+          <td><%= humanized_money_with_symbol refund.amount_to_money %> (<%= refund.currency %>)</td>
+          <td><%= refund.adjusted %></td>
+          <td><%= link_to refund.refund_id, refund_path(refund.refund_id) %></td>
+          <td><%= refund.payment_id %></td>
+        </tr>
+        <% end #end refunds%>
+      <% end #end payments%>
+    <% end #end if payments present%>
+  </tbody>
+</table>

data/kaui.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rest-client', '~> 1.6.7'
   s.add_dependency 'money-rails', '~> 0.5.0'
   s.add_dependency 'd3_rails', '~> 2.10.3'
-  s.add_dependency 'killbill-client', '~> 0.1.1'
+  s.add_dependency 'killbill-client', '~> 0.1.3'
 
   if defined?(JRUBY_VERSION)
     s.add_development_dependency 'activerecord-jdbc-adapter', '~> 1.2.2'

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/test/functional/kaui/accounts_controller_test.rb

@@ -12,14 +12,14 @@ class Kaui::AccountsControllerTest < ActionController::TestCase
   fixtures :accounts
 
   test "should get index" do
-    get :index
+    get :index, :use_route => 'kaui'
     assert_response :success
   end
 
   test "should find account by id" do
     pierre = accounts(:pierre)
 
-    get :show, :id => pierre["accountId"]
+    get :show, :id => pierre["accountId"], :use_route => 'kaui'
     assert_response :success
     assert_equal assigns(:account).account_id, pierre["accountId"]
   end
@@ -28,7 +28,7 @@ class Kaui::AccountsControllerTest < ActionController::TestCase
   test "should find correct positive balance" do
     accnt = accounts(:account_with_positive_balance)
 
-    get :show, :id => accnt["accountId"]
+    get :show, :id => accnt["accountId"], :use_route => 'kaui'
     assert_response :success
     assert assigns(:account).balance > 0
 
@@ -48,14 +48,14 @@ end
 test "should find correct negative balance" do
   accnt = accounts(:account_with_negative_balance)
 
-  get :show, :id => accnt["accountId"]
+  get :show, :id => accnt["accountId"], :use_route => 'kaui'
   assert_response :success
   assert assigns(:account).balance < 0
 end
 
 test "should find correct zero balance" do
   accnt = accounts(:account_with_zero_balance)
-  get :show, :id => accnt["accountId"]
+  get :show, :id => accnt["accountId"], :use_route => 'kaui'
   assert_response :success
   assert assigns(:account).balance == 0
 end

data/test/functional/kaui/bundles_controller_test.rb

@@ -4,7 +4,7 @@ class Kaui::BundlesControllerTest < ActionController::TestCase
   fixtures :accounts, :bundles
 
   test "should get index" do
-    get :index
+    get :index, :use_route => 'kaui'
     assert_response :success
   end
 
@@ -12,10 +12,10 @@ class Kaui::BundlesControllerTest < ActionController::TestCase
     pierre = accounts(:pierre)
     bundle = bundles(:bundle_for_pierre)
 
-    get :show, :id => bundle["bundleId"]
+    get :show, :id => bundle["bundleId"], :use_route => 'kaui'
     assert_response :success
     assert_equal assigns(:account).account_id, pierre["accountId"]
     assert_equal assigns(:bundle).bundle_id, bundle["bundleId"]
     assert_equal assigns(:bundle).account_id, pierre["accountId"]
   end
-end
+end

data/test/functional/kaui/home_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Kaui
   class HomeControllerTest < ActionController::TestCase
     test "should get index" do
-      get :index
+      get :index, :use_route => 'kaui'
       assert_response :success
     end
   

data/test/functional/kaui/invoice_items_controller_test.rb

@@ -4,14 +4,14 @@ class Kaui::InvoiceItemsControllerTest < ActionController::TestCase
   fixtures :invoice_items
 
   test "should get index" do
-    get :index
+    get :index, :use_route => 'kaui'
     assert_response :success
   end
 
   test "should find invoice item by id" do
     item = invoice_items(:recurring_item_for_pierre)
 
-    get :show, :id => item["invoiceItemId"], :invoice_id => item["invoiceId"]
+    get :show, :id => item["invoiceItemId"], :invoice_id => item["invoiceId"], :use_route => 'kaui'
     assert_response :success
     assert_equal assigns(:invoice_item).invoice_item_id, item["invoiceItemId"]
   end

data/test/functional/kaui/invoices_controller_test.rb

@@ -4,7 +4,7 @@ class Kaui::InvoicesControllerTest < ActionController::TestCase
   fixtures :accounts, :invoices
 
   test "should get index" do
-    get :index
+    get :index, :use_route => 'kaui'
     assert_response :success
   end
 
@@ -12,10 +12,10 @@ class Kaui::InvoicesControllerTest < ActionController::TestCase
     pierre = accounts(:pierre)
     invoice = invoices(:invoice_for_pierre)
 
-    get :show, :id => invoice["invoiceId"]
+    get :show, :id => invoice["invoiceId"], :use_route => 'kaui'
     assert_response :success
     assert_equal assigns(:account).account_id, pierre["accountId"]
     assert_equal assigns(:invoice).invoice_id, invoice["invoiceId"]
     assert_equal assigns(:invoice).account_id, pierre["accountId"]
   end
-end
+end

data/test/test_helper.rb

@@ -33,6 +33,10 @@ module Kaui::KillbillHelper
     find_among_fixtures(Kaui::Account, account_id)
   end
 
+  def self.get_overdue_state_for_bundle(bundle_id)
+    find_among_fixtures(Kaui::OverdueState, bundle_id)
+  end
+
   def self.get_invoice(invoice_id)
     find_among_fixtures(Kaui::Invoice, invoice_id)
   end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.2.5
-  prerelease: 
+  version: 0.2.6
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: money-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: d3_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,33 +83,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Rails UI plugin for Killbill administration.
@@ -240,6 +225,7 @@ files:
 - app/views/kaui/payment_methods/show.html.erb
 - app/views/kaui/payments/_payments_table.html.erb
 - app/views/kaui/payments/new.html.erb
+- app/views/kaui/refunds/_refunds_table.html.erb
 - app/views/kaui/refunds/index.html.erb
 - app/views/kaui/refunds/new.html.erb
 - app/views/kaui/refunds/show.html.erb
@@ -357,30 +343,26 @@ files:
 homepage: http://www.killbilling.org
 licenses:
 - Apache License (2.0)
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3532343417055905152
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Killbill Admin UI plugin
 test_files:
 - test/dummy/README.rdoc