kaui 0.6.5 → 0.6.6

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    kaui (0.6.5)
+    kaui (0.6.6)
       cancan (~> 1.6.10)
       d3_rails (~> 3.2.8)
       devise (~> 3.0.2)
       jquery-rails (~> 3.0.4)
-      killbill-client (~> 0.6.0)
+      killbill-client (~> 0.6.1)
       money-rails (~> 0.8.1)
       rails (~> 3.2.14)
       rest-client (~> 1.6.7)
@@ -53,6 +53,7 @@ GEM
       railties (>= 3.2.6, < 5)
       warden (~> 1.2.3)
     erubis (2.7.0)
+    fakeweb (1.3.0)
     hike (1.2.3)
     i18n (0.6.9)
     journey (1.0.4)
@@ -60,7 +61,7 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
-    killbill-client (0.6.0)
+    killbill-client (0.6.1)
       json (~> 1.8.0)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -122,6 +123,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  fakeweb (~> 1.3)
   kaui!
   mysql2
   sqlite3

data/app/controllers/kaui/accounts_controller.rb

@@ -55,7 +55,7 @@ class Kaui::AccountsController < Kaui::EngineController
           @account_emails = Kaui::AccountEmail.where({ :account_id => @account.account_id }, options_for_klient)
           @overdue_state = Kaui::KillbillHelper::get_overdue_state_for_account(@account.account_id, options_for_klient)
           @payment_methods = Kaui::KillbillHelper::get_non_external_payment_methods(@account.account_id, options_for_klient)
-          @bundles = Kaui::KillbillHelper::get_bundles(@account.account_id, options_for_klient)
+          @bundles = Kaui::KillbillHelper::get_bundles_for_account(@account.account_id, options_for_klient)
 
           @subscriptions_by_bundle_id = {}
 

data/app/controllers/kaui/bundles_controller.rb

@@ -6,6 +6,32 @@ class Kaui::BundlesController < Kaui::EngineController
     end
   end
 
+  def pagination
+    json = { :sEcho => params[:sEcho], :iTotalRecords => 0, :iTotalDisplayRecords => 0, :aaData => [] }
+
+    search_key = params[:sSearch]
+    if search_key.present?
+      bundles = Kaui::KillbillHelper::search_bundles(search_key, params[:iDisplayStart] || 0, params[:iDisplayLength] || 10, options_for_klient)
+    else
+      bundles = Kaui::KillbillHelper::get_bundles(params[:iDisplayStart] || 0, params[:iDisplayLength] || 10, options_for_klient)
+    end
+    json[:iTotalDisplayRecords] = bundles.pagination_total_nb_records
+    json[:iTotalRecords] = bundles.pagination_max_nb_records
+
+    bundles.each do |bundle|
+      json[:aaData] << [
+                         view_context.link_to(bundle.bundle_id, view_context.url_for(:action => :show, :id => bundle.bundle_id)),
+                         view_context.link_to(bundle.account_id, view_context.url_for(:controller => :accounts, :action => :show, :id => bundle.account_id)),
+                         bundle.external_key,
+                         bundle.subscriptions.nil? ? '' : (bundle.subscriptions.map { |s| s.product_name }).join(', ')
+                       ]
+    end
+
+    respond_to do |format|
+      format.json { render :json => json }
+    end
+  end
+
   def show
     key = params[:id]
     if key.present?

data/app/controllers/kaui/chargebacks_controller.rb

@@ -54,7 +54,7 @@ class Kaui::ChargebacksController < Kaui::EngineController
       # Cancel all subscriptions on the account, if required
       if should_cancel_subs
         begin
-          bundles = Kaui::KillbillHelper::get_bundles(params[:account_id], options_for_klient)
+          bundles = Kaui::KillbillHelper::get_bundles_for_account(params[:account_id], options_for_klient)
           bundles.each do |bundle|
             bundle.subscriptions.each do |subscription|
               # Already cancelled?

data/app/controllers/kaui/invoices_controller.rb

@@ -8,7 +8,12 @@ class Kaui::InvoicesController < Kaui::EngineController
   def pagination
     json = { :sEcho => params[:sEcho], :iTotalRecords => 0, :iTotalDisplayRecords => 0, :aaData => [] }
 
-    invoices = Kaui::KillbillHelper::get_invoices(params[:iDisplayStart] || 0, params[:iDisplayLength] || 10, options_for_klient)
+    search_key = params[:sSearch]
+    if search_key.present?
+      invoices = Kaui::KillbillHelper::search_invoices(search_key, params[:iDisplayStart] || 0, params[:iDisplayLength] || 10, options_for_klient)
+    else
+      invoices = Kaui::KillbillHelper::get_invoices(params[:iDisplayStart] || 0, params[:iDisplayLength] || 10, options_for_klient)
+    end
     json[:iTotalDisplayRecords] = invoices.pagination_total_nb_records
     json[:iTotalRecords] = invoices.pagination_max_nb_records
 

data/app/helpers/kaui/killbill_helper.rb

@@ -147,11 +147,47 @@ module Kaui
       else
         raise ArgumentError.new("account id not specified") if account_id.blank?
         bundles = KillBillClient::Model::Bundle.find_all_by_account_id_and_external_key account_id, key, options
-        bundles.empty? ? nil : bundles[-1]
+        get_active_bundle_or_latest_created(bundles)
       end
     end
 
-    def self.get_bundles(account_id, options = {})
+    def self.get_active_bundle_or_latest_created(bundles)
+
+      if bundles.empty?
+        return nil
+      end
+
+      latest_start_date = nil
+      latest_bundle = nil
+
+      bundles.each do |b|
+        b.subscriptions.each do |s|
+          if s.product_category != 'ADD_ON'
+            if latest_start_date.nil? || latest_start_date < s.start_date
+              latest_start_date = s.start_date
+              latest_bundle = b
+            end
+
+            if s.cancelled_date.nil? || s.cancelled_date > Time.now
+              return b
+            end
+          end
+        end
+      end
+
+      latest_bundle
+    end
+
+
+    def self.get_bundles(offset, limit, options = {})
+      KillBillClient::Model::Bundle.find_in_batches offset, limit, options
+    end
+
+    def self.search_bundles(search_key, offset, limit, options = {})
+      KillBillClient::Model::Bundle.find_in_batches_by_search_key search_key, offset, limit, options
+    end
+
+    def self.get_bundles_for_account(account_id, options = {})
       account = KillBillClient::Model::Account.find_by_id account_id, false, false, options
       account.bundles options
     end
@@ -229,6 +265,10 @@ module Kaui
       KillBillClient::Model::Invoice.find_in_batches offset, limit, options
     end
 
+    def self.search_invoices(search_key, offset, limit, options = {})
+      KillBillClient::Model::Invoice.find_in_batches_by_search_key search_key, offset, limit, options
+    end
+
     def self.get_invoice(id_or_number, with_items = true, audit = "NONE", options = {})
       KillBillClient::Model::Invoice.find_by_id_or_number id_or_number, with_items, audit, options
     end
@@ -292,11 +332,6 @@ module Kaui
 
     ############## CATALOG ##############
 
-    def self.get_full_catalog(options = {})
-      data = call_killbill :get, "/1.0/kb/catalog/simpleCatalog", options
-      data[:json]
-    end
-
     def self.get_available_addons(base_product_name, options = {})
       data = call_killbill :get, "/1.0/kb/catalog/availableAddons?baseProductName=#{base_product_name}", options
       if data.has_key?(:json)
@@ -404,7 +439,6 @@ module Kaui
     end
 
     def self.create_refund(payment_id, refund, current_user = nil, reason = nil, comment = nil, options = {})
-
       new_refund = KillBillClient::Model::Refund.new
       new_refund.payment_id = payment_id
       new_refund.amount = refund["amount"]
@@ -433,7 +467,6 @@ module Kaui
     end
 
     def self.create_chargeback(chargeback, current_user = nil, reason = nil, comment = nil, options = {})
-
       new_chargeback = KillBillClient::Model::Chargeback.new
       new_chargeback.payment_id = chargeback.payment_id
       new_chargeback.amount = chargeback.chargeback_amount
@@ -535,11 +568,6 @@ module Kaui
       KillBillClient::Model::CustomField.find_in_batches_by_search_key search_key, offset, limit, options
     end
 
-    def self.get_custom_fields_for_account(account_id, options = {})
-      data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/customFields", options
-      process_response(data, :multiple) { |json| Kaui::CustomField.new(json) }
-    end
-
     ############## OVERDUE ##############
 
     def self.get_overdue_state_for_account(account_id, options = {})

data/app/models/kaui/user.rb

@@ -26,6 +26,15 @@ module Kaui
                                :api_secret => api_secret
     end
 
+    # Verify the Kill Bill session hasn't timed-out
+    def authenticated_with_killbill?(api_key=KillBillClient.api_key, api_secret=KillBillClient.api_secret)
+      KillBillClient.url = Kaui.killbill_finder.call
+      subject = KillBillClient::Model::Security.find_subject :session_id => kb_session_id,
+                                                             :api_key => api_key,
+                                                             :api_secret => api_secret
+      subject.is_authenticated
+    end
+
     private
 
     def self.do_find_permissions(options = {})

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

@@ -1,14 +1,27 @@
-<%= form_tag bundles_path, :class => "form-horizontal", :method => :get do %>
-  <fieldset>
-    <legend>Please enter bundle id</legend>
-    <div class="control-group">
-      <label class="control-label" for="bundle_id">Bundle</label>
-      <div class="controls">
-        <%= text_field_tag 'bundle_id', nil, :class => "input-xlarge", :id => "bundle_id" %>
-      </div>
-    </div>
-    <div class="form-actions">
-      <%= button_tag "Search", :class =>"btn btn-primary" %>
-    </div>
-  </fieldset>
+<table id="bundles-table" class="table table-condensed">
+  <thead>
+    <tr>
+      <th>Bundle ID</th>
+      <th>Account ID</th>
+      <th>External key</th>
+      <th>Subscriptions</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td colspan="1" class="dataTables_empty">Loading data from server</td>
+    </tr>
+  </tbody>
+</table>
+
+<%= javascript_tag do %>
+$(document).ready(function() {
+  $('#bundles-table').dataTable({
+    "sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>",
+    "sPaginationType": "bootstrap",
+    "bProcessing": true,
+    "bServerSide": true,
+    "sAjaxSource": "<%= bundles_pagination_path :format => :json %>"
+  });
+});
 <% end %>

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

@@ -1,18 +1,3 @@
-<%= form_tag invoices_path, :class => "form-horizontal", :method => :get do %>
-  <fieldset>
-    <legend>Please enter invoice id</legend>
-    <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", :placeholder => "InvoiceId, InvoiceNumber" %>
-      </div>
-    </div>
-    <div class="form-actions">
-      <%= button_tag "Search", :class =>"btn btn-primary" %>
-    </div>
-  </fieldset>
-<% end %>
-
 <table id="invoices-table" class="table table-condensed">
   <thead>
     <tr>
@@ -33,7 +18,7 @@
 <%= javascript_tag do %>
 $(document).ready(function() {
   $('#invoices-table').dataTable({
-    "sDom": "<'row-fluid'<'span6'l><'span6'>r>t<'row-fluid'<'span6'i><'span6'p>>",
+    "sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>",
     "sPaginationType": "bootstrap",
     "bProcessing": true,
     "bServerSide": true,

data/app/views/kaui/tags/_tags_table.html.erb

@@ -6,6 +6,8 @@
     <% end %>
     <br/>
   <% end %>
-  <%= link_to 'Add/Remove', tags_url_or_path, :class => 'btn btn-mini' %>
+  <% if can? :add, Kaui::Tag or can? :remove, Kaui::Tag %>
+    <%= link_to 'Add/Remove', tags_url_or_path, :class => 'btn btn-mini' %>
+  <% end %>
   <%= link_to 'Tags Audit', tags_show_path, :class => 'btn btn-mini' %>
 </dd>

data/config/initializers/killbill_authenticatable.rb

@@ -31,6 +31,14 @@ end
 
 Warden::Strategies.add(:killbill_authenticatable, Devise::Strategies::KillbillAuthenticatable)
 
+Warden::Manager.after_set_user do |user, auth, opts|
+  unless user.authenticated_with_killbill?
+    scope = opts[:scope]
+    auth.logout(scope)
+    throw(:warden, :scope => scope, :reason => "Kill Bill session expired")
+  end
+end
+
 Devise.add_module(:killbill_authenticatable,
                   :strategy => true,
                   :route => :session,

data/config/routes.rb

@@ -69,6 +69,9 @@ Kaui::Engine.routes.draw do
 
   resources :invoice_items, :only => [ :index, :show, :edit, :update, :destroy ]
 
+  scope "/bundles" do
+    match "/pagination" => "bundles#pagination", :via => :get, :as => "bundles_pagination"
+  end
   resources :bundles, :only => [ :index, :show ] do
     member do
       put :do_transfer

data/kaui.gemspec

@@ -27,10 +27,12 @@ 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.6.0'
+  s.add_dependency 'killbill-client', '~> 0.6.1'
   s.add_dependency 'devise', '~> 3.0.2'
   s.add_dependency 'cancan', '~> 1.6.10'
 
+  s.add_development_dependency "fakeweb", '~> 1.3'
+
   if defined?(JRUBY_VERSION)
     s.add_development_dependency 'activerecord-jdbc-adapter', '~> 1.2.2'
     s.add_development_dependency 'activerecord-jdbcmysql-adapter', '~> 1.2.2'

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+require 'fakeweb'
+
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
@@ -13,6 +15,11 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 # Load helpers
 Dir["#{File.dirname(__FILE__)}/unit/helpers/kaui/*.rb"].each { |f| require f }
 
+# Setup Kill Bill stubs
+FakeWeb.allow_net_connect = false
+FakeWeb.register_uri(:get, "http://127.0.0.1:8080/1.0/kb/security/subject", body: "{\"is_authenticated\":true}", :content_type => "application/json")
+FakeWeb.register_uri(:any, %r|http://127.0.0.1:8080|, body: "{}", :content_type => "application/json")
+
 # Include Devise helpers
 class ActionController::TestCase
   include Devise::TestHelpers
@@ -86,7 +93,7 @@ module Kaui::KillbillHelper
     []
   end
 
-  def self.get_bundles(account_id, options = {})
+  def self.get_bundles_for_account(account_id, options = {})
     []
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.10
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -441,7 +457,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3758218617985278409
+      hash: -1686099938526165848
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25