effective_events 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31dd5da1350e8c47f262ae186a59758c589747ad054bb2d9c73a766aab858673
-  data.tar.gz: 3523f02edb4b5e1e5144c4ae43686ab077a4873f0ce5346fb27429a05853e2de
+  metadata.gz: 28f5c7415e3b84908b2656bbd58cf74e202b924086f0c735b640063ab2bfca2d
+  data.tar.gz: c8cd136cfdfba553ddaf73c63d977d883486e72a775630fbcd85778baa38a4c7
 SHA512:
-  metadata.gz: f5a012b7f897b93841d14080109278adc3d52231ffc9e0e5fc71c3379406d28cbf5ed6b11a3455eaeb8737b7065abc87ad78eea8b7441e16d34d886c919d00bd
-  data.tar.gz: 1f21df543c199fbb5f0cfb565b928d4d29405c731dc24dd8824baeb5b83e3436f63966100af4cefac0a1700757737e5e52f982a4ddc9e0ea36055186e5dac1fc
+  metadata.gz: 6d515ddf50f3e622c92af47f17cb69cd4315da25001e7c236c0f98bb05b068ad3a19db2611ab66e58f461982a691ca7601cc473ad98a596fc41d07bab73ac198
+  data.tar.gz: 7481e857dbc9bd01a2b1b192b3115cb0e8385e93ad4e011f060311d7432ff6cd7804f788657b0525550bc4200367a1e14e31321a95aaca3b15b6028505bc8d23

data/app/models/concerns/effective_events_event_registration.rb

@@ -133,10 +133,10 @@ module EffectiveEventsEventRegistration
 
     # Validate the same registrant user isn't being registered twice
     validate(if: -> { current_step == :details }) do
-      present_event_registrants.group_by { |er| er.user }.each do |user, event_registrants|
+      present_event_registrants.group_by { |er| [er.user, er.event_ticket] }.each do |(user, event_ticket), event_registrants|
         if user.present? && event_registrants.length > 1
-          errors.add(:base, "Unable to register #{user} more than once")
-          event_registrants.each { |er| er.errors.add(:user_id, "cannot be registered more than once") }
+          errors.add(:base, "Unable to register #{user} for #{event_ticket} more than once")
+          event_registrants.each { |er| er.errors.add(:user_id, "cannot be registered for #{event_ticket} more than once") }
         end
       end
     end
@@ -316,6 +316,8 @@ module EffectiveEventsEventRegistration
   def tickets!
     assign_attributes(current_step: :tickets) # Ensure the unavailable tickets validations are run
 
+    reset_all_wizard_steps_after(:tickets) unless was_submitted?
+
     update_event_registrants
     select_event_registrants
     waitlist_event_registrants

data/app/models/effective/event_registrant.rb

@@ -115,7 +115,7 @@ module Effective
     validates :email, email: true
 
     # This works for persisted and adding a new one. But not adding two at same time in a registration
-    validates :user_id, uniqueness: { scope: [:event_id], allow_blank: true, message: 'is already registered for this event' }
+    validates :user_id, uniqueness: { scope: [:event_ticket_id], allow_blank: true, message: 'is already registered for this event ticket' }
 
     # First name, last name and email are always required fields on details
     validates :first_name, presence: true, if: -> { registrant_validations_enabled? }

data/app/views/effective/event_registrations/_layout.html.haml

@@ -5,7 +5,7 @@
     - if resource.display_countdown?
       .mt-4
     
-      = card do
-        %p Your tickets are reserved until #{resource.selected_expires_at.strftime("%I:%M%P %Z")}
+      .alert.alert-warning
+        Your tickets are reserved until #{resource.selected_expires_at.strftime("%l:%M%P %Z")}
 
   .col-lg-9.mb-3= yield

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.20.1'.freeze
+  VERSION = '0.20.2'.freeze
 end

metadata

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