From 66876360611381f7dab62348e81276543a05dd5f Mon Sep 17 00:00:00 2001 From: Matt Levy Date: Fri, 6 Sep 2024 09:25:02 -0700 Subject: [PATCH 1/3] fix alignment issues --- .../events/_table_camping_permits.html.haml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/views/events/_table_camping_permits.html.haml b/app/views/events/_table_camping_permits.html.haml index 129a1930..ebe89c62 100644 --- a/app/views/events/_table_camping_permits.html.haml +++ b/app/views/events/_table_camping_permits.html.haml @@ -15,24 +15,24 @@ %tbody.border-dark-subtle.border-2 - ticket_requests.each do |ticket_request| - next unless ticket_request.active_addon_camp_sum > 0 - %tr{ class: "ticket-request-row" } - %td.align-content-center.ticket-user - = link_to event_ticket_request_path(event, ticket_request) do - = ticket_request.user.name + - ticket_request.active_sorted_addons_by_category(Addon::CATEGORY_CAMP).each do |tr_event_addon| + %tr{ class: "ticket-request-row" } + %td.align-content-center.ticket-user + = link_to event_ticket_request_path(event, ticket_request) do + = ticket_request.user.name - - if event.require_role - %td.muted.align-content-center - = TicketRequest::ROLES[ticket_request.role] + - if event.require_role + %td.muted.align-content-center + = TicketRequest::ROLES[ticket_request.role] - - ticket_request.active_sorted_addons_by_category(Addon::CATEGORY_CAMP).each do |tr_event_addon| %td.align-content-center.text-center = "#{tr_event_addon.name}" %td.align-content-center.text-center = "#{tr_event_addon.quantity}" - %td.align-content-center.text-center - = ticket_request.created_at.to_date + %td.align-content-center.text-center + = ticket_request.created_at.to_date - %td.align-content-center.text-center.ticket-status - %span.p-2.rounded.small.bi-credit-card.text-black{ class: text_class_for_status(ticket_request) } - = text_for_status ticket_request + %td.align-content-center.text-center.ticket-status + %span.p-2.rounded.small.bi-credit-card.text-black{ class: text_class_for_status(ticket_request) } + = text_for_status ticket_request From 779067ee5703207bbe564539ebc9b2251bbb8914 Mon Sep 17 00:00:00 2001 From: Matt Levy Date: Fri, 6 Sep 2024 09:33:54 -0700 Subject: [PATCH 2/3] fix alignment for multiple passes --- .../events/_table_event_passes.html.haml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/views/events/_table_event_passes.html.haml b/app/views/events/_table_event_passes.html.haml index 7a5fc3a0..084c1168 100644 --- a/app/views/events/_table_event_passes.html.haml +++ b/app/views/events/_table_event_passes.html.haml @@ -15,24 +15,24 @@ %tbody.border-dark-subtle.border-2 - ticket_requests.each do |ticket_request| - next unless ticket_request.active_addon_pass_sum > 0 - %tr{ class: "ticket-request-row" } - %td.align-content-center.ticket-user - = link_to event_ticket_request_path(event, ticket_request) do - = ticket_request.user.name + - ticket_request.active_sorted_addons_by_category(Addon::CATEGORY_PASS).each do |tr_event_addon| + %tr{ class: "ticket-request-row" } + %td.align-content-center.ticket-user + = link_to event_ticket_request_path(event, ticket_request) do + = ticket_request.user.name - - if event.require_role - %td.muted.align-content-center - = TicketRequest::ROLES[ticket_request.role] + - if event.require_role + %td.muted.align-content-center + = TicketRequest::ROLES[ticket_request.role] - - ticket_request.active_sorted_addons_by_category(Addon::CATEGORY_PASS).each do |tr_event_addon| %td.align-content-center.text-center = "#{tr_event_addon.name}" %td.align-content-center.text-center = "#{tr_event_addon.quantity}" - %td.align-content-center.text-center - = ticket_request.created_at.to_date + %td.align-content-center.text-center + = ticket_request.created_at.to_date - %td.align-content-center.text-center.ticket-status - %span.p-2.rounded.small.bi-credit-card.text-black{ class: text_class_for_status(ticket_request) } - = text_for_status ticket_request + %td.align-content-center.text-center.ticket-status + %span.p-2.rounded.small.bi-credit-card.text-black{ class: text_class_for_status(ticket_request) } + = text_for_status ticket_request From dded08ee96bc10a37f8d714a95e163d08247d2e8 Mon Sep 17 00:00:00 2001 From: Matt Levy Date: Fri, 6 Sep 2024 09:34:15 -0700 Subject: [PATCH 3/3] bump --- .version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version b/.version index 085c0f26..5bdcf5c3 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.3.14 +1.3.15