diff --git a/.version b/.version index 3a3cd8cc..1892b926 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.3.1 +1.3.2 diff --git a/app/models/event.rb b/app/models/event.rb index 389d655b..3ab3d7cd 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -225,12 +225,12 @@ def active_event_addons? event_addons.where('price > ?', 0).count.positive? end - def active_event_addons_passes? - @active_event_addons_passes ||= active_event_addons_by_category(Addon::CATEGORY_PASS).count + def active_event_addons_passes_count + active_event_addons_by_category(Addon::CATEGORY_PASS).count end - def active_event_addons_camping? - @active_event_addons_camping ||= active_event_addons_by_category(Addon::CATEGORY_CAMP).count + def active_event_addons_camping_count + active_event_addons_by_category(Addon::CATEGORY_CAMP).count end def active_event_addons_by_category(category) diff --git a/app/views/ticket_requests/_table_ticket_request_statuses.html.haml b/app/views/ticket_requests/_table_ticket_request_statuses.html.haml index c9c9de8e..1cab8392 100644 --- a/app/views/ticket_requests/_table_ticket_request_statuses.html.haml +++ b/app/views/ticket_requests/_table_ticket_request_statuses.html.haml @@ -21,10 +21,10 @@ %th.bg-dark-subtle.text-end Tickets - if event.kid_ticket_price %th.bg-dark-subtle.text-end Kids - - if event.active_event_addons_passes? + - if event.active_event_addons_passes_count > 0 %th.bg-dark-subtle.text-end =Addon::HUMANIZED_CATEGORIES[Addon::CATEGORY_PASS] - - if event.active_event_addons_camping? + - if event.active_event_addons_camping_count > 0 %th.bg-dark-subtle.text-end =Addon::HUMANIZED_CATEGORIES[Addon::CATEGORY_CAMP] %th.bg-dark-subtle.text-end Earn @@ -41,10 +41,10 @@ - if event.kid_ticket_price %td.text-end.bg-success-subtle %span= stats[:completed][:kids] - - if event.active_event_addons_passes? + - if event.active_event_addons_passes_count > 0 %td.text-end.bg-success-subtle %span= stats[:completed][:addon_passes] - - if event.active_event_addons_camping? + - if event.active_event_addons_camping_count > 0 %td.text-end.bg-success-subtle %span= stats[:completed][:addon_camping] %td.text-end.bg-success-subtle @@ -58,9 +58,9 @@ %td.text-end.bg-warning= stats[:pending][:adults] - if event.kid_ticket_price %td.text-end.bg-warning= stats[:pending][:kids] - - if event.active_event_addons_passes? + - if event.active_event_addons_passes_count > 0 %td.text-end.bg-warning= stats[:pending][:addon_passes] - - if event.active_event_addons_camping? + - if event.active_event_addons_camping_count > 0 %td.text-end.bg-warning= stats[:pending][:addon_camping] %td.text-end.bg-warning.fs-6 = number_to_currency(stats[:pending][:raised], precision: 0) @@ -72,9 +72,9 @@ %td.text-end.bg-warning-subtle= stats[:awaiting_payment][:adults] - if event.kid_ticket_price %td.text-end.bg-warning-subtle= stats[:awaiting_payment][:kids] - - if event.active_event_addons_passes? + - if event.active_event_addons_passes_count > 0 %td.text-end.bg-warning-subtle= stats[:awaiting_payment][:addon_passes] - - if event.active_event_addons_camping? + - if event.active_event_addons_camping_count > 0 %td.text-end.bg-warning-subtle= stats[:awaiting_payment][:addon_camping] %td.text-end.bg-warning-subtle.fs-6 = number_to_currency(stats[:awaiting_payment][:raised], precision: 0) @@ -87,8 +87,8 @@ %td.bg-dark-subtle.text-end= stats[:total][:adults] - if event.kid_ticket_price %td.bg-dark-subtle.text-end= stats[:total][:kids] - - if event.active_event_addons_passes? + - if event.active_event_addons_passes_count > 0 %td.bg-dark-subtle.text-end= stats[:total][:addon_passes] - - if event.active_event_addons_camping? + - if event.active_event_addons_camping_count > 0 %td.bg-dark-subtle.text-end= stats[:total][:addon_camping] %td.bg-dark-subtle.text-end.fs-5= number_to_currency(stats[:total][:raised], precision: 0) diff --git a/app/views/ticket_requests/_table_ticket_requests.html.haml b/app/views/ticket_requests/_table_ticket_requests.html.haml index 17904965..bf76560f 100644 --- a/app/views/ticket_requests/_table_ticket_requests.html.haml +++ b/app/views/ticket_requests/_table_ticket_requests.html.haml @@ -41,10 +41,10 @@ - if ticket_request.needs_assistance = tooltip_box('Financial Assistance was requested.') do = image_tag('icons/dollar.png', width: 20, class: 'hover-tooltip') - - if ticket_request.active_addon_camp_sum + - if ticket_request.active_addon_camp_sum > 0 = tooltip_box(ticket_request.active_addon_camp_sum, title: "Camping:") do = image_tag('icons/car.png', width: 20, class: 'hover-tooltip') - - if ticket_request.active_addon_pass_sum + - if ticket_request.active_addon_pass_sum > 0 = tooltip_box(ticket_request.active_addon_pass_sum, title: "Passes:") do = image_tag('icons/pass.png', width: 20, class: 'hover-tooltip') - if ticket_request.admin_notes.present?