kaui 0.4.7 → 0.4.8

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    kaui (0.4.7)
+    kaui (0.4.8)
       cancan (~> 1.6.10)
       d3_rails (~> 3.2.8)
       devise (~> 3.0.2)
       jquery-rails (~> 3.0.4)
-      killbill-client (~> 0.3.5)
+      killbill-client (~> 0.3.6)
       money-rails (~> 0.8.1)
       rails (~> 3.2.14)
       rest-client (~> 1.6.7)
@@ -60,18 +60,18 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.0)
-    killbill-client (0.3.5)
+    killbill-client (0.3.6)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.24)
+    mime-types (1.25)
     money (5.1.1)
       i18n (~> 0.6.0)
     money-rails (0.8.1)
       activesupport (>= 3.0)
       money (~> 5.1.0)
       railties (>= 3.0)
-    multi_json (1.7.9)
+    multi_json (1.8.0)
     mysql2 (0.3.13)
     orm_adapter (0.4.0)
     polyglot (0.3.3)

data/app/controllers/kaui/analytics_controller.rb

@@ -1,22 +1,7 @@
 module Kaui
   class AnalyticsController < Kaui::EngineController
+
     def index
-      @slugs = []
-      begin
-        catalog = Kaui::KillbillHelper::get_full_catalog(options_for_klient)
-        catalog['products'].each do |product|
-          product['plans'].each do |plan|
-            name = plan['name']
-            plan['phases'].each do |phase|
-              type = phase['type']
-              @slugs << "#{name.downcase}-#{type.downcase}"
-            end
-          end
-        end
-        @product_type = catalog['name']
-      rescue => e
-        flash[:error] = "Error while retrieving catalog: #{as_string(e)}"
-      end
     end
 
     def account_snapshot
@@ -39,29 +24,5 @@ module Kaui
       end
       redirect_to account_snapshot_path(:account_id => params[:account_id])
     end
-
-    def accounts_over_time
-      begin
-        @accounts = Analytics.accounts_over_time
-      rescue => e
-        flash[:error] = "Error while retrieving data: #{as_string(e)}"
-        @accounts = Kaui::TimeSeriesData.empty
-      end
-    end
-
-    def subscriptions_over_time
-      @product_type = params[:product_type]
-      @slug = params[:slug]
-      @subscriptions = Analytics.subscriptions_over_time(@product_type, @slug)
-    end
-
-    def sanity
-      begin
-        @sanity = Kaui::KillbillHelper::check_analytics_sanity(options_for_klient)
-      rescue => e
-        flash[:error] = "Error while checking Analytics sanity: #{as_string(e)}"
-        redirect_to :analytics
-      end
-    end
   end
 end

data/app/helpers/kaui/killbill_helper.rb

@@ -26,9 +26,10 @@ module Kaui
         response = RestClient.send(method.to_sym, url, *args)
         data = {:code => response.code}
         if response.code < 300 && response.body.present?
-          if response.headers[:content_type] =~ /application\/json.*/
+          # Hack for Analytics plugin (no content-type header returned)
+          begin
             data[:json] = JSON.parse(response.body)
-          else
+          rescue => e
             data[:body] = response.body
           end
         end
@@ -212,7 +213,7 @@ module Kaui
       entitlement = KillBillClient::Model::EntitlementNoEvents.new
       entitlement.subscription_id = subscription_id
       # We are using same entitlement/billing policy here for now
-      entitlement.cancel(extract_created_by(current_user), extract_reason_code(reason), comment, nil, policy, policy, options)
+      entitlement.cancel(extract_created_by(current_user), extract_reason_code(reason), comment, nil, policy, policy, true, options)
     end
 
     def self.compute_previous_ctd(ctd, billing_period, options = {})
@@ -508,32 +509,17 @@ module Kaui
     ############## ANALYTICS ##############
 
     def self.get_account_snapshot(account_id, options = {})
-      data = call_killbill :get, "/1.0/kb/analytics/#{account_id}", options
+      data = call_killbill :get, "/plugins/killbill-analytics/#{account_id}", options
       process_response(data, :single) { |json| Kaui::BusinessSnapshot.new(json) }
     end
 
     def self.refresh_account(account_id, current_user = nil, reason = nil, comment = nil, options = {})
       call_killbill :put,
-                    "/1.0/kb/analytics/#{account_id}",
+                    "/plugins/killbill-analytics/#{account_id}",
                     nil,
                     build_audit_headers(current_user, reason, comment, options)
     end
 
-    def self.get_accounts_created_over_time(options = {})
-      data = call_killbill :get, "/1.0/kb/analytics/accountsCreatedOverTime", options
-      process_response(data, :single) { |json| Kaui::TimeSeriesData.new(json) }
-    end
-
-    def self.get_subscriptions_created_over_time(product_type, slug, options = {})
-      data = call_killbill :get, "/1.0/kb/analytics/subscriptionsCreatedOverTime?productType=#{product_type}&slug=#{slug}", options
-      process_response(data, :single) { |json| Kaui::TimeSeriesData.new(json) }
-    end
-
-    def self.check_analytics_sanity(options = {})
-      data = call_killbill :get, "/1.0/kb/analytics/sanity", options
-      process_response(data, :single) { |json| Kaui::AnalyticsSanity.new(json) }
-    end
-
     def self.before_all
       methods.each do |method_name|
         method = method(method_name)

data/app/models/kaui/base.rb

@@ -70,7 +70,11 @@ class Kaui::Base
           value = type.to_s.constantize.new(value)
         end
       end
-      send("#{name}=", value)
+      begin
+        send("#{name}=", value)
+      rescue NoMethodError => e
+        # Ignore new API fields
+      end
     end
   end
 

data/app/models/kaui/business_account.rb

@@ -1,12 +1,12 @@
 class Kaui::BusinessAccount < Kaui::Base
-  define_attr :external_key
-  define_attr :name
+  define_attr :account_external_key
+  define_attr :account_name
   define_attr :currency
   define_attr :balance
   define_attr :last_invoice_date
-  define_attr :total_invoice_balance
+  define_attr :last_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
+end

data/app/models/kaui/business_field.rb

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

data/app/models/kaui/business_snapshot.rb

@@ -3,7 +3,7 @@ class Kaui::BusinessSnapshot < Kaui::Base
   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_account_transitions, Kaui::BusinessOverdueStatus
   has_many :business_tags, Kaui::BusinessTag
   has_many :business_fields, Kaui::BusinessField
-end
+end

data/app/models/kaui/business_subscription_transition.rb

@@ -1,14 +1,13 @@
 class Kaui::BusinessSubscriptionTransition < Kaui::Base
   define_attr :total_ordering
   define_attr :bundle_id
-  define_attr :external_key
+  define_attr :bundle_external_key
   define_attr :account_id
-  define_attr :account_key
+  define_attr :account_external_key
   define_attr :subscription_id
 
   define_attr :requested_timestamp
-  define_attr :event_type
-  define_attr :category
+  define_attr :event
 
   define_attr :prev_product_name
   define_attr :prev_product_type
@@ -51,4 +50,4 @@ class Kaui::BusinessSubscriptionTransition < Kaui::Base
   def next_mrr_to_money
     Kaui::Base.to_money(next_mrr.abs, next_currency)
   end
-end
+end

data/app/models/kaui/business_tag.rb

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

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

@@ -8,7 +8,7 @@
       <th>Name</th>
       <th>Currency</th>
       <th>Balance</th>
-      <th>Inv. balance</th>
+      <th>Last inv. balance</th>
       <th>Last inv. date</th>
       <th>Last payment status</th>
       <th>Default payment method</th>
@@ -16,15 +16,15 @@
   </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><%= link_to @snapshot.business_account.account_external_key, Kaui.account_home_path.call(@snapshot.business_account.account_external_key) %></td>
+      <td><%= @snapshot.business_account.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"
+      <td><span <% if    @snapshot.business_account.balance.present? and @snapshot.business_account.balance > 0 %>class="alert-error"
+                <% elsif @snapshot.business_account.balance.present? and @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><span <% if    @snapshot.business_account.last_invoice_balance.present? and @snapshot.business_account.last_invoice_balance > 0 %>class="alert-error"
+                <% elsif @snapshot.business_account.last_invoice_balance.present? and @snapshot.business_account.last_invoice_balance <= 0 %>class="alert-success"
+                <% end %>><%= @snapshot.business_account.last_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"
@@ -51,14 +51,14 @@
   </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"
+      <tr <% if business_subscription_transition.event.start_with? 'START_' %>class="success"
+          <% elsif business_subscription_transition.event.start_with? 'CHANGE_' %>class="info"
+          <% elsif business_subscription_transition.event.start_with? 'PAUSE_' %>class="warning"
+          <% elsif business_subscription_transition.event.start_with? 'STOP_' %>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><%= link_to Kaui.bundle_key_display_string.call(business_subscription_transition.bundle_external_key), Kaui.bundle_home_path.call(business_subscription_transition.bundle_external_key) %></td>
         <td><%= format_date(business_subscription_transition.requested_timestamp, @account.timezone).html_safe %></td>
-        <td><%= business_subscription_transition.event_type %></td>
+        <td><%= business_subscription_transition.event %></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>
@@ -157,13 +157,13 @@
         <td><%= business_tag.object_type %></td>
         <td>
           <% if business_tag.object_type == 'ACCOUNT' %>
-            <%= link_to business_tag.id, account_path(:id => business_tag.id) %>
+            <%= link_to business_tag.object_id, account_path(:id => business_tag.object_id) %>
           <% elsif business_tag.object_type == 'INVOICE' %>
-            <%= link_to business_tag.id, invoice_path(:id => business_tag.id) %>
+            <%= link_to business_tag.object_id, invoice_path(:id => business_tag.object_id) %>
           <% elsif business_tag.object_type == 'PAYMENT' %>
-            <%= link_to business_tag.id, payment_path(:id => business_tag.id) %>
+            <%= link_to business_tag.object_id, payment_path(:id => business_tag.object_id) %>
           <% elsif business_tag.object_type == 'BUNDLE' %>
-            <%= link_to business_tag.id, bundle_path(:id => business_tag.id) %>
+            <%= link_to business_tag.object_id, bundle_path(:id => business_tag.object_id) %>
           <% else %>
             <%= business_field.id %>
           <% end %>
@@ -192,13 +192,13 @@
         <td><%= business_field.object_type %></td>
         <td>
           <% if business_field.object_type == 'ACCOUNT' %>
-            <%= link_to business_field.id, account_path(:id => business_field.id) %>
+            <%= link_to business_field.object_id, account_path(:id => business_field.object_id) %>
           <% elsif business_field.object_type == 'INVOICE' %>
-            <%= link_to business_field.id, invoice_path(:id => business_field.id) %>
+            <%= link_to business_field.object_id, invoice_path(:id => business_field.object_id) %>
           <% elsif business_field.object_type == 'PAYMENT' %>
-            <%= link_to business_field.id, payment_path(:id => business_field.id) %>
+            <%= link_to business_field.object_id, payment_path(:id => business_field.object_id) %>
           <% elsif business_field.object_type == 'BUNDLE' %>
-            <%= link_to business_field.id, bundle_path(:id => business_field.id) %>
+            <%= link_to business_field.object_id, bundle_path(:id => business_field.object_id) %>
           <% else %>
             <%= business_field.id %>
           <% end %>
@@ -208,4 +208,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

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

@@ -2,21 +2,6 @@
   <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">
@@ -30,5 +15,3 @@
     </div>
   </fieldset>
 <% end %>
-
-<%= button_to "Check sanity", { :action => "sanity" }, :method => :get %>

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

@@ -12,14 +12,14 @@
         <div class="container">
           <ul class="nav">
             <li <%= "class='active'" if params[:controller] == 'accounts' %>><%= link_to "Accounts", kaui_engine.accounts_path %></li>
-            <li <%= "class='active'" if params[:controller] == 'account_timelines' %>><%= link_to "Account timelines", kaui_engine.account_timelines_path %></li>
             <li <%= "class='active'" if params[:controller] == 'bundles' %>><%= link_to "Bundles", kaui_engine.bundles_path %></li>
-            <li <%= "class='active'" if params[:controller] == 'subscriptions' %>><%= link_to "Subscriptions", kaui_engine.subscriptions_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>
+            <li <%= "class='active'" if params[:controller] == 'refunds' %>><%= link_to "Refunds", kaui_engine.refunds_path %></li>
             <li <%= "class='active'" if params[:controller] == 'tag_definitions' %>><%= link_to "Tag definitions", kaui_engine.tag_definitions_path %></li>
+            <li <%= "class='active'" if params[:controller] == 'analytics' %>><%= link_to "Analytics", kaui_engine.analytics_path %></li>
+          </ul>
+          <ul class="nav pull-right">
             <% if user_signed_in? -%>
               <li><%= link_to 'Sign out', destroy_user_session_path, method: :delete %></li>
             <% end -%>

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.8.1'
   s.add_dependency 'd3_rails', '~> 3.2.8'
-  s.add_dependency 'killbill-client', '~> 0.3.5'
+  s.add_dependency 'killbill-client', '~> 0.3.6'
   s.add_dependency 'devise', '~> 3.0.2'
   s.add_dependency 'cancan', '~> 1.6.10'
 

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -265,10 +265,7 @@ files:
 - app/views/kaui/accounts/index.html.erb
 - app/views/kaui/accounts/show.html.erb
 - app/views/kaui/analytics/account_snapshot.html.erb
-- app/views/kaui/analytics/accounts_over_time.html.erb
 - app/views/kaui/analytics/index.html.erb
-- app/views/kaui/analytics/sanity.html.erb
-- app/views/kaui/analytics/subscriptions_over_time.html.erb
 - app/views/kaui/bundle_tags/_bundle_tags_table.html.erb
 - app/views/kaui/bundle_tags/edit.html.erb
 - app/views/kaui/bundles/index.html.erb
@@ -438,10 +435,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2882470456735170116
+      hash: 2214569211670130331
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Killbill Admin UI plugin

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

@@ -1,9 +0,0 @@
-<h2>Number of accounts created over time</h2>
-
-<div id="chart"></div>
-
-<%= javascript_tag do %>
-  $(document).ready(function() {
-    drawGraph(<%=raw @accounts.dates.to_json %>, <%=raw @accounts.values.to_json %>, "chart");
-  });
-<% end %>

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

@@ -1,47 +0,0 @@
-<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/analytics/subscriptions_over_time.html.erb

@@ -1,9 +0,0 @@
-<h2>Number of <%= @slug %> <%= @product_type %> subscriptions created over time</h2>
-
-<div id="chart"></div>
-
-<%= javascript_tag do %>
-  $(document).ready(function() {
-    drawGraph(<%=raw @subscriptions.dates.to_json %>, <%=raw @subscriptions.values.to_json %>, "chart");
-  });
-<% end %>