kaui 0.1.7 → 0.1.8

data/app/controllers/kaui/subscriptions_controller.rb

@@ -8,10 +8,14 @@ class Kaui::SubscriptionsController < Kaui::EngineController
   end
 
   def show
-    @subscription = Kaui::KillbillHelper.get_subscription(params[:id])
-    unless @subscription.present?
-      flash[:error] = "No subscription id given or subscription not found"
-      redirect_to :back
+    begin
+      @subscription = Kaui::KillbillHelper.get_subscription(params[:id])
+      unless @subscription.present?
+        flash[:error] = "No subscription id given or subscription not found"
+        redirect_to :back
+      end
+    rescue => e
+      flash[:error] = "Error while getting subscription information: #{e.message} #{e.response}"
     end
   end
 
@@ -34,23 +38,24 @@ class Kaui::SubscriptionsController < Kaui::EngineController
 
   def create
     @base_subscription = params[:base_subscription]
-    @subscription = Kaui::Subscription.new(params[:subscription])
-    @bundle = Kaui::KillbillHelper::get_bundle(@subscription.bundle_id)
     @plan_name = params[:plan_name]
-    if @base_subscription.present?
-      @catalog = Kaui::KillbillHelper::get_available_addons(@base_subscription)
-      @subscription.product_category = "ADD_ON"
-    else
-      @catalog = Kaui::KillbillHelper::get_available_base_plans()
-      @subscription.product_category = "BASE"
-    end
-
-    plan = @catalog[@plan_name]
-    @subscription.billing_period = plan["billingPeriod"]
-    @subscription.product_name = plan["productName"]
-    @subscription.price_list = plan["priceListName"]
 
     begin
+      @subscription = Kaui::Subscription.new(params[:subscription])
+      @bundle = Kaui::KillbillHelper::get_bundle(@subscription.bundle_id)
+      if @base_subscription.present?
+        @catalog = Kaui::KillbillHelper::get_available_addons(@base_subscription)
+        @subscription.product_category = "ADD_ON"
+      else
+        @catalog = Kaui::KillbillHelper::get_available_base_plans()
+        @subscription.product_category = "BASE"
+      end
+
+      plan = @catalog[@plan_name]
+      @subscription.billing_period = plan["billingPeriod"]
+      @subscription.product_name = plan["productName"]
+      @subscription.price_list = plan["priceListName"]
+
       Kaui::KillbillHelper::create_subscription(@subscription, current_user)
       redirect_to Kaui.bundle_home_path.call(@bundle.bundle_id)
     rescue => e
@@ -83,21 +88,25 @@ class Kaui::SubscriptionsController < Kaui::EngineController
   end
 
   def edit
-    @subscription = Kaui::KillbillHelper.get_subscription(params[:id])
+    begin
+      @subscription = Kaui::KillbillHelper.get_subscription(params[:id])
 
-    if @subscription.present?
-      @bundle = Kaui::KillbillHelper::get_bundle(@subscription.bundle_id)
-      @account = Kaui::KillbillHelper::get_account(@bundle.account_id)
-      @catalog = Kaui::KillbillHelper::get_available_base_plans
+      if @subscription.present?
+        @bundle = Kaui::KillbillHelper::get_bundle(@subscription.bundle_id)
+        @account = Kaui::KillbillHelper::get_account(@bundle.account_id)
+        @catalog = Kaui::KillbillHelper::get_available_base_plans
 
-      @current_plan = "#{@subscription.product_name} #{@subscription.billing_period}".humanize
+        @current_plan = "#{@subscription.product_name} #{@subscription.billing_period}".humanize
 
-      if @subscription.price_list != "DEFAULT"
-        @current_plan += " (price list #{@subscription.price_list})"
+        if @subscription.price_list != "DEFAULT"
+          @current_plan += " (price list #{@subscription.price_list})"
+        end
+      else
+        flash[:error] = "No subscription id given or subscription not found"
+        redirect_to :back
       end
-    else
-      flash[:error] = "No subscription id given or subscription not found"
-      redirect_to :back
+    rescue => e
+      flash[:error] = "Error while editing subscription: #{e.message} #{e.response}"
     end
   end
 
@@ -119,38 +128,41 @@ class Kaui::SubscriptionsController < Kaui::EngineController
         subscription.subscription_id = params[:subscription][:subscription_id]
 
         Kaui::KillbillHelper::update_subscription(subscription, requested_date, current_user)
-        redirect_to Kaui.bundle_home_path.call(bundle.bundle_id)
       rescue => e
         flash[:error] = "Error while updating subscription: #{e.message} #{e.response}"
       end
     else
       flash[:error] = "No subscription given"
-      redirect_to :back
     end
+    redirect_to Kaui.bundle_home_path.call(bundle.bundle_id)
   end
 
   def reinstate
     subscription_id = params[:id]
     if subscription_id.present?
-      success = Kaui::KillbillHelper::reinstate_subscription(subscription_id, current_user)
-      if success
+      begin
+        Kaui::KillbillHelper::reinstate_subscription(subscription_id, current_user)
         flash[:info] = "Subscription reinstated"
-      else
-        flash[:error] = "Error reinstating subscription"
+      rescue => e
+        flash[:error] = "Error while reinstating subscription: #{e.message} #{e.response}"
       end
-      redirect_to :back
     else
       flash[:error] = "No subscription id given"
     end
+    redirect_to :back
   end
 
   def destroy
     subscription_id = params[:id]
     if subscription_id.present?
-      Kaui::KillbillHelper::delete_subscription(subscription_id, current_user)
-      redirect_to :back
+      begin
+        Kaui::KillbillHelper::delete_subscription(subscription_id, current_user)
+      rescue => e
+        flash[:error] = "Error while reinstating subscription: #{e.message} #{e.response}"
+      end
     else
       flash[:error] = "No subscription id given"
     end
+    redirect_to :back
   end
 end