kaui 0.1.7 → 0.1.8

data/app/controllers/kaui/account_tags_controller.rb

@@ -4,7 +4,11 @@ class Kaui::AccountTagsController < Kaui::EngineController
     account_id = params[:id]
 
     if account_id.present?
-      tags = Kaui::KillbillHelper::get_tags_for_account(account_id)
+      begin
+        tags = Kaui::KillbillHelper::get_tags_for_account(account_id)
+      rescue => e
+        flash[:error] = "Error while getting tags: #{e.message} #{e.response}"
+      end
     else
       flash[:error] = "No account id given"
     end
@@ -12,36 +16,43 @@ class Kaui::AccountTagsController < Kaui::EngineController
 
   def edit
     @account_id = params[:account_id]
-    @available_tags = Kaui::KillbillHelper::get_tag_definitions.sort
-
-    @account = Kaui::KillbillHelper::get_account(@account_id)
-    @tag_names = Kaui::KillbillHelper::get_tags_for_account(@account.account_id).map { |tag| tag.tag_definition_name }
+    begin
+      @available_tags = Kaui::KillbillHelper::get_tag_definitions.sort
+      @account = Kaui::KillbillHelper::get_account(@account_id)
+      @tag_names = Kaui::KillbillHelper::get_tags_for_account(@account.account_id).map { |tag| tag.tag_definition_name }
+    rescue => e
+      flash[:error] = "Error while editing tags: #{e.message} #{e.response}"
+    end
   end
 
   def update
-    current_tags = Kaui::KillbillHelper::get_tags_for_account(params[:account_id]).map { |tag| tag.tag_definition_id }
-    new_tags = []
-    params.each do |tag, tag_name|
-      tag_info = tag.split('_')
-      next if tag_info.size != 2 or tag_info[0] != 'tag'
-      new_tags << tag_info[1]
-    end
-
-    # Find tags to remove
-    tags_to_remove = []
-    current_tags.each do |current_tag_definition_id|
-      tags_to_remove << current_tag_definition_id unless new_tags.include?(current_tag_definition_id)
+    begin
+      current_tags = Kaui::KillbillHelper::get_tags_for_account(params[:account_id]).map { |tag| tag.tag_definition_id }
+
+      new_tags = []
+      params.each do |tag, tag_name|
+        tag_info = tag.split('_')
+        next if tag_info.size != 2 or tag_info[0] != 'tag'
+        new_tags << tag_info[1]
+      end
+
+      # Find tags to remove
+      tags_to_remove = []
+      current_tags.each do |current_tag_definition_id|
+        tags_to_remove << current_tag_definition_id unless new_tags.include?(current_tag_definition_id)
+      end
+
+      # Find tags to add
+      tags_to_add = []
+      new_tags.each do |new_tag_definition_id|
+        tags_to_add << new_tag_definition_id unless current_tags.include?(new_tag_definition_id)
+      end
+
+      Kaui::KillbillHelper::remove_tags_for_account(params[:account_id], tags_to_remove)
+      Kaui::KillbillHelper::add_tags_for_account(params[:account_id], tags_to_add)
+    rescue => e
+      flash[:error] = "Error while updating tags: #{e.message} #{e.response}"
     end
-
-    # Find tags to add
-    tags_to_add = []
-    new_tags.each do |new_tag_definition_id|
-      tags_to_add << new_tag_definition_id unless current_tags.include?(new_tag_definition_id)
-    end
-
-    Kaui::KillbillHelper::remove_tags_for_account(params[:account_id], tags_to_remove)
-    Kaui::KillbillHelper::add_tags_for_account(params[:account_id], tags_to_add)
-
     redirect_to kaui_engine.account_path(params[:account_id])
   end
 

data/app/controllers/kaui/account_timelines_controller.rb

@@ -26,9 +26,11 @@ class Kaui::AccountTimelinesController < Kaui::EngineController
     unless @timeline.nil?
       @timeline.payments.each do |payment|
         if payment.invoice_id.present? && payment.payment_id.present?
-
-          @invoices_by_id[payment.invoice_id] = Kaui::KillbillHelper::get_invoice(payment.invoice_id)
-
+          begin
+            @invoices_by_id[payment.invoice_id] = Kaui::KillbillHelper::get_invoice(payment.invoice_id)
+          rescue => e
+            flash[:error] = "Could not get invoice information for the timeline #{@account_id}: #{e.message} #{e.response}"
+          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)
@@ -38,7 +40,11 @@ class Kaui::AccountTimelinesController < Kaui::EngineController
       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)
+          begin
+            @invoices_by_id[invoice.invoice_id] = Kaui::KillbillHelper::get_invoice(invoice.invoice_id)
+          rescue => e
+            flash[:error] = "Could not get invoice information for the timeline #{@account_id}: #{e.message} #{e.response}"
+          end
           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)

data/app/controllers/kaui/accounts_controller.rb

@@ -53,7 +53,11 @@ class Kaui::AccountsController < Kaui::EngineController
   def payment_methods
     @account_id = params[:id]
     if @account_id.present?
-      @payment_methods = Kaui::KillbillHelper::get_payment_methods(@account_id)
+      begin
+        @payment_methods = Kaui::KillbillHelper::get_payment_methods(@account_id)
+      rescue => e
+        flash[:error] = "Error while getting payment methods: #{e.message} #{e.response}"
+      end
       unless @payment_methods.is_a?(Array)
         flash[:notice] = "No payment methods for account_id '#{@account_id}'"
         redirect_to :action => :index
@@ -66,7 +70,11 @@ class Kaui::AccountsController < Kaui::EngineController
 
   def add_payment_method
     account_id = params[:id]
-    @account = Kaui::KillbillHelper::get_account(account_id)
+    begin
+      @account = Kaui::KillbillHelper::get_account(account_id)
+    rescue => e
+      flash[:error] = "Error while adding payment methods: #{e.message} #{e.response}"
+    end
     if @account.nil?
       flash[:error] = "Account not found for id #{account_id}"
       redirect_to :back
@@ -77,7 +85,11 @@ class Kaui::AccountsController < Kaui::EngineController
 
   def do_add_payment_method
     account_id = params[:id]
-    @account = Kaui::KillbillHelper::get_account(account_id)
+    begin
+      @account = Kaui::KillbillHelper::get_account(account_id)
+    rescue => e
+      flash[:error] = "Error while adding payment method: #{e.message} #{e.response}"
+    end
 
     # Implementation example using standard credit card fields
     @card_type = params[:card_type]
@@ -114,14 +126,13 @@ class Kaui::AccountsController < Kaui::EngineController
                                                'pluginName' => Kaui.creditcard_plugin_name.call,
                                                'pluginInfo' => plugin_info)
 
-      success = Kaui::KillbillHelper::add_payment_method(payment_method, current_user, @reason, @comment)
-
-      if success
+      begin
+        Kaui::KillbillHelper::add_payment_method(payment_method, current_user, @reason, @comment)
         flash[:info] = "Payment method created"
         redirect_to kaui_engine.account_timeline_path(@account.account_id)
         return
-      else
-        flash[:error] = "Error while adding payment method"
+      rescue => e
+        flash[:error] = "Error while adding payment method #{invoice_id}: #{e.message} #{e.response}"
       end
     end
     render "kaui/payment_methods/new"
@@ -131,7 +142,11 @@ class Kaui::AccountsController < Kaui::EngineController
     @account_id = params[:id]
     @payment_method_id = params[:payment_method_id]
     if @account_id.present? && @payment_method_id.present?
-      @payment_methods = Kaui::KillbillHelper::set_payment_method_as_default(@account_id, @payment_method_id)
+      begin
+        @payment_methods = Kaui::KillbillHelper::set_payment_method_as_default(@account_id, @payment_method_id)
+      rescue => e
+        flash[:error] = "Error while setting payment method as default #{invoice_id}: #{e.message} #{e.response}"
+      end
     else
       flash[:notice] = "No account_id or payment_method_id given"
     end
@@ -139,8 +154,12 @@ class Kaui::AccountsController < Kaui::EngineController
   end
 
   def toggle_email_notifications
-    @account = Kaui::KillbillHelper::update_email_notifications(params[:id], params[:is_notified])
-    flash[:notice] = "Email preferences updated"
-    redirect_to :back
+    begin
+      @account = Kaui::KillbillHelper::update_email_notifications(params[:id], params[:is_notified])
+      flash[:notice] = "Email preferences updated"
+      redirect_to :back
+    rescue => e
+      flash[:error] = "Error while switching email notifications #{invoice_id}: #{e.message} #{e.response}"
+    end
   end
 end

data/app/controllers/kaui/bundle_tags_controller.rb

@@ -3,7 +3,11 @@ class Kaui::BundleTagsController < Kaui::EngineController
   def show
     bundle_id = params[:id]
     if bundle_id.present?
-      tags = Kaui::KillbillHelper::get_tags_for_bundle(bundle_id)
+      begin
+        tags = Kaui::KillbillHelper::get_tags_for_bundle(bundle_id)
+      rescue => e
+        flash[:error] = "Error while retrieving tags information: #{e.message} #{e.response}"
+      end
     else
       flash[:error] = "No account id given"
     end

data/app/controllers/kaui/bundles_controller.rb

@@ -29,9 +29,12 @@ class Kaui::BundlesController < Kaui::EngineController
 
   def transfer
     bundle_id = params[:id]
-    @bundle = Kaui::KillbillHelper::get_bundle(bundle_id)
-    @account = Kaui::KillbillHelper::get_account_by_bundle_id(bundle_id)
-
+    begin
+      @bundle = Kaui::KillbillHelper::get_bundle(bundle_id)
+      @account = Kaui::KillbillHelper::get_account_by_bundle_id(bundle_id)
+    rescue => e
+      flash[:error] = "Error while preparing to transfer bundle: #{e.message} #{e.response}"
+    end
     if @account.nil?
       flash[:error] = "Account not found for bundle id #{bundle_id}"
     end

data/app/controllers/kaui/chargebacks_controller.rb

@@ -3,7 +3,11 @@ class Kaui::ChargebacksController < Kaui::EngineController
   def show
     @payment_id = params[:id]
     if @payment_id.present?
-      data = Kaui::KillbillHelper::get_chargebacks_for_payment(@payment_id)
+      begin
+        data = Kaui::KillbillHelper::get_chargebacks_for_payment(@payment_id)
+      rescue => e
+        flash[:error] = "Error while getting chargeback information: #{e.message} #{e.response}"
+      end
       if data.present?
         @chargeback = Kaui::Chargeback.new(data)
       else
@@ -19,25 +23,30 @@ class Kaui::ChargebacksController < Kaui::EngineController
     @account_id = params[: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)
-    @payment = Kaui::KillbillHelper::get_payment(@payment_id)
-    @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
-    @payment_method = Kaui::KillbillHelper::get_payment_method(@payment.payment_method_id)
+    begin
+      @account = Kaui::KillbillHelper::get_account(@account_id)
+      @payment = Kaui::KillbillHelper::get_payment(@payment_id)
+      @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
+      @payment_method = Kaui::KillbillHelper::get_payment_method(@payment.payment_method_id)
+    rescue => e
+      flash[:error] = "Error while starting a new chargeback: #{e.message} #{e.response}"
+      redirect_to kaui_engine.account_timeline_path(:id => params[:account_id])
+    end
 
-    @chargeback = Kaui::Chargeback.new("payment_id" => @payment_id,
-                                       "chargeback_amount" => @payment.amount)
+    @chargeback = Kaui::Chargeback.new("paymentId" => @payment_id,
+                                       "chargebackAmount" => @payment.amount)
   end
 
   def create
     account_id = params[:account_id]
     chargeback = Kaui::Chargeback.new(params[:chargeback])
+
     if chargeback.present?
-      success = Kaui::KillbillHelper::create_chargeback(chargeback, params[:reason], params[:comment])
-      if success
+      begin
+        Kaui::KillbillHelper::create_chargeback(chargeback, params[:reason], params[:comment])
         flash[:info] = "Chargeback created"
-      else
-        flash[:error] = "Could not process chargeback"
+      rescue => e
+        flash[:error] = "Error while creating a new chargeback: #{e.message} #{e.response}"
       end
     else
       flash[:error] = "No chargeback to process"

data/app/controllers/kaui/charges_controller.rb

@@ -3,30 +3,32 @@ class Kaui::ChargesController < Kaui::EngineController
   def new
     @account_id = params[:account_id]
     @invoice_id = params[:invoice_id]
+    begin
+      @account = Kaui::KillbillHelper::get_account(@account_id)
 
-    @account = Kaui::KillbillHelper::get_account(@account_id)
-
-    if @invoice_id.present?
-      @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
-      @charge = Kaui::Charge.new("accountId" => @account_id, "invoiceId" => @invoice_id)
-    else
-      @charge = Kaui::Charge.new("accountId" => @account_id)
+      if @invoice_id.present?
+        @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
+        @charge = Kaui::Charge.new("accountId" => @account_id, "invoiceId" => @invoice_id)
+      else
+        @charge = Kaui::Charge.new("accountId" => @account_id)
+      end
+    rescue => e
+      flash[:error] = "Error while creating a charge: #{e.message} #{e.response}"
     end
-
   end
 
   def create
     charge = Kaui::Charge.new(params[:charge])
 
     if charge.present?
-      success = Kaui::KillbillHelper::create_charge(charge, params[:requested_date], current_user, nil, params[:comment])
-      if success
+      begin
+        Kaui::KillbillHelper::create_charge(charge, params[:requested_date], current_user, nil, params[:comment])
         flash[:info] = "Charge created"
+        redirect_to kaui_engine.account_timeline_path(:id => charge.account_id)
+      rescue => e
+        flash[:error] = "Error while creating a charge: #{e.message} #{e.response}"
       end
-    else
-      flash[:error] = "No charge to process"
     end
-    redirect_to kaui_engine.account_timeline_path(:id => charge.account_id)
   end
 
 end

data/app/controllers/kaui/credits_controller.rb

@@ -4,8 +4,12 @@ class Kaui::CreditsController < Kaui::EngineController
     @invoice_id = params[:invoice_id]
 
     if params.has_key?(:account_id)
-    # invoice id can be nil for account level credit
-      data = Kaui::KillbillHelper::get_credits(@account_id, @invoice_id)
+      begin
+      # invoice id can be nil for account level credit
+        data = Kaui::KillbillHelper::get_credits(@account_id, @invoice_id)
+      rescue => e
+        flash[:error] = "Error getting credit information: #{e.message} #{e.response}"
+      end
       if data.present?
         @credit = Kaui::Credit.new(data)
       else
@@ -19,8 +23,14 @@ class Kaui::CreditsController < Kaui::EngineController
   def new
     @account_id = params[:account_id]
     @invoice_id = params[:invoice_id]
-    @account = Kaui::KillbillHelper::get_account(@account_id)
-    @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id) unless @invoice_id.nil?
+
+    begin
+      @account = Kaui::KillbillHelper::get_account(@account_id)
+      @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id) unless @invoice_id.nil?
+    rescue => e
+      flash[:error] = "Error while starting to create credit: #{e.message} #{e.response}"
+    end
+
     credit_amount = @invoice.balance unless @invoice.nil?
 
     @credit = Kaui::Credit.new("accountId" => @account_id, "invoiceId" => @invoice_id,
@@ -29,13 +39,13 @@ class Kaui::CreditsController < Kaui::EngineController
 
   def create
     credit = Kaui::Credit.new(params[:credit])
-    success = Kaui::KillbillHelper::create_credit(credit, current_user, params[:reason], params[:comment])
-    if success
+    begin
+      Kaui::KillbillHelper::create_credit(credit, current_user, params[:reason], params[:comment])
+      account = Kaui::KillbillHelper::get_account(credit.account_id)
       flash[:info] = "Credit created"
-    else
-      flash[:error] = "Error while creating credit"
+    rescue => e
+      flash[:error] = "Error while starting to create credit: #{e.message} #{e.response}"
     end
-    account = Kaui::KillbillHelper::get_account(credit.account_id)
     redirect_to Kaui.account_home_path.call(account.external_key)
   end
 end

data/app/controllers/kaui/invoice_items_controller.rb

@@ -15,12 +15,12 @@ class Kaui::InvoiceItemsController < Kaui::EngineController
 
   def update
     @invoice_item = Kaui::InvoiceItem.new(params[:invoice_item])
-    success = Kaui::KillbillHelper.adjust_invoice(@invoice_item, current_user, params[:reason], params[:comment])
-    if success
+    begin
+      Kaui::KillbillHelper.adjust_invoice(@invoice_item, current_user, params[:reason], params[:comment])
       flash[:notice] = "Adjustment item created"
       redirect_to kaui_engine.invoice_path(@invoice_item.invoice_id)
-    else
-      flash[:error] = "Unable to create adjustment item"
+    rescue => e
+      flash[:error] = "Error while updating the invoice item: #{e.message} #{e.response}"
       render :action => "edit"
     end
   end
@@ -31,7 +31,11 @@ class Kaui::InvoiceItemsController < Kaui::EngineController
     invoice_item_id = params[:id]
     invoice_id = params[:invoice_id]
     if invoice_item_id.present? and invoice_id.present?
-      @invoice_item = Kaui::KillbillHelper.get_invoice_item(invoice_id, invoice_item_id)
+      begin
+        @invoice_item = Kaui::KillbillHelper.get_invoice_item(invoice_id, invoice_item_id)
+      rescue => e
+        flash[:error] = "Error while trying to find the invoice item: #{e.message} #{e.response}"
+      end
       unless @invoice_item.present?
         flash[:error] = "Invoice for id #{invoice_id} and invoice item id #{invoice_item_id} not found"
         render :action => :index

data/app/controllers/kaui/invoices_controller.rb

@@ -8,28 +8,32 @@ class Kaui::InvoicesController < Kaui::EngineController
   def show
     @invoice_id = params[:id]
     if @invoice_id.present?
-      @invoice = Kaui::KillbillHelper.get_invoice(@invoice_id)
-      if @invoice.present?
-        @account = Kaui::KillbillHelper.get_account(@invoice.account_id)
-        @payments = Kaui::KillbillHelper.get_payments(@invoice_id)
+      begin
+        @invoice = Kaui::KillbillHelper.get_invoice(@invoice_id)
+        if @invoice.present?
+          @account = Kaui::KillbillHelper.get_account(@invoice.account_id)
+          @payments = Kaui::KillbillHelper.get_payments(@invoice_id)
 
-        @subscriptions = {}
-        @bundles = {}
-        if @invoice.items.present?
-          @invoice.items.each do |item|
-            unless item.subscription_id.nil? || @subscriptions.has_key?(item.subscription_id)
-              @subscriptions[item.subscription_id] = Kaui::KillbillHelper.get_subscription(item.subscription_id)
-            end
-            unless item.bundle_id.nil? || @bundles.has_key?(item.bundle_id)
-              @bundles[item.bundle_id] = Kaui::KillbillHelper.get_bundle(item.bundle_id)
-            end
-        end
+          @subscriptions = {}
+          @bundles = {}
+          if @invoice.items.present?
+            @invoice.items.each do |item|
+              unless item.subscription_id.nil? || @subscriptions.has_key?(item.subscription_id)
+                @subscriptions[item.subscription_id] = Kaui::KillbillHelper.get_subscription(item.subscription_id)
+              end
+              unless item.bundle_id.nil? || @bundles.has_key?(item.bundle_id)
+                @bundles[item.bundle_id] = Kaui::KillbillHelper.get_bundle(item.bundle_id)
+              end
+          end
+          else
+            flash[:error] = "Invoice items for #{@invoice_id} not found"
+          end
         else
-          flash[:error] = "Invoice items for #{@invoice_id} not found"
+          flash[:error] = "Invoice #{@invoice_id} not found"
+          render :action => :index
         end
-      else
-        flash[:error] = "Invoice #{@invoice_id} not found"
-        render :action => :index
+      rescue => e
+        flash[:error] = "Error while getting information for invoice #{invoice_id}: #{e.message} #{e.response}"
       end
     else
       flash[:error] = "No id given"
@@ -37,6 +41,10 @@ class Kaui::InvoicesController < Kaui::EngineController
   end
 
   def show_html
-    render :text => Kaui::KillbillHelper.get_invoice_html(params[:id])
+    begin
+      render :text => Kaui::KillbillHelper.get_invoice_html(params[:id])
+    rescue => e
+      flash[:error] = "Error rendering invoice html #{invoice_id}: #{e.message} #{e.response}"
+    end
   end
 end

data/app/controllers/kaui/payments_controller.rb

@@ -3,8 +3,13 @@ class Kaui::PaymentsController < Kaui::EngineController
   def new
     @account_id = params[:account_id]
     @invoice_id = params[:invoice_id]
-    @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
-    @account = Kaui::KillbillHelper::get_account(@account_id)
+    begin
+      @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
+      @account = Kaui::KillbillHelper::get_account(@account_id)
+    rescue => e
+      flash[:error] = "Error while creating a new payment: #{e.message} #{e.response}"
+      redirect_to kaui_engine.account_timeline_path(:id => payment.account_id)
+    end
 
     @payment = Kaui::Payment.new("accountId" => @account_id, "invoiceId" => @invoice_id, "amount" => @invoice.balance)
   end
@@ -13,12 +18,12 @@ class Kaui::PaymentsController < Kaui::EngineController
     payment = Kaui::Payment.new(params[:payment])
     if payment.present?
       payment.external = (payment.external == "1")
-      success = Kaui::KillbillHelper::create_payment(payment, payment.external, current_user, params[:reason], params[:comment])
-      if success
+      begin
+        Kaui::KillbillHelper::create_payment(payment, payment.external, current_user, params[:reason], params[:comment])
         flash[:info] = "Payment created"
+      rescue => e
+        flash[:error] = "Error while creating a new payment: #{e.message} #{e.response}"
       end
-    else
-      flash[:error] = "No payment to process"
     end
     redirect_to kaui_engine.account_timeline_path(:id => payment.account_id)
   end

data/app/controllers/kaui/refunds_controller.rb

@@ -39,10 +39,15 @@ class Kaui::RefundsController < Kaui::EngineController
 
     @refund = Kaui::Refund.new('adjusted' => true)
 
-    @account = Kaui::KillbillHelper::get_account(@account_id)
-    @payment = Kaui::KillbillHelper::get_payment(@payment_id)
-    @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
-    @payment_method = Kaui::KillbillHelper::get_payment_method(@payment.payment_method_id)
+    begin
+      @account = Kaui::KillbillHelper::get_account(@account_id)
+      @payment = Kaui::KillbillHelper::get_payment(@payment_id)
+      @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
+      @payment_method = Kaui::KillbillHelper::get_payment_method(@payment.payment_method_id)
+    rescue => e
+      flash[:error] = "Error while processing refund: #{e.message} #{e.response}"
+      redirect_to kaui_engine.account_timeline_path(:id => params[:account_id])
+    end
   end
 
   def create