effective_events 3.2.6 → 3.2.7

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: 1dd9d2e095415c1c44eeee3cda056411251c6f6e977a7d5f54443b44347fa21d
4
- data.tar.gz: 2a9d544a0b69ead3a42483b7eada7807f863d011e45c4b677fadb2d4c985275b
3
+ metadata.gz: c91b434d747f10bcbec7340c8bfbee4e755e3a72896c44a0fde8304e46c9ff39
4
+ data.tar.gz: 562fbb1b148b2c31e308ca0db490a478d7b1b86fc14e680d0c497d3e2455daf0
5
5
  SHA512:
6
- metadata.gz: 6ffb6b9f7cca907c767eff88b2bccbdcd0cfd14961b482cc97e61d44f39bbf12bd059d11e35a0c0d2e9a9a3989df9c7017881a98ddbfe86dac5f9488098eb9a9
7
- data.tar.gz: 26758d8de02ad9e4a68f870e12ae5303cbf1f780795e535b6c06676a253135209f6483e7f38c2bb9343ef391a2a5679921ddd1182bb59774b80cd799ff98865f
6
+ metadata.gz: cb2290e526506a0e3343ed09d6a925cc53197fcae387fe0506421ca34561c7519a755b47fac08f0c2af81491ac3d7e05e7ddfa3b3ac73a19c357f9e010c37996
7
+ data.tar.gz: 98f0d6df5d153deed1bb5e713f47b8ea00dbc9a586eef2e064ebda8279f5c8b86d7fe11322de490ae1de7c9d296555e1979f9666bbf8632b40ff3b4e43b38a86
@@ -256,6 +256,7 @@ module Effective
256
256
  def member?
257
257
  return false if event.blank?
258
258
  return false if event_ticket.blank?
259
+ return false if (user.try(:membership_disabled?) || organization.try(:membership_disabled?))
259
260
 
260
261
  user.try(:membership_present?) || organization.try(:membership_present?)
261
262
  end
@@ -265,6 +266,7 @@ module Effective
265
266
  return false if event.blank?
266
267
  return false if event_ticket.blank?
267
268
  return false unless event_ticket.guest_of_member?
269
+ return false if !member? && owner.try(:membership_disabled?)
268
270
 
269
271
  !member? && owner.try(:membership_present?)
270
272
  end
@@ -508,9 +510,9 @@ module Effective
508
510
 
509
511
  if early_bird?
510
512
  event_ticket.early_bird_price
511
- elsif blank_registrant? && owner.try(:membership_present?)
513
+ elsif blank_registrant? && owner.try(:membership_present?) && !owner.try(:membership_disabled?)
512
514
  event_ticket.blank_registrant_member_price
513
- elsif blank_registrant? && !owner.try(:membership_present?)
515
+ elsif blank_registrant?
514
516
  event_ticket.blank_registrant_non_member_price
515
517
  elsif member?
516
518
  event_ticket.member_price
@@ -5,7 +5,7 @@
5
5
 
6
6
  - all_members_tickets = tickets.all? { |ticket| ticket.members? }
7
7
  - any_members_tickets = tickets.any? { |ticket| ticket.members? }
8
- - is_member = current_user.try(:membership_present?)
8
+ - is_member = (current_user.try(:membership_present?) || current_user.is_any?(:member)) && !current_user.try(:membership_disabled?)
9
9
 
10
10
  - if event.early_bird?
11
11
  .alert.alert-warning.mb-3
@@ -42,7 +42,7 @@
42
42
  = price_to_currency(ticket.member_price)
43
43
  .badge.badge-secondary Member
44
44
 
45
- - if ticket.guest_of_member? && (current_user.try(:membership_present?) || current_user.is_any?(:member))
45
+ - if ticket.guest_of_member? && is_member
46
46
  %li
47
47
  = price_to_currency(ticket.guest_of_member_price)
48
48
  .badge.badge-secondary Guest of Member
@@ -58,7 +58,7 @@
58
58
  = price_to_currency(ticket.member_price)
59
59
  .badge.badge-secondary Member
60
60
 
61
- - if ticket.guest_of_member? && (current_user.try(:membership_present?) || current_user.is_any?(:member))
61
+ - if ticket.guest_of_member? && is_member
62
62
  %li
63
63
  = price_to_currency(ticket.guest_of_member_price)
64
64
  .badge.badge-secondary Guest of Member
@@ -1,3 +1,3 @@
1
1
  module EffectiveEvents
2
- VERSION = '3.2.6'.freeze
2
+ VERSION = '3.2.7'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_events
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.6
4
+ version: 3.2.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2025-10-30 00:00:00.000000000 Z
11
+ date: 2025-11-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails