effective_events 0.20.4 → 0.20.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e12380e8bc5f8d3cb7c8aca29a41195601e80d5254679a416883ac4978f9ce3
-  data.tar.gz: 2640f55717703f890452ebd971978a639bcc72a344ec05d3c67466e8aa94ab85
+  metadata.gz: fac59635c68fc7c14fdf1971a2a7b3cae0d2c5f2469e2c025d827b8d4c03428d
+  data.tar.gz: aa6ef8fa7bca306eedc5b4549c33561f08c384df90f7d57f7570f9d01b9a4919
 SHA512:
-  metadata.gz: 80f0a6730bf416ad9b51850487a7f0702d4b3c4a0e4fa07e923163a86384ee6958d423261fc63f98cb664faccd26dfb60166d240ec3879d9c3809a9e1db07a8a
-  data.tar.gz: 680987d30c84a812b21b11f4c50555ae2a79881f8e80023a14c53052037c2e8c4722d5f269442acbd216f9c65b0e18af514f6c3204945fbe8bbd490fd23066e6
+  metadata.gz: a3911304d324505f653a369436933f57190427be6555abe84c576dc2ca8adbec7687ae8b923fb68b70b901d147eaa57b40a5265c6d1f52f60331f2e268605d56
+  data.tar.gz: cfddf6a3d9282f1bc8b6380825d00c89c7ee486d24c193b2cefe0891846d3a5f9a821b2a8d11024c42c7a6d9eb94a8492ba8d0e6c694ad8bb31715616ec36dc0

data/app/controllers/effective/event_registrations_controller.rb

@@ -23,7 +23,7 @@ module Effective
       return if resource.event.registerable? && !resource.event.sold_out?(except: resource)
 
       flash[:danger] = "Your selected event is no longer available for registration. This event registration is no longer available."
-      return redirect_to('/dashboard')
+      return redirect_to(view_context.return_to_dashboard_path)
     end
 
     def expire_ticket_selection_window

data/app/helpers/effective_events_helper.rb

@@ -45,7 +45,7 @@ module EffectiveEventsHelper
 
     # Allow an admin to assign archived tickets
     authorized = (namespace == :admin)
-    member = current_user.try(:is_any?, :member)
+    member = current_user.try(:membership_present?)
 
     tickets = (authorized ? event.event_tickets : event.event_tickets.reject(&:archived?))
     tickets = tickets.reject { |ticket| ticket.member_only? } unless (authorized || member)

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
 
@@ -204,7 +204,7 @@ module Effective
     end
 
     def member_present?
-      user.try(:is?, :member) || organization.try(:is?, :member)
+      user.try(:membership_present?) || organization.try(:membership_present?)
     end
 
     def member_ticket?
@@ -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/app/views/effective/event_registrations/_fields_event_ticket_selections.html.haml

@@ -5,7 +5,7 @@
 
 - all_member_only_tickets = tickets.all? { |ticket| ticket.member_only? }
 - any_member_only_tickets = tickets.any? { |ticket| ticket.member_only? }
-- is_member = current_user.try(:is?, :member) 
+- is_member = current_user.try(:membership_present?)
 
 - if event.early_bird?
   .alert.alert-warning.mb-3

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.20.4'.freeze
+  VERSION = '0.20.6'.freeze
 end

metadata

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