effective_orders 6.21.4 → 6.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39ce34f3c38a2b137ae5d6277b766bab2215e1ef14271dc9ae26ced61897216a
-  data.tar.gz: b27f892799caee6f152f14f6dc3757ca910a1db2568b146736c3aa877c226f15
+  metadata.gz: 7355efac3dc644c7345ef82d62786ebfc6224047d8a67d81c14778fcc490b0ac
+  data.tar.gz: 23ac4db7e268dbb3927bd19ce650d52585cdf8821ef0ae0462ccb61cdd93f8de
 SHA512:
-  metadata.gz: 496a570f6ce2aa2fa1182c5b341761abb9183ea2da79e6d1e465b8c81bab11590edb529c385c825407258827ab703dfaba7c63da6d8680ccd6e607b2550bff90
-  data.tar.gz: c26a9381da40a34dcfc49dd08c933dc86caf75bc29a80876905081806e04df5ea31b7af64abb9c74aa446cefe1adbf328817b91c4c17f2d458aa5d89a24b6c93
+  metadata.gz: c6434225d448689ff1eb02e4b3db328c29ab23f1e000726e65b76cd9556f1f521f58c7eb1f1fa91755ef074485caabb228321e934ff7f27c9c3e3448bb5e6508
+  data.tar.gz: d918d1edbb87a1444c6c306627d11f20a7e881ae12527e8d1adcc28eb49f5f47c13de1d3d95811df5f58cb26af6b0f45561823e94b5efbd36317070f6e723255

data/app/models/effective/order.rb

@@ -880,7 +880,7 @@ module Effective
 
     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?
+      return true if purchased? && free? && OrderEmail.new(self).event_all_waitlisted_or_archived?
       false
     end
 

data/app/models/effective/order_email.rb

@@ -99,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.4'.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.4
+  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