Merge pull request #295 from fnf-org/mfl/view-addons

Mfl/view addons
fnf-org · Sep 6, 2024 · 27646b2 · 27646b2
2 parents f0cc478 + dded08e
commit 27646b2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-1.3.14
+1.3.15
diff --git 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
diff --git 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