kaui 0.1.10 → 0.1.11

data/app/controllers/kaui/accounts_controller.rb

@@ -28,11 +28,15 @@ 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_payment_methods(@account.account_id)
+          @payment_methods = Kaui::KillbillHelper::get_non_external_payment_methods(@account.account_id)
           @bundles = Kaui::KillbillHelper::get_bundles(@account.account_id)
+
+          @overdue_state_by_bundle_id = {}
           @subscriptions_by_bundle_id = {}
 
           @bundles.each do |bundle|
+            @overdue_state_by_bundle_id[bundle.bundle_id] = Kaui::KillbillHelper::get_overdue_state_for_bundle(bundle.bundle_id)
+
             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
@@ -54,7 +58,7 @@ class Kaui::AccountsController < Kaui::EngineController
     @account_id = params[:id]
     if @account_id.present?
       begin
-        @payment_methods = Kaui::KillbillHelper::get_payment_methods(@account_id)
+        @payment_methods = Kaui::KillbillHelper::get_non_external_payment_methods(@account_id)
       rescue => e
         flash[:error] = "Error while getting payment methods: #{as_string(e)}"
       end

data/app/controllers/kaui/bundles_controller.rb

@@ -15,6 +15,7 @@ class Kaui::BundlesController < Kaui::EngineController
         if @bundle.present?
           @account = Kaui::KillbillHelper::get_account_by_bundle_id(@bundle.bundle_id)
           @subscriptions = Kaui::KillbillHelper::get_subscriptions_for_bundle(@bundle.bundle_id)
+          @overdue_state = Kaui::KillbillHelper::get_overdue_state_for_bundle(@bundle.bundle_id)
         else
           flash[:error] = "Bundle #{key} not found"
           render :action => :index

data/app/helpers/kaui/killbill_helper.rb

@@ -331,6 +331,10 @@ module Kaui
                     "X-Killbill-Comment" => "#{comment}"
     end
 
+    def self.get_non_external_payment_methods(account_id)
+      self.get_payment_methods(account_id).reject { |x| x.plugin_name == '__EXTERNAL_PAYMENT__' }
+    end
+
     def self.get_payment_methods(account_id)
       data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/paymentMethods?withPluginInfo=true"
       process_response(data, :multiple) {|json| Kaui::PaymentMethod.new(json) }
@@ -490,6 +494,13 @@ module Kaui
       end
     end
 
+    ############## OVERDUE ##############
+
+    def self.get_overdue_state_for_bundle(bundle_id)
+      data = call_killbill :get, "/1.0/kb/overdue/bundles/#{bundle_id}"
+      process_response(data, :single) { |json| Kaui::OverdueState.new(json) }
+    end
+
     ############## ANALYTICS ##############
 
     def self.get_accounts_created_over_time

data/app/models/kaui/bill_cycle_day.rb

@@ -1,9 +1,5 @@
 class Kaui::BillCycleDay < Kaui::Base
+
   define_attr :day_of_month_local
   define_attr :day_of_month_utc
-
-  def initialize(data = {})
-    super(:day_of_month_local => data['dayOfMonthLocal'],
-          :day_of_month_utc => data['dayOfMonthUTC'])
-  end
 end

data/app/models/kaui/overdue_state.rb

@@ -0,0 +1,10 @@
+class Kaui::OverdueState < Kaui::Base
+
+  define_attr :name
+  define_attr :external_message
+  define_attr :days_between_payment_retries
+  define_attr :disable_entitlement_and_changes_blocked
+  define_attr :block_changes
+  define_attr :clear_state
+  define_attr :reevaluation_interval_days
+end

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

@@ -65,7 +65,14 @@
   <% @bundles.each do |bundle| %>
     <% subs = @subscriptions_by_bundle_id[bundle.bundle_id] %>
     <% if subs.present? %>
-      <h2>Bundle <%= link_to Kaui.bundle_key_display_string.call(bundle.external_key), Kaui.bundle_home_path.call(bundle.bundle_id) if bundle.external_key.present? %>&nbsp;</h2>
+      <h2>Bundle <%= link_to Kaui.bundle_key_display_string.call(bundle.external_key), Kaui.bundle_home_path.call(bundle.bundle_id) if bundle.external_key.present? %>&nbsp;</h2>Overdue state:
+      <% if @overdue_state_by_bundle_id[bundle.bundle_id].nil? %>
+          unknown
+      <% elsif @overdue_state_by_bundle_id[bundle.bundle_id].clear_state  %>
+          <span class='label label-success'>Good</span>
+      <% else %>
+          <span class='label label-important'><%= @overdue_state_by_bundle_id[bundle.bundle_id].name %></span>
+      <% end %>
       <%= render :partial => "kaui/subscriptions/subscriptions_table", :locals => { :subscriptions => subs } %>
     <% end %>
   <% end %>

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

@@ -7,7 +7,15 @@
     <dd><%= link_to @account.email, Kaui.account_home_path.call(@account.external_key) %>&nbsp;</dd>
     <dt>Bundle key:</dt>
     <dd><%= @bundle.external_key %>&nbsp;</dd>
-    <dd><%= link_to "Transfer Ownership", kaui_engine.transfer_bundle_path(@bundle.bundle_id), :class => "btn btn-mini" %></dd>
+    <dt>Overdue status:</dt>
+    <% if @overdue_state.nil? %>
+        <dd>unknown<dd>
+    <% elsif @overdue_state.clear_state  %>
+        <dd><span class='label label-success'>Good</span><dd>
+    <% else %>
+        <dd><span class='label label-important'><%= @overdue_state.name %></span><dd>
+    <% end %>
+    <%= link_to "Transfer Ownership", kaui_engine.transfer_bundle_path(@bundle.bundle_id), :class => "btn btn-mini" %></dd>
   <% if @subscriptions.present? %>
     <%= render :partial => "kaui/subscriptions/subscriptions_table", :locals => { :subscriptions => @subscriptions } %>
   <% end %>

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end