effective_orders 6.21.3 → 6.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 342b57d2357589ac84b7b8864e75a4948d662bbcf899cafb9dcd1134c16d4a16
-  data.tar.gz: e1b3942a707ac68de5e7c883b3ee178621146ae9faf9825f0774e75c8351c547
+  metadata.gz: 7355efac3dc644c7345ef82d62786ebfc6224047d8a67d81c14778fcc490b0ac
+  data.tar.gz: 23ac4db7e268dbb3927bd19ce650d52585cdf8821ef0ae0462ccb61cdd93f8de
 SHA512:
-  metadata.gz: 432194cc453ba1b16415e4efa6c68560ee075440acaa010c53c407dd4716a1e7cab7943fb0b9267e24dd950f0f40bf86788943aa6b26f34dd291ae6cc3dbe154
-  data.tar.gz: d0009c4d688f25c982557dd58e6c750c585745c9ece99e176a4a108ac4bb24b844a7bfa01d7538bcd2bca792bcdd56ca4f0d45807f0049d45e07cc70562b9a3a
+  metadata.gz: c6434225d448689ff1eb02e4b3db328c29ab23f1e000726e65b76cd9556f1f521f58c7eb1f1fa91755ef074485caabb228321e934ff7f27c9c3e3448bb5e6508
+  data.tar.gz: d918d1edbb87a1444c6c306627d11f20a7e881ae12527e8d1adcc28eb49f5f47c13de1d3d95811df5f58cb26af6b0f45561823e94b5efbd36317070f6e723255

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_or_archived?
+      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?
@@ -98,5 +99,9 @@ module Effective
       event_registrants.all? { |er| er.waitlisted_not_promoted? }
     end
 
+    def event_all_waitlisted_or_archived?
+      return false unless event_registrants.present?
+      event_registrants.all? { |er| er.waitlisted_not_promoted? || er.archived? }
+    end
   end
 end

data/app/models/effective/order_item.rb

@@ -93,5 +93,9 @@ module Effective
       (qb_order_item || build_qb_order_item(name: purchasable.try(:qb_item_name))).name
     end
 
+    def archived?
+      purchasable.try(:archived?) == true && price.to_i == 0
+    end
+
   end
 end

data/app/views/effective/orders/_order_items.html.haml

@@ -1,13 +1,15 @@
 .effective-order-items
+  - present_order_items = order.order_items.reject(&:archived?)
+
   %table.table{style: "margin-bottom: 20px;"}
     %thead
       %tr
         %th.quantity Qty
-        %th.item= order.order_items.length > 1 ? 'Items' : 'Item'
+        %th.item= present_order_items.length > 1 ? 'Items' : 'Item'
         %th.price Price
 
     %tbody
-      - order.order_items.each do |item|
+      - present_order_items.each do |item|
         %tr
           %td.quantity= item.quantity
 

data/lib/effective_orders/version.rb

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

metadata

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