Split shopping_shared/details partial into header and tabs partials and only include tabs in shop page (not cart and checkout).

This commit is contained in:
Matt-Yorkley
2020-01-22 11:30:43 +01:00
parent 6bb4f2477c
commit 444747c8b2
6 changed files with 16 additions and 16 deletions

View File

@@ -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"}

View File

@@ -36,6 +36,7 @@
= render partial: "shopping_shared/details"
= render partial: "shopping_shared/header"
= render partial: "shopping_shared/tabs"
= render partial: "shared/footer"

View File

@@ -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

View File

@@ -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

View File

@@ -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?

View File

@@ -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