kaui 0.0.2 → 0.0.3

data/app/controllers/kaui/account_tags_controller.rb

@@ -1,4 +1,4 @@
-class Kaui::AccountTagsController < ApplicationController
+class Kaui::AccountTagsController < Kaui::EngineController
 
   def show
     account_id = params[:id]

data/app/controllers/kaui/account_timelines_controller.rb

@@ -1,4 +1,4 @@
-class Kaui::AccountTimelinesController < ApplicationController
+class Kaui::AccountTimelinesController < Kaui::EngineController
   def index
     if params[:account_id].present?
       redirect_to account_timeline_path(params[:account_id])

data/app/controllers/kaui/accounts_controller.rb

@@ -1,7 +1,7 @@
 require 'rest_client'
 require 'json'
 
-class Kaui::AccountsController < ApplicationController
+class Kaui::AccountsController < Kaui::EngineController
   def index
     if params[:account_id].present?
       redirect_to account_path(params[:account_id])

data/app/controllers/kaui/bundle_tags_controller.rb

@@ -1,4 +1,4 @@
-class Kaui::BundleTagsController < ApplicationController
+class Kaui::BundleTagsController < Kaui::EngineController
 
   def show
     bundle_id = params[:id]

data/app/controllers/kaui/bundles_controller.rb

@@ -1,4 +1,4 @@
-class Kaui::BundlesController < ApplicationController
+class Kaui::BundlesController < Kaui::EngineController
 
   def index
     if params[:bundle_id].present?

data/app/controllers/kaui/chargebacks_controller.rb

@@ -1,4 +1,4 @@
-class Kaui::ChargebacksController < ApplicationController
+class Kaui::ChargebacksController < Kaui::EngineController
   def show
     @payment_id = params[:id]
     if @payment_id.present?
@@ -34,9 +34,12 @@ class Kaui::ChargebacksController < ApplicationController
       success = Kaui::KillbillHelper::create_chargeback(chargeback, params[:reason], params[:comment])
       if success
         flash[:info] = "Chargeback created"
+      else
+        flash[:error] = "Could not process chargeback"
       end
+    else
+      flash[:error] = "No chargeback to process"
     end
-    flash[:error] = "Could not process chargeback"
     redirect_to account_timeline_path(:id => params[:account_id])
   end
 

data/app/controllers/kaui/credits_controller.rb

@@ -1,4 +1,4 @@
-class Kaui::CreditsController < ApplicationController
+class Kaui::CreditsController < Kaui::EngineController
   def show
     @payment_id = params[:id]
     if @payment_id.present?

data/app/controllers/kaui/engine_controller.rb

@@ -0,0 +1,6 @@
+class Kaui::EngineController < ApplicationController
+  # This is a semi-isolated engine (https://bibwild.wordpress.com/2012/05/10/the-semi-isolated-rails-engine/)
+  # We expect that the hosting app's ApplicationController has these methods defined:
+  #
+  #   current_user - returns the id of the current user
+end

data/app/controllers/kaui/home_controller.rb

@@ -1,6 +1,4 @@
-module Kaui
-  class HomeController < ApplicationController
-    def index
-    end
+class Kaui::HomeController < Kaui::EngineController
+  def index
   end
 end

data/app/controllers/kaui/invoices_controller.rb

@@ -1,4 +1,4 @@
-class Kaui::InvoicesController < ApplicationController
+class Kaui::InvoicesController < Kaui::EngineController
   def index
     if params[:id].present?
       redirect_to invoice_path(params[:id])
@@ -23,7 +23,7 @@ class Kaui::InvoicesController < ApplicationController
             end
         end
         else
-          flash[:error] = "Invoice items for #{@invoice_id} not found"  
+          flash[:error] = "Invoice items for #{@invoice_id} not found"
         end
       else
         flash[:error] = "Invoice #{@invoice_id} not found"

data/app/controllers/kaui/payment_methods_controller.rb

@@ -1,6 +1,6 @@
 require 'kaui/killbill_helper'
 
-class Kaui::PaymentMethodsController < ApplicationController
+class Kaui::PaymentMethodsController < Kaui::EngineController
   def show
     # TODO: show payment method details
   end

data/app/controllers/kaui/refunds_controller.rb

@@ -1,4 +1,4 @@
-class Kaui::RefundsController < ApplicationController
+class Kaui::RefundsController < Kaui::EngineController
 	def show
     @payment_id = params[:id]
     if @payment_id.present?
@@ -32,10 +32,16 @@ class Kaui::RefundsController < ApplicationController
     refund = Kaui::Refund.new(params[:refund])
     refund.adjusted = (refund.adjusted == "1")
     if refund.present?
-      Kaui::KillbillHelper::create_refund(params[:payment_id], refund, params[:reason], params[:comment])
-      redirect_to account_timeline_path(:id => params[:account_id])
+      success = Kaui::KillbillHelper::create_refund(params[:payment_id], refund, params[:reason], params[:comment])
+      if success
+        flash[:info] = "Refund created"
+      else
+        flash[:error] = "Error while processing refund"
+      end
     else
-      flash[:error] = "No refund given to process"
+      flash[:error] = "No refund to process"
     end
+    redirect_to account_timeline_path(:id => params[:account_id])
   end
+
 end

data/app/controllers/kaui/subscriptions_controller.rb

@@ -1,6 +1,6 @@
 require 'kaui/product'
 
-class Kaui::SubscriptionsController < ApplicationController
+class Kaui::SubscriptionsController < Kaui::EngineController
   def index
     if params[:subscription_id].present?
       redirect_to subscription_path(params[:subscription_id])
@@ -16,6 +16,48 @@ class Kaui::SubscriptionsController < ApplicationController
   end
 
   def new
+    bundle_id = params[:bundle_id]
+    @base_subscription = params[:base_subscription]
+    @bundle = Kaui::KillbillHelper::get_bundle(bundle_id)
+    if @base_subscription.present?
+      @catalog = Kaui::KillbillHelper::get_available_addons(@base_subscription)
+    else
+      # TODO: call catalog to get base subscription types
+    end
+
+    @subscription = Kaui::Subscription.new("bundleId" => bundle_id)
+  end
+
+  def create
+    @base_subscription = params[:base_subscription]
+    @subscription = Kaui::Subscription.new(params[:subscription])
+    @bundle = Kaui::KillbillHelper::get_bundle(@subscription.bundle_id)
+    @plan_name = params[:plan_name]
+    if @base_subscription.present?
+      @catalog = Kaui::KillbillHelper::get_available_addons(@base_subscription)
+      @subscription.product_category = "ADD_ON"
+    else
+      # TODO: call catalog to get base subscription types
+      @subscription.product_category = "BASE"
+    end
+
+    plan = @catalog[@plan_name]
+    @subscription.billing_period = plan["billingPeriod"]
+    @subscription.product_name = plan["productName"]
+    @subscription.price_list = plan["priceListName"]
+
+    begin
+      Kaui::KillbillHelper::create_subscription(@subscription)
+      redirect_to Kaui.bundle_home_path.call(@bundle.external_key)
+    rescue => e
+      flash[:error] = e.message
+      render :new
+    end
+  end
+
+  def add_addon
+    @base_product_name = params[:base_product_name]
+
     @bundle_id = params[:bundle_id]
     @product_name = params[:product_name]
     @product_category = params[:product_category]
@@ -27,14 +69,9 @@ class Kaui::SubscriptionsController < ApplicationController
                                            :product_category => @product_category,
                                            :billing_period => @billing_period,
                                            :price_list => @price_list)
-  end
-
-  def create
-    subscription = Kaui::Subscription.new(params[:subscription])
-    bundle = Kaui::KillbillHelper.get_bundle(subscription.bundle_id)
 
-    Kaui::KillbillHelper::create_subscription(subscription)
-    redirect_to account_timeline_path(:id => bundle.account_id)
+    @bundle = Kaui::KillbillHelper.get_bundle(subscription.bundle_id)
+    @available_plans = Kaui::KillbillHelper.get_available_addons(params[:base_product_name])
   end
 
   def edit
@@ -64,6 +101,21 @@ class Kaui::SubscriptionsController < ApplicationController
     end
   end
 
+  def reinstate
+    subscription_id = params[:id]
+    if subscription_id.present?
+      success = Kaui::KillbillHelper.reinstate_subscription(subscription_id, current_user)
+      if success
+        flash[:info] = "Subscription reinstated"
+      else
+        flash[:error] = "Error reinstating subscription"
+      end
+      redirect_to :back
+    else
+      flash[:error] = "No subscription id given"
+    end
+  end
+
   def destroy
     subscription_id = params[:id]
     if subscription_id.present?

data/app/helpers/kaui/killbill_helper.rb

@@ -15,6 +15,20 @@ module Kaui
       data
     end
 
+    def self.process_response(response, arity, &block)
+      if response.nil? || response[:json].nil?
+        arity == :single ? nil : []
+      elsif block_given?
+        arity == :single ? yield(response[:json]) : response[:json].collect {|item| yield(item) }
+      else
+        response[:json]
+      end
+    end
+
+    def self.extract_reason_code(reason)
+      reason_code = $1 if reason =~ /\s*(\d+).*/
+    end
+
     ############## ACCOUNT ##############
 
     def self.get_account_timeline(account_id)
@@ -106,7 +120,6 @@ module Kaui
         bundles.each do |bundle|
           subscriptions += get_subscriptions_for_bundle(bundle.bundle_id)
         end
-        puts subscriptions
         subscriptions
       rescue RestClient::BadRequest
         []
@@ -124,60 +137,61 @@ module Kaui
       end
     end
 
-    def self.create_subscription(subscription)
+    def self.create_subscription(subscription, current_user = nil, reason = nil, comment = nil)
       begin
         subscription_data = Kaui::Subscription.camelize(subscription.to_hash)
         data = call_killbill :post,
                              "/1.0/kb/subscriptions",
                              ActiveSupport::JSON.encode(subscription_data, :root => false),
                              :content_type => "application/json",
-                              "X-Killbill-CreatedBy" => Kaui.current_user.call.to_s,
-                              "X-Killbill-Reason" => "Very special reason",
-                              "X-Killbill-Comment" => "Very special comment"
+                              "X-Killbill-CreatedBy" => current_user,
+                              "X-Killbill-Reason" => "#{reason}",
+                              "X-Killbill-Comment" => "#{comment}"
         return data[:code] == 201
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
-    def self.update_subscription(subscription)
+    def self.update_subscription(subscription, current_user = nil, reason = nil, comment = nil)
       begin
         subscription_data = Kaui::Subscription.camelize(subscription.to_hash)
         data = call_killbill :put,
                              "/1.0/kb/subscriptions/#{subscription.subscription_id}",
                              ActiveSupport::JSON.encode(subscription_data, :root => false),
                              :content_type => :json,
-                             "X-Killbill-CreatedBy" => Kaui.current_user.call.to_s,
-                             "X-Killbill-Reason" => "Very special reason",
-                             "X-Killbill-Comment" => "Very special comment"
-        return data[:code] == 200
+                             "X-Killbill-CreatedBy" => current_user,
+                             "X-Killbill-Reason" => "#{reason}",
+                             "X-Killbill-Comment" => "#{comment}"
+        return data[:code] < 300
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
-    def self.reinstate_subscription(subscription_id)
+    def self.reinstate_subscription(subscription_id, current_user = nil, reason = nil, comment = nil)
       begin
         data = call_killbill :put,
-                             "/1.0/subscriptions/#{subscription_id}/uncancel",
+                             "/1.0/kb/subscriptions/#{subscription_id}/uncancel",
+                             "",
                              :content_type => :json,
-                             "X-Killbill-CreatedBy" => Kaui.current_user.call.to_s,
-                             "X-Killbill-Reason" => "Very special reason",
-                             "X-Killbill-Comment" => "Very special comment"
-        return data[:code] == 200
+                             "X-Killbill-CreatedBy" => current_user,
+                             "X-Killbill-Reason" => "#{reason}",
+                             "X-Killbill-Comment" => "#{comment}"
+        return data[:code] < 300
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
-    def self.delete_subscription(subscription_id)
+    def self.delete_subscription(subscription_id, current_user = nil, reason = nil, comment = nil)
       begin
         data = call_killbill :delete,
                              "/1.0/kb/subscriptions/#{subscription_id}",
-                             "X-Killbill-CreatedBy" => Kaui.current_user.call.to_s,
-                             "X-Killbill-Reason" => "Very special reason",
-                             "X-Killbill-Comment" => "Very special comment"
-        return data[:code] == 200
+                             "X-Killbill-CreatedBy" => current_user,
+                             "X-Killbill-Reason" => "#{reason}",
+                             "X-Killbill-Comment" => "#{comment}"
+        return data[:code] < 300
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -196,10 +210,12 @@ module Kaui
 
     ############## CATALOG ##############
 
-    def self.get_available_addons
+    def self.get_available_addons(base_product_name)
       begin
-        data = call_killbill :get, "/1.0/catalog/availableAddons"
-        return data[:json]
+        data = call_killbill :get, "/1.0/kb/catalog/availableAddons?baseProductName=#{base_product_name}"
+        if data.has_key?(:json)
+          data[:json].inject({}) {|catalog_hash, item| catalog_hash.merge!(item["planName"] => item) }
+        end
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -231,8 +247,12 @@ module Kaui
 
     def self.get_payment(invoice_id, payment_id)
       payments = get_payments(invoice_id)
-      payments.each do |payment|
-        return payment if payment.payment_id == payment_id
+      if payments.present?
+        payments.each do |payment|
+          if payment.payment_id == payment_id
+            return payment
+          end
+        end
       end
       nil
     end
@@ -240,7 +260,8 @@ module Kaui
     def self.get_payments(invoice_id)
       begin
         data = call_killbill :get, "/1.0/kb/invoices/#{invoice_id}/payments"
-        process_response(data, :single) {|json| Kaui::Payment.new(json) }
+        response_data = process_response(data, :multiple) {|json| Kaui::Payment.new(json) }
+        return response_data
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
         []
@@ -249,9 +270,13 @@ module Kaui
 
     ############## PAYMENT METHOD ##############
 
-    def self.delete_payment_method(account_id, payment_method_id)
+    def self.delete_payment_method(account_id, payment_method_id, current_user = nil, reason = nil, comment = nil)
       begin
-        call_killbill :delete, "/1.0/accounts/#{account_id}/paymentMethods/#{payment_method_id}"
+        call_killbill :delete,
+                      "/1.0/accounts/#{account_id}/paymentMethods/#{payment_method_id}",
+                      "X-Killbill-CreatedBy" => current_user,
+                      "X-Killbill-Reason" => "#{reason}",
+                      "X-Killbill-Comment" => "#{comment}"
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -260,7 +285,7 @@ module Kaui
     def self.get_payment_methods(account_id)
       begin
         data = call_killbill :get, "/1.0/accounts/#{account_id}/paymentMethods"
-        process_response(data, :single) {|json| Kaui::PaymentMethod.new(json) }
+        process_response(data, :multiple) {|json| Kaui::PaymentMethod.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -270,23 +295,25 @@ module Kaui
 
     def self.get_refunds_for_payment(payment_id)
       begin
-        call_killbill :get, "/1.0/kb/payments/#{payment_id}/refunds"
+        data = call_killbill :get, "/1.0/kb/payments/#{payment_id}/refunds"
+        process_response(data, :multiple) {|json| Kaui::Refund.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
-    def self.create_refund(payment_id, refund, reason, comment)
+    def self.create_refund(payment_id, refund, current_user = nil, reason = nil, comment = nil)
       begin
         refund_data = Kaui::Refund.camelize(refund.to_hash)
+
         data = call_killbill :post,
                       "/1.0/kb/payments/#{payment_id}/refunds",
                       ActiveSupport::JSON.encode(refund_data, :root => false),
                       :content_type => "application/json",
-                      "X-Killbill-CreatedBy" => Kaui.current_user.call.to_s,
-                      "X-Killbill-Reason" => "#{reason}",
+                      "X-Killbill-CreatedBy" => current_user,
+                      "X-Killbill-Reason" => extract_reason_code(reason),
                       "X-Killbill-Comment" => "#{comment}"
-        return response[:code] == 201
+        return data[:code] < 300
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -297,23 +324,42 @@ module Kaui
     def self.get_chargebacks_for_payment(payment_id)
       begin
         data = call_killbill :get, "/1.0/kb/chargebacks/payments/#{payment_id}"
-        process_response(data, :single) {|json| Kaui::Chargeback.new(json) }
+        process_response(data, :multiple) {|json| Kaui::Chargeback.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
-    def self.create_chargeback(chargeback, reason, comment)
+    def self.create_chargeback(chargeback, current_user = nil, reason = nil, comment = nil)
       begin
         chargeback_data = Kaui::Refund.camelize(chargeback.to_hash)
+
         data = call_killbill :post,
                              "/1.0/kb/chargebacks",
                              ActiveSupport::JSON.encode(chargeback_data, :root => false),
                              :content_type => "application/json",
-                             "X-Killbill-CreatedBy" => Kaui.current_user.call.to_s,
-                             "X-Killbill-Reason" => "#{reason}",
+                             "X-Killbill-CreatedBy" => current_user,
+                             "X-Killbill-Reason" => extract_reason_code(reason),
                              "X-Killbill-Comment" => "#{comment}"
-        return data[:code] == 201
+        return data[:code] < 300
+      rescue => e
+        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
+      end
+    end
+
+    ############## CREDIT ##############
+
+    def self.create_credit(credit, current_user = nil, reason = nil, comment = nil)
+      begin
+        credit_data = Kaui::Refund.camelize(credit.to_hash)
+        data = call_killbill :post,
+                             "/1.0/kb/credits",
+                             ActiveSupport::JSON.encode(credit_data, :root => false),
+                             :content_type => "application/json",
+                             "X-Killbill-CreatedBy" => current_user,
+                             "X-Killbill-Reason" => extract_reason_code(reason),
+                             "X-Killbill-Comment" => "#{comment}"
+        return data[:code] < 300
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -350,16 +396,16 @@ module Kaui
     end
 
 
-    def self.set_tags_for_account(account_id, tags)
+    def self.set_tags_for_account(account_id, tags, current_user = nil, reason = nil, comment = nil)
       begin
         if tags.nil? || tags.empty?
         else
           data = call_killbill :post,
                                "/1.0/kb/accounts/#{account_id}/tags?" + RestClient::Payload.generate(:tag_list => tags.join(",")).to_s,
                                nil,
-                               "X-Killbill-CreatedBy" => Kaui.current_user.call.to_s,
-                               "X-Killbill-Reason" => "Very special reason",
-                               "X-Killbill-Comment" => "Very special comment"
+                               "X-Killbill-CreatedBy" => current_user,
+                               "X-Killbill-Reason" => "#{reason}",
+                               "X-Killbill-Comment" => "#{comment}"
           return data[:code] == 201
         end
       rescue => e
@@ -367,16 +413,16 @@ module Kaui
       end
     end
 
-    def self.set_tags_for_bundle(bundle_id, tags)
+    def self.set_tags_for_bundle(bundle_id, tags, current_user = nil, reason = nil, comment = nil)
       begin
         if tags.nil? || tags.empty?
         else
           data = call_killbill :post,
                                "/1.0/kb/bundles/#{bundle_id}/tags?" + RestClient::Payload.generate(:tag_list => tags.join(",")).to_s,
                                nil,
-                               "X-Killbill-CreatedBy" => Kaui.current_user.call.to_s,
-                               "X-Killbill-Reason" => "Very special reason",
-                               "X-Killbill-Comment" => "Very special comment"
+                               "X-Killbill-CreatedBy" => current_user,
+                               "X-Killbill-Reason" => "#{reason}",
+                               "X-Killbill-Comment" => "#{comment}"
           return data[:code] == 201
         end
       rescue => e
@@ -384,17 +430,5 @@ module Kaui
       end
     end
 
-    private
-
-    def self.process_response(response, arity, &block)
-      if response.nil? || response[:json].nil?
-        arity == :single ? nil : []
-      elsif block_given?
-        arity == :single ? yield(response[:json]) : response[:json].collect {|item| yield(item) }
-      else
-        response[:json]
-      end
-    end
-
   end
 end

data/app/models/kaui/account.rb

@@ -6,8 +6,8 @@ class Kaui::Account < Kaui::Base
   define_attr :name
   define_attr :first_name_length
   define_attr :email
-  define_attr :billing_day
   define_attr :currency
+  define_attr :payment_method_id
   define_attr :timezone
   define_attr :address1
   define_attr :address2
@@ -22,8 +22,8 @@ class Kaui::Account < Kaui::Base
           :name => data['name'] || "#{data['firstName'] || ''}#{data.has_key?('firstName') ? ' ' : ''}#{data['lastName'] || ''}",
           :first_name_length => data['length'] || (data.has_key?('firstName') ? data['firstName'].length : 0),
           :email => data['email'],
-          :billing_day => data['billingDay'],
           :currency => data['currency'],
+          :payment_method_id => data['paymentMethodId'],
           :timezone => data['timeZone'] || data['timezone'],
           :address1 => data['address1'],
           :address2 => data['address2'],

data/app/models/kaui/invoice.rb

@@ -17,19 +17,18 @@ class Kaui::Invoice < Kaui::Base
   has_many :items, Kaui::InvoiceItem
 
   def initialize(data = {})
-    super(:amount => data['amount'],
-          :balance => data['balance'],
-          :invoice_id => data['invoiceId'],
+    super(
           :account_id => data['accountId'],
-          :invoice_number => data['invoiceNumber'],
-          :payment_amount => data['paymentAmount'],
-          :refund_adjustment => data['refundAdj'],
+          :amount => data['amount'],
+          :balance => data['balance'],
           :credit_balance_adjustment => data['cba'],
           :credit_adjustment => data['creditAdj'],
           :invoice_dt => data['invoiceDate'],
-          :payment_dt => data['paymentDate'],
+          :invoice_id => data['invoiceId'],
+          :invoice_number => data['invoiceNumber'],
+          :refund_adjustment => data['refundAdj'],
           :target_dt => data['targetDate'],
-          :bundle_keys => data['bundleKeys'],
-          :items => data['items'])
+          :items => data['items'],
+          :bundle_keys => data['bundleKeys'])
   end
 end

data/app/models/kaui/invoice_item.rb

@@ -14,16 +14,17 @@ class Kaui::InvoiceItem < Kaui::Base
   define_attr :currency;
 
   def initialize(data = {})
-    super(:invoice_id => data['invoiceId'],
+    super(
           :account_id => data['accountId'],
+          :amount => data['amount'],
           :bundle_id => data['bundleId'],
-          :subscription_id => data['subscriptionId'],
-          :plan_name => data['planName'],
-          :phase_name => data['phaseName'],
+          :currency => data['currency'],
           :description => data['description'],
-          :start_date => data['startDate'],
           :end_date => data['endDate'],
-          :amount => data['amount'],
-          :currency => data['currency'])
+          :invoice_id => data['invoiceId'],
+          :phase_name => data['phaseName'],
+          :plan_name => data['planName'],
+          :start_date => data['startDate'],
+          :subscription_id => data['subscriptionId'])
   end
 end

data/app/models/kaui/payment.rb

@@ -1,34 +1,33 @@
 require 'active_model'
 
 class Kaui::Payment < Kaui::Base
-  define_attr :invoice_id
+  define_attr :account_id
   define_attr :amount
-  define_attr :refund_amount
   define_attr :currency
+  define_attr :invoice_id
+  define_attr :effective_dt
+  define_attr :paid_amount
   define_attr :payment_id
-  define_attr :external_payment_id
-  define_attr :payment_attempt_date
-  define_attr :payment_method
   define_attr :payment_method_id
-  define_attr :card_type
+  define_attr :refund_amount
   define_attr :requested_dt
-  define_attr :effective_dt
+  define_attr :retry_count
   define_attr :status
   define_attr :bundle_keys
 
   def initialize(data = {})
-    super(:invoice_id => data['invoiceId'],
+    super(
+          :account_id => data['accountId'],
           :amount => data['amount'],
-          :refund_amount => data['refundAmount'],
           :currency => data['currency'],
-          :payment_id => data['id'] || data['paymentId'],
-          :external_payment_id => data['externalPaymentId'],
-          :payment_attempt_date => data['paymentAttemptDate'],
-          :payment_method => data['paymentMethod'],
+          :effective_dt => data['effectiveDate'],
+          :invoice_id => data['invoiceId'],
+          :paid_amount => data['paidAmount'],
+          :payment_id => data['paymentId'],
           :payment_method_id => data['paymentMethodId'],
-          :card_type => data['cardType'],
+          :refund_amount => data['refundAmount'],
           :requested_dt => data['requestedDate'],
-          :effective_dt => data['effectiveDate'],
+          :retry_count => data['retryCount'],
           :status => data['status'],
           :bundle_keys => data['bundleKeys'])
   end

data/app/models/kaui/subscription.rb

@@ -7,19 +7,19 @@ class Kaui::Subscription < Kaui::Base
   define_attr :charged_through_date
   define_attr :price_list
   define_attr :start_date
-  define_attr :canceledDate
+  define_attr :canceled_date
   has_many :events, Kaui::Event
 
   def initialize(data = {})
-    super(:subscription_id => data['subscriptionId'],
-          :bundle_id => data['bundleId'],
-          :product_category => data['productCategory'],
-          :product_name => data['productName'],
-          :billing_period => data['billingPeriod'],
-          :charged_through_date => data['chargedThroughDate'],
-          :price_list => data['priceList'],
-          :start_date => data['startDate'],
-          :canceledDate => data['cancelledDate'],
+    super(: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'],
+          :billing_period => data['billingPeriod'] || data['billing_period'],
+          :charged_through_date => data['chargedThroughDate'] || data['charged_through_date'],
+          :price_list => data['priceList'] || data['price_list'],
+          :start_date => data['startDate'] || data['start_date'],
+          :canceled_date => data['cancelledDate'] || data['canceled_date'],
           :events => data['events'])
   end
 end

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

@@ -43,7 +43,7 @@
       <label class="control-label">Payment method</label>
       <div class="controls">
         <label class="checkbox">
-          <%= @payment.payment_method %>
+          <%= @payment.payment_method_id %>
         </label>
       </div>
     </div>

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

@@ -1,10 +1,9 @@
 <% if @invoice.present? %>
+  <h3>Invoice number: <%= @invoice.invoice_number %></h3>
   <dl class="dl-horizontal">
     <dt>Account Name:</dt>
     <dd><%= @account.name %>&nbsp;</dd>
     <dd><%= link_to @account.email, Kaui.account_home_path.call(@account.external_key) %>&nbsp;</dd>
-    <dt>Invoice number:</dt>
-    <dd><%= @invoice.invoice_number %>&nbsp;</dd>
     <dt>Invoice date:</dt>
     <dd><%= format_date(@invoice.invoice_dt).html_safe %>&nbsp;</dd>
     <dt>Target date:</dt>
@@ -27,7 +26,7 @@
         <th>Start date</th>
         <th>Charged through date</th>
         <th>Price list</th>
-      </tr>   
+      </tr>
     </thead>
     <tbody>
       <% @invoice.items.each do |item| %>
@@ -51,7 +50,7 @@
   </table>
   <div class="page-header">
     <h3>Payments</h3>
-  </div>  
+  </div>
 <% else %>
   <p>Invoice not found</p>
 <% end %>

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

@@ -42,7 +42,7 @@
       <label class="control-label">Payment method</label>
       <div class="controls">
         <label class="checkbox">
-          <%= @payment.payment_method %>
+          <%= @payment.payment_method_id %>
         </label>
       </div>
     </div>
@@ -58,7 +58,7 @@
       <label class="control-label">Payment</label>
       <div class="controls">
         <label class="checkbox">
-          <%= @payment.amount %> <%= @account.currency %>
+          <%= @payment.amount %> <%= @account.currency if @payment.amount.present? %>
         </label>
       </div>
     </div>

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

@@ -23,21 +23,25 @@
           <td><%= format_date(sub.start_date).html_safe %></td>
           <td><%= format_date(sub.charged_through_date).html_safe %></td>
           <td>
-            <% if sub.canceledDate.present? %>
-              <%= "Canceled as of #{sub.canceledDate}" %>
+            <% if sub.canceled_date.present? %>
+              <%= "Pending cancellation on " %> <%= format_date(sub.canceled_date).html_safe %>
             <% end %>
           </td>
           <td>
-            <% if sub.product_category == 'BASE' %>
-              <%= link_to "Change", kaui_engine.edit_subscription_path(sub.subscription_id), :class => "btn btn-mini" unless sub.canceledDate.present? %>
-              <%= link_to "Cancel", kaui_engine.subscription_path(:id => sub.subscription_id), :method => :delete, :class => "btn btn-mini" %>
-              <%= link_to "Add Addons", kaui_engine.subscription_path(sub.subscription_id), :method => :post, :class => "btn btn-mini" %>
-            <% else %>
-            <% end %>
-            <% if sub.product_category == 'ADD_ON' %>
-              <%= link_to "Cancel", kaui_engine.subscription_path(:id => sub.subscription_id), :method => :delete, :class => "btn btn-mini" unless sub.canceledDate.present? %>
-              <%= link_to "Reinstate", kaui_engine.subscription_path(:id => sub.subscription_id), :method => :put, :class => "btn btn-mini" if sub.canceledDate.present? %>
-            <% end %>
+            <nobr>
+              <% if sub.product_category == 'BASE' %>
+                <%= link_to "Change", kaui_engine.edit_subscription_path(sub.subscription_id), :class => "btn btn-mini" unless sub.canceled_date.present? %>
+                <%= link_to "Cancel", kaui_engine.subscription_path(:id => sub.subscription_id), :method => :delete, :class => "btn btn-mini" %>
+                <%= link_to "Add Addons", kaui_engine.new_subscription_path(:params => { :bundle_id => sub.bundle_id, :base_subscription => sub.product_name }), :class => "btn btn-mini" %>
+              <% else %>
+              <% end %>
+              <% if sub.product_category == 'ADD_ON' %>
+                <%= link_to "Cancel", kaui_engine.subscription_path(:id => sub.subscription_id), :method => :delete, :class => "btn btn-mini" unless sub.canceled_date.present? %>
+                <% if sub.canceled_date.present? && Time.parse(sub.canceled_date) > Time.now %>
+                  <%= link_to "Reinstate", kaui_engine.reinstate_subscription_path(:id => sub.subscription_id), :method => :put, :class => "btn btn-mini" %>
+                <% end %>
+              <% end %>
+            </nobr>
           </td>
         </tr>
       <% end %>

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

@@ -0,0 +1,22 @@
+<div class="page-header">
+  <h1>Add subscription to <%= Kaui.bundle_key_display_string.call(@bundle.external_key) %></h1>
+</div>
+<%= form_for(@subscription, :url => { :action => :create }, :html => { :class => "form-horizontal" }) do |f| %>
+  <fieldset>
+    <%= f.hidden_field :bundle_id %>
+    <%= hidden_field_tag :base_subscription, @base_subscription %>
+    <div class="control-group">
+      <%= label_tag :plan_name, "Available Plans:", :class => "control-label" %>
+      <div class="controls">
+        <%= select_tag :plan_name, options_for_select(@catalog.keys, @plan_name) %>
+        <p class="help-block">
+          Proration on customer's invoice will be done automatically.
+        </p>
+      </div>
+    </div>
+    <div class="form-actions">
+      <%= f.submit 'Add', :class => 'btn btn-primary' %>
+      <%= link_to 'Back', :back, :class => 'btn' %>
+    </div>
+  </fieldset>
+<% end %>

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

@@ -18,4 +18,4 @@
 <hr/>
 <%= link_to "Change", kaui_engine.edit_subscription_path(@subscription.subscription_id), :class => "btn btn-mini" %>
 <%= link_to "Cancel", kaui_engine.subscription_path(@subscription.subscription_id), :method => :delete, :confirm => "Are you sure?", :class => "btn btn-mini" %>
-<%= link_to "Add Addons", kaui_engine.subscription_path(@subscription.subscription_id), :method => :post, :class => "btn btn-mini" %>
+<%= link_to "Add Addons", kaui_engine.new_subscription_path(:params => { :bundle_id => @subscription.bundle_id, :base_subscription => @subscription.product_name }), :class => "btn btn-mini" %>

data/config/routes.rb

@@ -16,7 +16,7 @@ Kaui::Engine.routes.draw do
       post :credits, :as => "credits"
     end
   end
-    
+
   resources :chargebacks, :only => [ :show, :create, :new ]
 
   resources :credits, :only => [ :create, :new ]
@@ -29,7 +29,11 @@ Kaui::Engine.routes.draw do
 
   resources :bundles, :only => [ :index, :show ]
 
-  resources :subscriptions, :except => [ :new, :create ]
+  resources :subscriptions do
+    member do
+      put :reinstate
+    end
+  end
 
   scope "/account_tags" do
     match "/" => "account_tags#show", :via => :get, :as => "account_tags"

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/kaui.rb

@@ -9,12 +9,10 @@ module Kaui
   mattr_accessor :bundle_home_path
   mattr_accessor :invoice_home_path
   mattr_accessor :bundle_key_display_string
-  mattr_accessor :current_user
 
   self.killbill_finder = lambda { Kaui::Engine.config.killbill_url }
   self.account_home_path = lambda {|account_id| Kaui::Engine.routes.url_helpers.account_path(account_id) }
   self.bundle_home_path = lambda {|bundle_id| Kaui::Engine.routes.url_helpers.bundle_path(:id => bundle_id) }
   self.invoice_home_path = lambda {|invoice_id| Kaui::Engine.routes.url_helpers.invoice_path(:id => invoice_id) }
   self.bundle_key_display_string =  lambda {|bundle_key| bundle_key }
-  self.current_user = lambda { nil }
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaui
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Alena Dudzinskaya
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-17 00:00:00 Z
+date: 2012-07-23 00:00:00 Z
 dependencies: []
 
 description: Rails UI plugin for Killbill administration.
@@ -49,11 +49,11 @@ files:
 - app/controllers/kaui/account_tags_controller.rb
 - app/controllers/kaui/account_timelines_controller.rb
 - app/controllers/kaui/accounts_controller.rb
-- app/controllers/kaui/application_controller.rb
 - app/controllers/kaui/bundle_tags_controller.rb
 - app/controllers/kaui/bundles_controller.rb
 - app/controllers/kaui/chargebacks_controller.rb
 - app/controllers/kaui/credits_controller.rb
+- app/controllers/kaui/engine_controller.rb
 - app/controllers/kaui/home_controller.rb
 - app/controllers/kaui/invoices_controller.rb
 - app/controllers/kaui/payment_methods_controller.rb
@@ -107,6 +107,7 @@ files:
 - app/views/kaui/subscriptions/_subscriptions_table.html.erb
 - app/views/kaui/subscriptions/edit.html.erb
 - app/views/kaui/subscriptions/index.html.erb
+- app/views/kaui/subscriptions/new.html.erb
 - app/views/kaui/subscriptions/show.html.erb
 - app/views/kaui/tags/_tags_table.html.erb
 - config/initializers/time_formats.rb

data/app/controllers/kaui/application_controller.rb

@@ -1,2 +0,0 @@
-class Kaui::ApplicationController < ActionController::Base
-end