kaui 0.0.1 → 0.0.2

data/app/controllers/kaui/account_timelines_controller.rb

@@ -9,46 +9,52 @@ class Kaui::AccountTimelinesController < ApplicationController
     @account_id = params[:id]
     if @account_id.present?
       @account = Kaui::KillbillHelper::get_account(@account_id)
-      @timeline = Kaui::KillbillHelper::get_account_timeline(@account_id)
-      # @payment_attempts_by_payment_id = {}
-      @invoices_by_id = {}
-      @bundle_names = {}
-      unless @timeline.nil?
-        @timeline.payments.each do |payment|
-          if payment.invoice_id.present? &&
-             payment.payment_id.present? &&
-             # !@payment_attempts_by_payment_id.has_key?(payment.payment_id)
 
-            @invoices_by_id[payment.invoice_id] = Kaui::KillbillHelper::get_invoice(payment.invoice_id)
-            # payment_attempt = Kaui::KillbillHelper::get_payment_attempt(@timeline.account.external_key,
-            #                                                             payment.invoice_id,
-            #                                                             payment.payment_id)
-            # @payment_attempts_by_payment_id[payment.payment_id] = payment_attempt
-            payment.bundle_keys.split(",").each do |bundle_key|
-              unless @bundle_names.has_key?(bundle_key)
-                @bundle_names[bundle_key] = Kaui.bundle_key_display_string.call(bundle_key)
+      if @account.present?
+        @timeline = Kaui::KillbillHelper::get_account_timeline(@account_id)
+        # @payment_attempts_by_payment_id = {}
+        @invoices_by_id = {}
+        @bundle_names = {}
+        unless @timeline.nil?
+          @timeline.payments.each do |payment|
+            if payment.invoice_id.present? &&
+               payment.payment_id.present? &&
+               # !@payment_attempts_by_payment_id.has_key?(payment.payment_id)
+
+              @invoices_by_id[payment.invoice_id] = Kaui::KillbillHelper::get_invoice(payment.invoice_id)
+              # payment_attempt = Kaui::KillbillHelper::get_payment_attempt(@timeline.account.external_key,
+              #                                                             payment.invoice_id,
+              #                                                             payment.payment_id)
+              # @payment_attempts_by_payment_id[payment.payment_id] = payment_attempt
+              payment.bundle_keys.split(",").each do |bundle_key|
+                unless @bundle_names.has_key?(bundle_key)
+                  @bundle_names[bundle_key] = Kaui.bundle_key_display_string.call(bundle_key)
+                end
               end
             end
           end
-        end
-        @timeline.invoices.each do |invoice|
-          if invoice.invoice_id.present? && !@invoices_by_id.has_key?(invoice.invoice_id)
-            @invoices_by_id[invoice.invoice_id] = Kaui::KillbillHelper::get_invoice(invoice.invoice_id)
-            invoice.bundle_keys.split(",").each do |bundle_key|
-              unless @bundle_names.has_key?(bundle_key)
-                @bundle_names[bundle_key] = Kaui.bundle_key_display_string.call(bundle_key)
+          @timeline.invoices.each do |invoice|
+            if invoice.invoice_id.present? && !@invoices_by_id.has_key?(invoice.invoice_id)
+              @invoices_by_id[invoice.invoice_id] = Kaui::KillbillHelper::get_invoice(invoice.invoice_id)
+              invoice.bundle_keys.split(",").each do |bundle_key|
+                unless @bundle_names.has_key?(bundle_key)
+                  @bundle_names[bundle_key] = Kaui.bundle_key_display_string.call(bundle_key)
+                end
               end
             end
           end
-        end
-        @timeline.bundles.each do |bundle|
-          unless @bundle_names.has_key?(bundle.external_key)
-            @bundle_names[bundle.external_key] = Kaui.bundle_key_display_string.call(bundle.external_key)
+          @timeline.bundles.each do |bundle|
+            unless @bundle_names.has_key?(bundle.external_key)
+              @bundle_names[bundle.external_key] = Kaui.bundle_key_display_string.call(bundle.external_key)
+            end
+          end
+          if params.has_key?(:external_key)
+            @selected_bundle = @bundle_names[params[:external_key]]
           end
         end
-        if params.has_key?(:external_key)
-          @selected_bundle = @bundle_names[params[:external_key]]
-        end
+      else
+        flash[:error] = "Account #{@account_id} not found"
+        redirect_to :action => :index
       end
     else
       flash[:notice] = "No id given"

data/app/controllers/kaui/accounts_controller.rb

@@ -9,9 +9,15 @@ class Kaui::AccountsController < ApplicationController
   end
 
   def show
-    @account_id = params[:id]
-    if @account_id.present?
-      @account = Kaui::KillbillHelper.get_account(@account_id)
+    key = params[:id]
+    if key.present?
+      # 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}/
+        @account = Kaui::KillbillHelper.get_account(key)
+      else
+        @account = Kaui::KillbillHelper.get_account_by_external_key(key)
+      end
+
       if @account.present?
         # TODO: add when payment methods are implemented
         # @payment_methods = Kaui::KillbillHelper.get_payment_methods(@account_id)

data/app/controllers/kaui/bundles_controller.rb

@@ -7,13 +7,19 @@ class Kaui::BundlesController < ApplicationController
   end
 
   def show
-    @external_key = params[:id]
-    if @external_key.present?
-      @bundle = Kaui::KillbillHelper.get_bundle_by_external_key(@external_key)
+    key = params[:id]
+    if key.present?
+      # 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)
+      else
+        @bundle = Kaui::KillbillHelper.get_bundle_by_external_key(key)
+      end
+
       if @bundle.present?
         @subscriptions = Kaui::KillbillHelper.get_subscriptions_for_bundle(@bundle.bundle_id)
       else
-        flash[:error] = "Bundle #{@external_key} not found"
+        flash[:error] = "Bundle #{key} not found"
         redirect_to :action => :index
       end
     else

data/app/controllers/kaui/chargebacks_controller.rb

@@ -15,24 +15,30 @@ class Kaui::ChargebacksController < ApplicationController
 
   def new
     @payment_id = params[:payment_id]
-    @invoice_id = params[:invoice_id]
     @account_id = params[:account_id]
-
-    @chargeback = Kaui::Chargeback.new(:payment_id => @payment_id, 
-                                       :invoice_id => @invoice_id,
-                                       :account_id => @account_id)
+    @invoice_id = params[:invoice_id]
 
     # @payment_attempt = Kaui::KillbillHelper::get_payment_attempt(@external_key, @invoice_id, @payment_id)
     @account = Kaui::KillbillHelper::get_account(@account_id)
     # TODO: get payment by payment id (no api at the moment)
     @payment = Kaui::KillbillHelper::get_payment(@invoice_id, @payment_id)
     @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
+    @chargeback = Kaui::Chargeback.new("payment_id" => @payment_id,
+                                       "chargeback_amount" => @payment.amount)
   end
 
   def create
+    account_id = params[:account_id]
     chargeback = Kaui::Chargeback.new(params[:chargeback])
-    # TODO: read chargeback object from post params
-    #Kaui::KillbillHelper::create_chargeback(@payment_id)
-    redirect_to account_timeline_path(:id => chargeback.account_id)
+    if chargeback.present?
+      success = Kaui::KillbillHelper::create_chargeback(chargeback, params[:reason], params[:comment])
+      if success
+        flash[:info] = "Chargeback created"
+      end
+    end
+    flash[:error] = "Could not process chargeback"
+    redirect_to account_timeline_path(:id => params[:account_id])
   end
+
+
 end

data/app/controllers/kaui/refunds_controller.rb

@@ -18,21 +18,24 @@ class Kaui::RefundsController < ApplicationController
     @invoice_id = params[:invoice_id]
     @account_id = params[:account_id]
 
-    @refund = Kaui::Refund.new(:payment_id => @payment_id, 
-                               :invoice_id => @invoice_id,
-                               :account_id => @account_id)
+    @refund = Kaui::Refund.new('adjusted' => true)
 
     @account = Kaui::KillbillHelper::get_account(@account_id)
-    # @payment_attempt = Kaui::KillbillHelper::get_payment_attempt(@external_key, @invoice_id, @payment_id)
     @payment = Kaui::KillbillHelper::get_payment(@invoice_id, @payment_id)
-    puts "payment is #{@payment.to_yaml}"
     @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
   end
 
   def create
+    payment_id = params[:payment_id]
+    account_id = params[:account_id]
+
     refund = Kaui::Refund.new(params[:refund])
-    # TODO: read refund object from post params
-    #Kaui::KillbillHelper::create_refund(refund)
-    redirect_to account_timeline_path(:id => refund.account_id)
+    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])
+    else
+      flash[:error] = "No refund given to process"
+    end
   end
 end

data/app/controllers/kaui/subscriptions_controller.rb

@@ -2,6 +2,9 @@ require 'kaui/product'
 
 class Kaui::SubscriptionsController < ApplicationController
   def index
+    if params[:subscription_id].present?
+      redirect_to subscription_path(params[:subscription_id])
+    end
   end
 
   def show
@@ -19,7 +22,7 @@ class Kaui::SubscriptionsController < ApplicationController
     @billing_period = params[:billing_period]
     @price_list = params[:price_list]
 
-    @subscription = Kaui::Subscription.new(:bundle_id => @bundle_id, 
+    @subscription = Kaui::Subscription.new(:bundle_id => @bundle_id,
                                            :product_name => @product_name,
                                            :product_category => @product_category,
                                            :billing_period => @billing_period,
@@ -40,14 +43,14 @@ class Kaui::SubscriptionsController < ApplicationController
       flash[:error] = "No subscription id given or subscription not found"
       redirect_to :back
     end
-    @products = Kaui::BASE_PRODUCTS
+    @products = Kaui::SAMPLE_BASE_PRODUCTS
   end
 
   def update
     if params.has_key?(:subscription) && params[:subscription].has_key?(:subscription_id)
       subscription = Kaui::KillbillHelper.get_subscription(params[:subscription][:subscription_id])
       product_id = params[:subscription][:product_name]
-      products = Kaui::BASE_PRODUCTS.select{|p| p.id == product_id}
+      products = Kaui::SAMPLE_BASE_PRODUCTS.select{|p| p.id == product_id}
       unless products.empty?
         subscription.product_name = products[0].product_name
         subscription.billing_period = products[0].billing_period

data/app/helpers/kaui/killbill_helper.rb

@@ -7,11 +7,12 @@ module Kaui
       url = Kaui.killbill_finder.call + uri
       Rails.logger.info "Performing #{method} request to #{url}"
       response = RestClient.send(method.to_sym, url, *args)
-      if response.code < 300
-        return JSON.parse(response.body) if response.body.present?
+      data = { :code => response.code }
+      if response.code < 300 && response.body.present?
+        data[:json] = JSON.parse(response.body)
       end
       # TODO: error handling
-      nil
+      data
     end
 
     ############## ACCOUNT ##############
@@ -19,7 +20,7 @@ module Kaui
     def self.get_account_timeline(account_id)
       begin
         data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/timeline"
-        data.nil? ? nil : Kaui::AccountTimeline.new(data)
+        process_response(data, :single) {|json| Kaui::AccountTimeline.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -28,7 +29,7 @@ module Kaui
     def self.get_account(account_id)
       begin
         data = call_killbill :get, "/1.0/kb/accounts/#{account_id}"
-        data.nil? ? nil : Kaui::Account.new(data)
+        process_response(data, :single) {|json| Kaui::Account.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -37,22 +38,19 @@ module Kaui
     def self.get_account_by_external_key(external_key)
       begin
         data = call_killbill :get, "/1.0/kb/accounts?external_key=#{external_key}"
-        data.nil? ? nil : Kaui::Account.new(data)
+        process_response(data, :single) {|json| Kaui::Account.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
+
     ############## BUNDLE ##############
 
     def self.get_bundles(account_id)
       begin
         data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/bundles"
-        if data.nil?
-          []
-        else
-          data.collect {|item| Kaui::Bundle.new(item) }
-        end
+        process_response(data, :multiple) {|json| Kaui::Bundle.new(json) }
       rescue RestClient::BadRequest
         []
       rescue => e
@@ -63,7 +61,7 @@ module Kaui
     def self.get_bundle_by_external_key(external_key)
       begin
         data = call_killbill :get, "/1.0/kb/bundles?external_key=#{external_key}"
-        data.nil? ? nil : Kaui::Bundle.new(data)
+        process_response(data, :single) {|json| Kaui::Bundle.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -72,7 +70,7 @@ module Kaui
     def self.get_bundle(bundle_id)
       begin
         data = call_killbill :get, "/1.0/kb/bundles/#{bundle_id}"
-        data.nil? ? nil : Kaui::Bundle.new(data)
+        process_response(data, :single) {|json| Kaui::Bundle.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -81,11 +79,8 @@ module Kaui
     def self.get_bundles(account_id)
       begin
         data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/bundles"
-        if data.nil?
-          []
-        else
-          data.collect {|item| Kaui::Bundle.new(item) }
-        end
+        process_response(data, :multiple) {|json| Kaui::Bundle.new(json) }
+
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -96,11 +91,7 @@ module Kaui
     def self.get_subscriptions_for_bundle(bundle_id)
       begin
         data = call_killbill :get, "/1.0/kb/bundles/#{bundle_id}/subscriptions"
-        if data.nil?
-          []
-        else
-          data.collect {|item| Kaui::Subscription.new(item) }
-        end
+        process_response(data, :multiple) {|json| Kaui::Subscription.new(json) }
       rescue RestClient::BadRequest
         []
       rescue => e
@@ -127,7 +118,7 @@ module Kaui
     def self.get_subscription(subscription_id)
       begin
         data = call_killbill :get, "/1.0/kb/subscriptions/#{subscription_id}"
-        data.nil? ? nil : Kaui::Subscription.new(data)
+        process_response(data, :single) {|json| Kaui::Subscription.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -135,14 +126,15 @@ module Kaui
 
     def self.create_subscription(subscription)
       begin
-        data = Kaui::Subscription.camelize(subscription.to_hash)
-        call_killbill :post,
-                      "/1.0/kb/subscriptions",
-                      ActiveSupport::JSON.encode(subscription, :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"
+        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"
+        return data[:code] == 201
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -150,14 +142,15 @@ module Kaui
 
     def self.update_subscription(subscription)
       begin
-        data = Kaui::Subscription.camelize(subscription.to_hash)
-        call_killbill :put,
-                      "/1.0/kb/subscriptions/#{subscription.subscription_id}", 
-                      ActiveSupport::JSON.encode(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"
+        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
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -165,12 +158,13 @@ module Kaui
 
     def self.reinstate_subscription(subscription_id)
       begin
-        call_killbill :put, 
-                      "/1.0/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"
+        data = call_killbill :put,
+                             "/1.0/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
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -178,40 +172,34 @@ module Kaui
 
     def self.delete_subscription(subscription_id)
       begin
-        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"
+        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
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
-    def self.create_addon(subscription_id)
-      begin
-        call_killbill :post, "/1.0/kb/payments/#{payment_id}/chargebacks"
-      rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
-      end
-    end      
-    
     ############## INVOICE ##############
 
     def self.get_invoice(invoice_id)
       begin
         data = call_killbill :get, "/1.0/kb/invoices/#{invoice_id}?withItems=true"
-        data.nil? ? nil : Kaui::Invoice.new(data)
+        process_response(data, :single) {|json| Kaui::Invoice.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
-  
+
     ############## CATALOG ##############
 
     def self.get_available_addons
       begin
-        call_killbill :get, "/1.0/catalog"
+        data = call_killbill :get, "/1.0/catalog/availableAddons"
+        return data[:json]
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -252,11 +240,7 @@ module Kaui
     def self.get_payments(invoice_id)
       begin
         data = call_killbill :get, "/1.0/kb/invoices/#{invoice_id}/payments"
-        if data.nil?
-          []
-        else
-          data.collect {|item| Kaui::Payment.new(item) }
-        end
+        process_response(data, :single) {|json| Kaui::Payment.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
         []
@@ -276,11 +260,7 @@ module Kaui
     def self.get_payment_methods(account_id)
       begin
         data = call_killbill :get, "/1.0/accounts/#{account_id}/paymentMethods"
-        if data.nil?
-          []
-        else
-          data.collect { |item| Kaui::PaymentMethod.new(item) }
-        end
+        process_response(data, :single) {|json| Kaui::PaymentMethod.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -296,11 +276,19 @@ module Kaui
       end
     end
 
-    def self.create_refund(payment_id)
+    def self.create_refund(payment_id, refund, reason, comment)
       begin
-        # TODO: add handling when implemented
-        #call_killbill :post, "/1.0/kb/payments/#{payment_id}/refunds"
-      rescue
+        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-Comment" => "#{comment}"
+        return response[:code] == 201
+      rescue => e
+        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -308,30 +296,35 @@ module Kaui
 
     def self.get_chargebacks_for_payment(payment_id)
       begin
-        call_killbill :get, "/1.0/kb/payments/#{payment_id}/chargebacks"
+        data = call_killbill :get, "/1.0/kb/chargebacks/payments/#{payment_id}"
+        process_response(data, :single) {|json| Kaui::Chargeback.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
-    def self.create_chargeback(payment_id)
+    def self.create_chargeback(chargeback, reason, comment)
       begin
-        call_killbill :post, "/1.0/kb/payments/#{payment_id}/chargebacks"
+        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-Comment" => "#{comment}"
+        return data[:code] == 201
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
-    ############## TAG ############## 
+    ############## TAG ##############
 
     def self.get_tag_definitions
       begin
         data = call_killbill :get, "/1.0/kb/tagDefinitions"
-        if data.nil?
-          []
-        else
-          data.collect {|item| Kaui::Tag.new(item) }
-        end
+        process_response(data, :single) {|json| Kaui::Tag.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
         []
@@ -341,6 +334,7 @@ module Kaui
     def self.get_tags_for_account(account_id)
       begin
         data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/tags"
+        return data[:json]
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -349,6 +343,7 @@ module Kaui
     def self.get_tags_for_bundle(bundle_id)
       begin
         data = call_killbill :get, "/1.0/kb/bundles/#{bundle_id}/tags"
+        return data[:json]
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
@@ -359,12 +354,13 @@ module Kaui
       begin
         if tags.nil? || tags.empty?
         else
-          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"
+          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"
+          return data[:code] == 201
         end
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
@@ -375,17 +371,30 @@ module Kaui
       begin
         if tags.nil? || tags.empty?
         else
-          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"
+          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"
+          return data[:code] == 201
         end
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       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/chargeback.rb

@@ -22,10 +22,11 @@ class Kaui::Chargeback < Kaui::Base
                     "420 - Not as Described",
                     "499 - OTHER" ]
 
-  define_attr :account_id
   define_attr :payment_id
-  define_attr :invoice_id
-  define_attr :amount
-  define_attr :comment
-  define_attr :reason
+  define_attr :chargeback_amount
+
+  def initialize(data = {})
+    super(:payment_id => data['paymentId'] || data['payment_id'],
+          :chargeback_amount => data['chargebackAmount'] || data['chargeback_amount'])
+  end
 end

data/app/models/kaui/invoice.rb

@@ -7,6 +7,9 @@ class Kaui::Invoice < Kaui::Base
   define_attr :account_id
   define_attr :invoice_number
   define_attr :payment_amount
+  define_attr :refund_adjustment
+  define_attr :credit_balance_adjustment
+  define_attr :credit_adjustment
   define_attr :invoice_dt
   define_attr :payment_dt
   define_attr :target_dt
@@ -20,6 +23,9 @@ class Kaui::Invoice < Kaui::Base
           :account_id => data['accountId'],
           :invoice_number => data['invoiceNumber'],
           :payment_amount => data['paymentAmount'],
+          :refund_adjustment => data['refundAdj'],
+          :credit_balance_adjustment => data['cba'],
+          :credit_adjustment => data['creditAdj'],
           :invoice_dt => data['invoiceDate'],
           :payment_dt => data['paymentDate'],
           :target_dt => data['targetDate'],

data/app/models/kaui/product.rb

@@ -13,7 +13,7 @@ module Kaui
     end
   end
 
-  SAMPLE_SAMPLE_BASE_PRODUCTS = [
+  SAMPLE_BASE_PRODUCTS = [
     Kaui::Product.new(:id => "product1", :product_category => "Base", :product_name => "OneBase", :billing_period => "ANNUAL"),
     Kaui::Product.new(:id => "product2", :product_category => "Base", :product_name => "TwoBase", :billing_period => "MONTHLY"),
   ]

data/app/models/kaui/refund.rb

@@ -1,14 +1,18 @@
+require 'active_model'
+
 class Kaui::Refund < Kaui::Base
   SAMPLE_REASON_CODES = [ "500 - Courtesy",
-                   "501 - Billing Error",
-                   "502 - Alt payment method", 
-                   "599 - OTHER" ]
+                          "501 - Billing Error",
+                          "502 - Alt payment method",
+                          "599 - OTHER" ]
+
+  define_attr :refund_id
+  define_attr :adjusted
+  define_attr :refund_amount
 
-  define_attr :account_id
-  define_attr :external_key
-  define_attr :payment_id
-  define_attr :invoice_id
-  define_attr :amount
-  define_attr :comment
-  define_attr :reason
+  def initialize(data = {})
+    super(:refund_id => data['refundId'] || data['refund_id'],
+          :adjusted => data['adjusted'],
+          :refund_amount => data['refundAmount'] || data['refund_amount'])
+  end
 end

data/app/models/kaui/subscription.rb

@@ -7,7 +7,7 @@ class Kaui::Subscription < Kaui::Base
   define_attr :charged_through_date
   define_attr :price_list
   define_attr :start_date
-  define_attr :cancelledDate
+  define_attr :canceledDate
   has_many :events, Kaui::Event
 
   def initialize(data = {})
@@ -19,7 +19,7 @@ class Kaui::Subscription < Kaui::Base
           :charged_through_date => data['chargedThroughDate'],
           :price_list => data['priceList'],
           :start_date => data['startDate'],
-          :cancelledDate => data['cancelledDate'],
+          :canceledDate => data['cancelledDate'],
           :events => data['events'])
   end
 end

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

@@ -1,5 +1,5 @@
 <div class="page-header">
-  <h3>Account <%= @account.name %></h3> 
+  <h3>Account <%= @account.name %></h3>
   <%= link_to @account.email, Kaui.account_home_path.call(@account.external_key) %>
 </div>
 <form class="form-horizontal">
@@ -56,20 +56,29 @@
                 <%= link_to @bundle_names[bundle_key], Kaui.bundle_home_path.call(bundle_key) %><br/>
               <% end %>
             <% end %>
-          </td>          
+          </td>
           <td><%= "INVOICE" %></td>
-          <td><%= "Amount:" %> <%= invoice.amount %><br/>
-              <%= "Balance:" %> <%= invoice.balance %><br/> 
-              <%= "Invoice #" %> 
+          <td><%= "Amount:" %> <%= invoice.amount %>  <%= @account.currency %><br/>
+              <%= "Balance:" %> <%= invoice.balance %> <%= @account.currency %><br/>
+              <% if invoice.credit_adjustment.present? &&  invoice.credit_adjustment > 0  %>
+                <%= "Credit adjustment:" %> <%= invoice.credit_adjustment %> <%= @account.currency %> <br/>
+              <% end %>
+              <% if invoice.credit_balance_adjustment.present? &&  invoice.credit_balance_adjustment > 0  %>
+                <%= "Credit balance adjustment:" %> <%= invoice.credit_balance_adjustment %>  <%= @account.currency %> <br/>
+              <% end %>
+              <% if invoice.refund_adjustment.present? &&  invoice.refund_adjustment < 0  %>
+                <%= "Refund adjustment:" %> <%= invoice.refund_adjustment %>  <%= @account.currency %> <br/>
+              <% end %>
+              <%= "Invoice #" %>
               <%= link_to invoice.invoice_number, invoice_path(:id => invoice.invoice_id) %>
-          </td>      
+          </td>
           <td></td>
           <td>
             <% if invoice.balance > 0 %>
               <nobr>
                 <%= link_to "External Payment",
                             kaui_engine.new_credit_path(:params => { :account_id => @account.account_id,
-                                                                     :invoice_id => invoice.invoice_id }), 
+                                                                     :invoice_id => invoice.invoice_id }),
                             :class => "btn btn-mini" %>
               </nobr>
               <% end %>
@@ -106,34 +115,34 @@
             <% payment.bundle_keys.split(",").each do |bundle_key| %>
               <%= link_to @bundle_names[bundle_key], Kaui.bundle_home_path.call(bundle_key) %><br/>
             <% end %>
-          </td>    
+          </td>
           <td><%= "PAYMENT" %></td>
           <td>
-            <%= "Total amount:" %> <%= payment.amount %> <%= @account.currency %><br/> 
-            <%= "Paid amount:" %> <%= payment.amount %> <%= @account.currency %><br/> 
+            <%= "Total amount:" %> <%= payment.amount %> <%= @account.currency %><br/>
+            <%= "Paid amount:" %> <%= payment.amount %> <%= @account.currency %><br/>
             <span <% if payment.status == 'Failed' %>class="alert-error" <% elsif payment.status == 'Success' %>class="alert-success" <% end %>>
               <%= payment.status %>
-            </span>  
+            </span>
             <br/>
             <%= "Invoice #" %> <%= link_to invoice.invoice_number, invoice_path(:id => invoice.invoice_id) %>
           <td></td>
           <td>
             <% if payment.payment_id.present? %>
               <nobr>
-                <%= link_to 'Refund', kaui_engine.new_refund_path(:params => { :payment_id => payment.payment_id, 
+                <%= link_to 'Refund', kaui_engine.new_refund_path(:params => { :payment_id => payment.payment_id,
                                                                                :account_id => @account.account_id,
-                                                                               :invoice_id => payment.invoice_id }), 
+                                                                               :invoice_id => payment.invoice_id }),
                                                                   :class => "btn btn-mini" %>
-                <%= link_to 'Chargeback', kaui_engine.new_chargeback_path(:params => { :payment_id => payment.payment_id, 
+                <%= link_to 'Chargeback', kaui_engine.new_chargeback_path(:params => { :payment_id => payment.payment_id,
                                                                                        :account_id => @account.account_id,
-                                                                                       :invoice_id => payment.invoice_id }), 
+                                                                                       :invoice_id => payment.invoice_id }),
                                                                           :class => "btn btn-mini" %>
               </nobr>
               <% elsif invoice.balance > 0 %>
-                <%= link_to 'Pay', kaui_engine.new_chargeback_path(:params => { :payment_id => payment.payment_id, 
+                <%= link_to 'Pay', kaui_engine.new_chargeback_path(:params => { :payment_id => payment.payment_id,
                                                                                 :account_id => @account.account_id,
-                                                                                :invoice_id => payment.invoice_id }), 
-                                                                   :class => "btn btn-mini" %>                
+                                                                                :invoice_id => payment.invoice_id }),
+                                                                   :class => "btn btn-mini" %>
             <% end %>
           </td>
         </tr>

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

@@ -21,9 +21,9 @@
     <dt>State:</dt>
     <dd><%= @account.state %>&nbsp;</dd>
     <dt>Country:</dt>
-    <dd><%= @account.country %>&nbsp;</dd>        
+    <dd><%= @account.country %>&nbsp;</dd>
     <dt>Phone:</dt>
-    <dd><%= @account.phone %>&nbsp;</dd>        
+    <dd><%= @account.phone %>&nbsp;</dd>
     <dt>External key:</dt>
     <dd><%= @account.external_key %>&nbsp;</dd>
     <%= render :partial => "kaui/tags/tags_table",

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

@@ -1,8 +1,9 @@
 <div class="page-header">
-  <h1>Create Payment Chargeback</h1>
+  <h1>Apply Payment Chargeback</h1>
 </div>
 <%= form_for(@chargeback, :url => { :action => :create }, :html => { :class => "form-horizontal" }) do |f| %>
-  <%= f.hidden_field :account_id %>
+  <%= hidden_field_tag :account_id, @account_id %>
+  <%= hidden_field_tag :invoice_id, @invoice_id %>
   <%= f.hidden_field :payment_id %>
   <fieldset>
     <div class="control-group">
@@ -55,26 +56,26 @@
       </div>
     </div>
     <div class="control-group">
-      <%= f.label :amount, "Chargeback amount", :class => "control-label" %>
+      <%= f.label :chaergeback_amount, "Chargeback amount", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :amount, :default => @payment.amount, :class => 'input-small' %>
+        <%= f.text_field :chargeback_amount, :class => 'input-small' %>
         <p class="help-inline"><%= @account.currency %></p>
       </div>
     </div>
     <div class="control-group">
-    <%= f.label :reason, "Reason", :class => "control-label" %>
+      <%= label_tag :reason, "Reason", :class => "control-label" %>
       <div class="controls">
-        <%= f.select :reason, Kaui::Chargeback::SAMPLE_REASON_CODES, {}, :class => 'input-xxlarge' %>
+        <%= select_tag :reason, options_for_select(Kaui::Chargeback::SAMPLE_REASON_CODES) %>
       </div>
     </div>
     <div class="control-group">
-      <%= f.label :comment, :class => "control-label" %>
+      <%= label_tag :comment, "Comment", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_area :comment, :rows => 3, :class => 'input-xxlarge' %>
+        <%= text_area_tag :comment, "", :rows => 3, :class => 'input-xlarge' %>
       </div>
     </div>
     <div class="form-actions">
-      <%= button_tag "Create refund", :class =>"btn btn-primary" %>
+      <%= button_tag "Apply chargeback", :class =>"btn btn-primary" %>
       <%= link_to 'Back', :back, :class => 'btn' %>
     </div>
   </fieldset>

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

@@ -2,8 +2,8 @@
   <h1>Refund Payment</h1>
 </div>
 <%= form_for(@refund, :url => { :action => :create }, :html => { :class => "form-horizontal" }) do |f| %>
-  <%= f.hidden_field :account_id %>
-  <%= f.hidden_field :payment_id %>
+  <%= hidden_field_tag :account_id, @account_id %>
+  <%= hidden_field_tag :payment_id, @payment_id %>
   <fieldset>
     <div class="control-group">
       <label class="control-label">Date</label>
@@ -46,6 +46,14 @@
         </label>
       </div>
     </div>
+    <div class="control-group">
+      <%= f.label :adjusted, "Adjust Invoice?", :class => "control-label" %>
+      <div class="controls">
+        <label class="checkbox">
+          <%= f.check_box :adjusted %>
+        </label>
+      </div>
+    </div>
     <div class="control-group">
       <label class="control-label">Payment</label>
       <div class="controls">
@@ -55,22 +63,22 @@
       </div>
     </div>
     <div class="control-group">
-      <%= f.label :amount, "Refund amount", :class => "control-label" %>
+      <%= f.label :refund_amount, "Refund amount", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :amount, :value => @payment.amount, :class => 'input-small' %>
+        <%= f.text_field :refund_amount, :value => @payment.amount, :class => 'input-small' %>
         <p class="help-inline"><%= @account.currency %></p>
       </div>
     </div>
     <div class="control-group">
-      <%= f.label :reason, "Reason", :class => "control-label" %>
+      <%= label_tag :reason, "Reason", :class => "control-label" %>
       <div class="controls">
-        <%= f.select :reason, Kaui::Refund::SAMPLE_REASON_CODES %>
+        <%= select_tag :reason, options_for_select(Kaui::Refund::SAMPLE_REASON_CODES) %>
       </div>
     </div>
     <div class="control-group">
-      <%= f.label :comment, :class => "control-label" %>
+      <%= label_tag :comment, "Comment", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_area :comment, :rows => 3, :class => 'input-xlarge' %>
+        <%= text_area_tag :comment, "", :rows => 3, :class => 'input-xlarge' %>
       </div>
     </div>
     <div class="form-actions">

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

@@ -9,8 +9,9 @@
       <th>Billing period</th>
       <th>Start date</th>
       <th>Charged through date</th>
+      <th>Notes</th>
       <th>Actions</th>
-    </tr>   
+    </tr>
   </thead>
   <tbody>
     <% if @subscriptions.present? && !@subscriptions.nil? %>
@@ -21,15 +22,21 @@
           <td><%= sub.billing_period.downcase.capitalize if sub.billing_period.present? %></td>
           <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}" %>
+            <% end %>
+          </td>
           <td>
             <% if sub.product_category == 'BASE' %>
-              <%= link_to "Change", kaui_engine.edit_subscription_path(sub.subscription_id), :class => "btn btn-mini" %>
+              <%= 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" %>            
+              <%= 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 %>
           </td>
         </tr>

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

@@ -1,4 +1,4 @@
-<% @page_title = "Edit Subscription: #{@subscription.subscription_id}" %>
+<% @page_title = "Edit Subscription" %>
 <%= form_for(@subscription, :url => subscription_path(@subscription.subscription_id), :html => { :method => :put, :class => "form-horizontal" }) do |f| %>
   <%= f.hidden_field :subscription_id %>
   <div class="control-group">
@@ -21,7 +21,6 @@
   </div>
   <div class="form-actions">
     <%= f.submit "Change", :class => 'btn btn-primary' %>
-    <%= link_to 'Show', kaui_engine.subscription_path(@subscription.subscription_id), :class => 'btn' %>
     <%= link_to 'Back', :back, :class => 'btn' %>
   </div>
 <% end %>

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

@@ -1,10 +1,10 @@
 <%= form_tag subscriptions_path, :class => "form-horizontal", :method => :get do %>
   <fieldset>
-    <legend>Please enter bundle id</legend>
+    <legend>Please enter subsciption id</legend>
     <div class="control-group">
-      <label class="control-label" for="bundle_id">Bundle</label>
+      <label class="control-label" for="subscription_id">Subscription</label>
       <div class="controls">
-        <%= text_field_tag 'bundle_id', nil, :class => "input-xlarge", :id => "bundle_id" %>
+        <%= text_field_tag 'subscription_id', nil, :class => "input-xlarge", :id => "subscription_id" %>
       </div>
     </div>
     <div class="form-actions">

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

@@ -10,13 +10,12 @@
   <dd><%= @subscription.billing_period.downcase.capitalize %></dd>
   <dt>Charged through</dt>
   <dd> <%= format_date(@subscription.charged_through_date).html_safe %>
-  <dd><%= DateTime.parse(@subscription.charged_through_date).utc.to_s(:pretty) %>&nbsp;UTC</dd>
   <dt>Price List</dt>
   <dd><%= @subscription.price_list %></dd>
   <dt>Start Date</dt>
-  <dd><%= DateTime.parse(@subscription.start_date).utc.to_s(:pretty) %>&nbsp;UTC</dd>
+  <dd> <%= format_date(@subscription.start_date).html_safe %>
 </dl>
 <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 "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" %>

data/lib/kaui/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaui
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Alena Dudzinskaya
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-09 00:00:00 Z
+date: 2012-07-17 00:00:00 Z
 dependencies: []
 
 description: Rails UI plugin for Killbill administration.