kaui 0.1.8 → 0.1.9

data/app/controllers/kaui/account_tags_controller.rb

@@ -7,7 +7,8 @@ class Kaui::AccountTagsController < Kaui::EngineController
       begin
         tags = Kaui::KillbillHelper::get_tags_for_account(account_id)
       rescue => e
-        flash[:error] = "Error while getting tags: #{e.message} #{e.response}"
+        flash[:error] = "Error while getting tags: #{as_string(e)}"
+
       end
     else
       flash[:error] = "No account id given"
@@ -17,11 +18,11 @@ class Kaui::AccountTagsController < Kaui::EngineController
   def edit
     @account_id = params[:account_id]
     begin
-      @available_tags = Kaui::KillbillHelper::get_tag_definitions.sort
+      @available_tags = Kaui::TagDefinition.all_for_account.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}"
+      flash[:error] = "Error while editing tags: #{as_string(e)}"
     end
   end
 
@@ -51,7 +52,7 @@ class Kaui::AccountTagsController < Kaui::EngineController
       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}"
+      flash[:error] = "Error while updating tags: #{as_string(e)}"
     end
     redirect_to kaui_engine.account_path(params[:account_id])
   end

data/app/controllers/kaui/account_timelines_controller.rb

@@ -16,7 +16,7 @@ class Kaui::AccountTimelinesController < Kaui::EngineController
       @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}"
+      flash[:error] = "Could not load the account timeline for #{@account_id}: #{as_string(e)}"
       redirect_to :action => :index
       return
     end
@@ -29,7 +29,7 @@ class Kaui::AccountTimelinesController < Kaui::EngineController
           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}"
+            flash[:error] = "Could not get invoice information for the timeline #{@account_id}: #{as_string(e)}"
           end
           payment.bundle_keys.split(",").each do |bundle_key|
             unless @bundle_names.has_key?(bundle_key)
@@ -43,7 +43,7 @@ class Kaui::AccountTimelinesController < Kaui::EngineController
           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}"
+            flash[:error] = "Could not get invoice information for the timeline #{@account_id}: #{as_string(e)}"
           end
           invoice.bundle_keys.split(",").each do |bundle_key|
             unless @bundle_names.has_key?(bundle_key)

data/app/controllers/kaui/accounts_controller.rb

@@ -20,7 +20,7 @@ class Kaui::AccountsController < Kaui::EngineController
         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}"
+        flash[:error] = "Error while retrieving the account for #{key}: #{as_string(e)}"
         render :action => :index and return
       end
 
@@ -39,7 +39,7 @@ class Kaui::AccountsController < Kaui::EngineController
             end
           end
         rescue => e
-          flash[:error] = "Error while retrieving account information for account: #{e.message} #{e.response}"
+          flash[:error] = "Error while retrieving account information for account: #{as_string(e)}"
         end
       else
         flash[:error] = "Account #{@account_id} not found: #{@account}"
@@ -56,7 +56,7 @@ class Kaui::AccountsController < Kaui::EngineController
       begin
         @payment_methods = Kaui::KillbillHelper::get_payment_methods(@account_id)
       rescue => e
-        flash[:error] = "Error while getting payment methods: #{e.message} #{e.response}"
+        flash[:error] = "Error while getting payment methods: #{as_string(e)}"
       end
       unless @payment_methods.is_a?(Array)
         flash[:notice] = "No payment methods for account_id '#{@account_id}'"
@@ -73,7 +73,7 @@ class Kaui::AccountsController < Kaui::EngineController
     begin
       @account = Kaui::KillbillHelper::get_account(account_id)
     rescue => e
-      flash[:error] = "Error while adding payment methods: #{e.message} #{e.response}"
+      flash[:error] = "Error while adding payment methods: #{as_string(e)}"
     end
     if @account.nil?
       flash[:error] = "Account not found for id #{account_id}"
@@ -88,7 +88,7 @@ class Kaui::AccountsController < Kaui::EngineController
     begin
       @account = Kaui::KillbillHelper::get_account(account_id)
     rescue => e
-      flash[:error] = "Error while adding payment method: #{e.message} #{e.response}"
+      flash[:error] = "Error while adding payment method: #{as_string(e)}"
     end
 
     # Implementation example using standard credit card fields
@@ -132,7 +132,7 @@ class Kaui::AccountsController < Kaui::EngineController
         redirect_to kaui_engine.account_timeline_path(@account.account_id)
         return
       rescue => e
-        flash[:error] = "Error while adding payment method #{invoice_id}: #{e.message} #{e.response}"
+        flash[:error] = "Error while adding payment method #{invoice_id}: #{as_string(e)}"
       end
     end
     render "kaui/payment_methods/new"
@@ -145,7 +145,7 @@ class Kaui::AccountsController < Kaui::EngineController
       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}"
+        flash[:error] = "Error while setting payment method as default #{invoice_id}: #{as_string(e)}"
       end
     else
       flash[:notice] = "No account_id or payment_method_id given"
@@ -159,7 +159,7 @@ class Kaui::AccountsController < Kaui::EngineController
       flash[:notice] = "Email preferences updated"
       redirect_to :back
     rescue => e
-      flash[:error] = "Error while switching email notifications #{invoice_id}: #{e.message} #{e.response}"
+      flash[:error] = "Error while switching email notifications #{invoice_id}: #{as_string(e)}"
     end
   end
 end

data/app/controllers/kaui/analytics_controller.rb

@@ -0,0 +1,28 @@
+module Kaui
+  class AnalyticsController < ApplicationController
+    def index
+      @slugs = []
+      catalog = Kaui::KillbillHelper::get_full_catalog()
+      catalog['products'].each do |product|
+        product['plans'].each do |plan|
+          name = plan['name']
+          plan['phases'].each do |phase|
+            type = phase['type']
+            @slugs << "#{name.downcase}-#{type.downcase}"
+          end
+        end
+      end
+      @product_type = catalog['name']
+    end
+
+    def accounts_over_time
+      @accounts = Analytics.accounts_over_time
+    end
+
+    def subscriptions_over_time
+      @product_type = params[:product_type]
+      @slug = params[:slug]
+      @subscriptions = Analytics.subscriptions_over_time(@product_type, @slug)
+    end
+  end
+end

data/app/controllers/kaui/bundle_tags_controller.rb

@@ -6,7 +6,7 @@ class Kaui::BundleTagsController < Kaui::EngineController
       begin
         tags = Kaui::KillbillHelper::get_tags_for_bundle(bundle_id)
       rescue => e
-        flash[:error] = "Error while retrieving tags information: #{e.message} #{e.response}"
+        flash[:error] = "Error while retrieving tags information: #{as_string(e)}"
       end
     else
       flash[:error] = "No account id given"
@@ -21,7 +21,7 @@ class Kaui::BundleTagsController < Kaui::EngineController
       @bundle = Kaui::KillbillHelper::get_bundle(@bundle_id)
       @tags = Kaui::KillbillHelper::get_tags_for_bundle(@bundle_id)
     rescue => e
-      flash[:error] = "Error while retrieving tags information: #{e.message} #{e.response}"
+      flash[:error] = "Error while retrieving tags information: #{as_string(e)}"
     end
   end
 
@@ -33,7 +33,7 @@ class Kaui::BundleTagsController < Kaui::EngineController
       Kaui::KillbillHelper::set_tags_for_bundle(bundle.bundle_id, tags)
       redirect_to Kaui.bundle_home_path.call(bundle.bundle_id)
     rescue => e
-      flash[:error] = "Error while updating tags: #{e.message} #{e.response}"
+      flash[:error] = "Error while updating tags: #{as_string(e)}"
     end
   end
 

data/app/controllers/kaui/bundles_controller.rb

@@ -20,7 +20,7 @@ class Kaui::BundlesController < Kaui::EngineController
           render :action => :index
         end
       rescue => e
-        flash[:error] = "Error while retrieving bundle information for #{key}: #{e.message} #{e.response}"
+        flash[:error] = "Error while retrieving bundle information for #{key}: #{as_string(e)}"
       end
     else
       flash[:error] = "No id given"
@@ -33,7 +33,7 @@ class Kaui::BundlesController < Kaui::EngineController
       @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}"
+      flash[:error] = "Error while preparing to transfer bundle: #{as_string(e)}"
     end
     if @account.nil?
       flash[:error] = "Account not found for bundle id #{bundle_id}"
@@ -47,7 +47,7 @@ class Kaui::BundlesController < Kaui::EngineController
       begin
         result = Kaui::KillbillHelper.get_account_by_key(key, false)
       rescue => e
-        flash[:error] = "Error while retrieving account for #{key}: #{e.message} #{e.response}"
+        flash[:error] = "Error while retrieving account for #{key}: #{as_string(e)}"
         render :action => :index
         return
       end
@@ -57,7 +57,7 @@ class Kaui::BundlesController < Kaui::EngineController
           Kaui::KillbillHelper::transfer_bundle(bundle_id, @new_account.account_id)
           flash[:info] = "Bundle transfered successfully"
         rescue => e
-          flash[:error] = "Error transfering bundle #{e.message} #{e.response}"
+          flash[:error] = "Error transfering bundle #{as_string(e)}"
         end
         redirect_to Kaui.account_home_path.call(@new_account.external_key)
         return
@@ -72,7 +72,7 @@ class Kaui::BundlesController < Kaui::EngineController
       @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}"
+      flash[:error] = "Error while redirecting: #{as_string(e)}"
       render :transfer
     end
   end

data/app/controllers/kaui/chargebacks_controller.rb

@@ -6,7 +6,7 @@ class Kaui::ChargebacksController < Kaui::EngineController
       begin
         data = Kaui::KillbillHelper::get_chargebacks_for_payment(@payment_id)
       rescue => e
-        flash[:error] = "Error while getting chargeback information: #{e.message} #{e.response}"
+        flash[:error] = "Error while getting chargeback information: #{as_string(e)}"
       end
       if data.present?
         @chargeback = Kaui::Chargeback.new(data)
@@ -29,7 +29,7 @@ class Kaui::ChargebacksController < Kaui::EngineController
       @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}"
+      flash[:error] = "Error while starting a new chargeback: #{as_string(e)}"
       redirect_to kaui_engine.account_timeline_path(:id => params[:account_id])
     end
 
@@ -46,7 +46,7 @@ class Kaui::ChargebacksController < Kaui::EngineController
         Kaui::KillbillHelper::create_chargeback(chargeback, params[:reason], params[:comment])
         flash[:info] = "Chargeback created"
       rescue => e
-        flash[:error] = "Error while creating a new chargeback: #{e.message} #{e.response}"
+        flash[:error] = "Error while creating a new chargeback: #{as_string(e)}"
       end
     else
       flash[:error] = "No chargeback to process"

data/app/controllers/kaui/charges_controller.rb

@@ -13,7 +13,7 @@ class Kaui::ChargesController < Kaui::EngineController
         @charge = Kaui::Charge.new("accountId" => @account_id)
       end
     rescue => e
-      flash[:error] = "Error while creating a charge: #{e.message} #{e.response}"
+      flash[:error] = "Error while creating a charge: #{as_string(e)}"
     end
   end
 
@@ -26,7 +26,7 @@ class Kaui::ChargesController < Kaui::EngineController
         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}"
+        flash[:error] = "Error while creating a charge: #{as_string(e)}"
       end
     end
   end

data/app/controllers/kaui/credits_controller.rb

@@ -8,7 +8,7 @@ class Kaui::CreditsController < Kaui::EngineController
       # 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}"
+        flash[:error] = "Error getting credit information: #{as_string(e)}"
       end
       if data.present?
         @credit = Kaui::Credit.new(data)
@@ -28,7 +28,7 @@ class Kaui::CreditsController < Kaui::EngineController
       @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}"
+      flash[:error] = "Error while starting to create credit: #{as_string(e)}"
     end
 
     credit_amount = @invoice.balance unless @invoice.nil?
@@ -44,7 +44,7 @@ class Kaui::CreditsController < Kaui::EngineController
       account = Kaui::KillbillHelper::get_account(credit.account_id)
       flash[:info] = "Credit created"
     rescue => e
-      flash[:error] = "Error while starting to create credit: #{e.message} #{e.response}"
+      flash[:error] = "Error while starting to create credit: #{as_string(e)}"
     end
     redirect_to Kaui.account_home_path.call(account.external_key)
   end

data/app/controllers/kaui/engine_controller.rb

@@ -1,4 +1,7 @@
+require 'kaui/error_helper'
+
 class Kaui::EngineController < ApplicationController
+  include Kaui::ErrorHelper
   # This is a semi-isolated engine (https://bibwild.wordpress.com/2012/05/10/the-semi-isolated-rails-engine/)
   # We expect that the hosting app's ApplicationController has these methods defined:
   #

data/app/controllers/kaui/invoice_items_controller.rb

@@ -20,7 +20,7 @@ class Kaui::InvoiceItemsController < Kaui::EngineController
       flash[:notice] = "Adjustment item created"
       redirect_to kaui_engine.invoice_path(@invoice_item.invoice_id)
     rescue => e
-      flash[:error] = "Error while updating the invoice item: #{e.message} #{e.response}"
+      flash[:error] = "Error while updating the invoice item: #{as_string(e)}"
       render :action => "edit"
     end
   end
@@ -34,7 +34,7 @@ class Kaui::InvoiceItemsController < Kaui::EngineController
       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}"
+        flash[:error] = "Error while trying to find the invoice item: #{as_string(e)}"
       end
       unless @invoice_item.present?
         flash[:error] = "Invoice for id #{invoice_id} and invoice item id #{invoice_item_id} not found"

data/app/controllers/kaui/invoices_controller.rb

@@ -33,7 +33,7 @@ class Kaui::InvoicesController < Kaui::EngineController
           render :action => :index
         end
       rescue => e
-        flash[:error] = "Error while getting information for invoice #{invoice_id}: #{e.message} #{e.response}"
+        flash[:error] = "Error while getting information for invoice #{invoice_id}: #{as_string(e)}"
       end
     else
       flash[:error] = "No id given"
@@ -44,7 +44,7 @@ class Kaui::InvoicesController < Kaui::EngineController
     begin
       render :text => Kaui::KillbillHelper.get_invoice_html(params[:id])
     rescue => e
-      flash[:error] = "Error rendering invoice html #{invoice_id}: #{e.message} #{e.response}"
+      flash[:error] = "Error rendering invoice html #{invoice_id}: #{as_string(e)}"
     end
   end
 end

data/app/controllers/kaui/payment_methods_controller.rb

@@ -11,7 +11,7 @@ class Kaui::PaymentMethodsController < Kaui::EngineController
       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}"
+        flash[:error] = "Error while deleting payment method #{payment_method_id}: #{as_string(e)}"
       end
     else
       flash[:notice] = "Did not get the payment method id"

data/app/controllers/kaui/payments_controller.rb

@@ -7,7 +7,7 @@ class Kaui::PaymentsController < Kaui::EngineController
       @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}"
+      flash[:error] = "Error while creating a new payment: #{as_string(e)}"
       redirect_to kaui_engine.account_timeline_path(:id => payment.account_id)
     end
 
@@ -22,7 +22,7 @@ class Kaui::PaymentsController < Kaui::EngineController
         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}"
+        flash[:error] = "Error while creating a new payment: #{as_string(e)}"
       end
     end
     redirect_to kaui_engine.account_timeline_path(:id => payment.account_id)

data/app/controllers/kaui/refunds_controller.rb

@@ -10,7 +10,7 @@ class Kaui::RefundsController < Kaui::EngineController
       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}"
+        flash[:error] = "Error while retrieving the refund with id #{params[:id]}: #{as_string(e)}"
       end
       if data.present?
         @refunds = [data]
@@ -22,7 +22,7 @@ class Kaui::RefundsController < Kaui::EngineController
             render :action => :index
           end
         rescue => e
-          flash[:error] = "Error while retrieving the refunds for the payment: #{e.message} #{e.response}"
+          flash[:error] = "Error while retrieving the refunds for the payment: #{as_string(e)}"
           render :action => :index
         end
       end
@@ -45,7 +45,7 @@ class Kaui::RefundsController < Kaui::EngineController
       @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}"
+      flash[:error] = "Error while processing refund: #{as_string(e)}"
       redirect_to kaui_engine.account_timeline_path(:id => params[:account_id])
     end
   end
@@ -61,7 +61,7 @@ class Kaui::RefundsController < Kaui::EngineController
         Kaui::KillbillHelper::create_refund(params[:payment_id], refund, current_user, params[:reason], params[:comment])
         flash[:info] = "Refund created"
       rescue => e
-        flash[:error] = "Error while processing refund: #{e.message} #{e.response}"
+        flash[:error] = "Error while processing refund: #{as_string(e)}"
       end
     else
       flash[:error] = "No refund to process"

data/app/controllers/kaui/subscriptions_controller.rb

@@ -15,7 +15,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
         redirect_to :back
       end
     rescue => e
-      flash[:error] = "Error while getting subscription information: #{e.message} #{e.response}"
+      flash[:error] = "Error while getting subscription information: #{as_string(e)}"
     end
   end
 
@@ -31,7 +31,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
         @catalog = Kaui::KillbillHelper::get_available_base_plans()
       end
     rescue => e
-      flash[:error] = "Error while trying to start new subscription creation: #{e.message} #{e.response}"
+      flash[:error] = "Error while trying to start new subscription creation: #{as_string(e)}"
     end
     @subscription = Kaui::Subscription.new("bundleId" => bundle_id)
   end
@@ -59,7 +59,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
       Kaui::KillbillHelper::create_subscription(@subscription, current_user)
       redirect_to Kaui.bundle_home_path.call(@bundle.bundle_id)
     rescue => e
-      flash[:error] = "Error while creating the new subscription: #{e.message} #{e.response}"
+      flash[:error] = "Error while creating the new subscription: #{as_string(e)}"
       render :new
     end
   end
@@ -83,7 +83,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
       @bundle = Kaui::KillbillHelper.get_bundle(subscription.bundle_id)
       @available_plans = Kaui::KillbillHelper.get_available_addons(params[:base_product_name])
     rescue => e
-      flash[:error] = "Error while adding an addon: #{e.message} #{e.response}"
+      flash[:error] = "Error while adding an addon: #{as_string(e)}"
     end
   end
 
@@ -106,7 +106,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
         redirect_to :back
       end
     rescue => e
-      flash[:error] = "Error while editing subscription: #{e.message} #{e.response}"
+      flash[:error] = "Error while editing subscription: #{as_string(e)}"
     end
   end
 
@@ -120,6 +120,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
 
         plan = catalog[params[:plan_name]]
         requested_date = params[:requested_date]
+        policy = params[:policy]
 
         subscription.billing_period = plan["billingPeriod"]
         subscription.product_category = plan["productCategory"]
@@ -127,9 +128,9 @@ class Kaui::SubscriptionsController < Kaui::EngineController
         subscription.price_list = plan["priceListName"]
         subscription.subscription_id = params[:subscription][:subscription_id]
 
-        Kaui::KillbillHelper::update_subscription(subscription, requested_date, current_user)
+        Kaui::KillbillHelper::update_subscription(subscription, requested_date, policy, current_user)
       rescue => e
-        flash[:error] = "Error while updating subscription: #{e.message} #{e.response}"
+        flash[:error] = "Error while updating subscription: #{as_string(e)}"
       end
     else
       flash[:error] = "No subscription given"
@@ -144,7 +145,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
         Kaui::KillbillHelper::reinstate_subscription(subscription_id, current_user)
         flash[:info] = "Subscription reinstated"
       rescue => e
-        flash[:error] = "Error while reinstating subscription: #{e.message} #{e.response}"
+        flash[:error] = "Error while reinstating subscription: #{as_string(e)}"
       end
     else
       flash[:error] = "No subscription id given"
@@ -158,7 +159,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
       begin
         Kaui::KillbillHelper::delete_subscription(subscription_id, current_user)
       rescue => e
-        flash[:error] = "Error while reinstating subscription: #{e.message} #{e.response}"
+        flash[:error] = "Error while reinstating subscription: #{as_string(e)}"
       end
     else
       flash[:error] = "No subscription id given"

data/app/controllers/kaui/tags_controller.rb

@@ -0,0 +1,85 @@
+module Kaui
+  class TagsController < ApplicationController
+    # GET /tags
+    # GET /tags.json
+    def index
+      @tags = Tag.all
+  
+      respond_to do |format|
+        format.html # index.html.erb
+        format.json { render :json => @tags }
+      end
+    end
+  
+    # GET /tags/1
+    # GET /tags/1.json
+    def show
+      @tag = Tag.find(params[:id])
+  
+      respond_to do |format|
+        format.html # show.html.erb
+        format.json { render :json => @tag }
+      end
+    end
+  
+    # GET /tags/new
+    # GET /tags/new.json
+    def new
+      @tag = Tag.new
+  
+      respond_to do |format|
+        format.html # new.html.erb
+        format.json { render :json => @tag }
+      end
+    end
+  
+    # GET /tags/1/edit
+    def edit
+      @tag = Tag.find(params[:id])
+    end
+  
+    # POST /tags
+    # POST /tags.json
+    def create
+      @tag = Tag.new(params[:tag])
+  
+      respond_to do |format|
+        if @tag.save
+          format.html { redirect_to @tag, :notice => 'Tag was successfully created.' }
+          format.json { render :json => @tag, :status => :created, :location => @tag }
+        else
+          format.html { render :action => "new" }
+          format.json { render :json => @tag.errors, :status => :unprocessable_entity }
+        end
+      end
+    end
+  
+    # PUT /tags/1
+    # PUT /tags/1.json
+    def update
+      @tag = Tag.find(params[:id])
+  
+      respond_to do |format|
+        if @tag.update_attributes(params[:tag])
+          format.html { redirect_to @tag, :notice => 'Tag was successfully updated.' }
+          format.json { head :no_content }
+        else
+          format.html { render :action => "edit" }
+          format.json { render :json => @tag.errors, :status => :unprocessable_entity }
+        end
+      end
+    end
+  
+    # DELETE /tags/1
+    # DELETE /tags/1.json
+    def destroy
+      @tag = Tag.find(params[:id])
+      @tag.destroy
+  
+      respond_to do |format|
+        format.html { redirect_to tags_url }
+        format.json { head :no_content }
+      end
+    end
+  end
+end

data/app/helpers/kaui/killbill_helper.rb

@@ -173,13 +173,17 @@ module Kaui
                     "X-Killbill-Comment" => "#{comment}"
     end
 
-    def self.update_subscription(subscription, requested_date = nil, current_user = nil, reason = nil, comment = nil)
+    def self.update_subscription(subscription, requested_date = nil, policy = nil, current_user = nil, reason = nil, comment = nil)
       subscription_data = Kaui::Subscription.camelize(subscription.to_hash)
-      date_param = "?requestedDate=" + requested_date.to_s unless requested_date.blank?
+
+      params = "?"
+      params = "#{params}requestedDate=#{requested_date.to_s}&" unless requested_date.blank?
+      params = "#{params}policy=#{policy}" unless policy.blank?
+
       # We don't want to pass events
       subscription_data.delete(:events)
       call_killbill :put,
-                    "/1.0/kb/subscriptions/#{subscription.subscription_id}#{date_param}",
+                    "/1.0/kb/subscriptions/#{subscription.subscription_id}#{params}",
                     ActiveSupport::JSON.encode(subscription_data, :root => false),
                     :content_type => :json,
                     "X-Killbill-CreatedBy" => current_user,
@@ -265,6 +269,11 @@ module Kaui
 
     ############## CATALOG ##############
 
+    def self.get_full_catalog
+      data = call_killbill :get, "/1.0/kb/catalog/simpleCatalog"
+      data[:json]
+    end
+
     def self.get_available_addons(base_product_name)
       data = call_killbill :get, "/1.0/kb/catalog/availableAddons?baseProductName=#{base_product_name}"
       if data.has_key?(:json)
@@ -480,5 +489,17 @@ module Kaui
                       "X-Killbill-Comment" => "#{comment}"
       end
     end
+
+    ############## ANALYTICS ##############
+
+    def self.get_accounts_created_over_time
+      data = call_killbill :get, "/1.0/kb/analytics/accountsCreatedOverTime"
+      process_response(data, :single) { |json| Kaui::TimeSeriesData.new(json) }
+    end
+
+    def self.get_subscriptions_created_over_time(product_type, slug)
+      data = call_killbill :get, "/1.0/kb/analytics/subscriptionsCreatedOverTime?productType=#{product_type}&slug=#{slug}"
+      process_response(data, :single) { |json| Kaui::TimeSeriesData.new(json) }
+    end
   end
 end