kaui 0.3.1 → 0.4.0

data/.travis.yml

@@ -7,11 +7,9 @@ notifications:
 rvm:
   - 1.9.3
   - 1.9.2
-  - jruby-18mode
   - jruby-19mode
   - ruby-head
   - jruby-head
-  - 1.8.7
 
 jdk:
   - openjdk7
@@ -22,8 +20,7 @@ before_script:
   - mysql -e 'create database kaui_test;'
 
 script:
-  - RAILS_ENV=test bundle exec rake db:migrate --trace
-  - bundle exec rake db:test:prepare
+  - pushd test/dummy && RAILS_ENV=test bundle exec rake db:migrate --trace && RAILS_ENV=test bundle exec rake db:test:prepare && popd
   - bundle exec rake
 
 matrix:

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    kaui (0.3.1)
+    kaui (0.4.0)
       cancan (~> 1.6.10)
       d3_rails (~> 3.2.8)
       devise (~> 3.0.2)
       jquery-rails (~> 3.0.4)
-      killbill-client (~> 0.2.1)
+      killbill-client (~> 0.3.1)
       money-rails (~> 0.8.1)
       rails (~> 3.2.14)
       rest-client (~> 1.6.7)
@@ -60,7 +60,7 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.0)
-    killbill-client (0.2.1)
+    killbill-client (0.3.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)

data/README.md

@@ -46,14 +46,18 @@ Sharing a Kaui instance across multiple tenants is not supported yet (you need t
 Running tests
 -------------
 
-Prepare a kaui_test database locally to be able to run the test suite:
-
-    create database kaui_test;
-    grant all privileges on kaui_test.* to 'root'@'localhost' identified by '';
-
-You can run tests using rake:
-
-    rake test
+Go into 'test/dummy': 
+> cd test/dummy/
+
+Run mkigrations:
+> export RAILS_ENV=test
+> rake kaui:install:migrations
+> rake db:migrate
+
+Run the tests:
+(Move back to top level)
+> cd ../..
+> rake test
 
 
 Development

data/app/controllers/kaui/accounts_controller.rb

@@ -25,16 +25,13 @@ class Kaui::AccountsController < Kaui::EngineController
         begin
           @tags = Kaui::KillbillHelper::get_tags_for_account(@account.account_id, options_for_klient).sort
           @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)
 
-          @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, options_for_klient)
-
             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

data/app/controllers/kaui/bundles_controller.rb

@@ -15,7 +15,6 @@ class Kaui::BundlesController < Kaui::EngineController
         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)
-          @overdue_state = Kaui::KillbillHelper::get_overdue_state_for_bundle(@bundle.bundle_id, options_for_klient)
         else
           flash.now[:error] = "Bundle #{key} not found"
           render :action => :index
@@ -55,7 +54,7 @@ class Kaui::BundlesController < Kaui::EngineController
       if bundle_id.present? && result.is_a?(Kaui::Account)
         @new_account = result
         begin
-          Kaui::KillbillHelper::transfer_bundle(bundle_id, @new_account.account_id, current_user, params[:reason], params[:comment], options_for_klient)
+          Kaui::KillbillHelper::transfer_bundle(bundle_id, @new_account.account_id, false, true, current_user, params[:reason], params[:comment], options_for_klient)
           flash[:notice] = "Bundle transfered successfully"
         rescue => e
           flash[:error] = "Error transfering bundle #{as_string(e)}"

data/app/controllers/kaui/subscriptions_controller.rb

@@ -58,6 +58,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
       end
 
       plan = @catalog[@plan_name]
+      @subscription.account_id =  @bundle.account_id
       @subscription.billing_period = plan["billingPeriod"]
       @subscription.product_name = plan["productName"]
       @subscription.price_list = plan["priceListName"]
@@ -73,6 +74,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
   def add_addon
     @base_product_name = params[:base_product_name]
 
+    @account_id = params[:account_id]
     @bundle_id = params[:bundle_id]
     @product_name = params[:product_name]
     @product_category = params[:product_category]
@@ -80,7 +82,8 @@ class Kaui::SubscriptionsController < Kaui::EngineController
     @price_list = params[:price_list]
 
     begin
-      @subscription = Kaui::Subscription.new(:bundle_id => @bundle_id,
+      @subscription = Kaui::Subscription.new(:account_id => @account_id,
+                                             :bundle_id => @bundle_id,
                                              :product_name => @product_name,
                                              :product_category => @product_category,
                                              :billing_period => @billing_period,

data/app/helpers/kaui/killbill_helper.rb

@@ -98,7 +98,7 @@ module Kaui
     end
 
     def self.get_account_by_bundle_id(bundle_id, options = {})
-      bundle = get_bundle(bundle_id)
+      bundle = get_bundle(bundle_id, options)
       get_account(bundle.account_id, false, false, options)
     end
 
@@ -188,7 +188,7 @@ module Kaui
       # We don't want to pass events
       subscription_data.delete(:events)
       call_killbill :post,
-                    "/1.0/kb/subscriptions",
+                    "/1.0/kb/entitlements",
                     ActiveSupport::JSON.encode(subscription_data, :root => false),
                     build_audit_headers(current_user, reason, comment, options)
     end
@@ -203,14 +203,14 @@ module Kaui
       # We don't want to pass events
       subscription_data.delete(:events)
       call_killbill :put,
-                    "/1.0/kb/subscriptions/#{subscription.subscription_id}#{params}",
+                    "/1.0/kb/entitlements/#{subscription.subscription_id}#{params}",
                     ActiveSupport::JSON.encode(subscription_data, :root => false),
                     build_audit_headers(current_user, reason, comment, options)
     end
 
     def self.reinstate_subscription(subscription_id, current_user = nil, reason = nil, comment = nil, options = {})
       call_killbill :put,
-                    "/1.0/kb/subscriptions/#{subscription_id}/uncancel",
+                    "/1.0/kb/entitlements/#{subscription_id}/uncancel",
                     "",
                     build_audit_headers(current_user, reason, comment, options)
     end
@@ -221,7 +221,7 @@ module Kaui
       params += "policy=#{policy}&" unless policy.blank?
       params += "requestedDate=#{prev_ctd.strftime('%Y-%m-%dT%H:%M:%S')}" unless prev_ctd.nil?
       call_killbill :delete,
-                    "/1.0/kb/subscriptions/#{subscription_id}#{params}",
+                    "/1.0/kb/entitlements/#{subscription_id}#{params}",
                     build_audit_headers(current_user, reason, comment, options)
     end
 
@@ -502,8 +502,8 @@ module Kaui
 
     ############## OVERDUE ##############
 
-    def self.get_overdue_state_for_bundle(bundle_id, options = {})
-      data = call_killbill :get, "/1.0/kb/overdue/bundles/#{bundle_id}", options
+    def self.get_overdue_state_for_account(account_id, options = {})
+      data = call_killbill :get, "/1.0/kb/overdue/accounts/#{account_id}", options
       process_response(data, :single) { |json| Kaui::OverdueState.new(json) }
     end
 

data/app/models/kaui/subscription.rb

@@ -1,4 +1,5 @@
 class Kaui::Subscription < Kaui::Base
+  define_attr :account_id
   define_attr :subscription_id
   define_attr :bundle_id
   define_attr :product_category
@@ -12,7 +13,8 @@ class Kaui::Subscription < Kaui::Base
   has_many :events, Kaui::Event
 
   def initialize(data = {})
-    super(:subscription_id => data['subscriptionId'] || data['subscription_id'],
+    super(:account_id =>  data['accountId'] || data['account_id'],
+          :subscription_id => data['subscriptionId'] || data['subscription_id'],
           :bundle_id => data['bundleId'] || data['bundle_id'],
           :product_category => data['productCategory'] || data['product_category'],
           :product_name => data['productName'] || data['product_name'],

data/app/models/kaui/tag_definition.rb

@@ -17,7 +17,7 @@ class Kaui::TagDefinition < Kaui::Base
   # See com.ning.billing.util.dao.ObjectType in killbill-api
   %w(ACCOUNT ACCOUNT_EMAIL BUNDLE INVOICE PAYMENT INVOICE_ITEM INVOICE_PAYMENT
      SUBSCRIPTION SUBSCRIPTION_EVENT PAYMENT_METHOD REFUND TAG_DEFINITION).each do |object_type|
-       define_singleton_method "all_for_#{object_type.downcase}" do |options_for_klient = {}|
+       define_singleton_method "all_for_#{object_type.downcase}" do |options_for_klient|
          self.all(options_for_klient).delete_if { |tag_definition| !tag_definition.applicable_object_types.include? object_type }
        end
   end

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

@@ -259,8 +259,8 @@
       <% @timeline.bundles.each do |bundle| %>
         <% bundle.subscriptions.each do |sub| %>
           <% sub.events.each do |event| %>
-            <!-- SKIP UNCANCEL SINCE MATCHING CANCEL EVENT IS NOT RETURNED AS IT WAS INVALIDED -->
-            <% next if event.event_type == 'UNCANCEL' %>
+            <!-- SKIP SERVICE_STATE_CHANGE  -->
+            <% next if event.event_type == 'SERVICE_STATE_CHANGE' %>
             <tr title="<%= @bundle_names[bundle.external_key] %>" data-event_type="<%= event.event_type %>">
               <td>
                 <% if event.requested_date.present? %>
@@ -306,7 +306,7 @@
     });
   }
 
-  eventsOrder = ["CREATE", "PHASE", "CHANGE", "CANCEL", "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);

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

@@ -30,6 +30,14 @@
     <dd><%= @account.phone %>&nbsp;</dd>
     <dt>External key:</dt>
     <dd><%= @account.external_key %>&nbsp;</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 %>
     <dt>Account balance:</dt>
     <% if @account.balance.nil? %>
         <dd>unknown
@@ -85,14 +93,7 @@
   <% @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>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 %>
+      <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? %>
       <%= render :partial => "kaui/subscriptions/subscriptions_table", :locals => { :subscriptions => subs, :account => @account } %>
     <% end %>
   <% end %>

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

@@ -7,14 +7,6 @@
     <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>
-    <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, :account => @account } %>

data/kaui.gemspec

@@ -27,14 +27,15 @@ 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.2.1'
+  s.add_dependency 'killbill-client', '~> 0.3.1'
   s.add_dependency 'devise', '~> 3.0.2'
   s.add_dependency 'cancan', '~> 1.6.10'
 
   if defined?(JRUBY_VERSION)
     s.add_development_dependency 'activerecord-jdbc-adapter', '~> 1.2.2'
     s.add_development_dependency 'activerecord-jdbcmysql-adapter', '~> 1.2.2'
-    #s.add_development_dependency 'jdbc-mysql', :require => false
+    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.2.2'
+    s.add_development_dependency 'jdbc-mysql', '~> 5.1.25'
   else
     s.add_development_dependency 'sqlite3'
     s.add_development_dependency 'mysql2'

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/test/test_helper.rb

@@ -58,8 +58,8 @@ module Kaui::KillbillHelper
     find_among_fixtures(Kaui::Account, account_id)
   end
 
-  def self.get_overdue_state_for_bundle(bundle_id, options = {})
-    find_among_fixtures(Kaui::OverdueState, bundle_id)
+  def self.get_overdue_state_for_account(account_id, options = {})
+    find_among_fixtures(Kaui::OverdueState, account_id)
   end
 
   def self.get_invoice(invoice_id, with_items = true, options = {})

data/test/unit/kaui/tag_definition_test.rb

@@ -27,8 +27,8 @@ class Kaui::TagDefinitionTest < ActiveSupport::TestCase
 
   test "can find all per object type" do
     assert_equal 3, Kaui::TagDefinition.all.size
-    assert_equal 2, Kaui::TagDefinition.all_for_account.size
-    assert_equal 1, Kaui::TagDefinition.all_for_invoice.size
-    assert_equal 1, Kaui::TagDefinition.all_for_tag_definition.size
+    assert_equal 2, Kaui::TagDefinition.all_for_account({}).size
+    assert_equal 1, Kaui::TagDefinition.all_for_invoice({}).size
+    assert_equal 1, Kaui::TagDefinition.all_for_tag_definition({}).size
   end
-end
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: money-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: d3_rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,20 +94,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,29 +142,33 @@ 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.
@@ -396,26 +417,30 @@ 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: -830910028184591534
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Killbill Admin UI plugin
 test_files:
 - test/dummy/README.rdoc

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: bd49d087cb5c254ed629586ba797f0634fb3eb98
-  data.tar.gz: a974af62e8d78d37100fccf5c8bc27057cf98c6c
-SHA512:
-  metadata.gz: d87e9d3c36da492ff243e3ab800f9bc766f4884955d02e9697bc37a6239039ff38264c22563e912fd050cee10ef9f8565f649f2ac72bae675670b15abfd477da
-  data.tar.gz: c7f4ef4c208234e5667b7ce9eb887c923381a4e262239e3148d4559ed719f6a1bbbfb4685c5092c7e7158f5b7b3825d41814c3bbe376612171259ce8743497ad