From 4d9ebf0550ae2e1eabee4e62f43eca9ec7cfb3fc Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Tue, 11 Sep 2018 12:17:28 +0100
Subject: [PATCH] Apply submenu override

---
 app/overrides/add_orders_admin_sub_menu.rb   | 4 ----
 app/views/spree/admin/orders/index.html.haml | 5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 app/overrides/add_orders_admin_sub_menu.rb

diff --git a/app/overrides/add_orders_admin_sub_menu.rb b/app/overrides/add_orders_admin_sub_menu.rb
deleted file mode 100644
index ff26145421..0000000000
--- a/app/overrides/add_orders_admin_sub_menu.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-Deface::Override.new(:virtual_path => "spree/admin/orders/index",
-                     :name => "add_orders_admin_sub_menu",
-                     :insert_before => "code[erb-silent]:contains('content_for :table_filter_title do')",
-                     :text => "<%= render :partial => 'spree/admin/shared/order_sub_menu' %>")
diff --git a/app/views/spree/admin/orders/index.html.haml b/app/views/spree/admin/orders/index.html.haml
index dae0c47089..3b233424cc 100644
--- a/app/views/spree/admin/orders/index.html.haml
+++ b/app/views/spree/admin/orders/index.html.haml
@@ -3,6 +3,7 @@
 - content_for :page_actions do
   %li
     = button_link_to t(:new_order), new_admin_order_url, :icon => 'icon-plus', :id => 'admin_new_order'
+= render partial: 'spree/admin/shared/order_sub_menu'
 - content_for :table_filter_title do
   = t(:search)
 - content_for :table_filter do
@@ -56,6 +57,7 @@
       .actions.filter-actions
         %div{"data-hook" => "admin_orders_index_search_buttons"}
           = button t(:filter_results), 'icon-search'
+
 - unless @orders.empty?
   %table#listing_orders.index.responsive{"data-hook" => "", width: "100%", "ng-app" => "ofn.admin"}
     %colgroup
@@ -104,4 +106,5 @@
 - else
   .no-objects-found
     = t(:no_orders_found)
-= paginate @orders
\ No newline at end of file
+
+= paginate @orders