kaui 3.0.1 → 3.0.3

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -130,9 +130,23 @@ module Kaui
       uploaded_catalog = params.require(:catalog)
       catalog_xml = uploaded_catalog.read
 
-      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')
+      validate_response = Kaui::Catalog.validate_catalog(catalog_xml, options[:username], nil, comment, options)
+      catalog_validation_errors = begin
+        JSON.parse(validate_response.response.body)['catalogValidationErrors']
+      rescue StandardError
+        nil
+      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')
+      else
+        errors = ''
+        catalog_validation_errors.each do |validation_error|
+          errors += (validation_error['errorDescription'])
+        end
+        flash[:error] = errors
+        redirect_to admin_tenant_new_catalog_path(id: current_tenant.id)
+      end
     end
 
     def new_catalog
@@ -174,7 +188,7 @@ module Kaui
       options[:api_key] = @tenant.api_key
       options[:api_secret] = @tenant.api_secret
 
-      catalog = Kaui::Catalog.get_catalog_json(true, nil, options)
+      catalog = Kaui::Catalog.get_catalog_json(true, nil, nil, options)
 
       # seek if plan id exists
       catalog.products.each do |product|
@@ -434,16 +448,15 @@ module Kaui
 
         catalog = []
         result = begin
-          Kaui::Catalog.get_catalog_json(false, effective_date, options)
+          Kaui::Catalog.get_catalog_json(false, effective_date, nil, options)
         rescue StandardError
           catalog = []
         end
 
         # convert result to a full hash since dynamic attributes of a class are ignored when converting to json
         result.each do |data|
-          plans = []
-          data[:plans].each do |plan|
-            plans << plan.instance_variables.each_with_object({}) { |var, hash_plan| hash_plan[var.to_s.delete('@')] = plan.instance_variable_get(var) }
+          plans = data[:plans].map do |plan|
+            plan.instance_variables.each_with_object({}) { |var, hash_plan| hash_plan[var.to_s.delete('@')] = plan.instance_variable_get(var) }
           end
 
           catalog << { version_date: data[:version_date],
@@ -475,7 +488,7 @@ module Kaui
       options[:api_key] = @tenant.api_key
       options[:api_secret] = @tenant.api_secret
 
-      latest_catalog = Kaui::Catalog.get_catalog_json(true, nil, options)
+      latest_catalog = Kaui::Catalog.get_catalog_json(true, nil, nil, options)
       @all_plans = latest_catalog ? (latest_catalog.products || []).map(&:plans).flatten.map(&:name) : []
 
       @ao_mapping = Kaui::Catalog.build_ao_mapping(latest_catalog)

data/app/controllers/kaui/audit_logs_controller.rb

@@ -68,7 +68,7 @@ module Kaui
           when 'CUSTOM_FIELD'
             audit_logs_with_history = Kaui::CustomField.new({ custom_field_id: object_id }).audit_logs_with_history(cached_options_for_klient)
           when 'INVOICE'
-            invoice = Kaui::Invoice.find_by_id(object_id, 'NONE', cached_options_for_klient)
+            invoice = Kaui::Invoice.find_by_id(object_id, false, 'NONE', cached_options_for_klient)
             audit_logs_with_history = invoice.audit_logs_with_history(cached_options_for_klient)
           when 'INVOICE_ITEM'
             invoice_item = Kaui::InvoiceItem.new
@@ -84,10 +84,10 @@ module Kaui
             payment = Kaui::Payment.find_by_id(object_id, false, false, cached_options_for_klient)
             audit_logs_with_history = payment.audit_logs_with_history(cached_options_for_klient)
           when 'PAYMENT_METHOD'
-            payment_method = Kaui::PaymentMethod.find_by_id(object_id, false, cached_options_for_klient)
+            payment_method = Kaui::PaymentMethod.find_by_id(object_id, false, false, [], 'NONE', cached_options_for_klient)
             audit_logs_with_history = payment_method.audit_logs_with_history(cached_options_for_klient)
           when 'SUBSCRIPTION'
-            subscription = Kaui::Subscription.find_by_id(object_id, cached_options_for_klient)
+            subscription = Kaui::Subscription.find_by_id(object_id, 'NONE', cached_options_for_klient)
             audit_logs_with_history = subscription.audit_logs_with_history(cached_options_for_klient)
           when 'SUBSCRIPTION_EVENT'
             audit_logs_with_history = Kaui::Subscription.event_audit_logs_with_history(object_id, cached_options_for_klient)

data/app/controllers/kaui/bundle_tags_controller.rb

@@ -18,7 +18,7 @@ module Kaui
       bundle_id = params.require(:bundle_id)
 
       tags = []
-      params.each do |tag, _tag_name|
+      params.each_key do |tag|
         tag_info = tag.split('_')
         next if (tag_info.size != 2) || (tag_info[0] != 'tag')
 

data/app/controllers/kaui/charges_controller.rb

@@ -7,7 +7,7 @@ module Kaui
       amount = params[:amount]
 
       if invoice_id.present?
-        @invoice = Kaui::Invoice.find_by_id(invoice_id, 'NONE', options_for_klient)
+        @invoice = Kaui::Invoice.find_by_id(invoice_id, false, 'NONE', options_for_klient)
         amount ||= @invoice.balance
         currency = @invoice.currency
       else

data/app/controllers/kaui/credits_controller.rb

@@ -7,7 +7,7 @@ module Kaui
       amount = params[:amount]
 
       if invoice_id.present?
-        @invoice = Kaui::Invoice.find_by_id(invoice_id, 'NONE', options_for_klient)
+        @invoice = Kaui::Invoice.find_by_id(invoice_id, false, 'NONE', options_for_klient)
         amount ||= @invoice.balance
         currency = @invoice.currency
       else

data/app/controllers/kaui/custom_fields_controller.rb

@@ -71,7 +71,7 @@ module Kaui
         end
       when :SUBSCRIPTION
         begin
-          test_uuid = Kaui::Subscription.find_by_id(param_uuid, options_for_klient)
+          test_uuid = Kaui::Subscription.find_by_id(param_uuid, 'NONE', options_for_klient)
         rescue StandardError
           # Ignore
         end
@@ -163,7 +163,7 @@ module Kaui
         end
       when  'SUBSCRIPTION'
         begin
-          test_uuid = Kaui::Subscription.find_by_id(param_uuid, options_for_klient)
+          test_uuid = Kaui::Subscription.find_by_id(param_uuid, 'NONE', options_for_klient)
         rescue StandardError
           # Ignore
         ensure
@@ -172,7 +172,7 @@ module Kaui
       when  'INVOICE'
         begin
           cached_options_for_klient = options_for_klient
-          test_uuid = Kaui::Invoice.find_by_id(param_uuid, 'FULL', cached_options_for_klient)
+          test_uuid = Kaui::Invoice.find_by_id(param_uuid, false, 'FULL', cached_options_for_klient)
         rescue StandardError
           # Ignore
         ensure

data/app/controllers/kaui/engine_controller_util.rb

@@ -37,7 +37,7 @@ module Kaui
       pages ||= []
 
       # Until we support server-side sorting
-      ordering = ((params[:order] || {})[:'0'] || {})
+      ordering = (params[:order] || {})[:'0'] || {}
       ordering_column = (ordering[:column] || 0).to_i
       ordering_dir = ordering[:dir] || 'asc'
       unless search_key.nil?

data/app/controllers/kaui/home_controller.rb

@@ -52,15 +52,23 @@ module Kaui
     end
 
     def invoice_search(search_query, search_by = nil, fast = 0, options = {})
-      if search_by == 'ID'
+      case search_by
+      when 'ID'
         begin
-          invoice = Kaui::Invoice.find_by_id(search_query, 'NONE', options)
+          invoice = Kaui::Invoice.find_by_id(search_query, false, 'NONE', options)
           redirect_to account_invoice_path(invoice.account_id, invoice.invoice_id) and return
         rescue KillBillClient::API::NotFound => _e
           search_error("No invoice matches \"#{search_query}\"")
         end
-      elsif search_by == 'EXTERNAL_KEY'
-        unsupported_external_key_search('INVOICE')
+      when 'EXTERNAL_KEY'
+        unsupported_search_field('INVOICE', search_by)
+      when 'NUMBER'
+        begin
+          invoice = Kaui::Invoice.find_by_number(search_query, false, 'NONE', options)
+          redirect_to account_invoice_path(invoice.account_id, invoice.invoice_id) and return
+        rescue KillBillClient::API::NotFound, KillBillClient::API::BadRequest => _e
+          search_error("No invoice matches \"#{search_query}\"")
+        end
       else
         invoice = Kaui::Invoice.list_or_search(search_query, 0, 1, options).first
         if invoice.blank?
@@ -108,14 +116,14 @@ module Kaui
     def transaction_search(search_query, search_by = nil, _fast = 0, options = {})
       if search_by.blank? || search_by == 'ID'
         begin
-          payment = Kaui::Payment.find_by_transaction_id(search_query, false, true, options)
+          payment = Kaui::Payment.find_by_transaction_id(search_query, false, true, [], 'NONE', options)
           redirect_to account_payment_path(payment.account_id, payment.payment_id) and return
         rescue KillBillClient::API::NotFound => _e
           search_error("No transaction matches \"#{search_query}\"")
         end
       else
         begin
-          payment = Kaui::Payment.find_by_transaction_external_key(search_query, false, true, 'NONE', options)
+          payment = Kaui::Payment.find_by_transaction_external_key(search_query, false, true, [], 'NONE', options)
           redirect_to account_payment_path(payment.account_id, payment.payment_id) and return
         rescue KillBillClient::API::NotFound => _e
           search_error("No transaction matches \"#{search_query}\"")
@@ -157,7 +165,7 @@ module Kaui
           search_error("No credit matches \"#{search_query}\"")
         end
       else
-        unsupported_external_key_search('CREDIT')
+        unsupported_search_field('CREDIT', search_by)
       end
     end
 
@@ -170,7 +178,7 @@ module Kaui
           redirect_to custom_fields_path(q: search_query, fast:)
         end
       else
-        unsupported_external_key_search('CUSTOM FIELD')
+        unsupported_search_field('CUSTOM FIELD', search_by)
       end
     end
 
@@ -183,20 +191,20 @@ module Kaui
           search_error("No invoice payment matches \"#{search_query}\"")
         end
       else
-        unsupported_external_key_search('INVOICE PAYMENT')
+        unsupported_search_field('INVOICE PAYMENT', search_by)
       end
     end
 
     def subscription_search(search_query, search_by = nil, _fast = 0, options = {})
       if search_by.blank? || search_by == 'ID'
         begin
-          subscription = Kaui::Subscription.find_by_id(search_query, options)
+          subscription = Kaui::Subscription.find_by_id(search_query, 'NONE', options)
           redirect_to account_bundles_path(subscription.account_id) and return
         rescue KillBillClient::API::NotFound => _e
           search_error("No subscription matches \"#{search_query}\"")
         end
       else
-        unsupported_external_key_search('SUBSCRIPTION')
+        unsupported_search_field('SUBSCRIPTION', search_by)
       end
     end
 
@@ -209,7 +217,7 @@ module Kaui
           redirect_to tags_path(q: search_query, fast:)
         end
       else
-        unsupported_external_key_search('TAG')
+        unsupported_search_field('TAG', search_by)
       end
     end
 
@@ -222,7 +230,7 @@ module Kaui
           search_error("No tag definition matches \"#{search_query}\"")
         end
       elsif search_by == 'EXTERNAL_KEY'
-        unsupported_external_key_search('TAG DEFINITION')
+        unsupported_search_field('TAG DEFINITION', search_by)
       else
         tag_definition = Kaui::TagDefinition.find_by_name(search_query, 'NONE', options)
         if tag_definition.blank?
@@ -238,8 +246,9 @@ module Kaui
       end
     end
 
-    def unsupported_external_key_search(object_type)
-      search_error("\"#{object_type}\": Search by \"EXTERNAL KEY\" is not supported.")
+    def unsupported_search_field(object_type, object_field)
+      field_name = object_field.gsub('_', ' ')
+      search_error("\"#{object_type}\": Search by \"#{field_name}\" is not supported.")
     end
 
     def search_error(message)
@@ -267,7 +276,7 @@ module Kaui
         '0'
       end
 
-      search_error("\"#{search_by}\" is not a valid search by value") if !search_by.blank? && !%w[ID EXTERNAL_KEY].include?(search_by)
+      search_error("\"#{search_by}\" is not a valid search by value") if !search_by.blank? && !search_by.in?(Kaui::ObjectHelper::ADVANCED_SEARCH_OBJECT_FIELDS)
 
       [object_type, search_for, search_by, fast]
     end

data/app/controllers/kaui/invoice_items_controller.rb

@@ -7,7 +7,7 @@ module Kaui
       invoice_id = params.require(:invoice_id)
 
       # See https://github.com/killbill/killbill/issues/7
-      invoice = Kaui::Invoice.find_by_id(invoice_id, 'NONE', options_for_klient)
+      invoice = Kaui::Invoice.find_by_id(invoice_id, false, 'NONE', options_for_klient)
       @invoice_item = invoice.items.find { |ii| ii.invoice_item_id == invoice_item_id }
 
       return unless @invoice_item.nil?

data/app/controllers/kaui/invoice_tags_controller.rb

@@ -18,7 +18,7 @@ module Kaui
       invoice_id = params.require(:invoice_id)
 
       tags = []
-      params.each do |tag, _tag_name|
+      params.each_key do |tag|
         tag_info = tag.split('_')
         next if (tag_info.size != 2) || (tag_info[0] != 'tag')
 

data/app/controllers/kaui/invoices_controller.rb

@@ -39,7 +39,7 @@ module Kaui
         end
         formatter = lambda do |invoice|
           row = [view_context.link_to(invoice.invoice_number, view_context.url_for(controller: :invoices, action: :show, account_id: invoice.account_id, id: invoice.invoice_id))]
-          row += Kaui.invoice_search_columns.call(invoice, view_context)[1]
+          row += Kaui.invoice_search_columns.call(invoice, view_context, cached_options_for_klient)[1]
           row
         end
       else
@@ -67,7 +67,7 @@ module Kaui
       # Go to the database once
       cached_options_for_klient = options_for_klient
 
-      @invoice = Kaui::Invoice.find_by_id(params.require(:id), 'FULL', cached_options_for_klient)
+      @invoice = Kaui::Invoice.find_by_id(params.require(:id), false, 'FULL', cached_options_for_klient)
       # This will put the TAX items at the bottom
       precedence = {
         'EXTERNAL_CHARGE' => 0,
@@ -132,7 +132,7 @@ module Kaui
 
     def void_invoice
       cached_options_for_klient = options_for_klient
-      invoice = KillBillClient::Model::Invoice.find_by_id(params.require(:id), 'NONE', cached_options_for_klient)
+      invoice = KillBillClient::Model::Invoice.find_by_id(params.require(:id), false, 'NONE', cached_options_for_klient)
       begin
         invoice.void(current_user.kb_username, params[:reason], params[:comment], cached_options_for_klient)
         redirect_to account_invoice_path(invoice.account_id, invoice.invoice_id), notice: 'Invoice successfully voided'
@@ -143,7 +143,12 @@ module Kaui
     end
 
     def restful_show
-      invoice = Kaui::Invoice.find_by_id(params.require(:id), 'NONE', options_for_klient)
+      invoice = Kaui::Invoice.find_by_id(params.require(:id), false, 'NONE', options_for_klient)
+      redirect_to account_invoice_path(invoice.account_id, invoice.invoice_id)
+    end
+
+    def restful_show_by_number
+      invoice = Kaui::Invoice.find_by_number(params.require(:number), false, 'NONE', options_for_klient)
       redirect_to account_invoice_path(invoice.account_id, invoice.invoice_id)
     end
 
@@ -153,7 +158,7 @@ module Kaui
 
     def commit_invoice
       cached_options_for_klient = options_for_klient
-      invoice = KillBillClient::Model::Invoice.find_by_id(params.require(:id), 'NONE', cached_options_for_klient)
+      invoice = KillBillClient::Model::Invoice.find_by_id(params.require(:id), false, 'NONE', cached_options_for_klient)
       invoice.commit(current_user.kb_username, params[:reason], params[:comment], cached_options_for_klient)
       redirect_to account_invoice_path(invoice.account_id, invoice.invoice_id), notice: 'Invoice successfully committed'
     end

data/app/controllers/kaui/payment_methods_controller.rb

@@ -47,7 +47,7 @@ module Kaui
       }
 
       @plugin_properties = begin
-        params[:plugin_properties].values.reject { |item| (item['value'].blank? || item['key'].blank?) }
+        params[:plugin_properties].values.reject { |item| item['value'].blank? || item['key'].blank? }
       rescue StandardError
         @plugin_properties = nil
       end
@@ -74,7 +74,7 @@ module Kaui
     def destroy
       payment_method_id = params[:id]
 
-      payment_method = Kaui::PaymentMethod.find_by_id(payment_method_id, false, options_for_klient)
+      payment_method = Kaui::PaymentMethod.find_by_id(payment_method_id, false, false, [], 'NONE', options_for_klient)
       begin
         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"
@@ -89,7 +89,7 @@ module Kaui
     end
 
     def restful_show
-      payment_method = Kaui::PaymentMethod.find_by_id(params.require(:id), false, options_for_klient)
+      payment_method = Kaui::PaymentMethod.find_by_id(params.require(:id), false, false, [], 'NONE', options_for_klient)
       redirect_to kaui_engine.account_path(payment_method.account_id)
     end
 
@@ -98,7 +98,7 @@ module Kaui
         external_key = params.require(:external_key)
 
         begin
-          payment_methods = Kaui::PaymentMethod.find_by_external_key(external_key, false, false, 'NONE', options_for_klient)
+          payment_methods = Kaui::PaymentMethod.find_by_external_key(external_key, false, false, [], 'NONE', options_for_klient)
         rescue KillBillClient::API::NotFound
           payment_methods = nil
         end

data/app/controllers/kaui/payments_controller.rb

@@ -78,7 +78,7 @@ module Kaui
 
     def new
       cached_options_for_klient = options_for_klient
-      fetch_invoice = promise { Kaui::Invoice.find_by_id(params.require(:invoice_id), 'NONE', cached_options_for_klient) }
+      fetch_invoice = promise { Kaui::Invoice.find_by_id(params.require(:invoice_id), false, 'NONE', cached_options_for_klient) }
       fetch_payment_methods = promise { Kaui::PaymentMethod.find_all_by_account_id(params.require(:account_id), false, cached_options_for_klient) }
 
       @invoice = wait(fetch_invoice)

data/app/controllers/kaui/refunds_controller.rb

@@ -5,8 +5,9 @@ module Kaui
     def new
       cached_options_for_klient = options_for_klient
 
-      fetch_invoice = promise { Kaui::Invoice.find_by_id(params.require(:invoice_id), 'NONE', cached_options_for_klient) }
+      fetch_invoice = promise { Kaui::Invoice.find_by_id(params.require(:invoice_id), false, 'NONE', cached_options_for_klient) }
       fetch_payment = promise { Kaui::InvoicePayment.find_by_id(params.require(:payment_id), false, false, cached_options_for_klient) }
+
       fetch_bundles = promise { @account.bundles(cached_options_for_klient) }
 
       @invoice = wait(fetch_invoice)
@@ -18,7 +19,7 @@ module Kaui
 
     # rubocop:disable Lint/FloatComparison
     def create
-      invoice = Kaui::Invoice.find_by_id(params.require(:invoice_id), 'NONE', options_for_klient)
+      invoice = Kaui::Invoice.find_by_id(params.require(:invoice_id), false, 'NONE', options_for_klient)
 
       if params[:adjustment_type] == 'invoiceItemAdjustment'
         items = []

data/app/controllers/kaui/subscriptions_controller.rb

@@ -72,7 +72,7 @@ module Kaui
     end
 
     def edit
-      @subscription = Kaui::Subscription.find_by_id(params.require(:id), options_for_klient)
+      @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))
@@ -86,7 +86,7 @@ module Kaui
 
       wait_for_completion = params[:wait_for_completion] == '1'
 
-      subscription = Kaui::Subscription.find_by_id(params.require(:id), options_for_klient)
+      subscription = Kaui::Subscription.find_by_id(params.require(:id), 'NONE', options_for_klient)
 
       input = { planName: plan_name }
 
@@ -124,13 +124,13 @@ module Kaui
                                        else
                                          nil
                                        end
-      subscription = Kaui::Subscription.find_by_id(params.require(:id), options_for_klient)
+      subscription = Kaui::Subscription.find_by_id(params.require(:id), 'NONE', options_for_klient)
       subscription.cancel(current_user.kb_username, params[:reason], params[:comment], requested_date, entitlement_policy, billing_policy, use_requested_date_for_billing, options_for_klient)
       redirect_to kaui_engine.account_bundles_path(subscription.account_id), notice: 'Subscription was successfully cancelled'
     end
 
     def reinstate
-      subscription = Kaui::Subscription.find_by_id(params.require(:id), options_for_klient)
+      subscription = Kaui::Subscription.find_by_id(params.require(:id), 'NONE', options_for_klient)
 
       subscription.uncancel(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
 
@@ -138,7 +138,7 @@ module Kaui
     end
 
     def edit_bcd
-      @subscription = Kaui::Subscription.find_by_id(params.require(:id), options_for_klient)
+      @subscription = Kaui::Subscription.find_by_id(params.require(:id), 'NONE', options_for_klient)
     end
 
     def update_bcd
@@ -158,7 +158,7 @@ module Kaui
     end
 
     def restful_show
-      subscription = Kaui::Subscription.find_by_id(params.require(:id), options_for_klient)
+      subscription = Kaui::Subscription.find_by_id(params.require(:id), 'NONE', options_for_klient)
       redirect_to kaui_engine.account_bundles_path(subscription.account_id)
     end
 
@@ -181,7 +181,7 @@ module Kaui
         external_key = params.require(:external_key)
 
         begin
-          subscription = Kaui::Subscription.find_by_external_key(external_key, options_for_klient)
+          subscription = Kaui::Subscription.find_by_external_key(external_key, 'NONE', options_for_klient)
         rescue KillBillClient::API::NotFound
           subscription = nil
         end
@@ -192,11 +192,12 @@ module Kaui
 
     def update_tags
       subscription_id = params.require(:id)
-      subscription = Kaui::Subscription.find_by_id(subscription_id, options_for_klient)
-
+      subscription = Kaui::Subscription.find_by_id(subscription_id, 'NONE', options_for_klient)
       tags = []
-      params.each do |tag|
-        tag_info = tag.split('_')
+      params.each_key do |key|
+        next unless key.include? 'tag'
+
+        tag_info = key.split('_')
         next if (tag_info.size != 2) || (tag_info[0] != 'tag')
 
         tags << tag_info[1]
@@ -210,7 +211,7 @@ module Kaui
 
     def lookup_bundle_and_plan_details(subscription, base_product_name = nil)
       if subscription.product_category == 'ADD_ON'
-        bundle = Kaui::Bundle.find_by_id(@subscription.bundle_id, options_for_klient)
+        bundle = Kaui::Bundle.find_by_id(subscription.bundle_id, options_for_klient)
         if base_product_name.blank?
           bundle.subscriptions.each do |sub|
             if sub.product_category == 'BASE'
@@ -222,17 +223,17 @@ module Kaui
         plans_details = Kaui::Catalog.available_addons(base_product_name, subscription.account_id, options_for_klient)
       else
         bundle = nil
-        plans_details = catalog_plans(subscription.product_category == 'BASE' ? nil : subscription.product_category)
+        plans_details = catalog_plans(subscription.product_category == 'BASE' ? nil : subscription.product_category, subscription.account_id)
       end
       [bundle, plans_details]
     end
 
-    def catalog_plans(product_category = nil)
-      return Kaui::Catalog.available_base_plans(@subscription.account_id, options_for_klient) if product_category == 'BASE'
+    def catalog_plans(product_category = nil, account_id = nil)
+      return Kaui::Catalog.available_base_plans(account_id, options_for_klient) if product_category == 'BASE'
 
       options = options_for_klient
 
-      catalog = Kaui::Catalog.get_tenant_catalog_json(DateTime.now.to_s, @subscription.account_id, options)
+      catalog = Kaui::Catalog.get_tenant_catalog_json(DateTime.now.to_s, account_id, options)
       return [] if catalog.blank?
 
       plans = []

data/app/controllers/kaui/transactions_controller.rb

@@ -3,7 +3,7 @@
 module Kaui
   class TransactionsController < Kaui::EngineController
     def restful_show
-      payment = Kaui::Payment.find_by_transaction_id(params.require(:id), false, true, options_for_klient)
+      payment = Kaui::Payment.find_by_transaction_id(params.require(:id), false, true, [], 'NONE', options_for_klient)
       redirect_to account_payment_path(payment.account_id, payment.payment_id)
     end
 
@@ -18,7 +18,7 @@ module Kaui
                                              currency: params[:currency],
                                              transaction_type: params[:transaction_type])
       else
-        payment = Kaui::Payment.find_by_transaction_id(transaction_id, false, false, options_for_klient)
+        payment = Kaui::Payment.find_by_transaction_id(transaction_id, false, false, [], 'NONE', options_for_klient)
         @transaction = Kaui::Transaction.build_from_raw_transaction(payment.transactions.find { |tx| tx.transaction_id == transaction_id })
       end
     end
@@ -26,7 +26,7 @@ module Kaui
     def create
       transaction = Kaui::Transaction.new(params[:transaction].delete_if { |_key, value| value.blank? })
 
-      plugin_properties = params[:plugin_properties].values.reject { |item| (item['value'].blank? || item['key'].blank?) } unless params[: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)

data/app/helpers/kaui/object_helper.rb

@@ -2,6 +2,13 @@
 
 module Kaui
   module ObjectHelper
+    ADVANCED_SEARCH_OBJECT_FIELDS = %w[ID EXTERNAL_KEY NUMBER].freeze
+    ADVANCED_SEARCH_OBJECT_FIELDS_MAP = {
+      # ID is supported by all object types, hence not listed.
+      EXTERNAL_KEY: %w[ACCOUNT PAYMENT TRANSACTION BUNDLE],
+      NUMBER: %w[INVOICE]
+    }.freeze
+
     # Because we don't have access to the account_id, we use the restful_show routes
     def url_for_object(object_id, object_type)
       case object_type
@@ -27,7 +34,15 @@ module Kaui
     end
 
     def object_types_for_advanced_search
-      %i[ACCOUNT BUNDLE INVOICE CREDIT CUSTOM_FIELD INVOICE_PAYMENT INVOICE PAYMENT SUBSCRIPTION TRANSACTION TAG TAG_DEFINITION]
+      %i[ACCOUNT BUNDLE INVOICE CREDIT CUSTOM_FIELD INVOICE_PAYMENT PAYMENT SUBSCRIPTION TRANSACTION TAG TAG_DEFINITION]
+    end
+
+    def object_fields_for_advanced_search
+      [' '] + ADVANCED_SEARCH_OBJECT_FIELDS
+    end
+
+    def advanced_search_object_fields_map
+      ADVANCED_SEARCH_OBJECT_FIELDS_MAP
     end
   end
 end

data/app/models/kaui/admin_tenant.rb

@@ -33,7 +33,7 @@ module Kaui
 
         raw_tenant_config.each_with_object({}) do |e, hsh|
           # Strip prefix '/PLUGIN_CONFIG_'
-          plugin_name = e.key.gsub!(/PLUGIN_CONFIG_/, '')
+          plugin_name = e.key.gsub!('PLUGIN_CONFIG_', '')
 
           # Construct simple hash with one property (first value)
           hsh[plugin_name] = e.values[0]

data/app/models/kaui/catalog.rb

@@ -35,8 +35,8 @@ module Kaui
         raise e
       end
 
-      def get_catalog_json(latest, requested_date, options)
-        catalogs = get_tenant_catalog_json(requested_date, nil, options)
+      def get_catalog_json(latest, requested_date, account_id, options)
+        catalogs = get_tenant_catalog_json(requested_date, account_id, options)
         return catalogs.length.positive? ? catalogs[catalogs.length - 1] : nil if latest
 
         # Order by latest

data/app/models/kaui/custom_field.rb

@@ -6,7 +6,7 @@ module Kaui
       if search_key.present?
         find_in_batches_by_search_key(search_key, offset, limit, options)
       else
-        find_in_batches(offset, limit, options)
+        find_in_batches(offset, limit, 'NONE', options)
       end
     end
   end

data/app/models/kaui/invoice_payment.rb

@@ -21,7 +21,7 @@ module Kaui
           result.send("#{attr}=", raw_payment.send(attr))
         end
         # Use  Kaui::Transaction to benefit from additional fields (e.g next_retry_date)
-        original_transactions = (result.transactions || [])
+        original_transactions = result.transactions || []
         result.transactions = []
         original_transactions.each do |transaction|
           new_transaction = Kaui::Transaction.new

data/app/models/kaui/overdue.rb

@@ -19,7 +19,7 @@ module Kaui
             state.subscription_cancellation_policy = nil
           else
             state.is_disable_entitlement = true
-            state.subscription_cancellation_policy = state_model['subscription_cancellation_policy'].blank? ? :NONE : state_model['subscription_cancellation_policy'].to_s.gsub!(/POLICY_/, '')
+            state.subscription_cancellation_policy = state_model['subscription_cancellation_policy'].blank? ? :NONE : state_model['subscription_cancellation_policy'].to_s.gsub!('POLICY_', '')
           end
 
           if state_model['condition']
@@ -60,7 +60,7 @@ module Kaui
             attr_accessor :subscription_cancellation
           end
           state.subscription_cancellation = if state.is_disable_entitlement
-                                              state.subscription_cancellation_policy ? "POLICY_#{state.subscription_cancellation_policy}".to_sym : :NONE
+                                              state.subscription_cancellation_policy ? :"POLICY_#{state.subscription_cancellation_policy}" : :NONE
                                             else
                                               :NONE
                                             end