effective_orders 6.6.0 → 6.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e804f4ca70a3cb57e200abd2dc81f3148db743f3f76680dd3368f34a631d355
-  data.tar.gz: d88242d6315a34d6fe4aca05f44b8a0445e688cea8265439659d7be693010f59
+  metadata.gz: 86a4f7535e5766ae1bff99cbabd94b9b134c381c255a8f745ef6e63f5685f7cb
+  data.tar.gz: e55dd3dd359e7e46bd5bedb251eece208e36cabefef22caaa8c57e3eb84ee9c1
 SHA512:
-  metadata.gz: fc681292de818d3248e8cf757a80ffe1efa097685036ded498c6f322a0181e175d069f85b551139cd1f52253dd866da3f3c3708aa3bcb6f436ccb634814bc853
-  data.tar.gz: fe83a4ee4de83547f88e18b75d30996c884d7edb3721161cf64b180ead5b7780da27857f6ba342d7657242cd73655461d824f6f1780e1157563f3ac94440e555
+  metadata.gz: 968a79995bdd6ea7bb51d170145dc375fa6db28095238fad9f18c3e18b6126b4179e692715ae02f68fa707f9c94506418039250691dbf771e690ebe6413784d1
+  data.tar.gz: 0a346ecf19463553ebf8ee7ced123067ac750809036de53ba09775fb72a8d870572bfb49d2d8a16d91a9e41c10ed3aff5bdf4d31f97861ee477cc66399688061

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/app/views/effective/orders/_datatable_actions.html.haml

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

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.6.0'.freeze
+  VERSION = '6.6.2'.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.2
 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