kaui 2.0.4 → 3.0.1

data/app/controllers/kaui/tenants_controller.rb

@@ -1,20 +1,22 @@
-class Kaui::TenantsController < Kaui::EngineController
+# frozen_string_literal: true
 
-  skip_before_action :check_for_redirect_to_tenant_screen
+module Kaui
+  class TenantsController < Kaui::EngineController
+    skip_before_action :check_for_redirect_to_tenant_screen
 
-  def index
-    # Retrieve current user and extract allowed list of tenants
-    allowed_user = Kaui::AllowedUser.find_by_kb_username(current_user.kb_username)
-    @tenants = (allowed_user && allowed_user.kaui_tenants) || []
+    def index
+      # Retrieve current user and extract allowed list of tenants
+      allowed_user = Kaui::AllowedUser.find_by_kb_username(current_user.kb_username)
+      @tenants = allowed_user&.kaui_tenants || []
 
-    #
-    # If there is nothing, we check for override with KillBillClient.api_key/KillBillClient.api_secret
-    # If there is only one, we skip the tenant screen since the choice is obvious
-    # If not, we allow user to choose what he wants
-    #
-    case @tenants.size
+      #
+      # If there is nothing, we check for override with KillBillClient.api_key/KillBillClient.api_secret
+      # If there is only one, we skip the tenant screen since the choice is obvious
+      # If not, we allow user to choose what he wants
+      #
+      case @tenants.size
       when 0
-        tenant = KillBillClient.api_key.nil? ? nil : KillBillClient::Model::Tenant.find_by_api_key(KillBillClient.api_key, :session_id => current_user.kb_session_id)
+        tenant = KillBillClient.api_key.nil? ? nil : KillBillClient::Model::Tenant.find_by_api_key(KillBillClient.api_key, session_id: current_user.kb_session_id)
         if tenant.present?
           select_tenant_for_tenant_id(tenant.tenant_id, tenant.external_key, nil)
         else
@@ -23,25 +25,25 @@ class Kaui::TenantsController < Kaui::EngineController
       when 1
         # If there is only one tenant defined we skip the screen and set the tenant for the user
         select_tenant_for_tenant_id(@tenants[0].kb_tenant_id, @tenants[0].name, @tenants[0].id)
-      else
-        # Jump to default view allowing to chose which tenant to pick
+        # else jump to default view allowing to chose which tenant to pick
+      end
     end
-  end
 
-  def select_tenant
-    tenant = Kaui::Tenant.find_by_kb_tenant_id(params.require(:kb_tenant_id))
-    select_tenant_for_tenant_id(tenant.kb_tenant_id, tenant.name, tenant.id)
-  end
+    def select_tenant
+      tenant = Kaui::Tenant.find_by_kb_tenant_id(params.require(:kb_tenant_id))
+      select_tenant_for_tenant_id(tenant.kb_tenant_id, tenant.name, tenant.id)
+    end
 
-  private
+    private
 
-  def select_tenant_for_tenant_id(kb_tenant_id, kb_tenant_name_or_key, tenant_id)
-    # Set kb_tenant_id in the session
-    session[:kb_tenant_id] = kb_tenant_id
-    session[:kb_tenant_name] = kb_tenant_name_or_key
-    session[:tenant_id] = tenant_id
+    def select_tenant_for_tenant_id(kb_tenant_id, kb_tenant_name_or_key, tenant_id)
+      # Set kb_tenant_id in the session
+      session[:kb_tenant_id] = kb_tenant_id
+      session[:kb_tenant_name] = kb_tenant_name_or_key
+      session[:tenant_id] = tenant_id
 
-    # Devise will have stored the requested url while signed-out
-    redirect_to stored_location_for(:user) || Kaui.home_path.call
+      # Devise will have stored the requested url while signed-out
+      redirect_to stored_location_for(:user) || Kaui.home_path.call
+    end
   end
 end

data/app/controllers/kaui/transactions_controller.rb

@@ -1,51 +1,56 @@
-class Kaui::TransactionsController < Kaui::EngineController
+# frozen_string_literal: true
 
-  def restful_show
-    payment = Kaui::Payment.find_by_transaction_id(params.require(:id), false, true, options_for_klient)
-    redirect_to account_payment_path(payment.account_id, payment.payment_id)
-  end
+module Kaui
+  class TransactionsController < Kaui::EngineController
+    def restful_show
+      payment = Kaui::Payment.find_by_transaction_id(params.require(:id), false, true, options_for_klient)
+      redirect_to account_payment_path(payment.account_id, payment.payment_id)
+    end
 
-  def new
-    @account_id = params[:account_id]
-    @payment_method_id = params[:payment_method_id]
-
-    transaction_id = params[:transaction_id].presence
-    if transaction_id.nil?
-      @transaction = Kaui::Transaction.new(:payment_id => params[:payment_id],
-                                           :amount => params[:amount],
-                                           :currency => params[:currency],
-                                           :transaction_type => params[:transaction_type])
-    else
-      payment = Kaui::Payment.find_by_transaction_id(transaction_id, false, false, options_for_klient)
-      @transaction = Kaui::Transaction.build_from_raw_transaction(payment.transactions.find { |tx| tx.transaction_id == transaction_id })
+    def new
+      @account_id = params[:account_id]
+      @payment_method_id = params[:payment_method_id]
+
+      transaction_id = params[:transaction_id].presence
+      if transaction_id.nil?
+        @transaction = Kaui::Transaction.new(payment_id: params[:payment_id],
+                                             amount: params[:amount],
+                                             currency: params[:currency],
+                                             transaction_type: params[:transaction_type])
+      else
+        payment = Kaui::Payment.find_by_transaction_id(transaction_id, false, false, options_for_klient)
+        @transaction = Kaui::Transaction.build_from_raw_transaction(payment.transactions.find { |tx| tx.transaction_id == transaction_id })
+      end
     end
-  end
 
-  def create
-    transaction = Kaui::Transaction.new(params[:transaction].delete_if { |key, value| value.blank? })
+    def create
+      transaction = Kaui::Transaction.new(params[:transaction].delete_if { |_key, value| value.blank? })
 
-    plugin_properties = params[:plugin_properties].values.select{ |item| !(item['value'].blank? || item['key'].blank?) } unless params[:plugin_properties].blank?
-    plugin_properties.map! do |property|
-      KillBillClient::Model::PluginPropertyAttributes.new(property)
-    end unless plugin_properties.blank?
+      plugin_properties = params[:plugin_properties].values.reject { |item| (item['value'].blank? || item['key'].blank?) } unless params[:plugin_properties].blank?
+      unless plugin_properties.blank?
+        plugin_properties.map! do |property|
+          KillBillClient::Model::PluginPropertyAttributes.new(property)
+        end
+      end
 
-    options = plugin_properties.blank? ? options_for_klient : ({:pluginProperty => plugin_properties}).merge(options_for_klient)
+      options = plugin_properties.blank? ? options_for_klient : { pluginProperty: plugin_properties }.merge(options_for_klient)
 
-    control_plugin_names = params[:control_plugin_names].select{ |item| !item.blank? } unless params[:control_plugin_names].blank?
-    options.merge!({:controlPluginNames => control_plugin_names}) unless control_plugin_names.blank?
+      control_plugin_names = params[:control_plugin_names].reject(&:blank?) unless params[:control_plugin_names].blank?
+      options.merge!({ controlPluginNames: control_plugin_names }) unless control_plugin_names.blank?
 
-    payment = transaction.create(params.require(:account_id), params[:payment_method_id], current_user.kb_username, params[:reason], params[:comment], options)
-    redirect_to kaui_engine.account_payment_path(payment.account_id, payment.payment_id), :notice => 'Transaction successfully created'
-  end
+      payment = transaction.create(params.require(:account_id), params[:payment_method_id], current_user.kb_username, params[:reason], params[:comment], options)
+      redirect_to kaui_engine.account_payment_path(payment.account_id, payment.payment_id), notice: 'Transaction successfully created'
+    end
 
-  def fix_transaction_state
-    transaction = Kaui::Transaction.new(params[:transaction].delete_if { |key, value| value.blank? })
-    payment_id = transaction.payment_id
-    transaction_id = transaction.transaction_id
-    transaction_status = transaction.status
+    def fix_transaction_state
+      transaction = Kaui::Transaction.new(params[:transaction].delete_if { |_key, value| value.blank? })
+      payment_id = transaction.payment_id
+      transaction_id = transaction.transaction_id
+      transaction_status = transaction.status
 
-    Kaui::Admin.fix_transaction_state(payment_id, transaction_id, transaction_status, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+      Kaui::Admin.fix_transaction_state(payment_id, transaction_id, transaction_status, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
 
-    redirect_to kaui_engine.account_payment_path(params.require(:account_id), payment_id), :notice => "Transaction successfully transitioned to #{transaction_status}"
+      redirect_to kaui_engine.account_payment_path(params.require(:account_id), payment_id), notice: "Transaction successfully transitioned to #{transaction_status}"
+    end
   end
 end

data/app/helpers/kaui/account_helper.rb

@@ -1,20 +1,35 @@
+# frozen_string_literal: true
+
 module Kaui
   module AccountHelper
-
     def pretty_account_identifier
       return nil if @account.nil?
-      @account.name.presence || @account.email.presence || truncate_uuid(@account.external_key)
+
+      Kaui.pretty_account_identifier.call(@account)
     end
 
     def email_notifications_plugin_available?
       Kenui::EmailNotificationService.email_notification_plugin_available?(Kaui.current_tenant_user_options(current_user, session)).first
-    rescue
-      return false
+    rescue StandardError
+      false
+    end
+
+    def deposit_plugin_available?
+      Killbill::Deposit::DepositClient.deposit_plugin_available?(Kaui.current_tenant_user_options(current_user, session)).first
+    rescue StandardError
+      false
     end
 
     def account_closed?
       return false if @account.nil?
-      blocking_states = @account.blocking_states('ACCOUNT','account-service','NONE', Kaui.current_tenant_user_options(current_user, session))
+
+      # NOTE: we ignore errors here, so that the call doesn't prevent the screen to load. While the error isn't surfaced, if there is an error with the catalog for instance,
+      # the AJAX call to compute the next invoice date should hopefully trigger a flash error.
+      blocking_states = begin
+        @account.blocking_states('ACCOUNT', 'account-service', 'NONE', Kaui.current_tenant_user_options(current_user, session))
+      rescue StandardError
+        []
+      end
 
       is_account_closed = false
       blocking_states.each do |blocking_state|
@@ -28,17 +43,12 @@ module Kaui
 
     def billing_info_margin
       style = ''
-      unless can?(:trigger, Kaui::Payment) && can?(:credit, Kaui::Account) && can?(:charge, Kaui::Account)
-        style = "#{style}margin-top:15px;"
-      end
+      style = "#{style}margin-top:15px;" unless can?(:trigger, Kaui::Payment) && can?(:credit, Kaui::Account) && can?(:charge, Kaui::Account)
 
-      unless can? :trigger, Kaui::Invoice
-        style = "#{style}margin-bottom:15px;"
-      end
+      style = "#{style}margin-bottom:15px;" unless can? :trigger, Kaui::Invoice
 
       style = "style='#{style}'" unless style.empty?
       style
     end
-
   end
 end

data/app/helpers/kaui/application_helper.rb

@@ -1,13 +1,18 @@
+# frozen_string_literal: true
+
 module Kaui
   module ApplicationHelper
-
     def tenant_selected?
       session[:kb_tenant_id].present?
     end
 
-    def truncate_class_name(klass, with_abbr = false)
+    def truncate_class_name(klass, with_abbr)
       splitted = klass.split('.')
-      with_abbr ? splitted.each_with_index.map { |k, idx| idx == splitted.size - 1 ? k : k[0]+'.' }.join : splitted[-1]
+      if with_abbr
+        splitted.each_with_index.map { |k, idx| idx == splitted.size - 1 ? k : "#{k[0]}." }.join
+      else
+        splitted[-1]
+      end
     end
   end
 end

data/app/helpers/kaui/date_helper.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module Kaui
   module DateHelper
-
     LOCAL_DATE_RE = /^\d+-\d+-\d+$/
 
     def format_date(date, timezone)
@@ -16,7 +17,7 @@ module Kaui
 
       # If not, convert into account timezone and return the date part only
       parsed_date = DateTime.parse(date.to_s).in_time_zone(timezone)
-      parsed_date.to_s(:date_only)
+      parsed_date.to_fs(:date_only)
     end
 
     def truncate_millis(date_s)
@@ -30,7 +31,7 @@ module Kaui
     # +time_zone+:: The time zone of the current time to return.
     # +options+:: A hash that contains credentials needed to retrieve the time from the
     #             killbill server.
-    def current_time(time_zone=nil, options=nil)
+    def current_time(time_zone = nil, options = nil)
       current_utc_time = nil
       begin
         # fetch time from killbill server

data/app/helpers/kaui/home_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Kaui
   module HomeHelper
   end

data/app/helpers/kaui/locale_helper.rb

@@ -1,20 +1,21 @@
+# frozen_string_literal: true
+
 module Kaui
   module LocaleHelper
-
-    def get_available_locales
+    def all_available_locales
       locale_yaml_file = File.join(File.dirname(__FILE__), 'locale_helper.yml')
-      available_locales = YAML::load_file(locale_yaml_file)
+      available_locales = YAML.load_file(locale_yaml_file)
 
       favorites = []
       locales = []
 
       available_locales.each do |locale|
-        option = ["#{locale[:language]} #{locale[:country]} (#{locale[:language_tag]})", locale[:language_tag] ]
+        option = ["#{locale[:language]} #{locale[:country]} (#{locale[:language_tag]})", locale[:language_tag]]
         locales << option unless locale[:favorite]
         favorites << option if locale[:favorite]
       end
 
-      favorites.concat(['---------------']).concat(locales)
+      favorites.push('---------------').concat(locales)
     end
   end
-end
+end

data/app/helpers/kaui/money_helper.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module Kaui
   module MoneyHelper
-
     def currencies
       (Money::Currency.table.map { |c| c[1][:iso_code] } + ['BTC']).sort.uniq
     end

data/app/helpers/kaui/object_helper.rb

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 module Kaui
   module ObjectHelper
-
     # Because we don't have access to the account_id, we use the restful_show routes
     def url_for_object(object_id, object_type)
-      if object_type == 'ACCOUNT'
+      case object_type
+      when 'ACCOUNT'
         account_path(object_id)
-      elsif object_type == 'BUNDLE'
+      when 'BUNDLE'
         bundle_path(object_id)
-      elsif object_type == 'SUBSCRIPTION'
+      when 'SUBSCRIPTION'
         subscription_path(object_id)
-      elsif object_type == 'INVOICE'
+      when 'INVOICE'
         invoice_path(object_id)
-      elsif object_type == 'PAYMENT'
+      when 'PAYMENT'
         payment_path(object_id)
-      elsif object_type == 'PAYMENT_METHOD'
+      when 'PAYMENT_METHOD'
         payment_method_path(object_id)
       else
         nil
@@ -21,12 +23,11 @@ module Kaui
     end
 
     def object_types
-      [:ACCOUNT, :BUNDLE, :INVOICE, :INVOICE_ITEM, :INVOICE_PAYMENT, :PAYMENT, :SUBSCRIPTION, :TRANSACTION]
+      %i[ACCOUNT BUNDLE INVOICE INVOICE_ITEM INVOICE_PAYMENT PAYMENT SUBSCRIPTION TRANSACTION]
     end
 
     def object_types_for_advanced_search
-      [:ACCOUNT, :BUNDLE, :INVOICE, :CREDIT, :CUSTOM_FIELD, :INVOICE_PAYMENT, :INVOICE, :PAYMENT, :SUBSCRIPTION, :TRANSACTION, :TAG, :TAG_DEFINITION]
+      %i[ACCOUNT BUNDLE INVOICE CREDIT CUSTOM_FIELD INVOICE_PAYMENT INVOICE PAYMENT SUBSCRIPTION TRANSACTION TAG TAG_DEFINITION]
     end
-
   end
 end

data/app/helpers/kaui/payment_helper.rb

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
+
 module Kaui
   module PaymentHelper
-
     def transaction_statuses
       Kaui::Payment::TRANSACTION_STATUSES
     end
 
     def colored_transaction_status(transaction_status)
       data = "<span class='alert-"
-      if transaction_status != 'SUCCESS'
-        data += "danger'>"
-      else
-        data += "success'>"
-      end
+      data += if transaction_status == 'SUCCESS'
+                "success'>"
+              else
+                "danger'>"
+              end
       data += transaction_status
       data += '</span>'
       data.html_safe

data/app/helpers/kaui/payment_method_helper.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Kaui
   module PaymentMethodHelper
-
-    def is_json?(value)
+    def json?(value)
       result = JSON.parse(value)
       result.is_a?(Hash) || result.is_a?(Array)
     rescue JSON::ParserError, TypeError

data/app/helpers/kaui/permissions_helper.rb

@@ -1,15 +1,15 @@
+# frozen_string_literal: true
+
 module Kaui
   module PermissionsHelper
-
     def can_close_account?
-      isAuthorizedWhen = true
-      isAuthorizedWhen &= can? :cancel, Kaui::Subscription
-      isAuthorizedWhen &= can? :pause_resume, Kaui::Subscription
-      isAuthorizedWhen &= can? :add, Kaui::Tag
-      isAuthorizedWhen &= can? :item_adjust, Kaui::Invoice
+      is_authorized_when = true
+      is_authorized_when &= can? :cancel, Kaui::Subscription
+      is_authorized_when &= can? :pause_resume, Kaui::Subscription
+      is_authorized_when &= can? :add, Kaui::Tag
+      is_authorized_when &= can? :item_adjust, Kaui::Invoice
 
-      isAuthorizedWhen
+      is_authorized_when
     end
-
   end
-end
+end

data/app/helpers/kaui/plugin_helper.rb

@@ -1,36 +1,38 @@
+# frozen_string_literal: true
+
 module Kaui
   module PluginHelper
-
     def plugin_repository
       installed_plugins
     end
 
     private
 
-      def installed_plugins
-        installed_plugins = []
-        nodes_info = KillBillClient::Model::NodesInfo.nodes_info(Kaui.current_tenant_user_options(current_user, session)) || []
-        plugins_info = nodes_info.first.plugins_info || []
+    def installed_plugins
+      installed_plugins = []
+      nodes_info = KillBillClient::Model::NodesInfo.nodes_info(Kaui.current_tenant_user_options(current_user, session)) || []
+      plugins_info = nodes_info.empty? ? [] : (nodes_info.first.plugins_info || [])
 
-        plugins_info.each do |plugin|
-          next if plugin.version.nil?
-          # do not allow duplicate
-          next if installed_plugins.any? { |p| p[:plugin_name].eql?(plugin.plugin_name) }
-          plugin_key = plugin.plugin_key
-          installed_plugins << {
-              # Unique identifier chosen by the user and used for kpm operations
-              plugin_key: plugin_key,
-              # Notes:
-              #   * plugin.plugin_name comes from kpm and is arbitrary (see Utils.get_plugin_name_from_file_path in the kpm codebase for instance)
-              #   * plugin_name here is the plugin name as seen by Kill Bill and is typically defined in the Activator.java (this value is the one that matters for plugin configuration)
-              #   * The mapping here is a convention we've used over the years and is no way enforced anywhere - it likely won't work for proprietary plugins (the user would need to specify it by toggling the input on the UI)
-              plugin_name: "killbill-#{plugin_key}",
-              installed: true
-          }
-        end
+      plugins_info.each do |plugin|
+        next if plugin.version.nil?
+        # do not allow duplicate
+        next if installed_plugins.any? { |p| p[:plugin_name].eql?(plugin.plugin_name) }
 
-        # to_s to handle nil
-        installed_plugins.sort! { |a,b| a[:plugin_key].to_s <=> b[:plugin_key].to_s }
+        plugin_key = plugin.plugin_key
+        installed_plugins << {
+          # Unique identifier chosen by the user and used for kpm operations
+          plugin_key:,
+          # Notes:
+          #   * plugin.plugin_name comes from kpm and is arbitrary (see Utils.get_plugin_name_from_file_path in the kpm codebase for instance)
+          #   * plugin_name here is the plugin name as seen by Kill Bill and is typically defined in the Activator.java (this value is the one that matters for plugin configuration)
+          #   * The mapping here is a convention we've used over the years and is no way enforced anywhere - it likely won't work for proprietary plugins (the user would need to specify it by toggling the input on the UI)
+          plugin_name: "killbill-#{plugin_key}",
+          installed: true
+        }
       end
+
+      # to_s to handle nil
+      installed_plugins.sort! { |a, b| a[:plugin_key].to_s <=> b[:plugin_key].to_s }
+    end
   end
 end

data/app/helpers/kaui/subscription_helper.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 module Kaui
   module SubscriptionHelper
-
     def humanized_subscription_product_category(sub)
-      if !sub.present? or !sub.product_category.present?
+      if !sub.present? || !sub.product_category.present?
         nil
       else
         humanized_product_category(sub.product_category)
@@ -23,7 +24,7 @@ module Kaui
       if !sub.present? || !sub.product_name.present?
         nil
       else
-        product = catalog.nil? ? nil : catalog.products.find { |p| p.name == sub.product_name }
+        product = catalog&.products&.find { |p| p.name == sub.product_name }
         humanized_product_name(!product.nil? && !product.pretty_name.blank? ? product.pretty_name : sub.product_name)
       end
     end
@@ -32,7 +33,7 @@ module Kaui
       if !sub.present? || !sub.product_name.present?
         nil
       else
-        product = catalog.nil? ? nil : catalog.products.find { |p| p.name == sub.product_name }
+        product = catalog&.products&.find { |p| p.name == sub.product_name }
         return nil if product.nil?
 
         plan = product.plans.find { |p| p.name == sub.plan_name }
@@ -46,7 +47,7 @@ module Kaui
     end
 
     def humanized_subscription_billing_period(sub)
-      if !sub.present? or !sub.billing_period.present?
+      if !sub.present? || !sub.billing_period.present?
         nil
       else
         humanized_billing_period(sub.billing_period)
@@ -61,8 +62,8 @@ module Kaui
       end
     end
 
-    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')
+    def humanized_subscription_price_list(sub, show_default)
+      if !sub.present? || !sub.price_list.present? || (!show_default && (sub.price_list.upcase == 'DEFAULT'))
         nil
       else
         sub.price_list.downcase.capitalize
@@ -77,19 +78,17 @@ module Kaui
       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?
-          humanized_product_name = humanized_product_name + humanized_price_override(sub, '', '(', ')')
-        else
-          humanized_product_name = humanized_product_name + ' (' + humanized_price_list.downcase + humanized_price_override(sub) + ')'
-        end
-      else
-        if humanized_price_list.nil?
-          humanized_product_name = humanized_product_name + ' (' + humanized_billing_period.downcase + humanized_price_override(sub) + ')'
-        else
-          humanized_product_name = humanized_product_name + ' (' + humanized_billing_period.downcase + ', ' + humanized_price_list.downcase + humanized_price_override(sub) + ')'
-        end
-      end
+      humanized_product_name = if humanized_billing_period.nil?
+                                 if humanized_price_list.nil?
+                                   humanized_product_name + humanized_price_override(sub, '', '(', ')')
+                                 else
+                                   "#{humanized_product_name} (#{humanized_price_list.downcase}#{humanized_price_override(sub)})"
+                                 end
+                               elsif humanized_price_list.nil?
+                                 "#{humanized_product_name} (#{humanized_billing_period.downcase}#{humanized_price_override(sub)})"
+                               else
+                                 "#{humanized_product_name} (#{humanized_billing_period.downcase}, #{humanized_price_list.downcase}#{humanized_price_override(sub)})"
+                               end
 
       humanized_product_name.html_safe
     end
@@ -115,7 +114,7 @@ module Kaui
     end
 
     def humanized_subscription_start_date(sub, account)
-      if !sub.present? or !sub.start_date.present? or !account.present? or !account.time_zone.present?
+      if !sub.present? || !sub.start_date.present? || !account.present? || !account.time_zone.present?
         nil
       else
         format_date(sub.start_date, account.time_zone).html_safe
@@ -123,7 +122,7 @@ module Kaui
     end
 
     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?
+      if !sub.present? || !sub.charged_through_date.present? || !account.present? || !account.time_zone.present?
         nil
       else
         format_date(sub.charged_through_date, account.time_zone).html_safe
@@ -131,7 +130,7 @@ module Kaui
     end
 
     def humanized_subscription_cancelled_date(sub, account)
-      if !sub.present? or !sub.cancelled_date.present? or !account.present? or !account.time_zone.present?
+      if !sub.present? || !sub.cancelled_date.present? || !account.present? || !account.time_zone.present?
         nil
       else
         "Entitlement date: #{format_date(sub.cancelled_date, account.time_zone)}"
@@ -139,7 +138,7 @@ module Kaui
     end
 
     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?
+      if !sub.present? || !sub.billing_start_date.present? || !account.present? || !account.time_zone.present?
         nil
       else
         format_date(sub.billing_start_date, account.time_zone).html_safe
@@ -147,7 +146,7 @@ module Kaui
     end
 
     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?
+      if !sub.present? || !sub.billing_end_date.present? || !account.present? || !account.time_zone.present?
         nil
       else
         "Billing date: #{format_date(sub.billing_end_date, account.time_zone)}"
@@ -155,7 +154,7 @@ module Kaui
     end
 
     def humanized_subscription_cancelled_information(sub, account)
-      if !sub.present? or !sub.cancelled_date.present? or !account.present? or !account.time_zone.present?
+      if !sub.present? || !sub.cancelled_date.present? || !account.present? || !account.time_zone.present?
         nil
       else
         "#{humanized_subscription_cancelled_date(sub, account)}<br/>#{humanized_subscription_billing_end_date(sub, account)}".html_safe
@@ -166,12 +165,11 @@ module Kaui
       time_unit.downcase.capitalize
     end
 
-
-    def is_subscription_future_cancelled?(sub, account)
+    def subscription_future_cancelled?(sub, account)
       sub.present? && sub.state != 'CANCELLED' && sub.billing_end_date.present? && Time.parse(sub.billing_end_date) > current_time(account.time_zone)
     end
 
-    def is_subscription_cancelled?(sub)
+    def subscription_cancelled?(sub)
       sub.present? and sub.billing_end_date.present?
     end
   end