kaui 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a9ec1ec7ef252ca12a43f8149f34b8d05f9380e
-  data.tar.gz: 74b4b0292efc15111d1c199572a38dc8d47db671
+  metadata.gz: bf008611430663168c6e6f8ef1adca13ef8b0929
+  data.tar.gz: 55cd8e91ff9c1798881a5e8af70dfede6f9576de
 SHA512:
-  metadata.gz: 4d1c6e1c3c01e6e17fa8b124a6211edfb95cd3104770b1f2abaa93a661e96334263564ea5b5bdaa9c450912182daba58efe24915b606d42ac090addaa23055cf
-  data.tar.gz: 5bb0eb6ca5e539d3c8debd3fbca23817d028ae14438e3f7ded0f770d2e73709b2ae59c1ace08db7e3fbde6cc15bb24a1086a55de0d8c3ebb4fc0245b14f84d11
+  metadata.gz: 90239db91f63b3eeff5170aa41f6e7b75b34c3b4f17eceabe1830f86134193c8a44f3e09c28450b4e6851fdec534e346cd599c97094dd28039f480dd38b690f0
+  data.tar.gz: 7ee1407b3378494668e50879f686c6c33809ad3a3a086572c4abe9572b5a10c460298a5a6058977fe39c1ddcfc62195fc0cf7d461f4c062c6ebdc58ac4f20e23

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
 
+sudo: false
+
 notifications:
   email:
     - kill-bill-commits@googlegroups.com

data/Gemfile

@@ -3,4 +3,4 @@ source 'http://rubygems.org'
 gemspec
 
 #gem 'killbill-client', :path => '../killbill-client-ruby'
-#gem 'killbill-client', :github => 'killbill/killbill-client-ruby', :ref => 'HEAD'
+#gem 'killbill-client', :git => 'https://github.com/killbill/killbill-client-ruby.git'

data/README.md

@@ -1,6 +1,16 @@
 Getting started
 ===============
 
+Kaui core mountable engine. For Kaui the UI, see [killbill-admin-ui-standalone](https://github.com/killbill/killbill-admin-ui-standalone).
+
+Kill Bill compatibility
+-----------------------
+
+| API version | Kill Bill version |
+| ----------: | ----------------: |
+| 0.14.y      | 0.16.z            |
+| 0.15.y      | 0.18.z            |
+
 Running Kaui locally
 ---------------------
 
@@ -12,6 +22,7 @@ export RAILS_ENV=development
 bundle install
 rake kaui:install:migrations
 rake db:migrate
+bundle exec rake assets:precompile
 rails server
 ```
 
@@ -46,17 +57,23 @@ Running tests
 -------------
 
 Go into 'test/dummy': 
-> cd test/dummy/
+```
+cd test/dummy/
+```
 
 Run migrations:
-> export RAILS_ENV=test
-> rake kaui:install:migrations
-> rake db:migrate
+```
+export RAILS_ENV=test
+rake kaui:install:migrations
+rake db:migrate
+```
 
 Run the tests:
 (Move back to top level)
-> cd ../..
-> rake test
+```
+cd ../..
+rake test
+```
 
 Note: functional and integration tests require an instance of Kill Bill to test against.
 

data/app/assets/javascripts/application.js

@@ -6,6 +6,7 @@
 //
 //= require js-routes
 //= require jquery
+//= require jquery-ui/autocomplete
 //= require jquery_ujs
 //= require dataTables/jquery.dataTables
 //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap

data/app/assets/stylesheets/application.css

@@ -5,6 +5,7 @@
  *= require_self
  *= require bootstrap-datepicker3
  *= require dataTables/jquery.dataTables
+ *= require jquery-ui/autocomplete
  *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
  *= require bootstrap_and_overrides
  *= require kaui/kaui

data/app/assets/stylesheets/kaui/header.less

@@ -126,14 +126,11 @@ header {
         }
     }
 
-    a {
+    a,p {
         display: inline-block;
         padding: 12px 40px;
         font-size: 12px;
-        text-transform: uppercase;
-        color: #666666;
         margin: 0;
-        border-left: 1px solid #fff;
         line-height: 12px;
         background: transparent;
         vertical-align: top;
@@ -173,6 +170,12 @@ header {
                 width: 100%;
             }
         }
+    }
+
+    a {
+        color: #666666;
+        text-transform: uppercase;
+        border-left: 1px solid #fff;
 
         &:hover, &.current {
             color: #fff;
@@ -183,4 +186,8 @@ header {
             border-right: 1px solid #fff;
         }
     }
+
+    p {
+        font-weight: normal;
+    }
 }

data/app/controllers/kaui/accounts_controller.rb

@@ -55,6 +55,7 @@ class Kaui::AccountsController < Kaui::EngineController
   end
 
   def show
+    # Re-fetch the account with balance and CBA
     @account = Kaui::Account::find_by_id_or_key(params.require(:account_id), true, true, options_for_klient)
 
     fetch_overdue_state = lambda { @overdue_state = @account.overdue(options_for_klient) }
@@ -72,7 +73,6 @@ class Kaui::AccountsController < Kaui::EngineController
   end
 
   def edit
-    @account = Kaui::Account::find_by_id_or_key(params.require(:account_id), false, false, options_for_klient)
   end
 
   def update

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -14,18 +14,11 @@ class Kaui::AdminTenantsController < Kaui::EngineController
 
   def create
     param_tenant = params[:tenant]
-    old_tenant = Kaui::Tenant.find_by_name(param_tenant[:name])
-    if old_tenant
-      flash.now[:error] = "Tenant with name #{param_tenant[:name]} already exists!"
-      @tenant = Kaui::Tenant.new
-      render :new and return
-    end
 
-    old_tenant = Kaui::Tenant.find_by_api_key(param_tenant[:api_key])
+    old_tenant = Kaui::Tenant.find_by_name(param_tenant[:name]) || Kaui::Tenant.find_by_api_key(param_tenant[:api_key])
     if old_tenant
-      flash.now[:error] = "Tenant with api key #{param_tenant[:api_key]} already exists!"
-      @tenant = Kaui::Tenant.new
-      render :new and return
+      old_tenant.kaui_allowed_users << Kaui::AllowedUser.where(:kb_username => current_user.kb_username).first_or_create
+      redirect_to admin_tenant_path(old_tenant[:id]), :notice => 'Tenant was successfully configured' and return
     end
 
     begin
@@ -37,24 +30,24 @@ class Kaui::AdminTenantsController < Kaui::EngineController
         options[:api_secret] = param_tenant[:api_secret]
         new_tenant = Kaui::AdminTenant.find_by_api_key(param_tenant[:api_key], options)
       rescue KillBillClient::API::Unauthorized, KillBillClient::API::NotFound
+
         # Create the tenant in Kill Bill
         new_tenant = Kaui::AdminTenant.new
         new_tenant.external_key = param_tenant[:name]
         new_tenant.api_key = param_tenant[:api_key]
         new_tenant.api_secret = param_tenant[:api_secret]
-        new_tenant = new_tenant.create(options[:username], nil, comment, options)
+        new_tenant = new_tenant.create(false, options[:username], nil, comment, options)
       end
 
       # Transform object to Kaui model
       tenant_model = Kaui::Tenant.new
-      tenant_model.name = new_tenant.external_key
-      tenant_model.kb_tenant_id = new_tenant.tenant_id
-      tenant_model.api_key = new_tenant.api_key
+      tenant_model.name = param_tenant[:name]
+      tenant_model.api_key = param_tenant[:api_key]
       tenant_model.api_secret = param_tenant[:api_secret]
+      tenant_model.kb_tenant_id = new_tenant.tenant_id
 
       # Save in KAUI tables
       tenant_model.save!
-
       # Make sure at least the current user can access the tenant
       tenant_model.kaui_allowed_users << Kaui::AllowedUser.where(:kb_username => current_user.kb_username).first_or_create
     rescue => e
@@ -72,6 +65,20 @@ class Kaui::AdminTenantsController < Kaui::EngineController
   def show
     @tenant = safely_find_tenant_by_id(params[:id])
     @allowed_users = @tenant.kaui_allowed_users & retrieve_allowed_users_for_current_user
+
+    options = tenant_options_for_client
+    options[:api_key] = @tenant.api_key
+    options[:api_secret] = @tenant.api_secret
+
+    @catalogs = Kaui::Catalog::get_catalog_json(false, options) rescue @catalogs = []
+    @catalogs_xml = Kaui::Catalog::get_catalog_xml(options) rescue @catalogs_xml = []
+    @overdue =  Kaui::Overdue::get_overdue_json(options) rescue @overdue = nil
+    @overdue_xml = Kaui::Overdue::get_tenant_overdue_config('xml', options) rescue @overdue_xml = nil
+
+    plugin_repository = Kaui::AdminTenant::get_plugin_repository
+
+    @plugin_config =  Kaui::AdminTenant::get_oss_plugin_info(plugin_repository) rescue @plugin_config = ""
+    @tenant_plugin_config = Kaui::AdminTenant::get_tenant_plugin_config(plugin_repository, options) rescue @tenant_plugin_config = ""
   end
 
   def upload_catalog
@@ -89,6 +96,80 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     redirect_to admin_tenant_path(current_tenant.id), :notice => 'Catalog was successfully uploaded'
   end
 
+  def new_catalog
+    @tenant = safely_find_tenant_by_id(params[:id])
+
+    options = tenant_options_for_client
+    options[:api_key] = @tenant.api_key
+    options[:api_secret] = @tenant.api_secret
+
+    latest_catalog = Kaui::Catalog::get_catalog_json(true, options)
+
+    @ao_mapping = Kaui::Catalog::build_ao_mapping(latest_catalog)
+
+    @available_base_products = latest_catalog && latest_catalog.products ?
+        latest_catalog.products.select { |p| p.type == 'BASE' }.map { |p| p.name } : []
+    @available_ao_products = latest_catalog && latest_catalog.products ?
+        latest_catalog.products.select { |p| p.type == 'ADD_ON' }.map { |p| p.name } : []
+    @available_standalone_products = latest_catalog && latest_catalog.products ?
+        latest_catalog.products.select { |p| p.type == 'STANDALONE' }.map { |p| p.name } : []
+    @product_categories = [:BASE, :ADD_ON, :STANDALONE]
+    @billing_period = [:DAILY, :WEEKLY, :BIWEEKLY, :THIRTY_DAYS, :MONTHLY, :QUARTERLY, :BIANNUAL, :ANNUAL, :BIENNIAL]
+    @time_units = [:UNLIMITED, :DAYS, :MONTHS, :YEARS]
+
+    @simple_plan = Kaui::SimplePlan.new
+  end
+
+  def new_plan_currency
+    @tenant = safely_find_tenant_by_id(params[:id])
+    @simple_plan = Kaui::SimplePlan.new
+    @simple_plan.plan_id = params[:plan_id]
+  end
+
+
+  def create_simple_plan
+
+    current_tenant = safely_find_tenant_by_id(params[:id])
+
+    options = tenant_options_for_client
+    options[:api_key] = current_tenant.api_key
+    options[:api_secret] = current_tenant.api_secret
+
+    simple_plan = params.require(:simple_plan).delete_if { |e, value| value.blank? }
+    # Fix issue in Rails where first entry in the multi-select array is an empty string
+    simple_plan["available_base_products"].reject!(&:blank?) if simple_plan["available_base_products"]
+
+    simple_plan = KillBillClient::Model::SimplePlanAttributes.new(simple_plan)
+
+    Kaui::Catalog.add_tenant_catalog_simple_plan(simple_plan, options[:username], nil, comment, options)
+
+    redirect_to admin_tenant_path(current_tenant.id), :notice => 'Catalog plan was successfully added'
+  end
+
+  def new_overdue_config
+    @tenant = safely_find_tenant_by_id(params[:id])
+
+    options = tenant_options_for_client
+    options[:api_key] = @tenant.api_key
+    options[:api_secret] = @tenant.api_secret
+    @overdue = Kaui::Overdue::get_overdue_json(options)
+  end
+
+  def modify_overdue_config
+
+    current_tenant = safely_find_tenant_by_id(params[:id])
+
+    options = tenant_options_for_client
+    options[:api_key] = current_tenant.api_key
+    options[:api_secret] = current_tenant.api_secret
+
+    view_form_model = params.require(:kill_bill_client_model_overdue).delete_if { |e, value| value.blank? }
+    overdue = Kaui::Overdue::from_overdue_form_model(view_form_model)
+    overdue.upload_tenant_overdue_config_json(options[:username], nil, comment, options)
+    redirect_to admin_tenant_path(current_tenant.id), :notice => 'Overdue config was successfully added '
+  end
+
+
   def upload_overdue_config
     current_tenant = safely_find_tenant_by_id(params[:id])
 
@@ -161,10 +242,13 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     options[:api_secret] = current_tenant.api_secret
 
     plugin_name = params[:plugin_name]
-    uploaded_plugin_config = params[:plugin_config]
-    plugin_config = uploaded_plugin_config.read
+    plugin_properties = params[:plugin_properties]
+    plugin_type = params[:plugin_type]
 
-    Kaui::AdminTenant.upload_tenant_plugin_config(plugin_name, plugin_config, options[:username], nil, comment, options)
+    plugin_config = Kaui::AdminTenant.format_plugin_config(plugin_name, plugin_type, plugin_properties)
+
+    key = plugin_type.present? ? "killbill-#{plugin_name}" : plugin_name
+    Kaui::AdminTenant.upload_tenant_plugin_config(key, plugin_config, options[:username], nil, comment, options)
 
     redirect_to admin_tenant_path(current_tenant.id), :notice => 'Config for plugin was successfully uploaded'
   end
@@ -183,6 +267,17 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     render :json => '{}', :status => 200
   end
 
+  def display_catalog_xml
+    @catalog_xml = params.require(:xml)
+    render xml: @catalog_xml
+  end
+
+
+  def display_overdue_xml
+    render xml: params.require(:xml)
+  end
+
+
   private
 
   def safely_find_tenant_by_id(tenant_id)

data/app/controllers/kaui/bundles_controller.rb

@@ -1,8 +1,6 @@
 class Kaui::BundlesController < Kaui::EngineController
 
   def index
-    @account = Kaui::Account::find_by_id_or_key(params.require(:account_id), false, false, options_for_klient)
-
     fetch_bundles = lambda { @bundles = @account.bundles(options_for_klient) }
     fetch_bundle_tags = lambda {
       all_bundle_tags = @account.all_tags(:BUNDLE, false, 'NONE', options_for_klient)

data/app/controllers/kaui/chargebacks_controller.rb

@@ -1,7 +1,7 @@
 class Kaui::ChargebacksController < Kaui::EngineController
 
   def new
-    payment = Kaui::Payment::find_by_id(params.require(:payment_id), options_for_klient)
+    payment = Kaui::Payment::find_by_id(params.require(:payment_id), false, false, options_for_klient)
     @chargeback = Kaui::Chargeback.new(:payment_id => payment.payment_id,
                                        :amount => payment.paid_amount_to_money.to_f,
                                        :currency => payment.currency)

data/app/controllers/kaui/charges_controller.rb

@@ -19,7 +19,7 @@ class Kaui::ChargesController < Kaui::EngineController
     charge = Kaui::InvoiceItem.new(params.require(:invoice_item).delete_if { |key, value| value.blank? })
     charge.account_id ||= params.require(:account_id)
 
-    charge = charge.create(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+    charge = charge.create(true, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
     redirect_to kaui_engine.account_invoice_path(charge.account_id, charge.invoice_id), :notice => 'Charge was successfully created'
   end
 end

data/app/controllers/kaui/engine_controller.rb

@@ -2,7 +2,7 @@ class Kaui::EngineController < ApplicationController
 
   include Kaui::EngineControllerUtil
 
-  before_filter :authenticate_user!, :check_for_redirect_to_tenant_screen
+  before_filter :authenticate_user!, :check_for_redirect_to_tenant_screen, :populate_account_details
 
   layout :get_layout
 
@@ -18,7 +18,6 @@ class Kaui::EngineController < ApplicationController
     super
   end
 
-
   def current_ability
     # Redefined here to namespace Ability in the correct module
     @current_ability ||= Kaui::Ability.new(current_user)
@@ -32,6 +31,10 @@ class Kaui::EngineController < ApplicationController
     end
   end
 
+  def populate_account_details
+    @account ||= params[:account_id].present? ? Kaui::Account.find_by_id(params[:account_id], false, false, options_for_klient) : Kaui::Account.new
+  end
+
   def retrieve_tenants_for_current_user
     if Kaui.root_username == current_user.kb_username
       Kaui::Tenant.all.map(&:kb_tenant_id)

data/app/controllers/kaui/invoices_controller.rb

@@ -39,7 +39,7 @@ class Kaui::InvoicesController < Kaui::EngineController
     @invoice = Kaui::Invoice.find_by_id_or_number(params.require(:id), true, 'FULL', options_for_klient)
 
     fetch_payments_and_pms = lambda do
-      @payments = @invoice.payments(true, 'FULL', options_for_klient).map { |payment| Kaui::InvoicePayment.build_from_raw_payment(payment) }
+      @payments = @invoice.payments(true, true, 'FULL', options_for_klient).map { |payment| Kaui::InvoicePayment.build_from_raw_payment(payment) }
       @payment_methods = Kaui::PaymentMethod.payment_methods_for_payments(@payments, options_for_klient)
     end
     fetch_account = lambda { @account = Kaui::Account.find_by_id(@invoice.account_id, false, false, options_for_klient) }

data/app/controllers/kaui/payment_methods_controller.rb

@@ -58,7 +58,7 @@ class Kaui::PaymentMethodsController < Kaui::EngineController
 
     payment_method = Kaui::PaymentMethod.find_by_id(payment_method_id, false, options_for_klient)
     begin
-      Kaui::PaymentMethod.destroy(payment_method_id, params[:set_auto_pay_off], current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+      Kaui::PaymentMethod.destroy(payment_method_id, params[:set_auto_pay_off], false, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
       redirect_to kaui_engine.account_path(payment_method.account_id), :notice => "Payment method #{payment_method_id} successfully deleted"
     rescue => e
       flash[:error] = "Error while deleting payment method #{payment_method_id}: #{as_string(e)}"

data/app/controllers/kaui/payments_controller.rb

@@ -65,7 +65,7 @@ class Kaui::PaymentsController < Kaui::EngineController
   end
 
   def show
-    @payment = Kaui::InvoicePayment.find_by_id(params.require(:id), true, options_for_klient)
+    @payment = Kaui::InvoicePayment.build_from_raw_payment(Kaui::InvoicePayment.find_by_id(params.require(:id), true, true, options_for_klient))
 
     fetch_account = lambda { @account = Kaui::Account.find_by_id(@payment.account_id, false, false, options_for_klient) }
     # The payment method may have been deleted
@@ -75,10 +75,28 @@ class Kaui::PaymentsController < Kaui::EngineController
   end
 
   def restful_show
-    payment = Kaui::InvoicePayment.find_by_id(params.require(:id), false, options_for_klient)
+    begin
+      payment = Kaui::InvoicePayment.find_by_id(params.require(:id), false, true, options_for_klient)
+    rescue KillBillClient::API::NotFound
+      payment = Kaui::Payment.find_by_external_key(params.require(:id), false, true, options_for_klient)
+    end
     redirect_to account_payment_path(payment.account_id, payment.payment_id)
   end
 
+  def cancel_scheduled_payment
+    begin
+      payment_transaction = Kaui::Transaction.new
+      payment_transaction.transaction_external_key = params.require(:transaction_external_key)
+
+      payment_transaction.cancel_scheduled_payment(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+
+      redirect_to kaui_engine.account_payment_path(params.require(:account_id), params.require(:id)), :notice => "Payment attempt retry successfully deleted"
+    rescue => e
+      flash[:error] = "Error deleting payment attempt retry: #{as_string(e)}"
+      redirect_to kaui_engine.account_path(params.require(:account_id))
+    end
+  end
+
   private
 
   def invoice_payment_params

data/app/controllers/kaui/refunds_controller.rb

@@ -2,7 +2,7 @@ class Kaui::RefundsController < Kaui::EngineController
 
   def new
     fetch_invoice = lambda { @invoice = Kaui::Invoice.find_by_id_or_number(params.require(:invoice_id), true, 'NONE', options_for_klient) }
-    fetch_payment = lambda { @payment = Kaui::InvoicePayment::find_by_id(params.require(:payment_id), false, options_for_klient) }
+    fetch_payment = lambda { @payment = Kaui::InvoicePayment::find_by_id(params.require(:payment_id), false, false, options_for_klient) }
 
     run_in_parallel fetch_invoice, fetch_payment
 

data/app/controllers/kaui/subscriptions_controller.rb

@@ -30,11 +30,9 @@ class Kaui::SubscriptionsController < Kaui::EngineController
       plan_details = plans_details.find { |p| p.plan == plan_name }
       raise "Unable to find plan #{plan_name}" if plan_details.nil?
 
-      @subscription.billing_period = plan_details.final_phase_billing_period
-      @subscription.product_name = plan_details.product
-      @subscription.price_list = plan_details.price_list
-
-      @subscription = @subscription.create(current_user.kb_username, params[:reason], params[:comment], params[:requested_date], false, options_for_klient)
+      @subscription.plan_name = plan_name
+      requested_date = params[:type_change] == "DATE" ? params[:requested_date].presence : nil
+      @subscription = @subscription.create(current_user.kb_username, params[:reason], params[:comment], requested_date, false, options_for_klient)
       redirect_to kaui_engine.account_bundles_path(@subscription.account_id), :notice => 'Subscription was successfully created'
     rescue => e
       @plans = plans_details.nil? ? [] : plans_details.map { |p| p.plan }
@@ -53,21 +51,18 @@ class Kaui::SubscriptionsController < Kaui::EngineController
   end
 
   def update
+
     plan_name = params.require(:plan_name)
 
-    requested_date = params[:requested_date].presence
-    billing_policy = params[:policy].presence
+    requested_date = params[:type_change] == "DATE" ? params[:requested_date].presence : nil
+    billing_policy = params[:type_change] == "POLICY" ? params[:policy].presence : nil
+
     wait_for_completion = params[:wait_for_completion] == '1'
 
     subscription = Kaui::Subscription.find_by_id(params.require(:id), options_for_klient)
-    plans_details = Kaui::Catalog::available_base_plans(options_for_klient)
-    new_plan_details = plans_details.find { |p| p.plan == plan_name }
-    raise "Unable to find plan #{plan_name}" if new_plan_details.nil?
 
     subscription.change_plan({
-                                 :productName => new_plan_details.product,
-                                 :billingPeriod => new_plan_details.final_phase_billing_period,
-                                 :priceList => new_plan_details.price_list
+                                 :planName => plan_name
                              },
                              current_user.kb_username,
                              params[:reason],

data/app/helpers/kaui/account_helper.rb

@@ -0,0 +1,9 @@
+module Kaui
+  module AccountHelper
+
+    def pretty_account_identifier
+      return nil if @account.nil?
+      @account.name.presence || @account.email.presence || @account.external_key
+    end
+  end
+end

data/app/helpers/kaui/subscription_helper.rb

@@ -1,37 +1,53 @@
 module Kaui
   module SubscriptionHelper
 
-    def humanized_product_category(sub)
+    def humanized_subscription_product_category(sub)
       if !sub.present? or !sub.product_category.present?
         nil
-      elsif sub.product_category == 'BASE'
+      else
+        humanized_product_category(sub.product_category)
+      end
+    end
+
+    def humanized_product_category(product_category)
+      if product_category == 'BASE'
         'Base'
-      elsif sub.product_category == 'ADD_ON'
+      elsif product_category == 'ADD_ON'
         'Add-on'
       else
-        sub.product_category.downcase.capitalize
+        product_category.downcase.capitalize
       end
     end
 
-    def humanized_product_name(sub)
+    def humanized_subscription_product_name(sub)
       if !sub.present? or !sub.product_name.present?
         nil
       else
-        sub.product_name.downcase.capitalize
+        humanized_product_name(sub.product_name)
       end
     end
 
-    def humanized_billing_period(sub)
+    def humanized_product_name(product_name)
+        product_name.downcase.capitalize
+    end
+
+    def humanized_subscription_billing_period(sub)
       if !sub.present? or !sub.billing_period.present?
         nil
-      elsif sub.billing_period == 'NO_BILLING_PERIOD'
+      else
+        humanized_billing_period(sub.billing_period)
+      end
+    end
+
+    def humanized_billing_period(billing_period)
+      if billing_period == 'NO_BILLING_PERIOD'
         'No billing period'
       else
-        sub.billing_period.downcase.capitalize
+        billing_period.downcase.capitalize
       end
     end
 
-    def humanized_price_list(sub, show_default=true)
+    def humanized_subscription_price_list(sub, show_default=true)
       if !sub.present? or !sub.price_list.present? or (!show_default and sub.price_list.upcase == 'DEFAULT')
         nil
       else
@@ -39,10 +55,10 @@ module Kaui
       end
     end
 
-    def humanized_full_product_name(sub)
-      humanized_product_name   = humanized_product_name(sub)
-      humanized_billing_period = humanized_billing_period(sub)
-      humanized_price_list     = humanized_price_list(sub, false)
+    def humanized_subscription_full_product_name(sub)
+      humanized_product_name   = humanized_subscription_product_name(sub)
+      humanized_billing_period = humanized_subscription_billing_period(sub)
+      humanized_price_list     = humanized_subscription_price_list(sub, false)
 
       if humanized_billing_period.nil?
         if humanized_price_list.nil?
@@ -59,7 +75,11 @@ module Kaui
       end
     end
 
-    def humanized_start_date(sub, account)
+    def humanized_subscription_phase_type(sub)
+      sub.phase_type
+    end
+
+    def humanized_subscription_start_date(sub, account)
       if !sub.present? or !sub.start_date.present? or !account.present? or !account.time_zone.present?
         nil
       else
@@ -67,7 +87,7 @@ module Kaui
       end
     end
 
-    def humanized_charged_through_date(sub, account)
+    def humanized_subscription_charged_through_date(sub, account)
       if !sub.present? or !sub.charged_through_date.present? or !account.present? or !account.time_zone.present?
         nil
       else
@@ -75,7 +95,7 @@ module Kaui
       end
     end
 
-    def humanized_cancelled_date(sub, account)
+    def humanized_subscription_cancelled_date(sub, account)
       if !sub.present? or !sub.cancelled_date.present? or !account.present? or !account.time_zone.present?
         nil
       else
@@ -88,7 +108,7 @@ module Kaui
       end
     end
 
-    def humanized_billing_start_date(sub, account)
+    def humanized_subscription_billing_start_date(sub, account)
       if !sub.present? or !sub.billing_start_date.present? or !account.present? or !account.time_zone.present?
         nil
       else
@@ -96,7 +116,7 @@ module Kaui
       end
     end
 
-    def humanized_billing_end_date(sub, account)
+    def humanized_subscription_billing_end_date(sub, account)
       if !sub.present? or !sub.billing_end_date.present? or !account.present? or !account.time_zone.present?
         nil
       else
@@ -104,11 +124,17 @@ module Kaui
       end
     end
 
-    def is_future_cancelled?(sub)
+
+    def humanized_time_unit(time_unit)
+      time_unit.downcase.capitalize
+    end
+
+
+    def is_subscription_future_cancelled?(sub)
       sub.present? and sub.billing_end_date.present? and Time.parse(sub.billing_end_date) > Time.now
     end
 
-    def is_cancelled?(sub)
+    def is_subscription_cancelled?(sub)
       sub.present? and sub.billing_end_date.present?
     end
   end