effective_orders 6.6.0 → 6.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e804f4ca70a3cb57e200abd2dc81f3148db743f3f76680dd3368f34a631d355
-  data.tar.gz: d88242d6315a34d6fe4aca05f44b8a0445e688cea8265439659d7be693010f59
+  metadata.gz: 1e85399d8a94ed81ae67ced9f120983d83a626cbd7bd0fe410610803f7b65e32
+  data.tar.gz: f903881c98703d5ac9e3d6a7f356b45b5b02280b0ad4dc6125de970d887d3e2a
 SHA512:
-  metadata.gz: fc681292de818d3248e8cf757a80ffe1efa097685036ded498c6f322a0181e175d069f85b551139cd1f52253dd866da3f3c3708aa3bcb6f436ccb634814bc853
-  data.tar.gz: fe83a4ee4de83547f88e18b75d30996c884d7edb3721161cf64b180ead5b7780da27857f6ba342d7657242cd73655461d824f6f1780e1157563f3ac94440e555
+  metadata.gz: 8163a7d6cf97d35c85e1464fee0932d4e4159513c01d76e5d281598a52f67e2259455af9e35aeb46ee61fa97bd4908e7e440684e22165120906072f43f70bb40
+  data.tar.gz: 88f47fabff177758de90fb826424626af5496b14fc4a56e28e9a949a5477d68b8edba970c3413387aee4b50b09ccf84ec79b34cc1996482f3c8524ba44553299

data/app/datatables/admin/effective_orders_datatable.rb

@@ -44,7 +44,7 @@ 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
+      col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
 
       if attributes[:user_id].blank?
         col :user, search: :string

data/app/datatables/admin/report_transactions_datatable.rb

@@ -17,6 +17,12 @@ module Admin
       end
 
       col :purchased_at
+      col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
+
+      if EffectiveOrders.organization_enabled?
+        col :organization
+      end
+
       col :user
       col :order_items
       col :payment_provider, search: EffectiveOrders.payment_providers
@@ -49,10 +55,9 @@ module Admin
     end
 
     collection do
-      Effective::Order.purchased
+      Effective::Order.purchased.deep
         .where(purchased_at: date_range)
         .where('total != 0')
-        .includes(:user, [order_items: :purchasable])
     end
   end
 end

data/app/datatables/effective_orders_datatable.rb

@@ -29,7 +29,7 @@ class EffectiveOrdersDatatable < Effective::Datatable
         order.purchased_at&.strftime('%F %H:%M') || 'not purchased'
       end
 
-      col :purchased_by, search: :string
+      col :purchased_by, search: :string, visible: EffectiveOrders.organization_enabled?
     end
 
     if EffectiveOrders.billing_address

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.6.0'.freeze
+  VERSION = '6.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.6.0
+  version: 6.6.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails