Move actions from product column

tablexi · Jun 12, 2024 · 4261a33 · 4261a33
1 parent 3395220
commit 4261a33
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/app/views/facility_orders/_order_table.html.haml b/app/views/facility_orders/_order_table.html.haml
@@ -15,24 +15,25 @@
         - if od.time_data.present?
           %br
           = od.time_data
+        - if od.add_accessories? || od.reservation.present?
+          %br
+          - if od.add_accessories?
+            = link_to new_facility_order_order_detail_accessory_path(current_facility, @order, od), class: ["has_accessories", "persistent", "undecorated"] do
+              = tooltip_icon "fa fa-plus-square", t("product_accessories.pick_accessories.title")
+              %span= t("views.facility_orders.show.order_table.accessories")
+
+          - if od.reservation.present?
+            = link_to facility_order_order_detail_url(current_facility, @order, od, format: :ics) do
+              = tooltip_icon "fa fa-calendar", t("ical.calendar_tooltip")
+              %span= t("views.facility_orders.show.order_table.download")
+
+            - if cross_core
+              = reservation_actions(od.reservation)
       - if cross_core
         %td.user
           = od.created_by_user
         %td.order_date
           = od.ordered_at&.strftime("%m/%d/%Y")
-      %td.action
-        - if od.add_accessories?
-          = link_to new_facility_order_order_detail_accessory_path(current_facility, @order, od), class: ["has_accessories", "persistent", "undecorated"] do
-            = tooltip_icon "fa fa-plus-square", t("product_accessories.pick_accessories.title")
-            %span= t("views.facility_orders.show.order_table.accessories")
-
-        - if od.reservation.present?
-          = link_to facility_order_order_detail_url(current_facility, @order, od, format: :ics) do
-            = tooltip_icon "fa fa-calendar", t("ical.calendar_tooltip")
-            %span= t("views.facility_orders.show.order_table.download")
-
-          - if cross_core
-            = reservation_actions(od.reservation, use_delimiter: false)
 
         = render "order_file_icon", od: od
         = render "result_file_icon", od: od

diff --git a/app/views/facility_orders/_order_table_headers.html.haml b/app/views/facility_orders/_order_table_headers.html.haml
@@ -13,7 +13,6 @@
     - if cross_core
       %th{scope: "col"}= t("views.facility_orders.show.order_by")
       %th{scope: "col"}= t("views.facility_orders.show.order_date")
-    %th{scope: "col"}= t("views.facility_orders.show.actions")
     %th.time{scope: "col"}= t("views.facility_orders.show.reserved")
     %th.time{scope: "col"}= t("views.facility_orders.show.actual")
     %th.currency{scope: "col"}= t("views.facility_orders.show.cost")