effective_events 0.20.3 → 0.20.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0709b951c8c62ef98e05483a64c07f02c4f324e598a38fe248e53cf46505e0e7'
-  data.tar.gz: cccb708e60d917e8a52ca2da3933c145db3dd316835eaab493fa4fc3d62eef70
+  metadata.gz: b9b8633a6d61dfd2916934dff65ecbfe5df1ced40cfcff2ee4b49f2138ae2b30
+  data.tar.gz: 8b843be43da82c2e4127e3a77ecb4fb2eb4f4f503743749e817375db9d3420e2
 SHA512:
-  metadata.gz: 6a26c1676942e725de1f158c1763a7163f119fa12873e7bec523094aba5c62a82e0327bf91df00003a74d20f8bb326246205aad0bc337fd69608852cba1dc0cd
-  data.tar.gz: '0882344df168c99d2a767eac559a4865e5f12f0e6c96759f7cfafa7b1f3e4c6e2d5ae9745e8ba3abf65576613f32936878ded5289fd57c88125f825431298c66'
+  metadata.gz: 3c65f032ed10d4164d1e774af03b9b491a50ea8b7016dc8337c9ccb8d76edb556f3483a6c15766f8a8492f05a3b072a96db56f7b857ac102d9adcb3d30467c24
+  data.tar.gz: 7ad25cf506e1ea2867cbc47fdadecb0370d3cd7598c0424d34cb04d83ddc3f0a0acd0103fa9945341a0dc83eb2ec129113068a79e5dfb4a10387a6b33a76c7f8

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -21,7 +21,7 @@ module Admin
 
       col :event
 
-      col :owner, visible: false
+      col :owner
       col :event_registration, visible: false
 
       if attributes[:event_id]
@@ -56,7 +56,7 @@ module Admin
         end
       end
       
-      col :user, label: 'Member', visible: false
+      col :user, visible: false
       col :organization, visible: false
 
       col :orders, visible: false
@@ -81,6 +81,10 @@ module Admin
         scope = scope.where(event: event)
       end
 
+      if (user_id = attributes[:for_id]).present? && (user_type = attributes[:for_type]).present?
+        scope = scope.where(user_id: user_id, user_type: user_type).or(scope.where(owner_id: user_id, owner_type: user_type))
+      end
+
       scope
     end
 

data/app/models/effective/event_registrant.rb

@@ -181,7 +181,7 @@ module Effective
       [
         (content_tag(:span, 'Member', class: 'badge badge-warning') if member_ticket?),
         (content_tag(:span, 'Waitlist', class: 'badge badge-warning') if waitlisted_not_promoted?),
-        (content_tag(:span, 'Archived', class: 'badge badge-warning') if event_ticket&.archived?)
+        (content_tag(:span, 'Archived', class: 'badge badge-warning') if archived?)
       ].compact.join(' ').html_safe
     end
 
@@ -287,6 +287,18 @@ module Effective
       true
     end
 
+    def archive!
+      super()
+      orders.reject(&:purchased?).each { |order| order.update_purchasable_attributes! }
+      true
+    end
+
+    def unarchive!
+      super()
+      orders.reject(&:purchased?).each { |order| order.update_purchasable_attributes! }
+      true
+    end
+
     def event_ticket_price
       raise('expected an event') if event.blank?
       raise('expected an event ticket') if event_ticket.blank?
@@ -375,7 +387,7 @@ module Effective
     def assign_price
       raise('is already purchased') if purchased?
 
-      price = waitlisted_not_promoted? ? 0 : event_ticket_price
+      price = (waitlisted_not_promoted? || archived?) ? 0 : event_ticket_price
 
       assign_attributes(price: price)
     end

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.20.3'.freeze
+  VERSION = '0.20.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 0.20.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-29 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails