effective_orders 6.23.0 → 6.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 260c5da1c1e8d7f330a0cedc2ea511227b3e4f633f8d8c5cde9ee7517fff4010
-  data.tar.gz: 27fcfffdff8dd456095775a285ff8dcb26f26de4a5fd1d5cc0f1954f9266a035
+  metadata.gz: 93fca226f877ef017fbbcbd8dcaf505a5cecce3afb8bddc5c852b526b9d6fecd
+  data.tar.gz: f25a99203926805b4c1be5cb30898990b35de50ab1ef9175463906e7ff2cf58d
 SHA512:
-  metadata.gz: 2db38d74a702dcda44d80c041a1e6fb8eeb02b16db406685d8404f09d4bc975f1254f615c3bdcca1a3147b3fcaf45b7dbd91ed54fc556cd0293c13951317164e
-  data.tar.gz: cece056c424e1ddbc810a24a549c13f9355dad85dc78611242df7c41df575c2ee86d42f3a50517a12e28826e3bf04e3f6b922bf6bf0214c02c36ff7e9e16ff45
+  metadata.gz: 78bfc57f6dcf593c16e457a186aab279e9f7a0829bc0533c433c7decff62c66c39c0016cfe12ca3b40a6c1cacd73fe6c0dd0410350a66108af10e29aa1ac1f6c
+  data.tar.gz: aab10f6e4acf076e9825df141e671a2e0a94ee2c8700467470c0fe2564390b1aaff5f9e7aec7ac2fa4f120540dca7378651f9ecb99a9385b967546718662b638

data/app/datatables/admin/effective_customers_datatable.rb

@@ -4,7 +4,7 @@ module Admin
 
       col :id, visible: false
 
-      col :user, search: :string
+      col :user
 
       col :email do |customer|
         customer.user.email

data/app/datatables/admin/effective_orders_datatable.rb

@@ -47,14 +47,14 @@ module Admin
         order.purchased_at&.strftime('%F %H:%M') || ('pending refund' if order.pending_refund?) || ("pending #{order.payment_provider}" if order.deferred?) || 'not purchased'
       end
 
-      col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
+      col :purchased_by, visible: EffectiveOrders.organization_enabled?
 
       if attributes[:user_id].blank?
-        col :user, search: :string, visible: !EffectiveOrders.organization_enabled?
+        col :user, visible: !EffectiveOrders.organization_enabled?
       end
 
       if attributes[:organization_id].blank?
-        col :organization, search: :string, visible: EffectiveOrders.organization_enabled?
+        col :organization, visible: EffectiveOrders.organization_enabled?
       end
 
       if defined?(EffectiveMemberships)
@@ -70,7 +70,7 @@ module Admin
       col :billing_name, visible: false
       col :email, visible: false
 
-      col :parent, visible: false, search: :string
+      col :parent, visible: false
 
       col :cc, visible: false
 
@@ -82,7 +82,7 @@ module Admin
         col :shipping_address, visible: false
       end
 
-      col(:order_items, search: :string).search do |collection, term|
+      col(:order_items).search do |collection, term|
         collection.where(id: Effective::OrderItem.where('name ILIKE ?', "%#{term}%").select('order_id'))
       end
 

data/app/datatables/admin/report_transactions_datatable.rb

@@ -17,7 +17,7 @@ module Admin
       end
 
       col :purchased_at
-      col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
+      col :purchased_by, visible: EffectiveOrders.organization_enabled?
 
       if EffectiveOrders.organization_enabled?
         col :organization

data/app/datatables/admin/report_transactions_grouped_by_name_datatable.rb

@@ -20,7 +20,14 @@ module Admin
 
       col :orders_count
 
-      col :orders, visible: false
+      val(:details, visible: false) do |_, orders|
+        orders.map do |order|
+          content_tag(:div, class: 'col-resource_item') do
+            link_to(order.full_to_s, effective_orders.admin_order_path(order), title: order.full_to_s)
+          end
+        end.join.html_safe
+      end
+
       col :users, visible: false
 
       col :filtered_start_date, as: :date, search: false, sort: false, visible: false do
@@ -53,10 +60,12 @@ module Admin
           items.sum { |item| (item.order.payment_provider == payment_provider) ? item.total : 0 }.to_i
         end
 
+        orders = items.map { |item| item.order }.uniq.sort
+
         row += [
-          items.map(&:order_id).uniq.length,
-          items.map { |item| item.order },
-          items.map { |item| item.order.user },
+          orders.length,
+          orders,
+          orders.map(&:user),
           start_date,
           end_date
         ]

data/app/datatables/admin/report_transactions_grouped_by_qb_name_datatable.rb

@@ -20,7 +20,14 @@ module Admin
 
       col :orders_count
 
-      col :orders, visible: false
+      val(:details, visible: false) do |_, orders|
+        orders.map do |order|
+          content_tag(:div, class: 'col-resource_item') do
+            link_to(order.full_to_s, effective_orders.admin_order_path(order), title: order.full_to_s)
+          end
+        end.join.html_safe
+      end
+
       col :users, visible: false
 
       col :start_date, as: :date, search: false, sort: false, visible: false do
@@ -53,10 +60,12 @@ module Admin
           items.sum { |item| (item.order.payment_provider == payment_provider) ? item.total : 0 }.to_i
         end
 
+        orders = items.map { |item| item.order }.uniq.sort
+
         row += [
-          items.map(&:order_id).uniq.length,
-          items.map { |item| item.order },
-          items.map { |item| item.order.user },
+          orders.length,
+          orders,
+          orders.map(&:user),
           start_date,
           end_date
         ]

data/app/datatables/effective_orders_datatable.rb

@@ -22,9 +22,9 @@ class EffectiveOrdersDatatable < Effective::Datatable
       '#' + order.to_param
     end
 
-    col :parent, visible: false, search: :string
-    col :user, visible: false, search: :string
-    col :organization, search: :string, visible: false
+    col :parent, visible: false
+    col :user, visible: false
+    col :organization, visible: false
 
     col :status
 
@@ -33,7 +33,7 @@ class EffectiveOrdersDatatable < Effective::Datatable
         order.purchased_at&.strftime('%F %H:%M') || 'not purchased'
       end
 
-      col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
+      col :purchased_by, visible: EffectiveOrders.organization_enabled?
     end
 
     if EffectiveOrders.billing_address
@@ -44,7 +44,7 @@ class EffectiveOrdersDatatable < Effective::Datatable
       col :shipping_address, visible: false
     end
 
-    col(:order_items, search: :string).search do |collection, term|
+    col(:order_items).search do |collection, term|
       collection.where(id: Effective::OrderItem.where('name ILIKE ?', "%#{term}%").select('order_id'))
     end
 

data/app/models/effective/order.rb

@@ -416,6 +416,10 @@ module Effective
       [label, ' #', to_param].join
     end
 
+    def full_to_s
+      [to_s, billing_name.presence, email.presence, total_to_s].compact.join(' - ')
+    end
+
     def label
       if refund? && purchased?
         'Refund'
@@ -434,6 +438,10 @@ module Effective
       purchased? ? 'Total paid' : 'Total due'
     end
 
+    def total_to_s
+      "$#{'%0.2f' % total_to_f}"
+    end
+
     def payment_method
       payment_method_value if purchased?
     end
@@ -582,7 +590,7 @@ module Effective
       return unless delayed? && deferred? && delayed_payment_provider?
       return unless delayed_payment_date_upcoming?
 
-      "Your #{delayed_payment_method} will be charged $#{'%0.2f' % total_to_f} on #{delayed_payment_date.strftime('%A, %B %e, %Y')}."
+      "Your #{delayed_payment_method} will be charged #{total_to_s} on #{delayed_payment_date.strftime('%A, %B %e, %Y')}."
     end
 
     def delayed_payment_date_past?

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.23.0'.freeze
+  VERSION = '6.23.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.23.0
+  version: 6.23.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2025-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails