effective_orders 6.5.8 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c9eabbfa8db6fb53919cf3dae73c783f774c3af7fd242f6ca937f434d39e54e
-  data.tar.gz: ee95193ee1ef29b1c3854d4fa82c73f6d305b16edfcc73c2507b0f3922201ec8
+  metadata.gz: 4e804f4ca70a3cb57e200abd2dc81f3148db743f3f76680dd3368f34a631d355
+  data.tar.gz: d88242d6315a34d6fe4aca05f44b8a0445e688cea8265439659d7be693010f59
 SHA512:
-  metadata.gz: fc985176f4855ead79fe1394f49cb55551c24ab23c2913177874d78f38d24b51cef62bd0acb6a2543ba8e4f7ca63d3df40358494a897085c8d7deb2848c73440
-  data.tar.gz: 93afb3bd5f5588140dcf1efe0af860f87e7e30e9d8e9833bdca00ef9b03abcb3b50312cd0e3fd277b30448ae3f2e484760ba7c52187a3c37ef38c83c59879395
+  metadata.gz: fc681292de818d3248e8cf757a80ffe1efa097685036ded498c6f322a0181e175d069f85b551139cd1f52253dd866da3f3c3708aa3bcb6f436ccb634814bc853
+  data.tar.gz: fe83a4ee4de83547f88e18b75d30996c884d7edb3721161cf64b180ead5b7780da27857f6ba342d7657242cd73655461d824f6f1780e1157563f3ac94440e555

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

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

@@ -3,6 +3,7 @@
     %thead
       %tr
         %th Order
+        %th Buyer
         %th Date
         %th Description
         %th
@@ -10,10 +11,13 @@
       - orders.each do |order|
         %tr
           %td ##{order.to_param}
+          %td
+            = [order.organization, order.user].compact.join('<br>').html_safe
           %td
             = (order.purchased? ? 'Purchased' : 'Created')
             = (order.purchased_at || order.created_at).strftime("%F %H:%M")
-          %td= order_summary(order)
+          %td
+            = order_summary(order)
           %td
             - if order.pending? || order.confirmed?
               = link_to_checkout(order: order)

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.8'.freeze
+  VERSION = '6.6.0'.freeze
 end

metadata

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