From e27cf5f6b8d348e1645188db07324039cc40b95c Mon Sep 17 00:00:00 2001 From: Alex Luo <89435003+alexbluo@users.noreply.github.com> Date: Mon, 18 Aug 2025 01:58:44 +0000 Subject: [PATCH 1/6] add more nuanced premium ineligible tooltips --- app/views/events/promotions.html.erb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/views/events/promotions.html.erb b/app/views/events/promotions.html.erb index 0a6b5bd1a6..5180c76443 100644 --- a/app/views/events/promotions.html.erb +++ b/app/views/events/promotions.html.erb @@ -15,8 +15,16 @@ Jukebox Premium - <% if (!@perks_available || !@event.organized_by_teenagers? || @event.users.count { |user| user.teenager? && user.active? } < 10) %> -
+ <% if !@perks_available %> +
+ Ineligible +
+ <% elsif !@event.organized_by_teenagers? %> +
+ Ineligible +
+ <% elsif @event.users.count { |user| user.teenager? && user.active? } < 10 %> +
Ineligible
<% else %> From b0f88209672f74db837c4ee2cd84f756c95ed9ee Mon Sep 17 00:00:00 2001 From: Luke Oldenburg <87272260+Luke-Oldenburg@users.noreply.github.com> Date: Mon, 25 Aug 2025 00:52:46 +0000 Subject: [PATCH 2/6] Luke's fixes --- app/controllers/events_controller.rb | 2 ++ app/views/events/promotions.html.erb | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index 0ddcd8a6cb..95212c4b1c 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -770,6 +770,8 @@ def new_transfer def promotions authorize @event + + @perks_available = OrganizerPosition.role_at_least?(current_user, @event, :manager) && !@event.demo_mode? && @event.plan.eligible_for_perks? end def reimbursements diff --git a/app/views/events/promotions.html.erb b/app/views/events/promotions.html.erb index 5180c76443..0d3a14cdca 100644 --- a/app/views/events/promotions.html.erb +++ b/app/views/events/promotions.html.erb @@ -2,8 +2,6 @@ <% page_md %> <%= render "events/nav", selected: :promotions %> -<% @perks_available = OrganizerPosition.role_at_least?(current_user, @event, :manager) && organizer_signed_in? && !@event.demo_mode? && @event.plan.eligible_for_perks? %> -

Promotions & perks

@@ -15,16 +13,20 @@ Jukebox Premium - <% if !@perks_available %> -
+ <% if !@event.plan.eligible_for_perks? %> +
+ Ineligible +
+ <% elsif !@perks_available %> +
Ineligible
<% elsif !@event.organized_by_teenagers? %> -
+
Ineligible
<% elsif @event.users.count { |user| user.teenager? && user.active? } < 10 %> -
+
Ineligible
<% else %> From 1b5d87432e1b88d971a7669ca67870c4a721453f Mon Sep 17 00:00:00 2001 From: Sam Poder Date: Mon, 25 Aug 2025 09:37:03 -0500 Subject: [PATCH 3/6] Update app/views/events/promotions.html.erb Co-authored-by: yodalightsabr --- app/views/events/promotions.html.erb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app/views/events/promotions.html.erb b/app/views/events/promotions.html.erb index 0d3a14cdca..279c48ba20 100644 --- a/app/views/events/promotions.html.erb +++ b/app/views/events/promotions.html.erb @@ -14,19 +14,17 @@ Premium <% if !@event.plan.eligible_for_perks? %> -
- Ineligible -
+ <% jukebox_ineligible_reason = "Perks are not available for HQ organizations" <% elsif !@perks_available %> -
- Ineligible -
+ <% jukebox_ineligible_reason = "You must be a manager and organization must not be on demo mode" %> <% elsif !@event.organized_by_teenagers? %> -
- Ineligible -
+ <% jukebox_ineligible_reason = "Organization must have teen-led tag (reach out to your POC regarding this)" %> <% elsif @event.users.count { |user| user.teenager? && user.active? } < 10 %> -
+ <% jukebox_ineligible_reason = "Organization must have 10 or more active teens %> + <% end %> + + <% if defined?(jukebox_ineligible_reason) %> +
Ineligible
<% else %> From 5d0c60ec926a07d9587fc12ef6a6e4c0d56fb1b0 Mon Sep 17 00:00:00 2001 From: Sam Poder Date: Mon, 25 Aug 2025 15:26:27 -0500 Subject: [PATCH 4/6] Update app/views/events/promotions.html.erb --- app/views/events/promotions.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/events/promotions.html.erb b/app/views/events/promotions.html.erb index 279c48ba20..8806ff53f5 100644 --- a/app/views/events/promotions.html.erb +++ b/app/views/events/promotions.html.erb @@ -14,7 +14,7 @@ Premium <% if !@event.plan.eligible_for_perks? %> - <% jukebox_ineligible_reason = "Perks are not available for HQ organizations" + <% jukebox_ineligible_reason = "Perks are not available for HQ organizations" %> <% elsif !@perks_available %> <% jukebox_ineligible_reason = "You must be a manager and organization must not be on demo mode" %> <% elsif !@event.organized_by_teenagers? %> From 8c2976f2a87de5dca90d8a6f4976dbe8683b7946 Mon Sep 17 00:00:00 2001 From: Sam Poder <39828164+sampoder@users.noreply.github.com> Date: Mon, 25 Aug 2025 15:27:41 -0500 Subject: [PATCH 5/6] Update promotions.html.erb --- app/views/events/promotions.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/events/promotions.html.erb b/app/views/events/promotions.html.erb index 8806ff53f5..0f6b7458e6 100644 --- a/app/views/events/promotions.html.erb +++ b/app/views/events/promotions.html.erb @@ -20,7 +20,7 @@ <% elsif !@event.organized_by_teenagers? %> <% jukebox_ineligible_reason = "Organization must have teen-led tag (reach out to your POC regarding this)" %> <% elsif @event.users.count { |user| user.teenager? && user.active? } < 10 %> - <% jukebox_ineligible_reason = "Organization must have 10 or more active teens %> + <% jukebox_ineligible_reason = "Organization must have 10 or more active teens" %> <% end %> <% if defined?(jukebox_ineligible_reason) %> From 4d8c98dd9e4b3f26b8e8c7a8bd53ca4b0034a0b5 Mon Sep 17 00:00:00 2001 From: Sam Poder <39828164+sampoder@users.noreply.github.com> Date: Mon, 25 Aug 2025 15:38:02 -0500 Subject: [PATCH 6/6] Update promotions.html.erb --- app/views/events/promotions.html.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/events/promotions.html.erb b/app/views/events/promotions.html.erb index 0f6b7458e6..6a284ad383 100644 --- a/app/views/events/promotions.html.erb +++ b/app/views/events/promotions.html.erb @@ -14,17 +14,17 @@ Premium <% if !@event.plan.eligible_for_perks? %> - <% jukebox_ineligible_reason = "Perks are not available for HQ organizations" %> + <% jukebox_ineligible_reason = "Perks are not available for HQ organizations" %> <% elsif !@perks_available %> - <% jukebox_ineligible_reason = "You must be a manager and organization must not be on demo mode" %> + <% jukebox_ineligible_reason = "You must be a manager and organization must not be on demo mode" %> <% elsif !@event.organized_by_teenagers? %> - <% jukebox_ineligible_reason = "Organization must have teen-led tag (reach out to your POC regarding this)" %> + <% jukebox_ineligible_reason = "Organization must have teen-led tag (reach out to your POC regarding this)" %> <% elsif @event.users.count { |user| user.teenager? && user.active? } < 10 %> - <% jukebox_ineligible_reason = "Organization must have 10 or more active teens" %> + <% jukebox_ineligible_reason = "Organization must have 10 or more active teens" %> <% end %> - + <% if defined?(jukebox_ineligible_reason) %> -
+
Ineligible
<% else %>