effective_orders 6.21.3 → 6.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 342b57d2357589ac84b7b8864e75a4948d662bbcf899cafb9dcd1134c16d4a16
-  data.tar.gz: e1b3942a707ac68de5e7c883b3ee178621146ae9faf9825f0774e75c8351c547
+  metadata.gz: 39ce34f3c38a2b137ae5d6277b766bab2215e1ef14271dc9ae26ced61897216a
+  data.tar.gz: b27f892799caee6f152f14f6dc3757ca910a1db2568b146736c3aa877c226f15
 SHA512:
-  metadata.gz: 432194cc453ba1b16415e4efa6c68560ee075440acaa010c53c407dd4716a1e7cab7943fb0b9267e24dd950f0f40bf86788943aa6b26f34dd291ae6cc3dbe154
-  data.tar.gz: d0009c4d688f25c982557dd58e6c750c585745c9ece99e176a4a108ac4bb24b844a7bfa01d7538bcd2bca792bcdd56ca4f0d45807f0049d45e07cc70562b9a3a
+  metadata.gz: 496a570f6ce2aa2fa1182c5b341761abb9183ea2da79e6d1e465b8c81bab11590edb529c385c825407258827ab703dfaba7c63da6d8680ccd6e607b2550bff90
+  data.tar.gz: c26a9381da40a34dcfc49dd08c933dc86caf75bc29a80876905081806e04df5ea31b7af64abb9c74aa446cefe1adbf328817b91c4c17f2d458aa5d89a24b6c93

data/app/controllers/effective/concerns/purchase.rb

@@ -21,7 +21,7 @@ module Effective
         Effective::Cart.where(user: @order.current_user).destroy_all if @order.current_user.present?
 
         if flash[:success].blank?
-          if email && EffectiveOrders.send_order_receipt_to_buyer
+          if email && EffectiveOrders.send_order_receipt_to_buyer && !@order.skip_order_emails?
             flash[:success] = "Payment successful! A receipt has been sent to #{@order.email}"
           else
             flash[:success] = "Payment successful! An email receipt has not been sent."

data/app/models/effective/order.rb

@@ -612,7 +612,6 @@ module Effective
       present_order_items.map { |oi| oi.quantity }.sum
     end
 
-
     def skip_buyer_validations?
       EffectiveResources.truthy?(skip_buyer_validations)
     end
@@ -628,7 +627,9 @@ module Effective
       self.addresses.clear if addresses.any? { |address| address.valid? == false }
       save!
 
-      after_commit { send_payment_request_to_buyer! } if send_payment_request_to_buyer?
+      if send_payment_request_to_buyer?
+        after_commit { send_payment_request_to_buyer! }
+      end
 
       true
     end
@@ -877,8 +878,16 @@ module Effective
       (emails + [cc.presence]).compact.uniq.to_sentence
     end
 
+    def skip_order_emails?
+      return true if purchased? && free? && !EffectiveOrders.send_order_receipts_when_free
+      return true if purchased? && free? && OrderEmail.new(self).event_all_waitlisted?
+      false
+    end
+
     def send_order_emails!
-      if purchased_or_deferred? && (!free? || EffectiveOrders.send_order_receipts_when_free)
+      return false if skip_order_emails?
+
+      if purchased_or_deferred?
         EffectiveOrders.send_email(:order_email, self) if EffectiveOrders.send_order_receipt_to_buyer
         EffectiveOrders.send_email(:order_email_to_admin, self) if EffectiveOrders.send_order_receipt_to_admin
       end

data/app/models/effective/order_email.rb

@@ -43,6 +43,7 @@ module Effective
 
     def subject
       if event.present? && order.purchased_or_deferred?
+        return "Receipt - Order ##{order.to_param}" if order.purchased? && order.delayed_payment_date_past?
         return "Confirmation - #{event}" if event_none_waitlisted?
         return "Confirmation & Waitlist - #{event}" if event_some_waitlisted?
         return "Waitlist - #{event}" if event_all_waitlisted?

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.21.3'.freeze
+  VERSION = '6.21.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.21.3
+  version: 6.21.4
 platform: ruby
 authors:
 - Code and Effect