kaui 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1d09c53f971465792983fa62e85842cf0f7807e429793bcfaf298129fc30720
-  data.tar.gz: 4536845ab8261e1e16ef4d9a8caba638e62fd4b02090fe0142430fb4d988e8ed
+  metadata.gz: 4f1640604b51f6dc5c1d70ed464a59445fd16fc830d69797bb73c18a351db03f
+  data.tar.gz: b385394d51aed523a26d34b437a7e4f8f869de07447b18a0fcce3d81948e275f
 SHA512:
-  metadata.gz: a3f5018cfde24d5a5a53634a3b4098bb45cd439e0bcad1497163bb928737e6b628b6af430f4e3ff4ba792ed0e72c25c57f7a34f20a49480480383c35e4ddf741
-  data.tar.gz: e4079ed0b2ec629b9fb1ea6fbbc4d617515ec78e2cc75cc4b2742578164c14e8b2d344ebeebba5e3ca83a7a100cf844f0d65cef93d0d770d7743c94444bbb8a9
+  metadata.gz: ca50c69637a9fa3e7b7bd866ad3ac638bf676e8f8a61ff8b56e68eb7591f59fefa6536739b8c326523cf7013502586b23edc7fe62a08766e586cbcc73996aa07
+  data.tar.gz: 2ef386342bd738b4089d50dd1621c2e5e0542c37099435ef8a80f5419a30dd956d478ea3762a553b741985c5f6e1878686d502915b02b2f47f471d671ff11746

data/app/assets/javascripts/kaui/kaui_override.js

@@ -132,12 +132,7 @@ jQuery(document).ready(function ($) {
 
     function set_first_name_length(name){
         var name_in_parts = name.trim().split(' ');
-
-        if (name_in_parts.length > 1){
-            $('#account_first_name_length').val(name_in_parts[0].length);
-        }else{
-            $('#account_first_name_length').val('');
-        }
+        $('#account_first_name_length').val(name_in_parts[0].length);
     }
 
 

data/app/controllers/kaui/accounts_controller.rb

@@ -135,12 +135,10 @@ module Kaui
       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) } }
       fetch_payment_methods = promise { Kaui::PaymentMethod.find_all_by_account_id(@account.account_id, false, cached_options_for_klient) }
-
-      # is email notification plugin available
-      is_email_notifications_plugin_available = Kenui::EmailNotificationService.email_notification_plugin_available?(cached_options_for_klient).first
+      is_email_notifications_plugin_available = Dependencies::Kenui::EmailNotification.email_notification_plugin_available?(cached_options_for_klient).first
       fetch_email_notification_configuration = if is_email_notifications_plugin_available
                                                  promise do
-                                                   Kenui::EmailNotificationService.get_configuration_per_account(params.require(:account_id), cached_options_for_klient)
+                                                   Dependencies::Kenui::EmailNotification.get_configuration_per_account(params.require(:account_id), cached_options_for_klient)
                                                  end.then do |configuration|
                                                    if configuration.first.is_a?(FalseClass)
                                                      Rails.logger.warn(configuration[1])
@@ -175,7 +173,7 @@ module Kaui
       @available_tags = wait(fetch_available_tags)
       @children = wait(fetch_children)
       @account_parent = @account.parent_account_id.nil? ? nil : wait(fetch_parent)
-      @email_notification_configuration = wait(fetch_email_notification_configuration) if is_email_notifications_plugin_available
+      @email_notification_configuration = is_email_notifications_plugin_available ? wait(fetch_email_notification_configuration) : []
 
       @last_transaction_by_payment_method_id = {}
       wait(fetch_payments).each do |payment|
@@ -345,15 +343,15 @@ module Kaui
       event_types = configuration[:event_types]
       cached_options_for_klient = options_for_klient
 
-      is_success, message = email_notification_plugin_available?(cached_options_for_klient)
+      is_success, message = Dependencies::Kenui::EmailNotification.email_notification_plugin_available?(cached_options_for_klient)
 
       if is_success
-        is_success, message = Kenui::EmailNotificationService.set_configuration_per_account(account_id,
-                                                                                            event_types,
-                                                                                            current_user.kb_username,
-                                                                                            params[:reason],
-                                                                                            params[:comment],
-                                                                                            cached_options_for_klient)
+        is_success, message = Dependencies::Kenui::EmailNotification.set_configuration_per_account(account_id,
+                                                                                                   event_types,
+                                                                                                   current_user.kb_username,
+                                                                                                   params[:reason],
+                                                                                                   params[:comment],
+                                                                                                   cached_options_for_klient)
       end
       if is_success
         flash[:notice] = message
@@ -365,7 +363,7 @@ module Kaui
 
     def events_to_consider
       json_response do
-        { data: Kenui::EmailNotificationService.get_events_to_consider(options_for_klient) }
+        { data: Dependencies::Kenui::EmailNotification.get_events_to_consider(options_for_klient) }
       end
     end
 
@@ -373,16 +371,5 @@ module Kaui
       data = KillBillClient::Model::Export.find_by_account_id(params[:account_id], current_user.kb_username, options_for_klient)
       send_data data, filename: "account#{params[:account_id]}.txt", type: :txt
     end
-
-    private
-
-    def email_notification_plugin_available?(options_for_klient)
-      error_message = 'Email notification plugin is not installed'
-
-      is_available = Kenui::EmailNotificationService.email_notification_plugin_available?(options_for_klient).first
-      [is_available, is_available ? nil : error_message]
-    rescue StandardError
-      [false, error_message]
-    end
   end
 end

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -142,7 +142,7 @@ module Kaui
       else
         errors = ''
         catalog_validation_errors.each do |validation_error|
-          errors += (validation_error['errorDescription'])
+          errors += validation_error['errorDescription']
         end
         flash[:error] = errors
         redirect_to admin_tenant_new_catalog_path(id: current_tenant.id)

data/app/controllers/kaui/engine_controller_util.rb

@@ -41,6 +41,7 @@ module Kaui
       # Until we support server-side sorting
       ordering = (params[:order] || {})[:'0'] || {}
       ordering_column = (ordering[:column] || 0).to_i
+      ordering_column = params[:colum_order][ordering_column].to_i if params[:colum_order].present?
       ordering_dir = ordering[:dir] || 'asc'
       unless search_key.nil?
         pages.sort! do |a, b|

data/app/controllers/kaui/invoices_controller.rb

@@ -70,13 +70,7 @@ module Kaui
                          end
                        else
                          lambda do |invoice, column|
-                           [
-                             invoice.invoice_number.to_i,
-                             invoice.invoice_date,
-                             invoice.amount,
-                             invoice.balance,
-                             invoice.status
-                           ][column]
+                           Kaui.account_invoices_columns.call(invoice, view_context)[2][column]
                          end
                        end
 

data/app/controllers/kaui/payments_controller.rb

@@ -118,15 +118,7 @@ module Kaui
       end
 
       data_extractor = lambda do |payment, column|
-        [
-          payment.payment_number.to_i,
-          payment.payment_date,
-          payment.total_authed_amount_to_money,
-          payment.paid_amount_to_money,
-          payment.returned_amount_to_money,
-          payment.transactions.empty? ? nil : payment.transactions[-1].status,
-          payment.payment_external_key
-        ][column]
+        Kaui.account_payments_columns.call(account, payment, view_context)[2][column]
       end
 
       formatter = lambda do |payment|

data/app/services/dependencies/kenui.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Dependencies
+  module Kenui
+    class EmailNotification
+      ERROR_MESSAGE = I18n.translate('errors.messages.email_notification_plugin_not_available')
+      class << self
+        def email_notification_plugin_available?(options_for_klient)
+          is_available = ::Kenui::EmailNotificationService.email_notification_plugin_available?(options_for_klient)
+          [is_available, is_available ? nil : ERROR_MESSAGE]
+        rescue StandardError
+          [false, ERROR_MESSAGE]
+        end
+
+        def set_configuration_per_account(account_id, event_types, kb_username, reason, comment, options_for_klient)
+          ::Kenui::EmailNotificationService.set_configuration_per_account(account_id,
+                                                                          event_types,
+                                                                          kb_username,
+                                                                          reason,
+                                                                          comment,
+                                                                          options_for_klient)
+        rescue StandardError
+          [false, ERROR_MESSAGE]
+        end
+
+        def get_events_to_consider(options_for_klient)
+          ::Kenui::EmailNotificationService.get_events_to_consider(options_for_klient)
+        rescue StandardError
+          {}
+        end
+
+        def get_configuration_per_account(account_id, options_for_klient)
+          ::Kenui::EmailNotificationService.get_configuration_per_account(account_id, options_for_klient)
+        rescue StandardError
+          []
+        end
+      end
+    end
+  end
+end

data/app/views/kaui/invoices/index.html.erb

@@ -64,6 +64,9 @@ $(document).ready(function() {
     "search": {"search": "<%= @search_query %>"},
     "ajax": {
       url: "<%= invoices_pagination_path(:ordering => @ordering, :format => :json) %>",
+      data: function(d) {
+        d.colum_order = $('#invoices-table').DataTable().colReorder.order();
+      },
       dataSrc: function(json) {
         var colOrder = table.colReorder.order();
         var reorderedData = json.data.map(function(row) {

data/app/views/kaui/payments/index.html.erb

@@ -76,6 +76,9 @@ $(document).ready(function() {
       "paging": false,
       "ajax": {
         url: "<%= payments_pagination_path(:format => :json) %>",
+        data: function(d) {
+          d.colum_order = $('#payments-table').DataTable().colReorder.order();
+        },
         dataSrc: function(json) {
           var colOrder = $('#payments-table').DataTable().colReorder.order();
           var reorderedData = json.data.map(function(row) {

data/lib/kaui/engine.rb

@@ -14,7 +14,6 @@ require 'bootstrap-datepicker-rails'
 require 'json'
 require 'money-rails'
 require 'killbill_client'
-require 'kenui'
 require 'devise'
 require 'cancan'
 require 'country_select'

data/lib/kaui/version.rb

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

data/lib/kaui.rb

@@ -142,8 +142,10 @@ module Kaui
         invoice&.send(attr.downcase)
       end
     end
-    # Add additional values if needed
-    [headers, values]
+
+    raw_data = fields.map { |attr| invoice&.send(attr.downcase) }
+
+    [headers, values, raw_data]
   end
 
   self.account_payments_columns = lambda do |account = nil, payment = nil, view_context = nil|
@@ -177,8 +179,17 @@ module Kaui
       end
     end
 
+    raw_data = fields.map do |attr|
+      case attr
+      when 'status'
+        payment.transactions.empty? ? nil : payment.transactions[-1].status
+      else
+        payment&.send(attr.downcase)
+      end
+    end
+
     # Add additional values if needed
-    [headers, values]
+    [headers, values, raw_data]
   end
 
   self.account_audit_logs_columns = lambda do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+date: 2025-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -150,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: kenui
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: killbill-assets-ui
   requirement: !ruby/object:Gem::Requirement
@@ -424,6 +410,7 @@ files:
 - app/models/kaui/transaction.rb
 - app/models/kaui/user.rb
 - app/models/kaui/user_role.rb
+- app/services/dependencies/kenui.rb
 - app/views/kaui/account_children/index.html.erb
 - app/views/kaui/account_custom_fields/index.html.erb
 - app/views/kaui/account_emails/_account_emails_table.html.erb