kaui 4.0.11 → 4.0.13

data/app/controllers/kaui/payments_controller.rb

@@ -23,7 +23,7 @@ module Kaui
       query_string = params[:search]
 
       if all_fields_checked
-        columns = KillBillClient::Model::PaymentAttributes.instance_variable_get('@json_attributes') - %w[transactions audit_logs]
+        columns = KillBillClient::Model::PaymentAttributes.instance_variable_get(:@json_attributes) - %w[transactions audit_logs]
         columns += %w[payment_date status] # additional fields not part of the model
         csv_headers = columns.dup
         Kaui::Payment::REMAPPING_FIELDS.each do |k, v|
@@ -86,7 +86,7 @@ module Kaui
           csv << data
         end
       end
-      send_data csv_string, filename: "payments-#{Date.today}.csv", type: 'text/csv'
+      send_data csv_string, filename: "payments-#{Time.zone.today}.csv", type: 'text/csv'
     end
 
     def pagination
@@ -140,6 +140,23 @@ module Kaui
       paginate searcher, data_extractor, formatter
     end
 
+    def show
+      cached_options_for_klient = options_for_klient
+
+      invoice_payment = Kaui::InvoicePayment.find_safely_by_id(params.require(:id), cached_options_for_klient)
+      @payment = Kaui::InvoicePayment.build_from_raw_payment(invoice_payment)
+
+      fetch_payment_fields = promise do
+        direct_payment = Kaui::Payment.new(payment_id: @payment.payment_id)
+        direct_payment.custom_fields('NONE', cached_options_for_klient).sort { |cf_a, cf_b| cf_a.name.downcase <=> cf_b.name.downcase }
+      end
+      # The payment method may have been deleted
+      fetch_payment_method = promise { Kaui::PaymentMethod.find_safely_by_id(@payment.payment_method_id, cached_options_for_klient) }
+
+      @custom_fields = wait(fetch_payment_fields)
+      @payment_method = wait(fetch_payment_method)
+    end
+
     def new
       cached_options_for_klient = options_for_klient
       fetch_invoice = promise { Kaui::Invoice.find_by_id(params.require(:invoice_id), false, 'NONE', cached_options_for_klient) }
@@ -159,23 +176,6 @@ module Kaui
       redirect_to kaui_engine.account_invoice_path(payment.account_id, payment.target_invoice_id), notice: 'Payment triggered'
     end
 
-    def show
-      cached_options_for_klient = options_for_klient
-
-      invoice_payment = Kaui::InvoicePayment.find_safely_by_id(params.require(:id), cached_options_for_klient)
-      @payment = Kaui::InvoicePayment.build_from_raw_payment(invoice_payment)
-
-      fetch_payment_fields = promise do
-        direct_payment = Kaui::Payment.new(payment_id: @payment.payment_id)
-        direct_payment.custom_fields('NONE', cached_options_for_klient).sort { |cf_a, cf_b| cf_a.name.downcase <=> cf_b.name.downcase }
-      end
-      # The payment method may have been deleted
-      fetch_payment_method = promise { Kaui::PaymentMethod.find_safely_by_id(@payment.payment_method_id, cached_options_for_klient) }
-
-      @custom_fields = wait(fetch_payment_fields)
-      @payment_method = wait(fetch_payment_method)
-    end
-
     def restful_show
       begin
         payment = Kaui::InvoicePayment.find_by_id(params.require(:id), false, true, options_for_klient)

data/app/controllers/kaui/queues_controller.rb

@@ -6,25 +6,25 @@ module Kaui
     def index
       @account_id = params[:account_id]
 
-      unless params[:max_date].blank?
+      if params[:max_date].present?
         begin
           max_date_test = Time.parse(params[:max_date]).iso8601
         rescue StandardError
         ensure
           if max_date_test.nil?
-            flash[:error] = I18n.translate('errors.messages.invalid_max_date')
+            flash[:error] = I18n.t('errors.messages.invalid_max_date')
             redirect_to account_queues_path(@account.account_id) and return
           end
         end
       end
 
-      unless params[:min_date].blank?
+      if params[:min_date].present?
         begin
           min_date_test = Time.parse(params[:min_date]).iso8601
         rescue StandardError
         ensure
           if min_date_test.nil?
-            flash[:error] = I18n.translate('errors.messages.invalid_min_date')
+            flash[:error] = I18n.t('errors.messages.invalid_min_date')
             redirect_to account_queues_path(@account.account_id) and return
           end
         end
@@ -37,8 +37,8 @@ module Kaui
         @now = DateTime.now.in_time_zone('UTC')
       end
 
-      min_date = (Time.parse(params[:min_date]).iso8601 unless params[:min_date].blank?) || '1970-01-01'
-      max_date = (Time.parse(params[:max_date]).iso8601 unless params[:max_date].blank?) || Time.now.iso8601
+      min_date = (Time.parse(params[:min_date]).iso8601 if params[:min_date].present?) || '1970-01-01'
+      max_date = (Time.parse(params[:max_date]).iso8601 if params[:max_date].present?) || Time.now.iso8601
 
       with_history = params[:with_history] || false
       @queues_entries = Kaui::Admin.get_queues_entries(@account_id,

data/app/controllers/kaui/registrations_controller.rb

@@ -16,7 +16,7 @@ module Kaui
 
       @user = Kaui::AllowedUser.new(kb_username: sign_up_params.require(:kb_username))
 
-      if Kaui::AllowedUser.find_by_kb_username(@user.kb_username).present?
+      if Kaui::AllowedUser.find_by(kb_username: @user.kb_username).present?
         flash.now[:error] = "User with name #{@user.kb_username} already exists!"
         render :new and return
       end

data/app/controllers/kaui/role_definitions_controller.rb

@@ -6,7 +6,7 @@ module Kaui
       @role_definition = Kaui::RoleDefinition.new
 
       # Store user form context if coming from user creation/edit
-      return unless params[:return_to_user].present?
+      return if params[:return_to_user].blank?
 
       session[:role_return_context] = {
         kb_username: params[:kb_username],
@@ -29,7 +29,7 @@ module Kaui
         return_context = session.delete(:role_return_context)
         if return_context.present?
           # Add the new role to the existing roles
-          existing_roles = return_context[:roles].to_s.split(',').reject(&:blank?)
+          existing_roles = return_context[:roles].to_s.split(',').compact_blank
           existing_roles << @role_definition.role unless existing_roles.include?(@role_definition.role)
           return_context[:roles] = existing_roles.join(',')
 

data/app/controllers/kaui/sessions_controller.rb

@@ -20,7 +20,7 @@ module Kaui
       Rails.logger.error(exception.message)
       Rails.logger.error(exception.backtrace.join("\n")) if exception.backtrace
       @error = standardize_exception(exception)
-      render 'kaui/errors/500', status: 500, layout: false
+      render 'kaui/errors/500', status: :internal_server_error, layout: false
     end
 
     protected

data/app/controllers/kaui/subscriptions_controller.rb

@@ -2,6 +2,10 @@
 
 module Kaui
   class SubscriptionsController < Kaui::EngineController
+    def show
+      restful_show
+    end
+
     def new
       @base_product_name = params[:base_product_name]
       @subscription = Kaui::Subscription.new(bundle_id: params[:bundle_id],
@@ -21,10 +25,17 @@ module Kaui
       redirect_to kaui_engine.account_bundles_path(@subscription.account_id), error: 'No available plan'
     end
 
+    def edit
+      @subscription = Kaui::Subscription.find_by_id(params.require(:id), 'NONE', options_for_klient)
+      _, plans_details = lookup_bundle_and_plan_details(@subscription)
+      # Use a Set to deal with multiple pricelists
+      @plans = Set.new.merge(plans_details.map(&:plan))
+    end
+
     def create
       plan_name = params.require(:plan_name)
       @base_product_name = params[:base_product_name]
-      @subscription = Kaui::Subscription.new(params.require(:subscription).delete_if { |_key, value| value.blank? })
+      @subscription = Kaui::Subscription.new(params.require(:subscription).permit!.to_h.compact_blank)
 
       begin
         @bundle, plans_details = lookup_bundle_and_plan_details(@subscription, @base_product_name)
@@ -44,7 +55,8 @@ module Kaui
         override_recurring_price = !override_fixed_price
         phase_type = @bundle.nil? ? plan_details.phases.first.type : @bundle.subscriptions.first.phase_type
         overrides = price_overrides(phase_type, override_fixed_price, override_recurring_price)
-        @subscription.price_overrides = overrides unless overrides.blank?
+        @subscription.price_overrides = overrides if overrides.present?
+        @subscription.quantity = params[:quantity].to_i if params[:quantity].present? && params[:quantity].to_i.positive?
 
         # un-set product_category since is not needed if plan name exist
         @subscription.product_category = nil
@@ -71,13 +83,6 @@ module Kaui
       end
     end
 
-    def edit
-      @subscription = Kaui::Subscription.find_by_id(params.require(:id), 'NONE', options_for_klient)
-      _, plans_details = lookup_bundle_and_plan_details(@subscription)
-      # Use a Set to deal with multiple pricelists
-      @plans = Set.new.merge(plans_details.map(&:plan))
-    end
-
     def update
       plan_name = params.require(:plan_name)
 
@@ -95,7 +100,7 @@ module Kaui
       override_fixed_price = current_plan.last['recurringPrice'].nil?
       override_recurring_price = !override_fixed_price
       overrides = price_overrides(subscription.phase_type, override_fixed_price, override_recurring_price)
-      input[:priceOverrides] = overrides unless overrides.blank?
+      input[:priceOverrides] = overrides if overrides.present?
 
       subscription.change_plan(input,
                                current_user.kb_username,
@@ -153,10 +158,6 @@ module Kaui
       redirect_to kaui_engine.account_bundles_path(input_subscription['account_id']), notice: 'Subscription BCD was successfully changed'
     end
 
-    def show
-      restful_show
-    end
-
     def restful_show
       subscription = Kaui::Subscription.find_by_id(params.require(:id), 'NONE', options_for_klient)
       redirect_to kaui_engine.account_bundles_path(subscription.account_id)

data/app/controllers/kaui/tag_definitions_controller.rb

@@ -14,7 +14,7 @@ module Kaui
     end
 
     def create
-      params[:tag_definition][:applicable_object_types] = params[:tag_definition][:applicable_object_types].values unless params[:tag_definition][:applicable_object_types].blank?
+      params[:tag_definition][:applicable_object_types] = params[:tag_definition][:applicable_object_types].values if params[:tag_definition][:applicable_object_types].present?
       @tag_definition = Kaui::TagDefinition.new(params[:tag_definition])
 
       begin

data/app/controllers/kaui/tenants_controller.rb

@@ -6,7 +6,7 @@ module Kaui
 
     def index
       # Retrieve current user and extract allowed list of tenants
-      allowed_user = Kaui::AllowedUser.find_by_kb_username(current_user.kb_username)
+      allowed_user = Kaui::AllowedUser.find_by(kb_username: current_user.kb_username)
       @tenants = allowed_user&.kaui_tenants || []
 
       #
@@ -30,7 +30,7 @@ module Kaui
     end
 
     def select_tenant
-      tenant = Kaui::Tenant.find_by_kb_tenant_id(params.require(:kb_tenant_id))
+      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
 

data/app/controllers/kaui/transactions_controller.rb

@@ -24,10 +24,10 @@ module Kaui
     end
 
     def create
-      transaction = Kaui::Transaction.new(params[:transaction].delete_if { |_key, value| value.blank? })
+      transaction = Kaui::Transaction.new(params[:transaction].permit!.to_h.compact_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 = params[:plugin_properties].values.reject { |item| item['value'].blank? || item['key'].blank? } if params[:plugin_properties].present?
+      if plugin_properties.present?
         plugin_properties.map! do |property|
           KillBillClient::Model::PluginPropertyAttributes.new(property)
         end
@@ -35,15 +35,15 @@ module Kaui
 
       options = plugin_properties.blank? ? options_for_klient : { pluginProperty: plugin_properties }.merge(options_for_klient)
 
-      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?
+      control_plugin_names = params[:control_plugin_names].compact_blank if params[:control_plugin_names].present?
+      options[:controlPluginNames] = control_plugin_names if control_plugin_names.present?
 
       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? })
+      transaction = Kaui::Transaction.new(params[:transaction].permit!.to_h.compact_blank)
       payment_id = transaction.payment_id
       transaction_id = transaction.transaction_id
       transaction_status = transaction.status

data/app/helpers/kaui/account_helper.rb

@@ -2,10 +2,11 @@
 
 module Kaui
   module AccountHelper
-    def pretty_account_identifier
-      return nil if @account.nil?
+    def pretty_account_identifier(account = nil)
+      account ||= @account # rubocop:disable Rails/HelperInstanceVariable
+      return nil if account.nil?
 
-      Kaui.pretty_account_identifier.call(@account)
+      Kaui.pretty_account_identifier.call(account)
     end
 
     def email_notifications_plugin_available?
@@ -39,13 +40,14 @@ module Kaui
       end
     end
 
-    def account_closed?
-      return false if @account.nil?
+    def account_closed?(account = nil)
+      account ||= @account # rubocop:disable Rails/HelperInstanceVariable
+      return false if account.nil?
 
       # 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))
+        account.blocking_states('ACCOUNT', 'account-service', 'NONE', Kaui.current_tenant_user_options(current_user, session))
       rescue StandardError
         []
       end
@@ -77,7 +79,7 @@ module Kaui
       # If bundles are provided, check for subscription BCD
       if bundles.present?
         bundles.each do |bundle|
-          next unless bundle.subscriptions.present?
+          next if bundle.subscriptions.blank?
 
           bundle.subscriptions.each do |subscription|
             # Skip cancelled subscriptions

data/app/helpers/kaui/exception_helper.rb

@@ -6,7 +6,7 @@ module Kaui
       if defined?(JRUBY_VERSION)
         case exception
         when ActiveRecord::JDBCError, ActiveRecord::NoDatabaseError, ActiveRecord::DatabaseConnectionError, ActiveRecord::ConnectionNotEstablished
-          return I18n.translate('errors.messages.unable_to_connect_database')
+          return I18n.t('errors.messages.unable_to_connect_database')
         else
           return exception.message
         end
@@ -14,13 +14,15 @@ module Kaui
 
       case exception
       when ActiveRecord::DatabaseConnectionError
-        I18n.translate('errors.messages.unable_to_connect_database')
+        I18n.t('errors.messages.unable_to_connect_database')
       when Errno::ECONNREFUSED, Errno::EBADF
-        I18n.translate('errors.messages.unable_to_connect_killbill')
+        I18n.t('errors.messages.unable_to_connect_killbill')
       when ->(e) { e.class.name.start_with?('KillBillClient::API') }
-        I18n.translate('errors.messages.error_communicating_killbill')
+        I18n.t('errors.messages.error_communicating_killbill')
       else
-        nil
+        # Show detailed error in development/test, or when KAUI_SHOW_ERROR_DETAILS is set (for Docker)
+        show_details = Rails.env.development? || Rails.env.test? || ENV['KAUI_SHOW_ERROR_DETAILS'].present?
+        show_details ? exception.message : nil
       end
     end
   end

data/app/helpers/kaui/payment_helper.rb

@@ -7,15 +7,8 @@ module Kaui
     end
 
     def colored_transaction_status(transaction_status)
-      data = "<span class='alert-"
-      data += if transaction_status == 'SUCCESS'
-                "success'>"
-              else
-                "danger'>"
-              end
-      data += transaction_status
-      data += '</span>'
-      data.html_safe
+      alert_class = transaction_status == 'SUCCESS' ? 'alert-success' : 'alert-danger'
+      tag.span(transaction_status, class: alert_class)
     end
 
     def gateway_url(payment_method, payment)

data/app/helpers/kaui/plugin_helper.rb

@@ -11,10 +11,8 @@ module Kaui
     def installed_plugin_names
       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 unless plugin.state == 'RUNNING'
-
+      plugins_info = nodes_info.flat_map { |node| node.plugins_info || [] }
+      plugins_info.select { |p| p.state == 'RUNNING' }.uniq(&:plugin_name).each do |plugin|
         plugin_name = plugin.plugin_name
         plugin_key = plugin_name.gsub('-plugin', '')
 
@@ -40,7 +38,7 @@ module Kaui
     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 = nodes_info.flat_map { |node| node.plugins_info || [] }
 
       plugins_info.each do |plugin|
         next if plugin.version.nil?

data/app/helpers/kaui/subscription_helper.rb

@@ -3,7 +3,7 @@
 module Kaui
   module SubscriptionHelper
     def humanized_subscription_product_category(sub)
-      if !sub.present? || !sub.product_category.present?
+      if sub.blank? || sub.product_category.blank?
         nil
       else
         humanized_product_category(sub.product_category)
@@ -21,16 +21,16 @@ module Kaui
     end
 
     def humanized_subscription_product_name(sub, catalog = nil)
-      if !sub.present? || !sub.product_name.present?
+      if sub.blank? || sub.product_name.blank?
         nil
       else
         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)
+        humanized_product_name(!product.nil? && product.pretty_name.present? ? product.pretty_name : sub.product_name)
       end
     end
 
     def humanized_subscription_pretty_plan_name(sub, catalog = nil)
-      if !sub.present? || !sub.product_name.present?
+      if sub.blank? || sub.product_name.blank?
         nil
       else
         product = catalog&.products&.find { |p| p.name == sub.product_name }
@@ -47,7 +47,7 @@ module Kaui
     end
 
     def humanized_subscription_billing_period(sub)
-      if !sub.present? || !sub.billing_period.present?
+      if sub.blank? || sub.billing_period.blank?
         nil
       else
         humanized_billing_period(sub.billing_period)
@@ -63,7 +63,7 @@ module Kaui
     end
 
     def humanized_subscription_price_list(sub, show_default)
-      if !sub.present? || !sub.price_list.present? || (!show_default && (sub.price_list.upcase == 'DEFAULT'))
+      if sub.blank? || sub.price_list.blank? || (!show_default && (sub.price_list.upcase == 'DEFAULT'))
         nil
       else
         sub.price_list.downcase.capitalize
@@ -78,19 +78,17 @@ module Kaui
       humanized_billing_period = humanized_subscription_billing_period(sub)
       humanized_price_list     = humanized_subscription_price_list(sub, false)
 
-      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
+      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
     end
 
     def humanized_price_override(sub, separation = ', ', open_bracket = '', close_bracket = '')
@@ -109,28 +107,46 @@ module Kaui
       end
     end
 
+    def catalog_for_subscription(sub, catalogs)
+      return nil if catalogs.blank? || sub&.start_date.blank?
+
+      start_date = Date.parse(sub.start_date)
+
+      # Find the latest catalog version whose effective_date <= subscription start_date
+      best = catalogs.select do |c|
+        Date.parse(c.effective_date) <= start_date
+      rescue StandardError
+        false
+      end.max_by(&:effective_date)
+
+      # Fall back to the oldest version if none precedes the start_date
+      best || catalogs.first
+    rescue StandardError
+      catalogs.last
+    end
+
     def humanized_subscription_phase_type(sub)
       sub.phase_type
     end
 
     def humanized_subscription_start_date(sub, account)
-      if !sub.present? || !sub.start_date.present? || !account.present? || !account.time_zone.present?
+      if sub.blank? || sub.start_date.blank? || account.blank? || account.time_zone.blank?
         nil
       else
-        format_date(sub.start_date, account.time_zone).html_safe
+        format_date(sub.start_date, account.time_zone)
       end
     end
 
     def humanized_subscription_charged_through_date(sub, account)
-      if !sub.present? || !sub.charged_through_date.present? || !account.present? || !account.time_zone.present?
+      if sub.blank? || sub.charged_through_date.blank? || account.blank? || account.time_zone.blank?
         nil
       else
-        format_date(sub.charged_through_date, account.time_zone).html_safe
+        format_date(sub.charged_through_date, account.time_zone)
       end
     end
 
     def humanized_subscription_cancelled_date(sub, account)
-      if !sub.present? || !sub.cancelled_date.present? || !account.present? || !account.time_zone.present?
+      if sub.blank? || sub.cancelled_date.blank? || account.blank? || account.time_zone.blank?
         nil
       else
         "Entitlement date: #{format_date(sub.cancelled_date, account.time_zone)}"
@@ -138,15 +154,15 @@ module Kaui
     end
 
     def humanized_subscription_billing_start_date(sub, account)
-      if !sub.present? || !sub.billing_start_date.present? || !account.present? || !account.time_zone.present?
+      if sub.blank? || sub.billing_start_date.blank? || account.blank? || account.time_zone.blank?
         nil
       else
-        format_date(sub.billing_start_date, account.time_zone).html_safe
+        format_date(sub.billing_start_date, account.time_zone)
       end
     end
 
     def humanized_subscription_billing_end_date(sub, account)
-      if !sub.present? || !sub.billing_end_date.present? || !account.present? || !account.time_zone.present?
+      if sub.blank? || sub.billing_end_date.blank? || account.blank? || account.time_zone.blank?
         nil
       else
         "Billing date: #{format_date(sub.billing_end_date, account.time_zone)}"
@@ -154,10 +170,10 @@ module Kaui
     end
 
     def humanized_subscription_cancelled_information(sub, account)
-      if !sub.present? || !sub.cancelled_date.present? || !account.present? || !account.time_zone.present?
+      if sub.blank? || sub.cancelled_date.blank? || account.blank? || account.time_zone.blank?
         nil
       else
-        "#{humanized_subscription_cancelled_date(sub, account)}<br/>#{humanized_subscription_billing_end_date(sub, account)}".html_safe
+        safe_join([humanized_subscription_cancelled_date(sub, account), humanized_subscription_billing_end_date(sub, account)], tag.br)
       end
     end
 
@@ -166,7 +182,7 @@ module Kaui
     end
 
     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)
+      sub.present? && sub.state != 'CANCELLED' && sub.billing_end_date.present? && Time.zone.parse(sub.billing_end_date) > current_time(account.time_zone)
     end
 
     def subscription_cancelled?(sub)

data/app/helpers/kaui/uuid_helper.rb

@@ -3,7 +3,7 @@
 module Kaui
   module UuidHelper
     def truncate_uuid(uuid)
-      return uuid unless uuid =~ /[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}/
+      return uuid unless /[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}/.match?(uuid)
 
       split = uuid.split('-')
       "#{split[0]}-...-#{split[4]}"

data/app/models/kaui/account.rb

@@ -17,7 +17,8 @@ module Kaui
     ADVANCED_SEARCH_NAME_CHANGES = [%w[pay_via_parent is_payment_delegated_to_parent]].freeze
 
     def check_account_details_phone?
-      return true if phone =~ /\A(?:\+?\d{1,3}\s*-?)?\(?(?:\d{3})?\)?[- ]?\d{3}[- ]?\d{4}\z/i
+      return false if phone.blank?
+      return true if /\A(?:\+?\d{1,3}\s*-?)?\(?(?:\d{3})?\)?[- ]?\d{3}[- ]?\d{4}\z/i.match?(phone)
 
       false
     end
@@ -29,7 +30,7 @@ module Kaui
     end
 
     def self.find_by_id_or_key(account_id_or_key, with_balance, with_balance_and_cba, options = {})
-      if account_id_or_key =~ /[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}/
+      if /[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}/.match?(account_id_or_key)
         begin
           find_by_id(account_id_or_key, with_balance, with_balance_and_cba, options)
         rescue StandardError => e
@@ -63,7 +64,7 @@ module Kaui
     end
 
     def persisted?
-      !account_id.blank?
+      account_id.present?
     end
   end
 end

data/app/models/kaui/admin_tenant.rb

@@ -41,7 +41,7 @@ module Kaui
       end
 
       def format_plugin_config(plugin_key, plugin_type, props)
-        return nil unless props.present?
+        return nil if props.blank?
         return props['raw_config'].gsub(/\r\n?/, "\n") if props['raw_config']
 
         if plugin_type == 'ruby'
@@ -66,7 +66,7 @@ module Kaui
       end
 
       def reformat_plugin_config(_plugin_type, props)
-        unless props['raw_config'].blank?
+        if props['raw_config'].present?
           new_props = {}
           props['raw_config'].split("\n").each do |p|
             line = p.split('=')

data/app/models/kaui/allowed_user.rb

@@ -4,7 +4,9 @@ module Kaui
   class AllowedUser < ApplicationRecord
     has_many :kaui_allowed_user_tenants,
              class_name: 'Kaui::AllowedUserTenant',
-             foreign_key: 'kaui_allowed_user_id'
+             foreign_key: 'kaui_allowed_user_id',
+             dependent: :destroy,
+             inverse_of: :kaui_allowed_user
 
     has_many :kaui_tenants, -> { distinct },
              through: :kaui_allowed_user_tenants,

data/app/models/kaui/allowed_user_tenant.rb

@@ -2,7 +2,7 @@
 
 module Kaui
   class AllowedUserTenant < ApplicationRecord
-    belongs_to :kaui_allowed_user, class_name: 'Kaui::AllowedUser', foreign_key: 'kaui_allowed_user_id'
-    belongs_to :kaui_tenant, class_name: 'Kaui::Tenant', foreign_key: 'kaui_tenant_id'
+    belongs_to :kaui_allowed_user, class_name: 'Kaui::AllowedUser'
+    belongs_to :kaui_tenant, class_name: 'Kaui::Tenant'
   end
 end

data/app/models/kaui/audit_log.rb

@@ -3,7 +3,7 @@
 module Kaui
   class AuditLog
     def self.description(log)
-      return unless log.changed_by.present?
+      return if log.changed_by.blank?
 
       changed_str = "#{log.change_type} by #{log.changed_by.strip}"
       if log.reason_code.blank? && log.comments.blank?