From afedaea2b52aea121754ac4d263a3c737b1d3811 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Tue, 11 Sep 2018 11:45:40 +0100
Subject: [PATCH] Apply special instructions override

---
 .../orders/index/add_special_instructions.html.haml.deface | 6 ------
 app/views/spree/admin/orders/index.html.haml               | 7 ++++++-
 2 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100644 app/overrides/spree/admin/orders/index/add_special_instructions.html.haml.deface

diff --git a/app/overrides/spree/admin/orders/index/add_special_instructions.html.haml.deface b/app/overrides/spree/admin/orders/index/add_special_instructions.html.haml.deface
deleted file mode 100644
index 1711343f3c..0000000000
--- a/app/overrides/spree/admin/orders/index/add_special_instructions.html.haml.deface
+++ /dev/null
@@ -1,6 +0,0 @@
-/ insert_bottom "[data-hook='admin_orders_index_rows'] td:nth-child(3)"
-
-- if order.special_instructions.present?
-  %br
-  %span{class: "icon-warning-sign", "ofn-with-tip" => order.special_instructions}
-    notes
diff --git a/app/views/spree/admin/orders/index.html.haml b/app/views/spree/admin/orders/index.html.haml
index adfe35ee38..8c76fe630a 100644
--- a/app/views/spree/admin/orders/index.html.haml
+++ b/app/views/spree/admin/orders/index.html.haml
@@ -82,7 +82,12 @@
           %td.align-center
             = order.distributor.andand.name
           %td.align-center= l (@show_only_completed ? order.completed_at : order.created_at).to_date
-          %td= link_to order.number, admin_order_path(order)
+          %td
+            = link_to order.number, admin_order_path(order)
+            - if order.special_instructions.present?
+              %br
+              %span{class: "icon-warning-sign", "ofn-with-tip" => order.special_instructions}
+                notes
           %td.align-center
             %span{class: "state #{order.state.downcase}"}= t("order_state.#{order.state.downcase}")
           %td.align-center