kaui 4.0.11 → 4.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7328709e0c330b84f3e47b4041cf55aa61bf98c7ac80dbb9b2d199b71c3d1f7a
-  data.tar.gz: 27b7f69cdb1e950cd327ac7c31141a76ae6c07e7e063d5ccd6d66c020a4fe612
+  metadata.gz: a7cae94ec25bd96299f58f2bd783dabf34441f203d38fb2846e0f92b59b97e2a
+  data.tar.gz: 04f9d02da92a77eb81160518cad11a5c88af312d20b1c65cfc0d3ad141814801
 SHA512:
-  metadata.gz: e7e3008686fb14493dca39a5adcda76d6032c0a8ba23cbf76971dac4829d59ae275a34779d3450aaf7babead74924a66a968cfc07579e74bcd6669763681a632
-  data.tar.gz: 9195fcbb008a972b2a8e4b6dbee1b471662e5f30623910ea5b4abe290957f726b8c620c56c82df742ef43587b08f006a7c9d65825833938f01e98a666e3605fe
+  metadata.gz: b99fa2fe8751882f22e754e79a1b1eacc1a7933a039e572bbfa22cf880d1967b7e8c8156d04d98cc6511c9b2b6ae634f9ba3ff24102bc4341072b2422dd41e68
+  data.tar.gz: f494903ee370dd0a6bb10808bde638eedd769619cb7e0c70b321c74c9b246ea09ebc00f4d9976cfac8765c53a43fd724daace311ea59b15288d7adb070fb20cb

data/app/controllers/kaui/account_timelines_controller.rb

@@ -76,7 +76,7 @@ module Kaui
         if %w[INVOICE ALL].include?(event_type)
           @invoices.each do |invoice_stub|
             invoice = invoice_stub.invoice_id.present? && @invoices_by_id.key?(invoice_stub.invoice_id) ? @invoices_by_id[invoice_stub.invoice_id] : invoice_stub
-            target_date = invoice.target_date.present? ? invoice.target_date : '[unknown]'
+            target_date = invoice.target_date.presence || '[unknown]'
             bundle_keys = invoice_stub.bundle_keys.present? ? invoice_stub.bundle_keys.split(',').map { |bundle_key| @bundle_names[bundle_key] }.join(', ') : ''
             invoice_details = []
             invoice_details << "Amount: #{invoice.amount_to_money} (#{@account.currency})"
@@ -133,7 +133,7 @@ module Kaui
         end
       end
 
-      send_data csv_string, filename: "account-timelines-#{Date.today}.csv", type: 'text/csv'
+      send_data csv_string, filename: "account-timelines-#{Time.zone.today}.csv", type: 'text/csv'
     end
 
     private
@@ -154,7 +154,7 @@ module Kaui
     end
 
     def extract_invoices_by_id(all_invoices)
-      return {} if all_invoices.nil? || all_invoices.empty?
+      return {} if all_invoices.blank?
 
       # Convert into Kaui::Invoice to benefit from additional methods xxx_to_money
       @invoices_by_id = all_invoices.to_h do |invoice|

data/app/controllers/kaui/accounts_controller.rb

@@ -57,7 +57,7 @@ module Kaui
       query_string = params[:search]
 
       if all_fields_checked
-        columns = KillBillClient::Model::AccountAttributes.instance_variable_get('@json_attributes')
+        columns = KillBillClient::Model::AccountAttributes.instance_variable_get(:@json_attributes)
         csv_headers = columns.dup
         Kaui::Account::REMAPPING_FIELDS.each do |k, v|
           index = csv_headers.index(k)
@@ -97,36 +97,7 @@ module Kaui
           csv << data
         end
       end
-      send_data csv_string, filename: "accounts-#{Date.today}.csv", type: 'text/csv'
-    end
-
-    def new
-      @account = Kaui::Account.new
-    end
-
-    def create
-      @account = Kaui::Account.new(params.require(:account).delete_if { |_key, value| value.blank? })
-
-      @account.errors.add(:phone, :invalid_phone) if !@account.phone.nil? && !@account.check_account_details_phone?
-
-      @account.errors.add(:check_account_details_bill_cycle_day_local, :invalid_bill_cycle_day_local) if !@account.bill_cycle_day_local.nil? && !@account.check_account_details_bill_cycle_day_local?
-
-      unless @account.errors.empty?
-        flash.now[:errors] = @account.errors.messages.values.flatten
-        render action: :new and return
-      end
-
-      # Transform "1" into boolean
-      @account.is_migrated = @account.is_migrated == '1'
-
-      begin
-        @account = @account.create(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
-
-        redirect_to account_path(@account.account_id), notice: 'Account was successfully created'
-      rescue StandardError => e
-        flash.now[:error] = "Error while creating account: #{as_string(e)}"
-        render action: :new
-      end
+      send_data csv_string, filename: "accounts-#{Time.zone.today}.csv", type: 'text/csv'
     end
 
     # rubocop:disable Style/MultilineBlockChain
@@ -140,7 +111,7 @@ module Kaui
       fetch_children = promise { @account.children(false, false, 'NONE', cached_options_for_klient) }
       fetch_parent = @account.parent_account_id.nil? ? nil : promise { Kaui::Account.find_by_id(@account.parent_account_id, false, false, cached_options_for_klient) }
       fetch_overdue_state = promise { @account.overdue(cached_options_for_klient) }
-      fetch_account_tags = promise { @account.tags(false, 'NONE', cached_options_for_klient).sort { |tag_a, tag_b| tag_a <=> tag_b } }
+      fetch_account_tags = promise { @account.tags(false, 'NONE', cached_options_for_klient).sort }
       fetch_account_fields = promise { @account.custom_fields('NONE', cached_options_for_klient).sort { |cf_a, cf_b| cf_a.name.downcase <=> cf_b.name.downcase } }
       fetch_account_emails = promise { Kaui::AccountEmail.find_all_sorted_by_account_id(@account.account_id, 'NONE', cached_options_for_klient) }
       fetch_payments = promise { @account.payments(cached_options_for_klient).map! { |payment| Kaui::Payment.build_from_raw_payment(payment) } }
@@ -180,7 +151,7 @@ module Kaui
       @custom_fields = wait(fetch_account_fields)
       @account_emails = wait(fetch_account_emails)
       wait(fetch_payment_methods)
-      @payment_methods = wait(fetch_payment_methods_with_details).map { |pm_f| wait(pm_f) }.compact
+      @payment_methods = wait(fetch_payment_methods_with_details).filter_map { |pm_f| wait(pm_f) }
       @available_tags = wait(fetch_available_tags)
       @children = wait(fetch_children)
       @account_parent = @account.parent_account_id.nil? ? nil : wait(fetch_parent)
@@ -198,6 +169,52 @@ module Kaui
 
       params.permit!
     end
+
+    def new
+      @account = Kaui::Account.new
+    end
+
+    def edit; end
+
+    def create
+      @account = Kaui::Account.new(params.require(:account).permit!.to_h.compact_blank)
+
+      @account.errors.add(:phone, :invalid_phone) if !@account.phone.nil? && !@account.check_account_details_phone?
+
+      @account.errors.add(:check_account_details_bill_cycle_day_local, :invalid_bill_cycle_day_local) if !@account.bill_cycle_day_local.nil? && !@account.check_account_details_bill_cycle_day_local?
+
+      unless @account.errors.empty?
+        flash.now[:errors] = @account.errors.messages.values.flatten
+        render action: :new and return
+      end
+
+      # Transform "1" into boolean
+      @account.is_migrated = @account.is_migrated == '1'
+
+      begin
+        @account = @account.create(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+
+        redirect_to account_path(@account.account_id), notice: 'Account was successfully created'
+      rescue StandardError => e
+        flash.now[:error] = "Error while creating account: #{as_string(e)}"
+        render action: :new
+      end
+    end
+
+    def update
+      @account = Kaui::Account.new(params.require(:account).permit!.to_h.compact_blank)
+      @account.account_id = params.require(:account_id)
+
+      # Transform "1" into boolean
+      @account.is_migrated = @account.is_migrated == '1'
+
+      @account.update(true, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+
+      redirect_to account_path(@account.account_id), notice: 'Account successfully updated'
+    rescue StandardError => e
+      flash.now[:error] = "Error while updating account: #{as_string(e)}"
+      render action: :edit
+    end
     # rubocop:enable Style/MultilineBlockChain
 
     def destroy
@@ -261,23 +278,6 @@ module Kaui
       end
     end
 
-    def edit; end
-
-    def update
-      @account = Kaui::Account.new(params.require(:account).delete_if { |_key, value| value.blank? })
-      @account.account_id = params.require(:account_id)
-
-      # Transform "1" into boolean
-      @account.is_migrated = @account.is_migrated == '1'
-
-      @account.update(true, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
-
-      redirect_to account_path(@account.account_id), notice: 'Account successfully updated'
-    rescue StandardError => e
-      flash.now[:error] = "Error while updating account: #{as_string(e)}"
-      render action: :edit
-    end
-
     def set_default_payment_method
       account_id = params.require(:account_id)
       payment_method_id = params.require(:payment_method_id)
@@ -309,7 +309,7 @@ module Kaui
     end
 
     def link_to_parent
-      @account = Kaui::Account.new(params.require(:account).delete_if { |_key, value| value.blank? })
+      @account = Kaui::Account.new(params.require(:account).permit!.to_h.compact_blank)
       @account.account_id = params.require(:account_id)
       @account.is_payment_delegated_to_parent = @account.is_payment_delegated_to_parent == '1'
 

data/app/controllers/kaui/admin_allowed_users_controller.rb

@@ -12,26 +12,50 @@ module Kaui
       end
     end
 
+    def show
+      @allowed_user = Kaui::AllowedUser.find(params.require(:id))
+      raise ActiveRecord::RecordNotFound, "Could not find user #{@allowed_user.id}" unless current_user.root? || @allowed_user.kb_username == current_user.kb_username
+
+      @roles = roles_for_user(@allowed_user)
+
+      tenants_for_current_user = retrieve_tenants_for_current_user
+      @tenants = Kaui::Tenant.all.select { |tenant| tenants_for_current_user.include?(tenant.kb_tenant_id) }
+    end
+
     def new
       @allowed_user = Kaui::AllowedUser.new
       @is_killbill_managed = true
       @roles = []
 
       # Restore form state if returning from role creation
-      return unless params[:user_context].present?
+      return if params[:user_context].blank?
 
       context = params[:user_context]
       @allowed_user.kb_username = context[:kb_username]
       @allowed_user.description = context[:description]
-      @roles = context[:roles].to_s.split(',').reject(&:blank?)
+      @roles = context[:roles].to_s.split(',').compact_blank
       @external_checked = context[:external] == '1'
     end
 
+    def edit
+      @allowed_user = Kaui::AllowedUser.find(params.require(:id))
+      @is_killbill_managed = killbill_managed?(@allowed_user, options_for_klient)
+
+      # Use roles from context if returning from role creation, otherwise fetch from KB
+      if params[:user_context].present?
+        context = params[:user_context]
+        @roles = context[:roles].to_s.split(',').compact_blank
+        @allowed_user.description = context[:description] if context[:description].present?
+      else
+        @roles = roles_for_user(@allowed_user)
+      end
+    end
+
     def create
       @is_killbill_managed = nil
       @allowed_user = Kaui::AllowedUser.new(allowed_user_params)
 
-      existing_user = Kaui::AllowedUser.find_by_kb_username(@allowed_user.kb_username)
+      existing_user = Kaui::AllowedUser.find_by(kb_username: @allowed_user.kb_username)
       if existing_user.blank?
         if params[:external] == '1'
           # Create locally only
@@ -53,37 +77,13 @@ module Kaui
       end
     end
 
-    def show
-      @allowed_user = Kaui::AllowedUser.find(params.require(:id))
-      raise ActiveRecord::RecordNotFound, "Could not find user #{@allowed_user.id}" unless current_user.root? || @allowed_user.kb_username == current_user.kb_username
-
-      @roles = roles_for_user(@allowed_user)
-
-      tenants_for_current_user = retrieve_tenants_for_current_user
-      @tenants = Kaui::Tenant.all.select { |tenant| tenants_for_current_user.include?(tenant.kb_tenant_id) }
-    end
-
-    def edit
-      @allowed_user = Kaui::AllowedUser.find(params.require(:id))
-      @is_killbill_managed = killbill_managed?(@allowed_user, options_for_klient)
-
-      # Use roles from context if returning from role creation, otherwise fetch from KB
-      if params[:user_context].present?
-        context = params[:user_context]
-        @roles = context[:roles].to_s.split(',').reject(&:blank?)
-        @allowed_user.description = context[:description] if context[:description].present?
-      else
-        @roles = roles_for_user(@allowed_user)
-      end
-    end
-
     def update
       @allowed_user = Kaui::AllowedUser.find(params.require(:id))
 
       @allowed_user.description = params[:allowed_user][:description].presence
 
       @allowed_user.update_in_kb!(params[:password].presence,
-                                  params[:roles].blank? ? nil : params[:roles].split(','),
+                                  params[:roles].presence&.split(','),
                                   current_user.kb_username,
                                   params[:reason],
                                   params[:comment],
@@ -149,7 +149,7 @@ module Kaui
     end
 
     def roles_for_user(allowed_user)
-      Kaui::UserRole.find_roles_by_username(allowed_user.kb_username, options_for_klient).map(&:presence).compact
+      Kaui::UserRole.find_roles_by_username(allowed_user.kb_username, options_for_klient).filter_map(&:presence)
     rescue StandardError
       []
     end

data/app/controllers/kaui/admin_controller.rb

@@ -23,10 +23,10 @@ module Kaui
     def set_clock
       if params[:commit] == 'Submit'
         date = Date.parse(params[:new_date]).strftime('%Y-%m-%d')
-        msg = I18n.translate('flashes.notices.clock_updated_successfully', new_date: date)
+        msg = I18n.t('flashes.notices.clock_updated_successfully', new_date: date)
       else
         date = nil
-        msg = I18n.translate('flashes.notices.clock_reset_successfully')
+        msg = I18n.t('flashes.notices.clock_reset_successfully')
       end
       begin
         Kaui::Admin.set_clock(date, nil, options_for_klient)

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -10,68 +10,6 @@ module Kaui
       @tenants = Kaui::Tenant.all.select { |tenant| tenants_for_current_user.include?(tenant.kb_tenant_id) }
     end
 
-    def new
-      @tenant = Kaui::Tenant.new
-    end
-
-    def create
-      param_tenant = params[:tenant]
-
-      old_tenant = Kaui::Tenant.find_by_name(param_tenant[:name]) || Kaui::Tenant.find_by_api_key(param_tenant[:api_key])
-      if old_tenant
-        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
-        options = tenant_options_for_client
-        new_tenant = nil
-
-        begin
-          options[:api_key] = param_tenant[:api_key]
-          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, KillBillClient::API::InternalServerError => e
-          # Create the tenant in Kill Bill
-          if e.instance_of?(KillBillClient::API::InternalServerError) && !e.message&.include?('TenantCacheLoader cannot find value')
-            flash[:error] = "Internal server error while retrieving tenant: #{as_string(e)}"
-            redirect_to admin_tenants_path and return
-          end
-          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(false, options[:username], nil, comment, options)
-        end
-
-        # Transform object to Kaui model
-        tenant_model = Kaui::Tenant.new
-        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 KillBillClient::API::Conflict => _e
-        # tenant api_key was found but has a wrong api_secret
-        flash[:error] = "Submitted credentials for #{param_tenant[:api_key]} did not match the expected credentials."
-        redirect_to admin_tenants_path and return
-      rescue StandardError => e
-        flash[:error] = "Failed to create the tenant: #{as_string(e)}"
-        redirect_to admin_tenants_path and return
-      end
-
-      # Select the tenant, see TenantsController
-      session[:kb_tenant_id] = tenant_model.kb_tenant_id
-      session[:kb_tenant_name] = tenant_model.name
-      session[:tenant_id] = tenant_model.id
-
-      redirect_to admin_tenant_path(tenant_model[:id]), notice: 'Tenant was successfully configured'
-    end
-
     def show
       @tenant = safely_find_tenant_by_id(params[:id])
       @allowed_users = @tenant.kaui_allowed_users & retrieve_allowed_users_for_current_user
@@ -140,6 +78,68 @@ module Kaui
       end
     end
 
+    def new
+      @tenant = Kaui::Tenant.new
+    end
+
+    def create
+      param_tenant = params[:tenant]
+
+      old_tenant = Kaui::Tenant.find_by(name: param_tenant[:name]) || Kaui::Tenant.find_by(api_key: param_tenant[:api_key])
+      if old_tenant
+        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
+        options = tenant_options_for_client
+        new_tenant = nil
+
+        begin
+          options[:api_key] = param_tenant[:api_key]
+          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, KillBillClient::API::InternalServerError => e
+          # Create the tenant in Kill Bill
+          if e.instance_of?(KillBillClient::API::InternalServerError) && !e.message&.include?('TenantCacheLoader cannot find value')
+            flash[:error] = "Internal server error while retrieving tenant: #{as_string(e)}"
+            redirect_to admin_tenants_path and return
+          end
+          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(false, options[:username], nil, comment, options)
+        end
+
+        # Transform object to Kaui model
+        tenant_model = Kaui::Tenant.new
+        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 KillBillClient::API::Conflict => _e
+        # tenant api_key was found but has a wrong api_secret
+        flash[:error] = "Submitted credentials for #{param_tenant[:api_key]} did not match the expected credentials."
+        redirect_to admin_tenants_path and return
+      rescue StandardError => e
+        flash[:error] = "Failed to create the tenant: #{as_string(e)}"
+        redirect_to admin_tenants_path and return
+      end
+
+      # Select the tenant, see TenantsController
+      session[:kb_tenant_id] = tenant_model.kb_tenant_id
+      session[:kb_tenant_name] = tenant_model.name
+      session[:tenant_id] = tenant_model.id
+
+      redirect_to admin_tenant_path(tenant_model[:id]), notice: 'Tenant was successfully configured'
+    end
+
     def upload_catalog
       current_tenant = safely_find_tenant_by_id(params[:id])
 
@@ -158,7 +158,7 @@ module Kaui
       end
       if catalog_validation_errors.blank?
         Kaui::AdminTenant.upload_catalog(catalog_xml, options[:username], nil, comment, options)
-        redirect_to admin_tenant_path(current_tenant.id), notice: I18n.translate('flashes.notices.catalog_uploaded_successfully')
+        redirect_to admin_tenant_path(current_tenant.id), notice: I18n.t('flashes.notices.catalog_uploaded_successfully')
       else
         errors = ''
         catalog_validation_errors.each do |validation_error|
@@ -234,7 +234,7 @@ module Kaui
       options = tenant_options_for_client
       fetch_state_for_new_catalog_screen(options)
 
-      simple_plan = params.require(:simple_plan).delete_if { |_e, value| value.blank? }
+      simple_plan = params.require(:simple_plan).permit!.to_h.compact_blank
       # Fix issue in Rails where first entry in the multi-select array is an empty string
       simple_plan['available_base_products']&.reject!(&:blank?)
 
@@ -298,12 +298,12 @@ module Kaui
       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? }
-      view_form_model['states'] = view_form_model['states'].values unless view_form_model['states'].blank?
+      view_form_model = params.require(:kill_bill_client_model_overdue).permit!.to_h.compact_blank
+      view_form_model['states'] = view_form_model['states'].values if view_form_model['states'].present?
 
       overdue = Kaui::Overdue.from_overdue_form_model(view_form_model)
       Kaui::Overdue.upload_tenant_overdue_config_json(overdue.to_json, options[:username], nil, comment, options)
-      redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.translate('flashes.notices.overdue_added_successfully')
+      redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_added_successfully')
     end
 
     def upload_overdue_config
@@ -319,13 +319,13 @@ module Kaui
       begin
         Nokogiri::XML(overdue_config_xml, &:strict)
       rescue Nokogiri::XML::SyntaxError => e
-        flash[:error] = I18n.translate('errors.messages.invalid_xml', error: e)
+        flash[:error] = I18n.t('errors.messages.invalid_xml', error: e)
         redirect_to admin_tenant_path(current_tenant.id) and return
       end
 
       Kaui::AdminTenant.upload_overdue_config(overdue_config_xml, options[:username], nil, comment, options)
 
-      redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.translate('flashes.notices.overdue_uploaded_successfully')
+      redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_uploaded_successfully')
     end
 
     def upload_invoice_template
@@ -341,7 +341,7 @@ module Kaui
 
       Kaui::AdminTenant.upload_invoice_template(invoice_template, is_manual_pay, true, options[:username], nil, comment, options)
 
-      redirect_to admin_tenant_path(current_tenant.id), notice: I18n.translate('flashes.notices.invoice_template_uploaded_successfully')
+      redirect_to admin_tenant_path(current_tenant.id), notice: I18n.t('flashes.notices.invoice_template_uploaded_successfully')
     end
 
     def upload_invoice_translation
@@ -357,7 +357,7 @@ module Kaui
 
       Kaui::AdminTenant.upload_invoice_translation(invoice_translation, locale, true, options[:username], nil, comment, options)
 
-      redirect_to admin_tenant_path(current_tenant.id), notice: I18n.translate('flashes.notices.invoice_translation_uploaded_successfully')
+      redirect_to admin_tenant_path(current_tenant.id), notice: I18n.t('flashes.notices.invoice_translation_uploaded_successfully')
     end
 
     def upload_catalog_translation
@@ -373,7 +373,7 @@ module Kaui
 
       Kaui::AdminTenant.upload_catalog_translation(catalog_translation, locale, true, options[:username], nil, comment, options)
 
-      redirect_to admin_tenant_path(current_tenant.id), notice: I18n.translate('flashes.notices.catalog_translation_uploaded_successfully')
+      redirect_to admin_tenant_path(current_tenant.id), notice: I18n.t('flashes.notices.catalog_translation_uploaded_successfully')
     end
 
     def upload_plugin_config
@@ -407,18 +407,18 @@ module Kaui
       au = Kaui::AllowedUser.find(params.require(:allowed_user).require(:id))
 
       unless current_user.root?
-        render json: { alert: 'Only the root user can remove users from tenants' }.to_json, status: 401
+        render json: { alert: 'Only the root user can remove users from tenants' }.to_json, status: :unauthorized
         return
       end
 
       # remove the association
       au.kaui_tenants.delete current_tenant
-      render json: '{}', status: 200
+      render json: '{}', status: :ok
     end
 
     def add_allowed_user
       current_tenant = safely_find_tenant_by_id(params[:tenant_id])
-      allowed_user = Kaui::AllowedUser.find_by_kb_username(params.require(:allowed_user).require(:kb_username))
+      allowed_user = Kaui::AllowedUser.find_by(kb_username: params.require(:allowed_user).require(:kb_username))
 
       unless current_user.root?
         flash[:error] = 'Only the root user can add users from tenants'
@@ -498,10 +498,10 @@ module Kaui
 
       if params[:commit] == 'Submit'
         date = Date.parse(params[:new_date]).strftime('%Y-%m-%d')
-        msg = I18n.translate('flashes.notices.clock_updated_successfully', new_date: date)
+        msg = I18n.t('flashes.notices.clock_updated_successfully', new_date: date)
       else
         date = nil
-        msg = I18n.translate('flashes.notices.clock_reset_successfully')
+        msg = I18n.t('flashes.notices.clock_reset_successfully')
       end
 
       begin
@@ -515,7 +515,7 @@ module Kaui
     end
 
     def switch_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 the tenant, see TenantsController
       session[:kb_tenant_id] = tenant.kb_tenant_id
@@ -560,7 +560,7 @@ module Kaui
     end
 
     def safely_find_tenant_by_id(tenant_id)
-      tenant = Kaui::Tenant.find_by_id(tenant_id)
+      tenant = Kaui::Tenant.find_by(id: tenant_id)
       raise ActiveRecord::RecordNotFound, "Could not find tenant #{tenant_id}" unless retrieve_tenants_for_current_user.include?(tenant.kb_tenant_id)
 
       tenant
@@ -606,7 +606,7 @@ module Kaui
       end
 
       catalog_xml = {}
-      catalog_xml = response[0][:xml] unless response.blank?
+      catalog_xml = response[0][:xml] if response.present?
 
       catalog_xml
     end

data/app/controllers/kaui/audit_logs_controller.rb

@@ -76,7 +76,7 @@ module Kaui
         end
       end
 
-      send_data csv_file, type: 'text/csv', filename: "audit-logs-#{Date.today}.csv"
+      send_data csv_file, type: 'text/csv', filename: "audit-logs-#{Time.zone.today}.csv"
     end
 
     def history

data/app/controllers/kaui/chargebacks_controller.rb

@@ -29,7 +29,7 @@ module Kaui
           account.bundles(cached_options_for_klient).each do |bundle|
             bundle.subscriptions.each do |subscription|
               # Already cancelled?
-              next unless subscription.billing_end_date.blank?
+              next if subscription.billing_end_date.present?
 
               # Cancel the entitlement immediately but use the default billing policy
               entitlement = Kaui::Subscription.new(subscription_id: subscription.subscription_id)

data/app/controllers/kaui/charges_controller.rb

@@ -19,13 +19,16 @@ module Kaui
     end
 
     def create
-      charge = Kaui::InvoiceItem.new(params.require(:invoice_item).delete_if { |_key, value| value.blank? })
+      charge = Kaui::InvoiceItem.new(params.require(:invoice_item).permit!.to_h.compact_blank)
       charge.account_id ||= params.require(:account_id)
 
+      # Preserve the original invoice_id since the API may not return it
+      original_invoice_id = charge.invoice_id
+
       auto_commit = params[:auto_commit] == '1'
 
       charge = charge.create(auto_commit, 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'
+      redirect_to kaui_engine.account_invoice_path(charge.account_id, charge.invoice_id || original_invoice_id), notice: 'Charge was successfully created'
     end
   end
 end

data/app/controllers/kaui/credits_controller.rb

@@ -19,7 +19,7 @@ module Kaui
     end
 
     def create
-      credit = Kaui::Credit.new(params[:credit].delete_if { |_key, value| value.blank? })
+      credit = Kaui::Credit.new(params[:credit].permit!.to_h.compact_blank)
       credit.account_id ||= params.require(:account_id)
 
       # No need to show the newly created invoice for account level credits