From fa0b365b28dab96aa763be7223d396b67eeea4fc Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Tue, 7 Jan 2020 21:18:28 +0100 Subject: [PATCH] Move "shop messages" and product list from main view into new "Home" and "Shop" tabs --- app/views/enterprises/shop.html.haml | 5 ----- app/views/shopping_shared/tabs/_home.html.haml | 2 ++ app/views/shopping_shared/tabs/_shop.html.haml | 4 ++++ 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 app/views/shopping_shared/tabs/_home.html.haml create mode 100644 app/views/shopping_shared/tabs/_shop.html.haml diff --git a/app/views/enterprises/shop.html.haml b/app/views/enterprises/shop.html.haml index 96df8b89ff..e47c85d1ad 100644 --- a/app/views/enterprises/shop.html.haml +++ b/app/views/enterprises/shop.html.haml @@ -38,9 +38,4 @@ = render partial: "shopping_shared/details" - = render partial: 'shop/messages' - - - unless require_customer? - .row= render partial: "shop/products/form" - = render partial: "shared/footer" diff --git a/app/views/shopping_shared/tabs/_home.html.haml b/app/views/shopping_shared/tabs/_home.html.haml new file mode 100644 index 0000000000..9a618fbdee --- /dev/null +++ b/app/views/shopping_shared/tabs/_home.html.haml @@ -0,0 +1,2 @@ +%script{ type: "text/ng-template", id: "shop/home.html" } + = render partial: 'shop/messages' diff --git a/app/views/shopping_shared/tabs/_shop.html.haml b/app/views/shopping_shared/tabs/_shop.html.haml new file mode 100644 index 0000000000..b9b5f863c1 --- /dev/null +++ b/app/views/shopping_shared/tabs/_shop.html.haml @@ -0,0 +1,4 @@ +%script{ type: "text/ng-template", id: "shop/shop.html" } + - unless require_customer? + .row + = render partial: "shop/products/form"