effective_events 3.4.0 → 3.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/models/effective/event_registrant.rb +2 -2
- data/lib/effective_events/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ede1dac979d0459241ce480d059faad4ba0fb72449d0151136fdae2191fa865a
|
|
4
|
+
data.tar.gz: ffeeaa49cab75013d15dcbb10d6d4f0b6571aa92b865816ea13de6d654ffc071
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d18f1a5d65f5abb3d1ea86c2c28754d1fe00d69aab66a1a1b17f11bcb0a3dad16c30f3001b08c6aecc37a1dc5e84d30c63a4edcd426a87bd8cc2bdf91b2f3d40
|
|
7
|
+
data.tar.gz: ed8c06ad3c8121e6c3133587b37a6389e90b28651f007026d5c23714b3a8f546232465ee5ba3a79237e9c967f1eb8c7defa9182c5b98169ea8e99e0114503866
|
|
@@ -85,7 +85,7 @@ module Effective
|
|
|
85
85
|
self.owner ||= event_registration.owner
|
|
86
86
|
end
|
|
87
87
|
|
|
88
|
-
with_options(unless: -> { purchased? && !blank_registrant_was }) do
|
|
88
|
+
with_options(unless: -> { purchased? && !blank_registrant_was && !user_changed? }) do
|
|
89
89
|
before_validation(if: -> { blank_registrant? }) do
|
|
90
90
|
assign_attributes(user: nil, organization: nil, first_name: nil, last_name: nil, email: nil, company: nil)
|
|
91
91
|
end
|
|
@@ -134,7 +134,7 @@ module Effective
|
|
|
134
134
|
|
|
135
135
|
# Validate this user isn't already registered for this event ticket on another registration
|
|
136
136
|
# Or for this event on any ticket, when one ticket per event is enabled
|
|
137
|
-
validate(if: -> { user.present? && event_ticket.present? && registrant_validations_enabled?
|
|
137
|
+
validate(if: -> { user.present? && event_ticket.present? && (registrant_validations_enabled? || (registered? && !archived? && user_changed?)) }) do
|
|
138
138
|
duplicate_of = (validate_one_ticket_per_event? ? { event: event } : { event_ticket: event_ticket })
|
|
139
139
|
|
|
140
140
|
if Effective::EventRegistrant.unarchived.registered.where(user: user).where(duplicate_of).where.not(id: id).present?
|