effective_orders 6.24.0 → 6.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9da5a3039ab999f6469ee93178d23257c81724a4532548e536af212e082ea782
-  data.tar.gz: 94e9f7086405b091105bb47ffd9d7fc4181c04f9eba5cdfd1f176285959d2c91
+  metadata.gz: 92f82229bbfabfdb94cd12f4155853a6f7a18ee196373404ad2b24525a84155b
+  data.tar.gz: 3f7bf5b05d87d50f3e86fb275d7f4f610210cd3fd2c3ddcbf85b3620e35d6de5
 SHA512:
-  metadata.gz: ebb63ef8c77027aef6a2fa831a14c96e22044746f208054c364d556b458f137adf16fb357ae60b00b09c1eb45a11208b9f2ac879548be8ccad1e9c87a0dbd6da
-  data.tar.gz: 83182d0a3220cdf5cf6ea93c7828fc90d8d3c124b4e48a9f3e54a50693de6b77bb087cf64a6da5ebfe30204a0d20d1ee6bc3d5909139cb2890f64cb82fc0e36d
+  metadata.gz: fbeda4073c818295729b10718d3b3ad96f238d1e4659ca2fac0e1de7070335ab4e85f05438e684eef5992c35ffc0cc2c1f739fb91028db0a6f3b0b5833b80b46
+  data.tar.gz: 3dd836f02ed0972487a7739a7550384cdd3a3ef15d67174914cc644b280eecf82f27123e98f84ca66bae033d8279846b8c4776931e87f90df7e46d65fd23b1a4

data/app/datatables/admin/report_payment_providers_datatable.rb

@@ -15,6 +15,10 @@ module Admin
       col :returns, as: :price
       col :total, as: :price
 
+      col :orders_count, visible: false
+
+      col :users, visible: false
+
       col :filtered_start_date, as: :date, search: false, sort: false, visible: false do
         date_range.begin&.strftime('%F')
       end
@@ -23,6 +27,16 @@ module Admin
         date_range.end&.strftime('%F')
       end
 
+      col(:orders, col_class: 'col-actions', search: false, sort: false) do |orders, row|
+        if orders.present?
+          title = pluralize(orders.length, 'orders')
+          order_ids = orders.map(&:id).join("|")
+
+          path = effective_orders.nested_orders_admin_order_reports_path(ids: order_ids)
+          nested_datatable_link_to(title, path, title: row.first)
+        end
+      end
+
       aggregate :total
     end
 
@@ -30,10 +44,11 @@ module Admin
       start_date = date_range.begin&.strftime('%F')
       end_date = date_range.end&.strftime('%F')
 
-      orders = Effective::Order.purchased.where(purchased_at: date_range).where('total != 0')
+      orders = Effective::Order.purchased.where(purchased_at: date_range).where('total != 0').includes(:user)
       order_items = Effective::OrderItem.where(order_id: orders).includes(:purchasable, order: :user)
 
       payment_providers.map do |provider|
+        provider_orders = orders.select { |order| order.payment_provider == provider }
         items = order_items.select { |item| item.order.payment_provider == provider }
 
         [
@@ -41,8 +56,11 @@ module Admin
           items.sum { |item| (item.total > 0 ? item.total : 0) }.to_i,
           items.sum { |item| (item.total < 0 ? item.total : 0) }.to_i,
           items.sum { |item| item.total }.to_i,
+          provider_orders.length,
+          provider_orders.map(&:user),
           start_date,
-          end_date
+          end_date,
+          provider_orders
         ]
       end
     end

data/app/datatables/admin/report_transactions_grouped_by_name_datatable.rb

@@ -20,15 +20,6 @@ module Admin
 
       col :orders_count, visible: false
 
-      col(:orders, col_class: 'col-actions') do |orders|
-        if orders.present?
-          title = pluralize(orders.length, 'orders')
-          order_ids = orders.map(&:id).join("|")
-
-          path = effective_orders.nested_orders_admin_order_reports_path(ids: order_ids)
-          nested_datatable_link_to(title, path)
-        end
-      end
 
       col :users, visible: false
 
@@ -40,6 +31,16 @@ module Admin
         date_range.end&.strftime('%F')
       end
 
+      col(:orders, col_class: 'col-actions', search: false, sort: false) do |orders, row|
+        if orders.present?
+          title = pluralize(orders.length, 'orders')
+          order_ids = orders.map(&:id).join("|")
+
+          path = effective_orders.nested_orders_admin_order_reports_path(ids: order_ids)
+          nested_datatable_link_to(title, path, title: row.first)
+        end
+      end
+
       aggregate :total
     end
 
@@ -66,10 +67,10 @@ module Admin
 
         row += [
           orders.length,
-          orders,
           orders.map(&:user),
           start_date,
-          end_date
+          end_date,
+          orders
         ]
 
         row

data/app/datatables/admin/report_transactions_grouped_by_qb_name_datatable.rb

@@ -20,16 +20,6 @@ module Admin
 
       col :orders_count, visible: false
 
-      col(:orders, col_class: 'col-actions') do |orders|
-        if orders.present?
-          title = pluralize(orders.length, 'orders')
-          order_ids = orders.map(&:id).join("|")
-
-          path = effective_orders.nested_orders_admin_order_reports_path(ids: order_ids)
-          nested_datatable_link_to(title, path)
-        end
-      end
-
       col :users, visible: false
 
       col :start_date, as: :date, search: false, sort: false, visible: false do
@@ -40,6 +30,16 @@ module Admin
         date_range.end&.strftime('%F')
       end
 
+      col(:orders, col_class: 'col-actions', search: false, sort: false) do |orders, row|
+        if orders.present?
+          title = pluralize(orders.length, 'orders')
+          order_ids = orders.map(&:id).join("|")
+
+          path = effective_orders.nested_orders_admin_order_reports_path(ids: order_ids)
+          nested_datatable_link_to(title, path, title: row.first)
+        end
+      end
+
       aggregate :total
     end
 
@@ -66,10 +66,10 @@ module Admin
 
         row += [
           orders.length,
-          orders,
           orders.map(&:user),
           start_date,
-          end_date
+          end_date,
+          orders
         ]
 
         row

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.24.0'.freeze
+  VERSION = '6.24.2'.freeze
 end

metadata

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