From 444747c8b26a1f49c307d0e9d5506270217beedb Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 22 Jan 2020 11:30:43 +0100
Subject: [PATCH] Split shopping_shared/details partial into header and tabs
 partials and only include tabs in shop page (not cart and checkout).

---
 app/views/checkout/edit.html.haml             |  2 +-
 app/views/enterprises/shop.html.haml          |  3 ++-
 .../{_details.html.haml => _header.html.haml} |  3 ---
 app/views/shopping_shared/_tabs.html.haml     | 20 ++++++++++---------
 app/views/spree/orders/edit.html.haml         |  2 +-
 app/views/spree/orders/show.html.haml         |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename app/views/shopping_shared/{_details.html.haml => _header.html.haml} (87%)

diff --git a/app/views/checkout/edit.html.haml b/app/views/checkout/edit.html.haml
index 1c5765243b..312b7b5a79 100644
--- a/app/views/checkout/edit.html.haml
+++ b/app/views/checkout/edit.html.haml
@@ -15,7 +15,7 @@
       %strong
         = pickup_time current_order_cycle
 
-  = render partial: "shopping_shared/details"
+  = render partial: "shopping_shared/header"
 
   %accordion{"close-others" => "false"}
     %checkout.row{"ng-controller" => "CheckoutCtrl"}
diff --git a/app/views/enterprises/shop.html.haml b/app/views/enterprises/shop.html.haml
index e47c85d1ad..5498ca3d0a 100644
--- a/app/views/enterprises/shop.html.haml
+++ b/app/views/enterprises/shop.html.haml
@@ -36,6 +36,7 @@
 
 
 
-  = render partial: "shopping_shared/details"
+  = render partial: "shopping_shared/header"
+  = render partial: "shopping_shared/tabs"
 
 = render partial: "shared/footer"
diff --git a/app/views/shopping_shared/_details.html.haml b/app/views/shopping_shared/_header.html.haml
similarity index 87%
rename from app/views/shopping_shared/_details.html.haml
rename to app/views/shopping_shared/_header.html.haml
index ec73b2f5af..af28612ded 100644
--- a/app/views/shopping_shared/_details.html.haml
+++ b/app/views/shopping_shared/_header.html.haml
@@ -13,6 +13,3 @@
 
     .small-12.medium-6.large-6.columns
       = render partial: "shopping_shared/order_cycles"
-
-
-= render partial: "shopping_shared/tabs" if distributor == current_distributor
diff --git a/app/views/shopping_shared/_tabs.html.haml b/app/views/shopping_shared/_tabs.html.haml
index 4b254a3780..8e07d4b993 100644
--- a/app/views/shopping_shared/_tabs.html.haml
+++ b/app/views/shopping_shared/_tabs.html.haml
@@ -1,11 +1,13 @@
-- shop_tabs.each do |tab|
-  = render "shopping_shared/tabs/#{tab[:name]}"
+- if (@order.andand.distributor || current_distributor) == current_distributor
 
-.tabset-ctrl#shop-tabs{ navigate: 'true', alwaysopen: 'true', selected: shop_tabs.first[:name], prefix: 'shop', ng: { cloak: true } }
-  .tab-buttons
-    .row
-      - shop_tabs.each do |tab|
-        .tab{ id: "tab_#{tab[:name]}", name: tab[:name] }
-          %a{ href: 'javascript:void(0)' }=tab[:title]
+  - shop_tabs.each do |tab|
+    = render "shopping_shared/tabs/#{tab[:name]}"
 
-  .tab-view
+  .tabset-ctrl#shop-tabs{ navigate: 'true', alwaysopen: 'true', selected: shop_tabs.first[:name], prefix: 'shop', ng: { cloak: true } }
+    .tab-buttons
+      .row
+        - shop_tabs.each do |tab|
+          .tab{ id: "tab_#{tab[:name]}", name: tab[:name] }
+            %a{ href: 'javascript:void(0)' }=tab[:title]
+
+    .tab-view
diff --git a/app/views/spree/orders/edit.html.haml b/app/views/spree/orders/edit.html.haml
index c05e644fac..d8d8ec600c 100644
--- a/app/views/spree/orders/edit.html.haml
+++ b/app/views/spree/orders/edit.html.haml
@@ -16,7 +16,7 @@
         - else
           = @order.distributor.next_collection_at
 
-  = render partial: "shopping_shared/details"
+  = render partial: "shopping_shared/header"
 
   %fieldset.footer-pad
     - if @order.line_items.empty?
diff --git a/app/views/spree/orders/show.html.haml b/app/views/spree/orders/show.html.haml
index 5abbc1c2ed..b1bd92da46 100644
--- a/app/views/spree/orders/show.html.haml
+++ b/app/views/spree/orders/show.html.haml
@@ -5,7 +5,7 @@
   = inject_enterprise_and_relatives if current_distributor.present?
 
 .darkswarm
-  = render "shopping_shared/details" if current_distributor.present?
+  = render "shopping_shared/header" if current_distributor.present?
 
   %fieldset#order_summary.footer-pad{"data-hook" => ""}
     .row