kaui 0.5.3 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dea19b00bc9a01b365d3a39fd237ad88b2d0cc34
+  data.tar.gz: 738868e5c83c65c4c76e29c7395b71944c3f12f0
+SHA512:
+  metadata.gz: f86d0958d9a8c1bb23c02d980ba8e958020c7fc0459d908f52d023e7a8cf8ada252bc8df233517a599ae4c0d47875f4d804f08f32fce97a0c1e91451c43d5494
+  data.tar.gz: a0a3708bd8116f351612b0a0e3e856747fdb78a50b6ca3048f9a1d947c1e8125cef955436b4537fc75eed41c831148d78907ff1e158f923272ef01e8c8525477

data/.travis.yml

@@ -2,19 +2,21 @@ language: ruby
 
 notifications:
   email:
-    - killbilling-dev@googlegroups.com
+    - kill-bill-commits@googlegroups.com
 
 rvm:
-  - 1.9.3
   - 1.9.2
-  - jruby-19mode
+  - 1.9.3
+  - 2.0.0
   - ruby-head
+  - jruby-19mode
+  - jruby-20mode
   - jruby-head
 
 jdk:
+  - openjdk6
   - openjdk7
   - oraclejdk7
-  - openjdk6
 
 before_script:
   - mysql -e 'create database kaui_test;'

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    kaui (0.5.3)
+    kaui (0.6.0)
       cancan (~> 1.6.10)
       d3_rails (~> 3.2.8)
       devise (~> 3.0.2)
       jquery-rails (~> 3.0.4)
-      killbill-client (~> 0.4.4)
+      killbill-client (~> 0.5.1)
       money-rails (~> 0.8.1)
       rails (~> 3.2.14)
       rest-client (~> 1.6.7)
@@ -14,12 +14,12 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.14)
-      actionpack (= 3.2.14)
+    actionmailer (3.2.15)
+      actionpack (= 3.2.15)
       mail (~> 2.5.4)
-    actionpack (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
+    actionpack (3.2.15)
+      activemodel (= 3.2.15)
+      activesupport (= 3.2.15)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -27,18 +27,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
+    activemodel (3.2.15)
+      activesupport (= 3.2.15)
       builder (~> 3.0.0)
-    activerecord (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
+    activerecord (3.2.15)
+      activemodel (= 3.2.15)
+      activesupport (= 3.2.15)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-    activesupport (3.2.14)
+    activeresource (3.2.15)
+      activemodel (= 3.2.15)
+      activesupport (= 3.2.15)
+    activesupport (3.2.15)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -59,8 +59,8 @@ GEM
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.0)
-    killbill-client (0.4.4)
+    json (1.8.1)
+    killbill-client (0.5.1)
       json (~> 1.8.0)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -72,7 +72,7 @@ GEM
       activesupport (>= 3.0)
       money (~> 5.1.0)
       railties (>= 3.0)
-    multi_json (1.8.0)
+    multi_json (1.8.2)
     mysql2 (0.3.13)
     orm_adapter (0.4.0)
     polyglot (0.3.3)
@@ -83,17 +83,17 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.14)
-      actionmailer (= 3.2.14)
-      actionpack (= 3.2.14)
-      activerecord (= 3.2.14)
-      activeresource (= 3.2.14)
-      activesupport (= 3.2.14)
+    rails (3.2.15)
+      actionmailer (= 3.2.15)
+      actionpack (= 3.2.15)
+      activerecord (= 3.2.15)
+      activeresource (= 3.2.15)
+      activesupport (= 3.2.15)
       bundler (~> 1.0)
-      railties (= 3.2.14)
-    railties (3.2.14)
-      actionpack (= 3.2.14)
-      activesupport (= 3.2.14)
+      railties (= 3.2.15)
+    railties (3.2.15)
+      actionpack (= 3.2.15)
+      activesupport (= 3.2.15)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -114,7 +114,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
     warden (1.2.3)
       rack (>= 1.0)
 

data/README.md

@@ -12,7 +12,7 @@ You can run Kaui locally using the sandbox script:
     # Point to your killbill installation
     export KILLBILL_URL="http://killbill.company.com:8080"
     # Run the sandbox script
-    script/sandbox 
+    bundle exec script/sandbox
     # Start the Rails app
     cd sandbox
     rails s
@@ -49,7 +49,7 @@ Running tests
 Go into 'test/dummy': 
 > cd test/dummy/
 
-Run mkigrations:
+Run migrations:
 > export RAILS_ENV=test
 > rake kaui:install:migrations
 > rake db:migrate

data/app/controllers/kaui/accounts_controller.rb

@@ -5,6 +5,34 @@ class Kaui::AccountsController < Kaui::EngineController
     end
   end
 
+  def pagination
+    json = { :sEcho => params[:sEcho], :iTotalRecords => 0, :iTotalDisplayRecords => 0, :aaData => [] }
+
+    search_key = params[:sSearch]
+    if search_key.present?
+      accounts = Kaui::KillbillHelper::search_accounts(search_key, params[:iDisplayStart] || 0, params[:iDisplayLength] || 10, options_for_klient)
+    else
+      accounts = Kaui::KillbillHelper::get_accounts(params[:iDisplayStart] || 0, params[:iDisplayLength] || 10, options_for_klient)
+    end
+    json[:iTotalDisplayRecords] = accounts.pagination_total_nb_records
+    json[:iTotalRecords] = accounts.pagination_max_nb_records
+
+    accounts.each do |account|
+      json[:aaData] << [
+                         view_context.link_to(account.account_id, view_context.url_for(:action => :show, :id => account.account_id)),
+                         account.name,
+                         account.external_key,
+                         account.currency,
+                         account.city,
+                         account.country
+                       ]
+    end
+
+    respond_to do |format|
+      format.json { render :json => json }
+    end
+  end
+
   def show
     @key = params[:id]
     if @key.present?
@@ -32,10 +60,7 @@ class Kaui::AccountsController < Kaui::EngineController
           @subscriptions_by_bundle_id = {}
 
           @bundles.each do |bundle|
-            subscriptions = Kaui::KillbillHelper::get_subscriptions_for_bundle(bundle.bundle_id, options_for_klient)
-            if subscriptions.present?
-              @subscriptions_by_bundle_id[bundle.bundle_id.to_s] = (@subscriptions_by_bundle_id[bundle.bundle_id.to_s] || []) + subscriptions
-            end
+            @subscriptions_by_bundle_id[bundle.bundle_id.to_s] = (@subscriptions_by_bundle_id[bundle.bundle_id.to_s] || []) + bundle.subscriptions
           end
         rescue => e
           flash.now[:error] = "Error while retrieving account information for account: #{as_string(e)}"

data/app/controllers/kaui/bundles_controller.rb

@@ -13,17 +13,19 @@ class Kaui::BundlesController < Kaui::EngineController
         @bundle = Kaui::KillbillHelper::get_bundle_by_key(key, params[:account_id], options_for_klient)
 
         if @bundle.present?
-          @account = Kaui::KillbillHelper::get_account_by_bundle_id(@bundle.bundle_id, options_for_klient)
-          @subscriptions = Kaui::KillbillHelper::get_subscriptions_for_bundle(@bundle.bundle_id, options_for_klient)
+          @account = Kaui::KillbillHelper::get_account(@bundle.account_id, false, false, options_for_klient)
+          @subscriptions = @bundle.subscriptions
         else
           flash.now[:error] = "Bundle #{key} not found"
           render :action => :index
         end
       rescue => e
         flash.now[:error] = "Error while retrieving bundle information for #{key}: #{as_string(e)}"
+        render :action => :index
       end
     else
       flash.now[:error] = "No id given"
+      render :action => :index
     end
   end
 

data/app/controllers/kaui/chargebacks_controller.rb

@@ -41,14 +41,36 @@ class Kaui::ChargebacksController < Kaui::EngineController
 
   def create
     chargeback = Kaui::Chargeback.new(params[:chargeback])
+    should_cancel_subs = (params[:cancel_all_subs] == "1")
 
     if chargeback.present?
       begin
         Kaui::KillbillHelper::create_chargeback(chargeback, current_user, params[:reason], params[:comment], options_for_klient)
-        flash[:notice] = "Chargeback created"
       rescue => e
         flash[:error] = "Error while creating a new chargeback: #{as_string(e)}"
+        redirect_to kaui_engine.account_timeline_path(:id => params[:account_id]) and return
       end
+
+      # 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.each do |bundle|
+            bundle.subscriptions.each do |subscription|
+              # Already cancelled?
+              next unless subscription.billing_end_date.blank?
+
+              # Cancel the entitlement immediately but use the default billing policy
+              Kaui::KillbillHelper::delete_subscription(subscription.subscription_id, current_user, params[:reason], params[:comment], 'IMMEDIATE', nil, options_for_klient)
+            end
+          end
+        rescue => e
+          flash[:error] = "Error while cancelling subscriptions: #{as_string(e)}"
+          redirect_to kaui_engine.account_timeline_path(:id => params[:account_id]) and return
+        end
+      end
+
+      flash[:notice] = "Chargeback created"
     else
       flash[:error] = "No chargeback to process"
     end

data/app/controllers/kaui/credits_controller.rb

@@ -26,7 +26,7 @@ class Kaui::CreditsController < Kaui::EngineController
 
     begin
       @account = Kaui::KillbillHelper::get_account(@account_id, false, false, options_for_klient)
-      @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id, true, options_for_klient) unless @invoice_id.nil?
+      @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id, true, "NONE", options_for_klient) unless @invoice_id.nil?
     rescue => e
       flash.now[:error] = "Error while starting to create credit: #{as_string(e)}"
     end
@@ -38,14 +38,14 @@ class Kaui::CreditsController < Kaui::EngineController
   end
 
   def create
-    credit = Kaui::Credit.new(params[:credit])
+    credit = params[:credit]
     begin
       Kaui::KillbillHelper::create_credit(credit, current_user, params[:reason], params[:comment], options_for_klient)
-      account = Kaui::KillbillHelper::get_account(credit.account_id, false, false, options_for_klient)
+      account = Kaui::KillbillHelper::get_account(credit['account_id'], false, false, options_for_klient)
       flash[:notice] = "Credit created"
     rescue => e
       flash[:error] = "Error while starting to create credit: #{as_string(e)}"
     end
-    redirect_to Kaui.account_home_path.call(credit.account_id)
+    redirect_to Kaui.account_home_path.call(credit['account_id'])
   end
 end

data/app/controllers/kaui/payment_methods_controller.rb

@@ -2,14 +2,33 @@ require 'kaui/killbill_helper'
 
 class Kaui::PaymentMethodsController < Kaui::EngineController
   def index
-    if params[:key]
-      params[:key].strip!
-      begin
-        @payment_methods = Kaui::KillbillHelper.get_payment_methods(params[:key], options_for_klient)
-        render :show
-      rescue => e
-        flash.now[:error] = "Error while retrieving payment method for account: #{params[:key]}: #{as_string(e)}"
-      end
+  end
+
+  def pagination
+    json = { :sEcho => params[:sEcho], :iTotalRecords => 0, :iTotalDisplayRecords => 0, :aaData => [] }
+
+    search_key = params[:sSearch]
+    if search_key.present?
+      payment_methods = Kaui::KillbillHelper::search_payment_methods(search_key, params[:iDisplayStart] || 0, params[:iDisplayLength] || 10, options_for_klient)
+    else
+      payment_methods = Kaui::KillbillHelper::get_payment_methods(params[:iDisplayStart] || 0, params[:iDisplayLength] || 10, options_for_klient)
+    end
+    json[:iTotalDisplayRecords] = payment_methods.pagination_total_nb_records
+    json[:iTotalRecords] = payment_methods.pagination_max_nb_records
+
+    payment_methods.each do |payment_method|
+      info_plugin = payment_method.plugin_info || OpenStruct.new
+      json[:aaData] << [
+                         view_context.link_to(payment_method.account_id, view_context.url_for(:controller => :accounts, :action => :show, :id => payment_method.account_id)),
+                         info_plugin.external_payment_id,
+                         info_plugin.type,
+                         info_plugin.cc_name,
+                         info_plugin.cc_last4,
+                       ]
+    end
+
+    respond_to do |format|
+      format.json { render :json => json }
     end
   end
 

data/app/controllers/kaui/subscriptions_controller.rb

@@ -151,18 +151,11 @@ class Kaui::SubscriptionsController < Kaui::EngineController
   end
 
   def destroy
-
-
     subscription_id = params[:id]
 
-    puts "calling destroy id = #{subscription_id}"
-
     if subscription_id.present?
       begin
-
-        puts "current_user = #{current_user}"
-
-        Kaui::KillbillHelper::delete_subscription(subscription_id, current_user, params[:reason], params[:comment], params[:policy], options_for_klient)
+        Kaui::KillbillHelper::delete_subscription(subscription_id, current_user, params[:reason], params[:comment], params[:policy], params[:policy], options_for_klient)
       rescue => e
         flash[:error] = "Error while canceling subscription: #{as_string(e)}"
       end

data/app/helpers/kaui/killbill_helper.rb

@@ -71,6 +71,14 @@ module Kaui
 
     ############## ACCOUNT ##############
 
+    def self.get_accounts(offset, limit, options = {})
+      KillBillClient::Model::Account.find_in_batches offset, limit, false, false, options
+    end
+
+    def self.search_accounts(search_key, offset, limit, options = {})
+      KillBillClient::Model::Account.find_in_batches_by_search_key search_key, offset, limit, false, false, options
+    end
+
     def self.get_account_by_key_with_balance_and_cba(key, options = {})
       self.get_account_by_key(key, false, true, options)
     end
@@ -132,28 +140,24 @@ module Kaui
 
     ############## BUNDLE ##############
 
-    def self.get_bundle_by_key(key, account_id, options = {})
+    def self.get_bundle_by_key(key, account_id = nil, options = {})
       # support id (UUID) and external key search
       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}/
-        @bundle = Kaui::KillbillHelper::get_bundle(key, options)
+        Kaui::KillbillHelper::get_bundle(key, options)
       else
-        @bundle = Kaui::KillbillHelper::get_bundle_by_external_key(key, account_id, options)
+        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]
       end
     end
 
     def self.get_bundles(account_id, options = {})
-      data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/bundles", options
-      process_response(data, :multiple) { |json| Kaui::Bundle.new(json) }
-    end
-
-    def self.get_bundle_by_external_key(account_id, external_key, options = {})
-      data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/bundles?externalKey=#{external_key}", options
-      process_response(data, :single) { |json| Kaui::Bundle.new(json) }
+      account = KillBillClient::Model::Account.find_by_id account_id, options
+      account.bundles
     end
 
     def self.get_bundle(bundle_id, options = {})
-      data = call_killbill :get, "/1.0/kb/bundles/#{bundle_id}", options
-      process_response(data, :single) { |json| Kaui::Bundle.new(json) }
+      KillBillClient::Model::Bundle::find_by_id(bundle_id, options)
     end
 
     def self.transfer_bundle(bundle_id, new_account_id, cancel_immediately = false, transfer_addons = true, current_user = nil, reason = nil, comment = nil, options = {})
@@ -165,27 +169,11 @@ module Kaui
 
     ############## SUBSCRIPTION ##############
 
-    def self.get_subscriptions_for_bundle(bundle_id, options = {})
-      data = call_killbill :get, "/1.0/kb/bundles/#{bundle_id}/subscriptions", options
-      process_response(data, :multiple) { |json| Kaui::Subscription.new(json) }
-    end
-
-    def self.get_subscriptions(account_id, options = {})
-      subscriptions = []
-      bundles = get_bundles(account_id)
-      bundles.each do |bundle|
-        subscriptions += get_subscriptions_for_bundle(bundle.bundle_id)
-      end
-      subscriptions
-    end
-
     def self.get_subscription(subscription_id, options = {})
-      data = call_killbill :get, "/1.0/kb/subscriptions/#{subscription_id}", options
-      process_response(data, :single) { |json| Kaui::Subscription.new(json) }
+      KillBillClient::Model::Subscription::find_by_id(subscription_id, options)
     end
 
     def self.create_subscription(subscription, current_user = nil, reason = nil, comment = nil, options = {})
-
       entitlement = KillBillClient::Model::Subscription.new
       entitlement.account_id = subscription.account_id
       entitlement.bundle_id = subscription.bundle_id
@@ -195,12 +183,10 @@ module Kaui
       entitlement.billing_period = subscription.billing_period
       entitlement.price_list = subscription.price_list
 
-
       entitlement.create(extract_created_by(current_user), extract_reason_code(reason), comment, options)
     end
 
     def self.update_subscription(subscription, requested_date = nil, policy = nil, current_user = nil, reason = nil, comment = nil, options = {})
-
       requested_date = requested_date.to_s unless requested_date.blank?
       entitlement = KillBillClient::Model::Subscription.new
       entitlement.subscription_id = subscription.subscription_id
@@ -208,12 +194,10 @@ module Kaui
                               extract_created_by(current_user), extract_reason_code(reason), comment, requested_date, policy, false, options)
     end
 
-    def self.delete_subscription(subscription_id, current_user = nil, reason = nil, comment = nil,  policy = nil, options = {})
-
+    def self.delete_subscription(subscription_id, current_user = nil, reason = nil, comment = nil,  entitlement_policy = nil, billing_policy = nil, options = {})
       entitlement = KillBillClient::Model::Subscription.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, true, options)
+      entitlement.cancel(extract_created_by(current_user), extract_reason_code(reason), comment, nil, entitlement_policy, billing_policy, true, options)
     end
 
     def self.reinstate_subscription(subscription_id, current_user = nil, reason = nil, comment = nil, options = {})
@@ -338,7 +322,7 @@ module Kaui
 
     def self.pay_all_invoices(account_id, external = false, current_user = nil, reason = nil, comment = nil, options = {})
       call_killbill :post,
-                    "/1.0/kb/invoices/payments?externalPayment=#{external}",
+                    "/1.0/kb/accounts/#{account_id}/payments?externalPayment=#{external}",
                     ActiveSupport::JSON.encode({:accountId => account_id}, :root => false),
                     build_audit_headers(current_user, reason, comment, options)
     end
@@ -361,22 +345,20 @@ module Kaui
 
     ############## PAYMENT METHOD ##############
 
+    def self.get_payment_methods(offset, limit, options = {})
+      KillBillClient::Model::PaymentMethod.find_in_batches offset, limit, options
+    end
+
+    def self.search_payment_methods(search_key, offset, limit, options = {})
+      KillBillClient::Model::PaymentMethod.find_in_batches_by_search_key search_key, offset, limit, options
+    end
+
     def self.delete_payment_method(payment_method_id, set_auto_pay_off = false, current_user = nil, reason = nil, comment = nil, options = {})
       KillBillClient::Model::PaymentMethod.destroy payment_method_id, set_auto_pay_off, extract_created_by(current_user), extract_reason_code(reason), comment, options
     end
 
     def self.get_non_external_payment_methods(account_id, options = {})
-      self.get_payment_methods(account_id, options).reject { |x| x.plugin_name == '__EXTERNAL_PAYMENT__' }
-    end
-
-    def self.get_payment_methods(key, options = {})
-      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, options
-      else
-        #any search key
-        KillBillClient::Model::PaymentMethod.find_all_by_search_key key, true, options
-      end
+      KillBillClient::Model::PaymentMethod.find_all_by_account_id(account_id, true, options).reject { |x| x.plugin_name == '__EXTERNAL_PAYMENT__' }
     end
 
     def self.get_payment_method(payment_method_id, options = {})
@@ -444,11 +426,16 @@ module Kaui
     ############## CREDIT ##############
 
     def self.create_credit(credit, current_user = nil, reason = nil, comment = nil, options = {})
-      credit_data = Kaui::Credit.camelize(credit.to_hash)
-      call_killbill :post,
-                    "/1.0/kb/credits",
-                    ActiveSupport::JSON.encode(credit_data, :root => false),
-                    build_audit_headers(current_user, reason, comment, options)
+      new_credit = KillBillClient::Model::Credit.new
+      new_credit.credit_amount = credit['credit_amount']
+      new_credit.invoice_id = credit['invoice_id']
+      new_credit.effective_date = credit['effective_date']
+      new_credit.account_id = credit['account_id']
+      
+      new_credit.create(extract_created_by(current_user),
+                        extract_reason_code(reason),
+                        comment,
+                        options)
     end
 
     ############## TAG ##############

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

@@ -307,7 +307,7 @@
     });
   }
 
-  eventsOrder = ["START_ENTITLEMENT", "START_BILLING", "PAUSE_ENTITLEMENT", "PAUSE_BILLING", "RESUME_ENTITLEMENT", "RESUME_BILLING", "PHASE", "CHANGE", , "STOP_ENTITLEMENT", "STOP_BILLING", "INVOICE", "PAYMENT", "REFUND", "CHARGEBACK"];
+  eventsOrder = ["START_ENTITLEMENT", "START_BILLING", "PAUSE_ENTITLEMENT", "PAUSE_BILLING", "RESUME_ENTITLEMENT", "RESUME_BILLING", "PHASE", "CHANGE", "STOP_ENTITLEMENT", "STOP_BILLING", "INVOICE", "PAYMENT", "REFUND", "CHARGEBACK"];
 
   jQuery.fn.dataTableExt.oSort['timeline-event-asc']  = function(e1,e2) {
     var x = eventsOrder.indexOf(e1);
@@ -352,7 +352,7 @@
        "iDisplayLength": 100,
        "bRetrieve": true,
        // Force a predictive order for event types, invoices and payments
-       "aaSorting": [[1, 'desc'], [4, 'desc'], [3, 'desc']],
+       "aaSorting": [[1, 'desc'], [4, 'asc'], [3, 'desc']],
        "aoColumns": [
            { "sType": 'date' },
            { "sType": 'date' },

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

@@ -1,14 +1,29 @@
-<%= form_tag accounts_path, :class => "form-horizontal", :method => :get do %>
-  <fieldset>
-    <legend>Search accounts by id or external key</legend>
-    <div class="control-group">
-      <label class="control-label" for="account_id"><%=t :account %></label>
-      <div class="controls">
-        <%= text_field_tag 'account_id', @key, :class => "input-xlarge", :id => "account_id", :placeholder => "accountId, externalKey" %>
-      </div>
-    </div>
-    <div class="form-actions">
-      <%= button_tag "Search", :class =>"btn btn-primary" %>
-    </div>
-  </fieldset>
+<table id="accounts-table" class="table table-condensed">
+  <thead>
+    <tr>
+      <th>Account ID</th>
+      <th>Name</th>
+      <th>External key</th>
+      <th>Currency</th>
+      <th>City</th>
+      <th>Country</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() {
+  $('#accounts-table').dataTable({
+    "sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>",
+    "sPaginationType": "bootstrap",
+    "bProcessing": true,
+    "bServerSide": true,
+    "sAjaxSource": "<%= accounts_pagination_path :format => :json %>"
+  });
+});
 <% end %>

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

@@ -88,6 +88,14 @@
         <%= select_tag :reason, options_for_select(Kaui::Chargeback::SAMPLE_REASON_CODES) %>
       </div>
     </div>
+    <div class="control-group">
+      <%= label_tag :cancel_all_subs, "Cancel account subscriptions?", :class => "control-label" %>
+      <div class="controls">
+        <label class="checkbox">
+          <%= check_box_tag :cancel_all_subs %>
+        </label>
+      </div>
+    </div>
     <div class="control-group">
       <%= label_tag :comment, "Comment", :class => "control-label" %>
       <div class="controls">

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

@@ -1,15 +1,28 @@
-<%= form_tag payment_methods_path, :class => "form-horizontal", :method => :get do %>
-    <fieldset>
-      <legend>Payment Methods</legend>
-      <div class="control-group">
-        <label class="control-label" for="key">Enter Key</label>
+<table id="paymentMethods-table" class="table table-condensed">
+  <thead>
+    <tr>
+      <th>Account ID</th>
+      <th>External ID</th>
+      <th>Type</th>
+      <th>CC name</th>
+      <th>CC last 4</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td colspan="1" class="dataTables_empty">Loading data from server</td>
+    </tr>
+  </tbody>
+</table>
 
-        <div class="controls">
-          <%= text_field_tag 'key', nil, :class => "input-xlarge", :id => "key", :placeholder => "accountId, PayPalEmail, BAID, Last4cc" %>
-        </div>
-      </div>
-      <div class="form-actions">
-        <%= button_tag "Search", :class => "btn btn-primary" %>
-      </div>
-    </fieldset>
+<%= javascript_tag do %>
+$(document).ready(function() {
+  $('#paymentMethods-table').dataTable({
+    "sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>",
+    "sPaginationType": "bootstrap",
+    "bProcessing": true,
+    "bServerSide": true,
+    "sAjaxSource": "<%= payment_methods_pagination_path :format => :json %>"
+  });
+});
 <% end %>

data/app/views/kaui/subscriptions/_subscriptions_table.html.erb

@@ -21,15 +21,15 @@
           <td><%= format_date(sub.start_date, account.timezone).html_safe  if sub.start_date.present? %></td>
           <td><%= format_date(sub.charged_through_date, account.timezone).html_safe if sub.charged_through_date.present? %></td>
           <td>
-            <% if sub.canceled_date.present? && !sub.canceled_date.nil? %>
-              <% if Time.parse(sub.canceled_date) > Time.now %> <%= "Pending cancellation on " %> <% else %> <%= "Canceled on " %> <% end %> <%= format_date(sub.canceled_date, account.timezone).html_safe %>
+            <% if sub.cancelled_date.present? && !sub.cancelled_date.nil? %>
+              <% if Time.parse(sub.cancelled_date) > Time.now %> <%= "Pending cancellation on " %> <% else %> <%= "Canceled on " %> <% end %> <%= format_date(sub.cancelled_date, account.timezone).html_safe %>
             <% end %>
           </td>
           <td>
             <nobr>
-              <% if sub.canceled_date.present? && Time.parse(sub.canceled_date) > Time.now %>
+              <% if sub.cancelled_date.present? && Time.parse(sub.cancelled_date) > Time.now %>
                 <%= link_to "Reinstate", kaui_engine.reinstate_subscription_path(:id => sub.subscription_id), :method => :put, :class => "btn btn-mini" %>
-              <% elsif !sub.canceled_date.present? %>
+              <% elsif !sub.cancelled_date.present? %>
                 <%= link_to "Change", kaui_engine.edit_subscription_path(sub.subscription_id), :class => "btn btn-mini" %>
                 <div class="btn-group">
                   <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">

data/app/views/kaui/subscriptions/edit.html.erb

@@ -1,5 +1,5 @@
 <% @page_title = "Edit Subscription" %>
-<%= form_for(@subscription, :url => subscription_path(@subscription.subscription_id), :html => { :method => :put, :class => "form-horizontal" }) do |f| %>
+<%= form_for(@subscription, :as => :subscription, :url => subscription_path(@subscription.subscription_id), :html => { :method => :put, :class => "form-horizontal" }) do |f| %>
   <%= f.hidden_field :subscription_id %>
   <%= f.hidden_field :price_list %>
   <div class="control-group">

data/config/routes.rb

@@ -8,6 +8,9 @@ Kaui::Engine.routes.draw do
 
   root :to => "home#index"
 
+  scope "/accounts" do
+    match "/pagination" => "accounts#pagination", :via => :get, :as => "accounts_pagination"
+  end
   resources :accounts, :only => [ :index, :show ] do
     member do
       get :payment_methods
@@ -42,6 +45,9 @@ Kaui::Engine.routes.draw do
 
   resources :payments, :only => [ :create, :new, :index, :show ]
 
+  scope "/payment_methods" do
+    match "/pagination" => "payment_methods#pagination", :via => :get, :as => "payment_methods_pagination"
+  end
   resources :payment_methods, :only => [ :index, :show, :destroy ]
 
   resources :refunds, :only => [ :index, :show, :create, :new ]

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.4.4'
+  s.add_dependency 'killbill-client', '~> 0.5.1'
   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.5.3"
+  VERSION = "0.6.0"
 end

data/test/test_helper.rb

@@ -78,6 +78,10 @@ module Kaui::KillbillHelper
     []
   end
 
+  def self.get_non_external_payment_methods(account_id, options = {})
+    []
+  end
+
   def self.get_payment_methods(account_id, options = {})
     []
   end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.5.3
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-10-26 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,23 +83,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,33 +125,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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'
 - !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.
@@ -417,30 +396,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: -2070916750925486573
 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