kaui 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95dc79de55c417e61d67883ec040660bb28923268cc479b3fa0d027689bd007f
-  data.tar.gz: 722db58817b35d95ae08be67a131b85b1706868d73d0182bfa267a7007ea5eb2
+  metadata.gz: fdb45a75d2f3a57307ffe426a864911262563d623f25cccefd3941de52655e36
+  data.tar.gz: f45cbd12e90f63dfb544743381af6c4a2dbeab58fe0671334f02198bdeb97323
 SHA512:
-  metadata.gz: '091113972ba008f89462c312ea46f05f0510ed64dff52ecd5522af6eff02f8c61aeaea8cf92d89a405d6a893dfc1ee12f86268f895b3b77107a08722ba185f08'
-  data.tar.gz: bb5a5b1901b527d519503ca1a406afc86ac44025e51303ba6ab24403515c3ce61f2c2337d863db238418fbada9057243346be53c3e69547160ceaf0337b6c074
+  metadata.gz: 065274ae77055af9c3a54b7938f8c8f0d09775b5d7a7b4e953c990790ad7e4af247096b287f308062e53f09b13d16eda146ccd893c762baa3dc7ab644f8a3c01
+  data.tar.gz: 15cd32d52a680d624be8bf85f3db439f1afc78ad5d7308054fecf7aad66d130f8a5bd324ec93ba7fd140399be84f4eec6015e1c9a054f55f368f8c4202ecebfb

data/app/assets/images/kaui/logo.svg

@@ -0,0 +1,37 @@
+<svg width="138" height="36" viewBox="0 0 138 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.96891 13.6363L17.1663 16.2316L19.867 20.7179L7.22926 20.294L5.87472 17.7276C4.70442 15.5102 6.6717 12.9089 8.96891 13.6363Z" fill="url(#paint0_linear_5656_117635)"/>
+<path d="M2.73109 18.8862L23.0656 19.4261L31.0472 32.6526C31.9039 34.0722 30.9562 35.9453 29.3786 35.9506L14.6421 36C12.8282 36.0061 11.0908 35.2177 9.83259 33.8178L0.749744 23.712C-0.899153 21.8774 0.354861 18.8231 2.73109 18.8862Z" fill="url(#paint1_linear_5656_117635)"/>
+<path d="M20.5179 0.919922L15.7246 7.75567L23.189 11.3725L24.8913 4.89582L20.5179 0.919922Z" fill="url(#paint2_linear_5656_117635)"/>
+<path d="M27.5141 34.8764L15.4574 13.4093C14.4372 11.5929 14.565 9.35199 15.785 7.66255C16.4888 6.68792 17.8875 6.54241 18.778 7.35118L34.1718 21.3321C36.1567 23.1348 36.5779 26.0884 35.1757 28.371L31.1361 34.9469C30.2983 36.3107 28.2978 36.2717 27.5141 34.8764Z" fill="url(#paint3_linear_5656_117635)"/>
+<path d="M32.0753 11.0799L21.0977 3.84213C19.1972 2.5891 20.3796 -0.360792 22.623 0.0364992L27.8828 0.967948C29.1553 1.19329 30.1995 2.09954 30.5986 3.32489L32.9165 10.4422C33.0801 10.9445 32.5171 11.3713 32.0753 11.0799Z" fill="url(#paint4_linear_5656_117635)"/>
+<path d="M69.3857 29.5787C68.2643 29.5787 67.3552 28.684 67.3552 27.5803V14.5758C67.3552 13.4721 68.2643 12.5774 69.3857 12.5774C70.5072 12.5774 71.4163 13.4721 71.4163 14.5758V27.5803C71.4163 28.684 70.5072 29.5787 69.3857 29.5787ZM69.402 9.77566C68.6439 9.77566 68.0158 9.54218 67.5176 9.07523C67.0411 8.60827 66.8028 8.04581 66.8028 7.38783C66.8028 6.70862 67.0411 6.14616 67.5176 5.70043C68.0158 5.23348 68.6439 5 69.402 5C70.1601 5 70.7773 5.22286 71.2539 5.66859C71.752 6.0931 72.0011 6.63434 72.0011 7.29231C72.0011 7.99274 71.7629 8.58705 71.2863 9.07523C70.8098 9.54218 70.1817 9.77566 69.402 9.77566Z" fill="#293056"/>
+<path d="M77.4776 29.5787C76.3561 29.5787 75.447 28.684 75.447 27.5803V7.9536C75.447 6.84988 76.3561 5.95513 77.4776 5.95513C78.599 5.95513 79.5081 6.84988 79.5081 7.9536V27.5803C79.5081 28.684 78.599 29.5787 77.4776 29.5787Z" fill="#293056"/>
+<path d="M85.5694 29.5787C84.4479 29.5787 83.5388 28.684 83.5388 27.5803V7.9536C83.5388 6.84987 84.4479 5.95513 85.5694 5.95513C86.6908 5.95513 87.6 6.84988 87.6 7.9536V27.5803C87.6 28.684 86.6908 29.5787 85.5694 29.5787Z" fill="#293056"/>
+<path d="M119.786 29.5787C118.664 29.5787 117.755 28.684 117.755 27.5803V14.5758C117.755 13.4721 118.664 12.5774 119.786 12.5774C120.907 12.5774 121.816 13.4721 121.816 14.5758V27.5803C121.816 28.684 120.907 29.5787 119.786 29.5787ZM119.802 9.77566C119.044 9.77566 118.416 9.54218 117.918 9.07523C117.441 8.60827 117.203 8.04581 117.203 7.38783C117.203 6.70862 117.441 6.14616 117.918 5.70043C118.416 5.23348 119.044 5 119.802 5C120.56 5 121.177 5.22286 121.654 5.66859C122.152 6.0931 122.401 6.63434 122.401 7.29231C122.401 7.99274 122.163 8.58705 121.686 9.07523C121.21 9.54218 120.582 9.77566 119.802 9.77566Z" fill="#293056"/>
+<path d="M127.878 29.5787C126.756 29.5787 125.847 28.684 125.847 27.5803V7.9536C125.847 6.84987 126.756 5.95513 127.878 5.95513C128.999 5.95513 129.908 6.84988 129.908 7.9536V27.5803C129.908 28.684 128.999 29.5787 127.878 29.5787Z" fill="#293056"/>
+<path d="M135.969 29.5787C134.848 29.5787 133.939 28.684 133.939 27.5803V7.9536C133.939 6.84987 134.848 5.95513 135.969 5.95513C137.091 5.95513 138 6.84988 138 7.9536V27.5803C138 28.684 137.091 29.5787 135.969 29.5787Z" fill="#293056"/>
+<path d="M59.977 13.0294C60.2978 12.7387 60.7179 12.5774 61.1539 12.5774C62.702 12.5774 63.4773 14.4195 62.3826 15.4968L58.1099 19.7015L63.5453 26.4787C64.552 27.734 63.6435 29.5787 62.0187 29.5787C61.4331 29.5787 60.8787 29.319 60.5094 28.8718L55.0817 22.2982L52.0611 25.0975V27.5803C52.0611 28.684 51.152 29.5787 50.0306 29.5787C48.9091 29.5787 48 28.684 48 27.5803V7.9536C48 6.84987 48.9091 5.95513 50.0306 5.95513C51.152 5.95513 52.0611 6.84988 52.0611 7.9536V20.2027L59.977 13.0294Z" fill="#293056"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M106.399 29.8016C104.926 29.8016 103.615 29.4832 102.468 28.8465C101.774 28.4618 101.168 27.9611 100.648 27.3441V27.6762C100.648 28.7269 99.7826 29.5787 98.715 29.5787C97.6474 29.5787 96.7819 28.7269 96.7819 27.6762V7.9536C96.7819 6.84987 97.691 5.95513 98.8125 5.95513C99.9339 5.95513 100.843 6.84988 100.843 7.9536V14.6575C101.337 14.1191 101.9 13.6804 102.532 13.3415C103.702 12.7047 104.991 12.3864 106.399 12.3864C108.11 12.3864 109.615 12.7472 110.915 13.4688C112.236 14.1905 113.276 15.1987 114.034 16.4934C114.813 17.7882 115.203 19.3164 115.203 21.0781C115.203 22.8397 114.813 24.3679 114.034 25.6627C113.276 26.9574 112.236 27.9762 110.915 28.7191C109.615 29.4408 108.11 29.8016 106.399 29.8016ZM108.543 25.7582C107.785 26.1827 106.919 26.395 105.944 26.395C104.969 26.395 104.092 26.1827 103.312 25.7582C102.532 25.3337 101.915 24.7182 101.46 23.9116C101.006 23.1051 100.778 22.1605 100.778 21.0781C100.778 19.9743 101.006 19.0298 101.46 18.2445C101.915 17.4379 102.532 16.8224 103.312 16.3979C104.092 15.9734 104.969 15.7612 105.944 15.7612C106.919 15.7612 107.785 15.9734 108.543 16.3979C109.323 16.8224 109.94 17.4379 110.395 18.2445C110.85 19.0298 111.077 19.9743 111.077 21.0781C111.077 22.1605 110.85 23.1051 110.395 23.9116C109.94 24.7182 109.323 25.3337 108.543 25.7582Z" fill="#293056"/>
+<defs>
+<linearGradient id="paint0_linear_5656_117635" x1="6.3713" y1="14.584" x2="17.3232" y2="20.2038" gradientUnits="userSpaceOnUse">
+<stop stop-color="#004EEB"/>
+<stop offset="1" stop-color="#2970FF"/>
+</linearGradient>
+<linearGradient id="paint1_linear_5656_117635" x1="1.04487" y1="21.155" x2="29.4032" y2="32.4876" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2970FF"/>
+<stop offset="1" stop-color="#7CD4FD"/>
+</linearGradient>
+<linearGradient id="paint2_linear_5656_117635" x1="19.8881" y1="9.67384" x2="23.8884" y2="4.93559" gradientUnits="userSpaceOnUse">
+<stop stop-color="#A6EF67"/>
+<stop offset="1" stop-color="#FDE172"/>
+</linearGradient>
+<linearGradient id="paint3_linear_5656_117635" x1="15.1997" y1="8.83686" x2="29.3077" y2="34.3257" gradientUnits="userSpaceOnUse">
+<stop stop-color="#A6EF67"/>
+<stop offset="1" stop-color="#15B79E"/>
+</linearGradient>
+<linearGradient id="paint4_linear_5656_117635" x1="20.833" y1="1.40851" x2="32.7401" y2="9.43028" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FDE172"/>
+<stop offset="1" stop-color="#EAAA08"/>
+</linearGradient>
+</defs>
+</svg>

data/app/controllers/kaui/accounts_controller.rb

@@ -115,10 +115,9 @@ module Kaui
                                                end
 
       fetch_payment_methods_with_details = fetch_payment_methods.then do |pms|
-        ops = []
-        pms.each do |pm|
-          ops << promise do
-            Kaui::PaymentMethod.find_by_id(pm.payment_method_id, true, cached_options_for_klient)
+        ops = pms.map do |pm|
+          promise do
+            Kaui::PaymentMethod.find_by_id(pm.payment_method_id, false, true, [], 'NONE', cached_options_for_klient)
           rescue StandardError => e
             # Maybe the plugin is not registered or the plugin threw an exception
             Rails.logger.warn(e)
@@ -182,7 +181,7 @@ module Kaui
       invoice = nil
       begin
         invoice = if dry_run
-                    Kaui::Invoice.trigger_invoice_dry_run(account_id, target_date, false, options_for_klient)
+                    Kaui::Invoice.trigger_invoice_dry_run(account_id, target_date, false, [], current_user.kb_username, params[:reason], params[:comment], options_for_klient)
                   else
                     Kaui::Invoice.trigger_invoice(account_id, target_date, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
                   end
@@ -209,7 +208,7 @@ module Kaui
     # Fetched asynchronously, as it takes time. This also helps with enforcing permissions.
     def next_invoice_date
       json_response do
-        next_invoice = Kaui::Invoice.trigger_invoice_dry_run(params.require(:account_id), nil, true, options_for_klient)
+        next_invoice = Kaui::Invoice.trigger_invoice_dry_run(params.require(:account_id), nil, true, [], current_user.kb_username, params[:reason], params[:comment], options_for_klient)
         next_invoice ? next_invoice.target_date.to_json : nil
       end
     end

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
@@ -441,9 +455,8 @@ module Kaui
 
         # 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],

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/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/home_controller.rb

@@ -55,7 +55,7 @@ module Kaui
       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}\"")
@@ -64,7 +64,7 @@ module Kaui
         unsupported_search_field('INVOICE', search_by)
       when 'NUMBER'
         begin
-          invoice = Kaui::Invoice.find_by_number(search_query, 'NONE', options)
+          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}\"")
@@ -116,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}\"")
@@ -198,7 +198,7 @@ module Kaui
     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}\"")

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/invoices_controller.rb

@@ -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,12 +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), 'NONE', options_for_klient)
+      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
 
@@ -158,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

@@ -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,7 +192,7 @@ 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_key do |key|
         next unless key.include? 'tag'

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

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/payment_method.rb

@@ -11,12 +11,12 @@ module Kaui
     end
 
     def self.find_safely_by_id(id, options = {})
-      Kaui::PaymentMethod.find_by_id(id, true, options)
+      Kaui::PaymentMethod.find_by_id(id, false, true, [], 'NONE', options)
     rescue StandardError => e
       # Maybe the plugin is not registered or the plugin threw an exception
       Rails.logger.warn(e)
       begin
-        Kaui::PaymentMethod.find_by_id(id, false, options)
+        Kaui::PaymentMethod.find_by_id(id, false, true, [], 'NONE', options)
       rescue StandardError
         nil
       end
@@ -26,7 +26,7 @@ module Kaui
       pms = Kaui::PaymentMethod.find_all_by_account_id(account_id, false, options)
 
       pms.each_with_index do |pm, i|
-        pms[i] = Kaui::PaymentMethod.find_by_id(pm.payment_method_id, true, options)
+        pms[i] = Kaui::PaymentMethod.find_by_id(pm.payment_method_id, false, true, [], 'NONE', options)
       rescue StandardError => e
         # Maybe the plugin is not registered or the plugin threw an exception
         Rails.logger.warn(e)
@@ -49,7 +49,7 @@ module Kaui
 
         # The payment method may have been deleted
         payment_methods_cache[payment.payment_method_id] ||= begin
-          Kaui::PaymentMethod.find_by_id(payment.payment_method_id, true, options)
+          Kaui::PaymentMethod.find_by_id(payment.payment_method_id, false, true, [], 'NONE', options)
         rescue StandardError
           nil
         end

data/app/views/kaui/layouts/kaui_navbar.html.erb

@@ -3,7 +3,7 @@
     <div class="row">
 
       <div class="col-md-6">
-        <%= link_to image_tag('kaui/logo.png', :alt => 'Kill Bill Logo'), kaui_engine.home_path %>
+        <%= link_to image_tag('kaui/logo.svg', :alt => 'Kill Bill Logo'), kaui_engine.home_path %>
 
         <% if user_signed_in? -%>
             <% if tenant_selected? %>

data/lib/kaui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kaui
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 end

data/lib/tasks/kaui_tasks.rake

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :kaui do
 #   # Task goes here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-30 00:00:00.000000000 Z
+date: 2024-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -329,7 +329,7 @@ files:
 - Rakefile
 - app/assets/config/kaui_manifest.js
 - app/assets/images/kaui/duck.png
-- app/assets/images/kaui/logo.png
+- app/assets/images/kaui/logo.svg
 - app/assets/images/kaui/search.png
 - app/assets/images/kaui/search_white.png
 - app/assets/javascripts/application.js