effective_orders 6.5.9 → 6.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d67014fe256ed7ef96ee079c776855b73053d33bc116042ebd1a1c5e17bc5c
-  data.tar.gz: cd0503035984b062eaed51f779c10fb1124e59b97598ae2ed2cc503d0c8ddb11
+  metadata.gz: 1e85399d8a94ed81ae67ced9f120983d83a626cbd7bd0fe410610803f7b65e32
+  data.tar.gz: f903881c98703d5ac9e3d6a7f356b45b5b02280b0ad4dc6125de970d887d3e2a
 SHA512:
-  metadata.gz: f5418c8644cf04e5bb73bd1266cbe81215db8b02d2065b48559b0dc12be511ba0b62f64910ffa7a867f84e6a54dd3d975a1236243eb6674c04aaf47ceb065ddf
-  data.tar.gz: 3488074b6f0479e0f9c8d095a0799f551c8db36804d263c208069be52c3471d35b7fc769087ac8c08964dda51823988d6155022075e5e9642d4ea29f8d49f0d2
+  metadata.gz: 8163a7d6cf97d35c85e1464fee0932d4e4159513c01d76e5d281598a52f67e2259455af9e35aeb46ee61fa97bd4908e7e440684e22165120906072f43f70bb40
+  data.tar.gz: 88f47fabff177758de90fb826424626af5496b14fc4a56e28e9a949a5477d68b8edba970c3413387aee4b50b09ccf84ec79b34cc1996482f3c8524ba44553299

data/app/datatables/admin/effective_orders_datatable.rb

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

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

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

data/app/mailers/effective/orders_mailer.rb

@@ -21,8 +21,8 @@ module Effective
       subject = subject_for(__method__, "Order Receipt: ##{@order.to_param}", resource, opts)
       headers = headers_for(resource, opts)
 
-      # Just @order.email here. Not everyone.
-      mail(to: @order.email, cc: @order.cc.presence, subject: subject, **headers)
+      # Just to the purchaser. Not everyone.
+      mail(to: @order.emails.first, cc: @order.cc.presence, subject: subject, **headers)
     end
 
     # This is sent when an admin creates a new order or /admin/orders/new

data/app/models/effective/order.rb

@@ -31,13 +31,17 @@ module Effective
     # If we want to use orders in a has_many way
     belongs_to :parent, polymorphic: true, optional: true
 
-    belongs_to :user, polymorphic: true, optional: true, validate: false  # This is the buyer of the order. We validate it below.
+    # This is user the order is for
+    belongs_to :user, polymorphic: true, optional: true, validate: false
     accepts_nested_attributes_for :user, allow_destroy: false, update_only: true
 
     # When an organization is present, any user with role :billing in that organization can purchase this order
     belongs_to :organization, polymorphic: true, optional: true, validate: false
     accepts_nested_attributes_for :organization, allow_destroy: false, update_only: true
 
+    # When purchased, this is the user that purchased it.
+    belongs_to :purchased_by, polymorphic: true, optional: true, validate: false
+
     has_many :order_items, -> { order(:id) }, inverse_of: :order, dependent: :delete_all
     accepts_nested_attributes_for :order_items, allow_destroy: true, reject_if: :all_blank
 
@@ -75,7 +79,7 @@ module Effective
 
     serialize :payment, Hash
 
-    scope :deep, -> { includes(:addresses, :user, :organization, order_items: :purchasable) }
+    scope :deep, -> { includes(:addresses, :user, :purchased_by, :organization, order_items: :purchasable) }
     scope :sorted, -> { order(:id) }
 
     scope :purchased, -> { where(state: EffectiveOrders::PURCHASED) }
@@ -605,9 +609,10 @@ module Effective
         state: EffectiveOrders::PURCHASED,
         skip_buyer_validations: skip_buyer_validations,
 
-        payment: payment_to_h(payment.presence || 'none'),
         purchased_at: (purchased_at.presence || Time.zone.now),
+        purchased_by: (purchased_by.presence || current_user),
 
+        payment: payment_to_h(payment.presence || 'none'),
         payment_provider: (provider.presence || 'none'),
         payment_card: (card.presence || 'none')
       )
@@ -707,7 +712,7 @@ module Effective
 
     # These are all the emails we send all notifications to
     def emails
-      ([email] + [user.try(:email)] + Array(organization.try(:billing_emails))).map(&:presence).compact.uniq
+      ([purchased_by.try(:email)] + [email] + [user.try(:email)] + Array(organization.try(:billing_emails))).map(&:presence).compact.uniq
     end
 
     # Doesn't control anything. Purely for the flash messaging

data/db/migrate/01_create_effective_orders.rb.erb

@@ -13,6 +13,9 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.string    :state
       t.datetime  :purchased_at
 
+      t.integer   :purchased_by_id
+      t.string    :purchased_by_type
+
       t.text      :note
       t.text      :note_to_buyer
       t.text      :note_internal

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.5.9'.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.5.9
+  version: 6.6.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails