effective_events 3.0.3 → 3.0.4

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c7853d626aa69c0a8dff1a68fb7a1ccea55688f3f9fec5856bf4996f4790578b
4
- data.tar.gz: 6639d6d179c25b4a636871cd4750ef46fabb8a1eaa55ee49f7a0b35ab338aa9e
3
+ metadata.gz: 727e4c9d82e44668cf175eeb78d9cbf252dce6499e38895244e6bfdd12126c6b
4
+ data.tar.gz: f734b03843f83f65231c9684a3c1309309ece9eeb0361b70af1632f4e105b9cc
5
5
  SHA512:
6
- metadata.gz: c1732ef7246040d9abffe7a622d6886913819edbc09db4f67b7399d89e77bdd90c0809f16e986420a415d91b818d928d6bfd48be0416d0bf4e083f064b87e292
7
- data.tar.gz: fab79f89a0b04fe70e49a2e21b41084bd95d305ad43413ee366d9e591c7e4c692f99fd95761a0da806cdbe7586951e36e9c517626544ea871b5d687abf21838b
6
+ metadata.gz: 708327d6eca0f1332eae5e430e7f173cf97cf8022ce7c58103f3e08023fe7362262da33eef97ba317bee4be25b47d5843e411456350f36aca0913d925dace81d
7
+ data.tar.gz: 8916c88b24d4630ffdae2edfaa73ae444d342516f93694aa0fdcd9837498588409bd59bb222e43e433af74bfb6f5ca747905aed2b152a8c9797334358b8f39e6
@@ -50,10 +50,10 @@ module EffectiveEventsHelper
50
50
  prices = if event.early_bird? && ticket.early_bird_price.present?
51
51
  [ticket.early_bird_price]
52
52
  elsif ticket.members?
53
- [ticket.member_price, (ticket.guest_of_member_price if guest_of_member)].compact
53
+ [ticket.member_price, (ticket.guest_of_member_price if guest_of_member)]
54
54
  elsif ticket.anyone?
55
- [ticket.member_price, (ticket.guest_of_member_price if guest_of_member), ticket.non_member_price].compact
56
- end.uniq.sort
55
+ [ticket.member_price, (guest_of_member ? ticket.guest_of_member_price : ticket.non_member_price)]
56
+ end.compact.uniq.sort
57
57
 
58
58
  prices.map { |price| price == 0 ? '$0' : price_to_currency(price) }.to_sentence(last_word_connector: ' or ', two_words_connector: ' or ')
59
59
  end
@@ -442,8 +442,10 @@ module Effective
442
442
 
443
443
  if early_bird?
444
444
  event_ticket.early_bird_price
445
- elsif blank_registrant?
446
- event_ticket.maximum_price
445
+ elsif blank_registrant? && owner.try(:membership_present?)
446
+ event_ticket.blank_registrant_member_price
447
+ elsif blank_registrant? && !owner.try(:membership_present?)
448
+ event_ticket.blank_registrant_non_member_price
447
449
  elsif member?
448
450
  event_ticket.member_price
449
451
  elsif guest_of_member?
@@ -142,8 +142,16 @@ module Effective
142
142
  event&.early_bird_end_at.present?
143
143
  end
144
144
 
145
+ def blank_registrant_member_price
146
+ [member_price, (guest_of_member? ? guest_of_member_price : non_member_price)].compact.max
147
+ end
148
+
149
+ def blank_registrant_non_member_price
150
+ [member_price, non_member_price].compact.max
151
+ end
152
+
145
153
  def maximum_price
146
- [non_member_price, member_price, (guest_of_member_price if guest_of_member?)].compact.max
154
+ [member_price, (guest_of_member_price if guest_of_member?), non_member_price].compact.max
147
155
  end
148
156
 
149
157
  # “Anyone” can buy tickets have: Member, Non-member, and Guest of Member pricing. Member and Non-member are always required.
@@ -1,3 +1,3 @@
1
1
  module EffectiveEvents
2
- VERSION = '3.0.3'.freeze
2
+ VERSION = '3.0.4'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_events
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.3
4
+ version: 3.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect