From 777850259b5d2f7fc6fa13eb6f4d9e5f8a403cd4 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Sun, 28 Oct 2018 17:56:48 +0000 Subject: [PATCH] Apply and delete overrides --- .../_product_sub_menu/add_product_import_tab.html.haml.deface | 4 ---- .../add_variant_overrides_tab.html.haml.deface | 3 --- app/views/admin/shared/_product_sub_menu.html.haml | 2 ++ 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 app/overrides/spree/admin/shared/_product_sub_menu/add_product_import_tab.html.haml.deface delete mode 100644 app/overrides/spree/admin/shared/_product_sub_menu/add_variant_overrides_tab.html.haml.deface diff --git a/app/overrides/spree/admin/shared/_product_sub_menu/add_product_import_tab.html.haml.deface b/app/overrides/spree/admin/shared/_product_sub_menu/add_product_import_tab.html.haml.deface deleted file mode 100644 index f3029e55cf..0000000000 --- a/app/overrides/spree/admin/shared/_product_sub_menu/add_product_import_tab.html.haml.deface +++ /dev/null @@ -1,4 +0,0 @@ -/ insert_bottom "[data-hook='admin_product_sub_tabs']" - --# Commenting out for now, until product import is finished --# = tab :product_import, label: "Import", url: main_app.admin_product_import_path, match_path: '/product_import' diff --git a/app/overrides/spree/admin/shared/_product_sub_menu/add_variant_overrides_tab.html.haml.deface b/app/overrides/spree/admin/shared/_product_sub_menu/add_variant_overrides_tab.html.haml.deface deleted file mode 100644 index 2915a5a9f6..0000000000 --- a/app/overrides/spree/admin/shared/_product_sub_menu/add_variant_overrides_tab.html.haml.deface +++ /dev/null @@ -1,3 +0,0 @@ -/ insert_bottom "[data-hook='admin_product_sub_tabs']" - -= tab :variant_overrides, url: main_app.admin_inventory_path, match_path: '/inventory' diff --git a/app/views/admin/shared/_product_sub_menu.html.haml b/app/views/admin/shared/_product_sub_menu.html.haml index 2fa5c4d6ac..39a81923eb 100644 --- a/app/views/admin/shared/_product_sub_menu.html.haml +++ b/app/views/admin/shared/_product_sub_menu.html.haml @@ -4,3 +4,5 @@ = tab :option_types, match_path: '/option_types' = tab :properties = tab :prototypes + = tab :variant_overrides, url: main_app.admin_inventory_path, match_path: '/inventory' + = tab :import, url: main_app.admin_product_import_path, match_path: '/product_import'