effective_orders 6.23.1 → 6.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aacbf648e88be000dccd67b2eaf3b5f659f58ce5d04238cc2ce06cf38abb496f
-  data.tar.gz: 88fe0446cc0a7788a199e63020db3605cd165b407836e51e963fafcb8ea4ab64
+  metadata.gz: 9da5a3039ab999f6469ee93178d23257c81724a4532548e536af212e082ea782
+  data.tar.gz: 94e9f7086405b091105bb47ffd9d7fc4181c04f9eba5cdfd1f176285959d2c91
 SHA512:
-  metadata.gz: 18343e5fbc7c8d6462f40800078f02228afa29a983f1bab6ed5e6ce4c1b7ac7c824a60e30fdd93a9c0767dc1e9960b049fdfa3e9b22dc37925f7d6d7c20b14ba
-  data.tar.gz: 461cb7c6788cff12420017d6d1f4c0358f41131bc76500f92408b75e309a671c8e5baa0e221708a21a1843c4b4df859cc33a213316b5bcf2fbb5c29b7512387f
+  metadata.gz: ebb63ef8c77027aef6a2fa831a14c96e22044746f208054c364d556b458f137adf16fb357ae60b00b09c1eb45a11208b9f2ac879548be8ccad1e9c87a0dbd6da
+  data.tar.gz: 83182d0a3220cdf5cf6ea93c7828fc90d8d3c124b4e48a9f3e54a50693de6b77bb087cf64a6da5ebfe30204a0d20d1ee6bc3d5909139cb2890f64cb82fc0e36d

data/app/controllers/admin/order_reports_controller.rb

@@ -32,6 +32,14 @@ module Admin
       render 'index'
     end
 
+    # This is used by the transactions_grouped_by_name and transactions_grouped_by_qb_name datatables
+    # To display a nested datatable of the orders
+    def nested_orders
+      ids = params[:ids].to_s.split("|")
+      @datatable = Admin::EffectiveOrdersDatatable.new(ids: ids, skip_filters: true, skip_bulk_actions: true)
+      nested_datatable_action
+    end
+
     def payment_providers
       @datatable = Admin::ReportPaymentProvidersDatatable.new
       @page_title = @datatable.datatable_name

data/app/datatables/admin/effective_orders_datatable.rb

@@ -1,17 +1,19 @@
 module Admin
   class EffectiveOrdersDatatable < Effective::Datatable
     bulk_actions do
-      bulk_action(
-      'Send payment request email to selected orders',
-        effective_orders.bulk_send_payment_request_admin_orders_path,
-        data: { confirm: 'Send payment request emails?' }
-      )
-
-      bulk_action(
-        'Send invoice email to selected purchased orders',
-        effective_orders.bulk_send_order_email_to_buyer_orders_path,
-        data: { confirm: 'Send invoice emails?' }
-      )
+      unless attributes[:skip_bulk_actions]
+        bulk_action(
+        'Send payment request email to selected orders',
+          effective_orders.bulk_send_payment_request_admin_orders_path,
+          data: { confirm: 'Send payment request emails?' }
+        )
+
+        bulk_action(
+          'Send invoice email to selected purchased orders',
+          effective_orders.bulk_send_order_email_to_buyer_orders_path,
+          data: { confirm: 'Send invoice emails?' }
+        )
+      end
     end
 
     filters do
@@ -32,7 +34,9 @@ module Admin
     datatable do
       order :updated_at
 
-      bulk_actions_col
+      unless attributes[:skip_bulk_actions]
+        bulk_actions_col
+      end
 
       col :created_at, visible: false
       col :updated_at, visible: false
@@ -116,7 +120,9 @@ module Admin
       col :note_to_buyer, visible: false
       col :note_internal, visible: false
 
-      actions_col
+      unless attributes[:skip_actions]
+        actions_col
+      end
 
       unless attributes[:total] == false
         aggregate :total
@@ -147,6 +153,10 @@ module Admin
         scope = scope.where(parent_id: attributes[:parent_id], parent_type: attributes[:parent_type])
       end
 
+      if attributes[:ids].present?
+        scope = scope.where(id: attributes[:ids])
+      end
+
       scope
     end
 

data/app/datatables/admin/report_transactions_grouped_by_name_datatable.rb

@@ -18,9 +18,18 @@ module Admin
         col("p - #{provider}", as: :price, visible: false)
       end
 
-      col :orders_count
+      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 :orders, visible: false
       col :users, visible: false
 
       col :filtered_start_date, as: :date, search: false, sort: false, visible: false do
@@ -53,10 +62,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

@@ -18,9 +18,18 @@ module Admin
         col("p - #{provider}", as: :price, visible: false)
       end
 
-      col :orders_count
+      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 :orders, visible: false
       col :users, visible: false
 
       col :start_date, as: :date, search: false, sort: false, visible: false do
@@ -53,10 +62,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/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/config/routes.rb

@@ -78,6 +78,7 @@ EffectiveOrders::Engine.routes.draw do
 
     resources :order_reports, only: [] do
       collection do
+        get :nested_orders
         get :transactions
         get :transactions_grouped_by_name
         get :transactions_grouped_by_qb_name

data/lib/effective_orders/version.rb

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

metadata

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