effective_orders 6.21.2 → 6.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d44441a4047ff2e429c716b1d6a1fd0468cd3e4b6d3e507f4f2ad979f1d19cfa
-  data.tar.gz: b7e63a71d07f0fa59218a938174004022732d925b17185fb45d1376620521af1
+  metadata.gz: 39ce34f3c38a2b137ae5d6277b766bab2215e1ef14271dc9ae26ced61897216a
+  data.tar.gz: b27f892799caee6f152f14f6dc3757ca910a1db2568b146736c3aa877c226f15
 SHA512:
-  metadata.gz: 9f9ea59b2fb67092f6ea3d871954ab2437dab6d09f7f8828bc430be00754945afcdb0df8ea602d9228ce91cb2208ff0084d27d93b8eaca93621217fcdf0a9140
-  data.tar.gz: a35a53e9e14675b9a311c8a21b9138569cc62599ea1f8397a0819758644f96c4d1dfc0b28e880f0caa88fd7c23c82124bc1e471234d3745361bd20f7841c32a5
+  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,7 @@ module Effective
       self.addresses.clear if addresses.any? { |address| address.valid? == false }
       save!
 
-      if EffectiveResources.truthy?(send_payment_request_to_buyer)
+      if send_payment_request_to_buyer?
         after_commit { send_payment_request_to_buyer! }
       end
 
@@ -879,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
@@ -895,6 +902,10 @@ module Effective
       end
     end
 
+    def send_payment_request_to_buyer?
+      EffectiveResources.truthy?(send_payment_request_to_buyer)
+    end
+
     # Admin datatable action
     def send_payment_request_to_buyer!
       EffectiveOrders.send_email(:order_email, self, payment_request: true) unless (purchased? || refund?)

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.2'.freeze
+  VERSION = '6.21.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.21.2
+  version: 6.21.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-27 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails