effective_orders 6.24.1 → 6.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d22477dce74cc4074f01e3e485eec9ca74abc26749db4c4032c8af01a783114
-  data.tar.gz: 25e61d01d9ef14b48992920c13f7aec6f4a419862676c3534dfabbf4329d4aa1
+  metadata.gz: 6f3e7efab2b0bb2b06f0e4bc8e2af186773b48a8005b28359227c391cb7cc60a
+  data.tar.gz: 87ab0e0e84c6c533d33d483d3eb86b3783ee893cf1af527ab78421aa6afdc028
 SHA512:
-  metadata.gz: d25536f15cc4c458ef39eaa8362dbf6371ed8ea2f3f33b4e92fd6029b1c89cac05f129099fd9484103d834301a16673cc7ef5ff8697ebf2f72066ad48a5bd9e9
-  data.tar.gz: ab6e648a304c8c3acd308cfd47f27181df6e0fa757a0e32dc8946f88134172262891d888633403455eaafc4c369c128a40ca1b05690f1797743f7dd095fa16b4
+  metadata.gz: f81313f6f8d81e496496383070a3371b6f362956e7e25e9a055b14e9f220ea26f62613874ebab933404171bf9f492bc353b2ff149e829db7c3cf19fef5391baf
+  data.tar.gz: 48cb3d7c0542a930b94ee2dc25f4181ced2c7a483585921a7d85b7ad60a20c453890d4f954fab0acf1d772ac9cca678b4d838325a64a1cada21b9da516daa72d

data/app/datatables/admin/report_payment_providers_datatable.rb

@@ -17,16 +17,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 :filtered_start_date, as: :date, search: false, sort: false, visible: false do
@@ -37,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
 
@@ -44,7 +44,7 @@ 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|
@@ -57,10 +57,10 @@ module Admin
           items.sum { |item| (item.total < 0 ? item.total : 0) }.to_i,
           items.sum { |item| item.total }.to_i,
           provider_orders.length,
-          provider_orders,
           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/app/views/effective/orders/_datatable_actions.html.haml

@@ -4,6 +4,6 @@
   - else
     = dropdown_link_to 'View', effective_orders.order_path(order)
 
-  - if EffectiveResources.authorized?(controller, :send_buyer_receipt, order)
-    = dropdown_link_to 'E-mail Receipt', effective_orders.send_buyer_receipt_order_path(order),
+  - if EffectiveResources.authorized?(controller, :send_order_email_to_buyer, order)
+    = dropdown_link_to 'E-mail Receipt', effective_orders.send_order_email_to_buyer_order_path(order),
       data: { method: :post, confirm: "Send receipt to #{order.emails.first}?" }

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.24.1'.freeze
+  VERSION = '6.24.3'.freeze
 end

metadata

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