Handle sorting issue

app/controllers/kaui/invoices_controller.rb

@@ -70,13 +70,7 @@ def pagination
                          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
 

app/controllers/kaui/payments_controller.rb

@@ -118,15 +118,7 @@ def pagination
       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|

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 : view_context.colored_transaction_status(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