kaui 0.1.4 → 0.1.5

data/app/controllers/kaui/account_timelines_controller.rb

@@ -7,58 +7,53 @@ class Kaui::AccountTimelinesController < Kaui::EngineController
 
   def show
     @account_id = params[:id]
-    if @account_id.present?
+    unless @account_id.present?
+      flash[:notice] = "No id given"
+      redirect_to :back
+      return
+    end
+    begin
       @account = Kaui::KillbillHelper::get_account(@account_id)
+      @timeline = Kaui::KillbillHelper::get_account_timeline(@account_id)
+    rescue => e
+      flash[:error] = "Could not load the account timeline for #{@account_id}: #{e.message} #{e.response}"
+      redirect_to :action => :index
+      return
+    end
 
-      if @account.present?
-        @timeline = Kaui::KillbillHelper::get_account_timeline(@account_id)
+    @invoices_by_id = {}
+    @bundle_names = {}
+    unless @timeline.nil?
+      @timeline.payments.each do |payment|
+        if payment.invoice_id.present? && payment.payment_id.present?
 
-        @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)
 
-              @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
+          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
-          @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
-          @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
+      @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
-          if params.has_key?(:external_key)
-            @selected_bundle = @bundle_names[params[:external_key]]
-          end
         end
-      else
-        flash[:error] = "Account #{@account_id} not found"
-        redirect_to :action => :index
       end
-    else
-      flash[:notice] = "No id given"
-      redirect_to :back
+      @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
   end
 end

data/app/controllers/kaui/accounts_controller.rb

@@ -11,11 +11,17 @@ class Kaui::AccountsController < Kaui::EngineController
   def show
     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, true)
-      else
-        @account = Kaui::KillbillHelper::get_account_by_external_key(key, true)
+      # Remove extra whitespaces
+      key.strip!
+
+      begin
+        @account = Kaui::KillbillHelper::get_account_by_key(key, true)
+      rescue URI::InvalidURIError => e
+        flash[:error] = "Error while retrieving the account for #{key}: #{e.message}"
+        render :action => :index and return
+      rescue => e
+        flash[:error] = "Error while retrieving the account for #{key}: #{e.message} #{e.response}"
+        render :action => :index and return
       end
 
       if @account.present? and @account.is_a? Kaui::Account

data/app/controllers/kaui/bundles_controller.rb

@@ -42,31 +42,37 @@ class Kaui::BundlesController < Kaui::EngineController
     bundle_id = params[:id]
     key = params[:new_account_key]
     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}/
-        result = Kaui::KillbillHelper.get_account(key)
-      else
-        result = Kaui::KillbillHelper.get_account_by_external_key(key)
+      begin
+        result = Kaui::KillbillHelper.get_account_by_key(key, false)
+      rescue => e
+        flash[:error] = "Error while retrieving account for #{key}: #{e.message} #{e.response}"
+        render :action => :index
+        return
       end
       if bundle_id.present? && result.is_a?(Kaui::Account)
         @new_account = result
-        success = Kaui::KillbillHelper::transfer_bundle(bundle_id, @new_account.account_id)
-        if success
+        begin
+          Kaui::KillbillHelper::transfer_bundle(bundle_id, @new_account.account_id)
           flash[:info] = "Bundle transfered successfully"
-          redirect_to kaui_engine.account_home_path.call(@new_account.external_key)
-          return
-        else
-          flash[:error] = "Error transfering bundle"
+        rescue => e
+          flash[:error] = "Error transfering bundle #{e.message} #{e.response}"
         end
+        redirect_to Kaui.account_home_path.call(@new_account.external_key)
+        return
       else
         flash[:error] = "Could not retrieve account #{result}"
       end
     else
       flash[:error] = "No account key given"
     end
-    @bundle = Kaui::KillbillHelper::get_bundle(bundle_id)
-    @account = Kaui::KillbillHelper::get_account_by_bundle_id(bundle_id)
-    render :transfer
+
+    begin
+      @bundle = Kaui::KillbillHelper::get_bundle(bundle_id)
+      @account = Kaui::KillbillHelper::get_account_by_bundle_id(bundle_id)
+    rescue => e
+      flash[:error] = "Error while redirecting: #{e.message} #{e.response}"
+      render :transfer
+    end
   end
 
 end

data/app/controllers/kaui/credits_controller.rb

@@ -21,8 +21,9 @@ class Kaui::CreditsController < Kaui::EngineController
     @invoice_id = params[:invoice_id]
     @account = Kaui::KillbillHelper::get_account(@account_id)
     @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id) unless @invoice_id.nil?
+    credit_amount = @invoice.balance unless @invoice.nil?
 
-    @credit = Kaui::Credit.new("accountId" => @account_id, "invoiceId" => @invoice_id, "creditAmount" => @invoice.balance)
+    @credit = Kaui::Credit.new("accountId" => @account_id, "invoiceId" => @invoice_id, "creditAmount" => credit_amount)
   end
 
   def create
@@ -33,6 +34,7 @@ class Kaui::CreditsController < Kaui::EngineController
     else
       flash[:error] = "Error while creating credit"
     end
-    redirect_to kaui_engine.account_timeline_path(credit.account_id)
+    account = Kaui::KillbillHelper::get_account(credit.account_id)
+    redirect_to kaui_engine.account_home_path.call(account.external_key)
   end
 end

data/app/controllers/kaui/payment_methods_controller.rb

@@ -6,9 +6,13 @@ class Kaui::PaymentMethodsController < Kaui::EngineController
   end
 
   def destroy
-    @payment_method_id = params[:id]
-    if @payment_method_id.present?
-      Kaui::KillbillHelper.delete_payment_method(@payment_method_id)
+    payment_method_id = params[:id]
+    if payment_method_id.present?
+      begin
+        Kaui::KillbillHelper.delete_payment_method(payment_method_id, params[:set_auto_pay_off])
+      rescue => e
+        flash[:error] = "Error while deleting payment method #{payment_method_id}: #{e.message} #{e.response}"
+      end
     else
       flash[:notice] = "Did not get the payment method id"
     end

data/app/controllers/kaui/refunds_controller.rb

@@ -7,13 +7,22 @@ class Kaui::RefundsController < Kaui::EngineController
 
   def show
     if params[:id].present?
-      data = Kaui::KillbillHelper::get_refund(params[:id])
+      begin
+        data = Kaui::KillbillHelper::get_refund(params[:id])
+      rescue => e
+        flash[:error] = "Error while retrieving the refund with id #{params[:id]}: #{e.message} #{e.response}"
+      end
       if data.present?
         @refunds = [data]
       else
-        @refunds = Kaui::KillbillHelper::get_refunds_for_payment(params[:id])
-        unless @refunds.present?
-          flash[:error] = "Refund for id or payment id #{params[:id]} couldn't be found"
+        begin
+          @refunds = Kaui::KillbillHelper::get_refunds_for_payment(params[:id])
+          unless @refunds.present?
+            flash[:error] = "Refund for id or payment id #{params[:id]} couldn't be found"
+            render :action => :index
+          end
+        rescue => e
+          flash[:error] = "Error while retrieving the refunds for the payment: #{e.message} #{e.response}"
           render :action => :index
         end
       end
@@ -43,11 +52,11 @@ class Kaui::RefundsController < Kaui::EngineController
     refund = Kaui::Refund.new(params[:refund])
     refund.adjusted = (refund.adjusted == "1")
     if refund.present?
-      success = Kaui::KillbillHelper::create_refund(params[:payment_id], refund, current_user, params[:reason], params[:comment])
-      if success
+      begin
+        Kaui::KillbillHelper::create_refund(params[:payment_id], refund, current_user, params[:reason], params[:comment])
         flash[:info] = "Refund created"
-      else
-        flash[:error] = "Error while processing refund"
+      rescue => e
+        flash[:error] = "Error while processing refund: #{e.message} #{e.response}"
       end
     else
       flash[:error] = "No refund to process"

data/app/controllers/kaui/subscriptions_controller.rb

@@ -105,9 +105,8 @@ class Kaui::SubscriptionsController < Kaui::EngineController
       subscription.billing_period = plan["billingPeriod"]
       subscription.product_category = plan["productCategory"]
       subscription.product_name = plan["productName"]
-      subscription.price_list = params[:subscription][:price_list]
+      subscription.price_list = plan["priceListName"]
       subscription.subscription_id = params[:subscription][:subscription_id]
-      # TODO: need to use entered start_date (or current date if none entered)
 
       Kaui::KillbillHelper::update_subscription(subscription, requested_date, current_user)
       redirect_to kaui_engine.bundle_home_path.call(bundle.bundle_id)

data/app/helpers/kaui/killbill_helper.rb

@@ -6,17 +6,21 @@ module Kaui
     def self.call_killbill(method, uri, *args)
       url = Kaui.killbill_finder.call + uri
       Rails.logger.info "Performing #{method} request to #{url}"
-      response = RestClient.send(method.to_sym, url, *args)
-      data = { :code => response.code }
-      if response.code < 300 && response.body.present?
-        if response.headers[:content_type] =~ /application\/json.*/
-          data[:json] = JSON.parse(response.body)
-        else
-          data[:body] = response.body
+      begin
+        response = RestClient.send(method.to_sym, url, *args)
+        data = { :code => response.code }
+        if response.code < 300 && response.body.present?
+          if response.headers[:content_type] =~ /application\/json.*/
+            data[:json] = JSON.parse(response.body)
+          else
+            data[:body] = response.body
+          end
         end
+        data
+      rescue => e
+        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
+        raise e
       end
-      # TODO: error handling
-      data
     end
 
     def self.process_response(response, arity, &block)
@@ -35,32 +39,28 @@ module Kaui
 
     ############## ACCOUNT ##############
 
-    def self.get_account_timeline(account_id)
-      begin
-        data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/timeline?audit=MINIMAL"
-        process_response(data, :single) {|json| Kaui::AccountTimeline.new(json) }
-      rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
+    def self.get_account_by_key(key, with_balance)
+      # 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}/
+        Kaui::KillbillHelper.get_account(key, with_balance)
+      else
+        Kaui::KillbillHelper.get_account_by_external_key(key, with_balance)
       end
     end
 
+    def self.get_account_timeline(account_id)
+      data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/timeline?audit=MINIMAL"
+      process_response(data, :single) {|json| Kaui::AccountTimeline.new(json) }
+    end
+
     def self.get_account(account_id, with_balance=false)
-      begin
-        data = call_killbill :get, "/1.0/kb/accounts/#{account_id}?accountWithBalance=#{with_balance}"
-        process_response(data, :single) {|json| Kaui::Account.new(json) }
-      rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
-      end
+      data = call_killbill :get, "/1.0/kb/accounts/#{account_id}?accountWithBalance=#{with_balance}"
+      process_response(data, :single) {|json| Kaui::Account.new(json) }
     end
 
     def self.get_account_by_external_key(external_key, with_balance=false)
-      begin
-        data = call_killbill :get, "/1.0/kb/accounts?externalKey=#{external_key}&accountWithBalance=#{with_balance}"
-        process_response(data, :single) {|json| Kaui::Account.new(json) }
-      rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
-        "#{e.message} #{e.response}"
-      end
+      data = call_killbill :get, "/1.0/kb/accounts?externalKey=#{external_key}&accountWithBalance=#{with_balance}"
+      process_response(data, :single) {|json| Kaui::Account.new(json) }
     end
 
     def self.get_account_by_bundle_id(bundle_id)
@@ -68,7 +68,6 @@ module Kaui
         bundle = get_bundle(bundle_id)
         account = get_account(bundle.account_id)
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -135,7 +134,6 @@ module Kaui
       rescue RestClient::BadRequest
         []
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -144,7 +142,6 @@ module Kaui
         data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/bundles?externalKey=#{external_key}"
         process_response(data, :single) {|json| Kaui::Bundle.new(json) }
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -153,7 +150,6 @@ module Kaui
         data = call_killbill :get, "/1.0/kb/bundles/#{bundle_id}"
         process_response(data, :single) {|json| Kaui::Bundle.new(json) }
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -169,7 +165,6 @@ module Kaui
         return data[:code] < 300
 
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -182,7 +177,6 @@ module Kaui
       rescue RestClient::BadRequest
         []
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -197,7 +191,6 @@ module Kaui
       rescue RestClient::BadRequest
         []
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -206,7 +199,6 @@ module Kaui
         data = call_killbill :get, "/1.0/kb/subscriptions/#{subscription_id}"
         process_response(data, :single) {|json| Kaui::Subscription.new(json) }
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -224,7 +216,6 @@ module Kaui
                               "X-Killbill-Comment" => "#{comment}"
         return data[:code] == 201
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -242,7 +233,6 @@ module Kaui
                              "X-Killbill-Comment" => "#{comment}"
         return data[:code] < 300
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -257,7 +247,6 @@ module Kaui
                              "X-Killbill-Comment" => "#{comment}"
         return data[:code] < 300
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -270,7 +259,6 @@ module Kaui
                              "X-Killbill-Comment" => "#{comment}"
         return data[:code] < 300
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -281,7 +269,6 @@ module Kaui
         data = call_killbill :get, "/1.0/kb/invoices/#{invoice_id}?withItems=true"
         process_response(data, :single) {|json| Kaui::Invoice.new(json) }
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -302,7 +289,6 @@ module Kaui
         data = call_killbill :get, "/1.0/kb/invoices/#{invoice_id}/html"
         data[:body] if data.present?
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -318,7 +304,6 @@ module Kaui
                              "X-Killbill-Comment" => "#{comment}"
         return data[:code] < 300
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -346,7 +331,6 @@ module Kaui
         end
         return data[:code] < 300
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -359,7 +343,6 @@ module Kaui
           data[:json].inject({}) {|catalog_hash, item| catalog_hash.merge!(item["planName"] => item) }
         end
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -370,7 +353,6 @@ module Kaui
           data[:json].inject({}) {|catalog_hash, item| catalog_hash.merge!(item["planName"] => item) }
         end
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -381,7 +363,6 @@ module Kaui
         data = call_killbill :get, "/1.0/kb/payments/#{payment_id}"
         process_response(data, :single) { |json| Kaui::Payment.new(json) }
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -391,7 +372,6 @@ module Kaui
         response_data = process_response(data, :multiple) {|json| Kaui::Payment.new(json) }
         return response_data
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
         []
       end
     end
@@ -413,22 +393,18 @@ module Kaui
           return false
         end
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
     ############## PAYMENT METHOD ##############
 
-    def self.delete_payment_method(payment_method_id, current_user = nil, reason = nil, comment = nil)
-      begin
-        call_killbill :delete,
-                      "/1.0/kb/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
+    def self.delete_payment_method(payment_method_id, set_auto_pay_off = false,  current_user = nil, reason = nil, comment = nil)
+      set_auto_pay_off_param = "?deleteDefaultPmWithAutoPayOff=true" if set_auto_pay_off
+      call_killbill :delete,
+                    "/1.0/kb/paymentMethods/#{payment_method_id}#{set_auto_pay_off_param}",
+                    "X-Killbill-CreatedBy" => current_user,
+                    "X-Killbill-Reason" => "#{reason}",
+                    "X-Killbill-Comment" => "#{comment}"
     end
 
     def self.get_payment_methods(account_id)
@@ -436,7 +412,6 @@ module Kaui
         data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/paymentMethods?withPluginInfo=true"
         process_response(data, :multiple) {|json| Kaui::PaymentMethod.new(json) }
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -445,7 +420,6 @@ module Kaui
         data = call_killbill :get, "/1.0/kb/paymentMethods/#{payment_method_id}?withPluginInfo=true"
         process_response(data, :single) {|json| Kaui::PaymentMethod.new(json) }
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -459,7 +433,6 @@ module Kaui
                                    "X-Killbill-Comment" => "#{comment}"
         return data[:code] < 300
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -474,45 +447,31 @@ module Kaui
                                     "X-Killbill-Comment" => "#{comment}"
         return data[:code] < 300
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
     ############## REFUND ##############
 
     def self.get_refund(refund_id)
-      begin
-        data = call_killbill :get, "/1.0/kb/refunds/#{refund_id}"
-        process_response(data, :single) { |json| Kaui::Refund.new(json) }
-      rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
-      end
+      data = call_killbill :get, "/1.0/kb/refunds/#{refund_id}"
+      process_response(data, :single) { |json| Kaui::Refund.new(json) }
     end
 
     def self.get_refunds_for_payment(payment_id)
-      begin
-        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
+      data = call_killbill :get, "/1.0/kb/payments/#{payment_id}/refunds"
+      process_response(data, :multiple) {|json| Kaui::Refund.new(json) }
     end
 
     def self.create_refund(payment_id, refund, current_user = nil, reason = nil, comment = nil)
-      begin
-        refund_data = Kaui::Refund.camelize(refund.to_hash)
+      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" => 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
+      call_killbill :post,
+                    "/1.0/kb/payments/#{payment_id}/refunds",
+                    ActiveSupport::JSON.encode(refund_data, :root => false),
+                    :content_type => "application/json",
+                    "X-Killbill-CreatedBy" => current_user,
+                    "X-Killbill-Reason" => extract_reason_code(reason),
+                    "X-Killbill-Comment" => "#{comment}"
     end
 
     ############## CHARGEBACK ##############
@@ -522,7 +481,6 @@ module Kaui
         data = call_killbill :get, "/1.0/kb/chargebacks/payments/#{payment_id}"
         process_response(data, :multiple) {|json| Kaui::Chargeback.new(json) }
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -539,7 +497,6 @@ module Kaui
                              "X-Killbill-Comment" => "#{comment}"
         return data[:code] < 300
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -557,7 +514,6 @@ module Kaui
                              "X-Killbill-Comment" => "#{comment}"
         return data[:code] < 300
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -578,7 +534,6 @@ module Kaui
         data = call_killbill :get, "/1.0/kb/tagDefinitions/#{tag_definition_id}"
         process_response(data, :single) { |json| Kaui::TagDefinition.new(json) }
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
         []
       end
     end
@@ -617,7 +572,6 @@ module Kaui
         data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/tags"
         process_response(data, :multiple) { |json| Kaui::Tag.new(json) }
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -626,7 +580,6 @@ module Kaui
         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
     end
 
@@ -656,7 +609,6 @@ module Kaui
                              "X-Killbill-Comment" => "#{comment}"
         return data[:code] < 300
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end
 
@@ -673,7 +625,6 @@ module Kaui
           return data[:code] == 201
         end
       rescue => e
-        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
       end
     end