spree_frontend 4.1.0.rc2 → 4.1.0.rc3

data/app/controllers/spree/taxons_controller.rb

@@ -1,22 +1,27 @@
 module Spree
   class TaxonsController < Spree::StoreController
+    include Spree::FrontendHelper
     helper 'spree/products'
 
-    before_action :load_taxon, :load_products
+    before_action :load_taxon
 
     respond_to :html
 
     def show
+      if stale?(etag: etag, last_modified: last_modified, public: true)
+        load_products
+      end
     end
 
     def product_carousel
-      if @products.any?
-        render template: 'spree/taxons/product_carousel', layout: false
-      else
-        head :no_content
+      if stale?(etag: carousel_etag, last_modified: last_modified, public: true)
+        load_products
+        if @products.any?
+          render template: 'spree/taxons/product_carousel', layout: false
+        else
+          head :no_content
+        end
       end
-
-      fresh_when etag: "product-carousel/#{@taxon.cache_key_with_version}", last_modified: @taxon.updated_at.utc, public: true
     end
 
     private
@@ -33,5 +38,25 @@ module Spree
       @searcher = build_searcher(params.merge(taxon: @taxon.id, include_images: true))
       @products = @searcher.retrieve_products
     end
+
+    def etag
+      [
+        store_etag,
+        @taxon,
+        available_option_types_cache_key,
+        filtering_params_cache_key
+      ]
+    end
+
+    def carousel_etag
+      [
+        store_etag,
+        @taxon
+      ]
+    end
+
+    def last_modified
+      @taxon.updated_at&.utc
+    end
   end
 end

data/app/helpers/spree/addresses_helper.rb

@@ -7,10 +7,12 @@ module Spree
           yield
         else
           is_required = Spree::Address.required_fields.include?(method)
+          method_name = I18n.t("activerecord.attributes.spree/address.#{method}")
+          required = Spree.t(:required)
           form.text_field(method,
                           class: [is_required ? 'required' : nil, 'spree-flat-input'].compact,
                           required: is_required,
-                          placeholder: I18n.t("activerecord.attributes.spree/address.#{method}"))
+                          placeholder: is_required ? "#{method_name} #{required}" : method_name)
         end
       end
     end

data/app/helpers/spree/frontend_helper.rb

@@ -11,13 +11,14 @@ module Spree
       return '' if current_page?('/') || taxon.nil?
 
       separator = raw(separator)
-      crumbs = [content_tag(:li, content_tag(:span, link_to(content_tag(:span, Spree.t(:home), itemprop: 'name'), spree.root_path, itemprop: 'url') + separator, itemprop: 'item'), itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement', class: 'breadcrumb-item')]
+      crumbs = [content_tag(:li, content_tag(:span, link_to(content_tag(:span, Spree.t(:home), itemprop: 'name'), spree.root_path, itemprop: 'url') + separator, itemprop: 'item'), itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement', itemid: spree.root_path, class: 'breadcrumb-item', position: 0)]
       if taxon
-        crumbs << taxon.ancestors.where.not(parent_id: nil).map { |ancestor| content_tag(:li, content_tag(:span, link_to(content_tag(:span, ancestor.name, itemprop: 'name'), seo_url(ancestor, params: permitted_product_params), itemprop: 'url') + separator, itemprop: 'item'), itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement', class: 'breadcrumb-item') } unless taxon.ancestors.empty?
-        crumbs << content_tag(:li, content_tag(:span, link_to(content_tag(:span, taxon.name, itemprop: 'name'), seo_url(taxon, params: permitted_product_params), itemprop: 'url') + separator, itemprop: 'item'), class: 'breadcrumb-item', itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement')
-        crumbs << content_tag(:li, content_tag(:span, content_tag(:span, product.name) + separator), class: 'breadcrumb-item') if product
+        ancestors = taxon.ancestors.where.not(parent_id: nil)
+        crumbs << ancestors.each_with_index.map { |ancestor, index| content_tag(:li, content_tag(:span, link_to(content_tag(:span, ancestor.name, itemprop: 'name'), seo_url(ancestor, params: permitted_product_params), itemprop: 'url', itemid: seo_url(ancestor, params: permitted_product_params), position: index + 1) + separator, itemprop: 'item'), itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement', itemid: seo_url(ancestor, params: permitted_product_params), class: 'breadcrumb-item', position: index + 1) }
+        crumbs << content_tag(:li, content_tag(:span, link_to(content_tag(:span, taxon.name, itemprop: 'name'), seo_url(taxon, params: permitted_product_params), itemprop: 'url', itemid: seo_url(taxon, params: permitted_product_params), position: ancestors.size + 1) + separator, itemprop: 'item'), class: 'breadcrumb-item', itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement', itemid: seo_url(taxon, params: permitted_product_params), position: ancestors.size + 1)
+        crumbs << content_tag(:li, content_tag(:span, content_tag(:span, product.name) + separator, itemid: spree.product_path(product, taxon_id: taxon.try(:id)), position: ancestors.size + 2), class: 'breadcrumb-item', itemid: spree.product_path(product, taxon_id: taxon.try(:id)), position: ancestors.size + 2) if product
       else
-        crumbs << content_tag(:li, content_tag(:span, Spree.t(:products), itemprop: 'item'), class: 'active', itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement')
+        crumbs << content_tag(:li, content_tag(:span, Spree.t(:products), itemprop: 'item'), class: 'active', itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement', position: 1)
       end
       crumb_list = content_tag(:ol, raw(crumbs.flatten.map(&:mb_chars).join), class: 'breadcrumb', itemscope: 'itemscope', itemtype: 'https://schema.org/BreadcrumbList')
       content_tag(:nav, crumb_list, id: 'breadcrumbs', class: 'col-12 mt-1 mt-sm-3 mt-lg-4', aria: { label: 'breadcrumb' })
@@ -205,8 +206,16 @@ module Spree
       available_option_types.map(&:filter_param).concat(static_filters)
     end
 
+    def filtering_params_cache_key
+      params.permit(*filtering_params)&.reject { |_, v| v.blank? }&.to_s
+    end
+
+    def available_option_types_cache_key
+      @available_option_types_cache_key ||= Spree::OptionType.maximum(:updated_at)&.utc&.to_i
+    end
+
     def available_option_types
-      @available_option_types ||= Rails.cache.fetch('available-option-types', expires_in: 3.minutes) do
+      @available_option_types ||= Rails.cache.fetch("available-option-types/#{available_option_types_cache_key}") do
         Spree::OptionType.includes(:option_values).to_a
       end
       @available_option_types

data/app/views/spree/checkout/_delivery.html.erb

@@ -15,7 +15,8 @@
                     rate.id,
                     data: {
                       behavior: 'shipping-method-selector',
-                      cost: rate.display_cost
+                      cost: rate.display_cost,
+                      tax: rate.display_tax_amount
                     } %>
                   <span class="spree-radio-label-custom-input"></span>
                   <span class="rate-name"><%= rate.name %></span>

data/app/views/spree/checkout/_summary.html.erb

@@ -13,13 +13,40 @@
 
     <% order.all_adjustments.nonzero.tax.eligible.group_by(&:label).each do |label, adjustments| %>
       <div class="d-table-cell"><%= label %></div>
-      <div class="d-table-cell text-right"><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %></div>
+      <% tax_total = Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
+      <div class="d-table-cell text-right"
+           data-hook='tax-total'
+           data-currency='<%= Money::Currency.find(order.currency).symbol %>'
+           data-non-shipment-tax='<%= adjustments.reject{ |adj| adj.adjustable_type== 'Spree::Shipment'}.sum(&:amount) %>'
+           thousands-separator='<%= tax_total.thousands_separator %>'
+           decimal-mark='<%= tax_total.decimal_mark %>'
+           precision='<%= Money::Currency.find(order.currency).exponent %>'
+      >
+        <%= tax_total.to_html %>
+      </div>
+    <% end %>
+    <% if order.all_adjustments.nonzero.tax.eligible.empty? %>
+      <div class="d-table-cell"><%= Spree::TaxRate.first&.name || Spree.t(:tax) %></div>
+      <div class="d-table-cell text-right"
+           data-hook='tax-total'
+           data-non-shipment-tax='0'
+      >
+        <%= Spree::Money.new(0, currency: order.currency) %>
+      </div>
     <% end %>
 
     <% if order.passed_checkout_step?("address") && order.shipments.any? %>
       <div class="d-table-cell"><%= Spree.t(:shipping) %>:</div>
       <% shipping_total = Spree::Money.new(order.shipments.to_a.sum(&:cost), currency: order.currency) %>
-      <div class="d-table-cell text-right" data-hook='shipping-total' data-currency='<%= Money::Currency.find(order.currency).symbol %>' thousands-separator='<%= shipping_total.thousands_separator %>' decimal-mark='<%= shipping_total.decimal_mark %>' precision='<%= Money::Currency.find(order.currency).exponent %>'><%= shipping_total.to_html %></div>
+      <div class="d-table-cell text-right"
+           data-hook='shipping-total'
+           data-currency='<%= Money::Currency.find(order.currency).symbol %>'
+           thousands-separator='<%= shipping_total.thousands_separator %>'
+           decimal-mark='<%= shipping_total.decimal_mark %>'
+           precision='<%= Money::Currency.find(order.currency).exponent %>'
+      >
+        <%= shipping_total.to_html %>
+      </div>
 
       <% if order.shipment_adjustments.nonzero.exists? %>
         <% order.shipment_adjustments.nonzero.promotion.eligible.group_by(&:label).each do |label, adjustments| %>

data/app/views/spree/checkout/edit.html.erb

@@ -20,11 +20,13 @@
       </div>
 
       <% unless @order.confirm? %>
-        <div id="checkout-summary" class="col-md-12 col-lg-auto" data-hook="checkout_summary_box">
-          <%= render partial: 'summary', locals: { order: @order } %>
-          <div data-hook="buttons">
-            <% submit_label_key = @order.confirm? ? :place_order : :save_and_continue %>
-            <%= submit_tag Spree.t(submit_label_key), class: 'btn btn-primary text-uppercase font-weight-bold w-100 checkout-content-save-continue-button' %>
+        <div id="checkout-summary" class="col-md-12 col-lg-auto h-100" data-hook="checkout_summary_box">
+          <div class="checkout-summary-container position-sticky">
+            <%= render partial: 'summary', locals: { order: @order } %>
+            <div data-hook="buttons">
+              <% submit_label_key = @order.confirm? ? :place_order : :save_and_continue %>
+              <%= submit_tag Spree.t(submit_label_key), class: 'btn btn-primary text-uppercase font-weight-bold w-100 checkout-content-save-continue-button' %>
+            </div>
           </div>
         </div>
       <% end %>

data/app/views/spree/checkout/registration.html.erb

@@ -5,7 +5,7 @@
       <%= render partial: 'spree/shared/login' if defined?(spree_login_path) %>
     </div>
     <div class="col-xs-12 col-lg-6">
-      <div class="col-lg-11 mx-auto pt-lg-2">
+      <div class="col-lg-11 mx-auto">
         <% if defined?(spree_signup_path) %>
           <%= render partial: 'spree/shared/registration', locals: { registration_button: '' } %>
           <div class="checkout-registration-styled-or">

data/app/views/spree/products/_cart_form.html.erb

@@ -14,7 +14,7 @@
   <%= render 'cart_form_availability_templates', type: 'out-of-stock' %>
 </template>
 
-<% is_product_available_in_currency = product_available_in_currency?(@product) %>
+<% is_product_available_in_currency = product_available_in_currency? %>
 <% default_variant = default_variant(@variants) %>
 
 <%= form_for :order, html: {
@@ -27,7 +27,7 @@
   <div id="inside-product-cart-form" data-hook="inside_product_cart_form">
     <% if is_product_available_in_currency %>
       <div id="product-price" class="mb-2 text-center text-md-left add-to-cart-form-price" data-hook="product_price">
-        <span class="price selling" content="<%= @product.price_in(current_currency).amount.to_d %>">
+        <span class="price selling" content="<%= @product_price.to_d %>">
           <%= display_price(default_variant) %>
         </span>
         <span content="<%= current_currency %>"></span>

data/app/views/spree/products/_filters_desktop.html.erb

@@ -1,7 +1,7 @@
-<% cache base_cache_key + [available_option_types, permitted_params, @taxon] do %>
+<% cache base_cache_key + [available_option_types, permitted_params] do %>
   <div id="plp-filters-accordion" class="d-none d-lg-block col-lg-3 pr-5 position-sticky h-100 plp-filters" data-hook="taxon_sidebar_navigation">
     <% @available_option_types.each do |option_type| %>
-      <div class="w-100 py-2 card plp-filters-card">
+      <div class="w-100 card plp-filters-card">
         <% ot_downcase_name = option_type.filter_param %>
         <% option_type_name = ot_downcase_name.titleize %>
 
@@ -29,7 +29,7 @@
       </div>
     <% end %>
 
-    <div class="w-100 py-2 card plp-filters-card">
+    <div class="w-100 card plp-filters-card">
       <div class="card-header <%= 'collapsed' if params[:price].blank? %> px-1 plp-filters-card-header" id="filtersPrice" data-toggle="collapse" data-target="#collapseFilterPrice" aria-expanded="false" aria-controls="collapseFilterPrice" role="heading" aria-level="2">
         <%= Spree.t('plp.price') %>
         <%= icon(name: 'plus',

data/app/views/spree/products/_filters_mobile.html.erb

@@ -1,7 +1,7 @@
 <% is_visible = params[:menu_open] ? 'block' : 'none' %>
 
-<% cache base_cache_key + [available_option_types, permitted_params, @taxon, is_visible] do %>
-  <div id="filter-by-overlay" class="d-lg-none plp-overlay" style="display: <%= is_visible %>;">
+<div id="filter-by-overlay" class="d-lg-none plp-overlay" style="display: <%= is_visible %>;">
+  <% cache base_cache_key + [available_option_types, permitted_params] do %>
     <div class="plp-scroll">
       <div class="container">
         <div class="plp-overlay-header">
@@ -53,10 +53,10 @@
         </div>
       </div>
     </div>
+  <% end %>
 
-    <div class="container position-absolute text-center mb-2 plp-overlay-buttons pt-3">
-      <%= link_to Spree.t('plp.clear_all'), permitted_params.select { |key, value| key == "sort_by"}, class: 'btn spree-btn btn-outline-primary w-100 mb-4' %>
-      <%= link_to Spree.t('plp.done'), permitted_params, class: 'btn btn-primary spree-btn w-100' %>
-    </div>
+  <div class="container position-absolute text-center mb-2 plp-overlay-buttons pt-3">
+    <%= link_to Spree.t('plp.clear_all'), permitted_params.select { |key, value| key == "sort_by"}, class: 'btn spree-btn btn-outline-primary w-100 mb-4' %>
+    <%= link_to Spree.t('plp.done'), permitted_params, class: 'btn btn-primary spree-btn w-100' %>
   </div>
-<% end %>
+</div>

data/app/views/spree/products/_gallery_modal.html.erb

@@ -1,13 +1,13 @@
 <div class="modal fade" id="picturesModal" tabindex="-1" role="dialog" >
   <div class="modal-dialog--zoom modal-dialog mw-100 vh-100 mt-0 mb-0" role="document">
     <div class="modal-content h-100">
-      <div class="modal-body">
+      <div class="modal-body h-100">
         <button class="modal-close" type="button" class="close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&#x2715;</span>
         </button>
         <div class="d-flex justify-content-center align-items-center product-details-images h-100">
           <% if @product_images.size > 1 %>
-            <div class="d-none d-sm-block product-details-thumbnails">
+            <div class="h-100 d-none d-sm-block product-details-thumbnails">
               <%= render 'spree/shared/carousel/thumbnails',
                           images: @product_images,
                           group_id: 'main-product-modal-carousel',

data/app/views/spree/products/_sort_desktop.html.erb

@@ -13,8 +13,8 @@
 
   <div class="dropdown-menu text-right plp-sort-dropdown">
     <ul class="pt-1 plp-sort-dropdown-ul">
-      <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by] == 'default' || params[:sort_by].blank? %>">
-        <%= link_to Spree.t('plp.default'), url_for(permitted_params.merge(sort_by: 'default')) %>
+      <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by].blank? %>">
+        <%= link_to Spree.t('plp.default'), url_for(permitted_params.merge(sort_by: nil)) %>
       </li>
       <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by] == 'newest-first' %>">
         <%= link_to Spree.t('plp.newest_first'), url_for(permitted_params.merge(sort_by: 'newest-first')) %>

data/app/views/spree/products/_sort_mobile.html.erb

@@ -7,8 +7,8 @@
   </div>
   <div class="plp-overlay-header-border"></div>
   <ul class="pt-1 plp-overlay-ul">
-    <li class="p-3 plp-overlay-ul-li<%= '--active' if params[:sort_by] == 'default' || params[:sort_by].blank? %>">
-      <a href="<%= url_for(permitted_params.merge(sort_by: 'default')) %>" >
+    <li class="p-3 plp-overlay-ul-li<%= '--active' if params[:sort_by].blank? %>">
+      <a href="<%= url_for(permitted_params.merge(sort_by: nil)) %>" >
         <div class="plp-empty-dot">
           <div class="filled-dot"></div>
         </div>

data/app/views/spree/shared/_cart.html.erb

@@ -1,5 +1,3 @@
-<% item_count = simple_current_order&.item_count || 0 %>
-
 <%= link_to spree.cart_path,
   class: "cart-icon #{'cart-icon--visible-count' if item_count > 0} #{local_assigns[:class]}",
   'aria-label': Spree.t(:cart) do %>

data/app/views/spree/shared/_checkout_header.html.erb

@@ -10,7 +10,7 @@
         <%= link_to Spree.t('back'), spree.cart_path, class: "d-sm-none text-uppercase", method: :get %>
       </div>
       <div class="d-flex flex-nowrap align-items-center justify-content-center">
-        <figure class="logo flex-grow-0 flex-xl-grow-0 order-xl-0 header-spree-fluid-logo">
+        <figure class="logo flex-grow-0 flex-xl-grow-0 order-xl-0 header-spree-fluid-logo m-0">
         <%= logo(Spree::Config[:logo], method: :get) %>
         </figure>
       </div>

data/app/views/spree/shared/_copyright.html.erb

@@ -1,4 +1,4 @@
-<div class="border-bottom border-top footer-spree-copyright">
+<div class="border-top footer-spree-copyright">
   <div class="container">
     <div class="d-flex flex-column flex-lg-row align-items-center justify-content-center py-3 footer-spree-copyright-content">
       <div>Designed and developed by</div>

data/app/views/spree/shared/_header.html.erb

@@ -11,7 +11,7 @@
                       height: 16)  %>
             </button>
           </div>
-          <figure class="logo flex-grow-0 flex-xl-grow-1 order-xl-0 header-spree-fluid-logo">
+          <figure class="logo flex-grow-0 flex-xl-grow-1 order-xl-0 header-spree-fluid-logo m-0">
             <%= logo %>
           </figure>
           <div id="main-nav-bar" class="flex-grow-0 d-none d-xl-block h-100 header-spree-fluid-primary-navigation">

data/app/views/spree/shared/_link_to_cart.html.erb

@@ -1,2 +1,5 @@
-<%= render 'spree/shared/cart', class: 'd-none d-xl-inline-block cart-icon--xl', size: 36 %>
-<%= render 'spree/shared/cart', class: 'd-xl-none', size: 24 %>
+<% item_count = simple_current_order&.item_count || 0 %>
+<% cache [base_cache_key, 'cart-indicator', item_count] do %>
+  <%= render 'spree/shared/cart', class: 'd-none d-xl-inline-block cart-icon--xl', size: 36, item_count: item_count %>
+  <%= render 'spree/shared/cart', class: 'd-xl-none', size: 24, item_count: item_count %>
+<% end %>

data/app/views/spree/shared/_main_nav_bar.html.erb

@@ -2,7 +2,7 @@
   <ul class="nav h-100 main-nav-bar">
     <% spree_navigation_data.each do |root| %>
       <li class="navbar main-nav-bar-dropdown main-nav-bar-category">
-        <%= link_to root[:title], root[:url], class: 'p-2 main-nav-bar-item main-nav-bar-category-button' %>
+        <%= link_to root[:title], root[:url], class: "p-2 main-nav-bar-item main-nav-bar-category-button" %>
         <% if root[:items].present? || root[:promo_banners].present? %>
           <div class="w-100 shadow main-nav-bar-category-dropdown">
             <div class="container p-0 d-flex justify-content-xl-around mx-auto">
@@ -17,7 +17,7 @@
                     <ul class="pl-0">
                       <% root[:items].each do |item| %>
                         <li>
-                          <%= link_to item[:title], item[:url], class: 'text-uppercase' %>
+                          <%= link_to item[:title], item[:url], class: "text-uppercase main-nav-bar-category-links" %>
                         </li>
                       <% end %>
                     </ul>
@@ -26,7 +26,7 @@
                 <% if root[:promo_banners].present? %>
                   <% root[:promo_banners].each do |promo_banner| %>
                     <%= link_to promo_banner[:url] do %>
-                      <div class="category-image category-image text-center mx-3">
+                      <div class="category-image text-center mx-3">
                         <%= main_nav_image(promo_banner[:image], promo_banner[:title]) %>
                         <div class="category-box">
                           <div class="category-box-small-text">

data/app/views/spree/shared/_nav_bar.html.erb

@@ -21,7 +21,7 @@
   <% if defined?(spree.account_link_path) %>
     <li>
       <div class="dropdown navbar-right-dropdown">
-        <button type="button" data-toggle="dropdown" class="navbar-right-dropdown-toggle" aria-label="<%= Spree.t('nav_bar.show_user_menu')%>">
+        <button id="account-button" type="button" data-toggle="dropdown" class="navbar-right-dropdown-toggle" aria-label="<%= Spree.t('nav_bar.show_user_menu')%>">
           <%= icon(name: 'person',
                   classes: 'd-none d-xl-inline-block',
                   width: 41.4,

data/app/views/spree/shared/_option_values.html.erb

@@ -1,4 +1,4 @@
-<% cache base_cache_key + [ot_downcase_name, params_ot_downcase_name, permitted_params, @taxon] do %>
+<% cache base_cache_key + [ot_downcase_name, params_ot_downcase_name, permitted_params] do %>
   <% selected_option_values = params_ot_downcase_name&.split(',')&.map(&:to_i) || [] %>
   <% option_type.option_values.each do |option_value| %>
     <% id = option_value.id %>

data/app/views/spree/shared/_registration.html.erb

@@ -1,4 +1,4 @@
 <% if defined?(spree_signup_path) %>
-  <h3 class="spree-header header-sm spree-mt-medium mb-3 mb-sm-4 mb-xl-4"><%= Spree.t('dont_have_account') %></h3>
+  <h3 class="spree-mb-large spree-mt-large spree-header"><%= Spree.t('dont_have_account') %></h3>
   <%= link_to Spree.t(:sign_up), spree_signup_path, class: "btn btn-block btn-outline-primary spree-btn #{registration_button}" %>
 <% end %>

data/app/views/spree/shared/carousel/_thumbnails.html.erb

@@ -13,7 +13,7 @@
       <% if image_index % per_page == 0 %>
         <div class="carousel-item product-thumbnails-carousel-item<%= ' active' if image_index == 0 %>">
         <div class="h-100 d-flex flex-column justify-content-center">
-            <div class="product-thumbnails-carousel-item-content">
+            <div class="product-thumbnails-carousel-item-content py-1">
       <% end %>
               <div
                 class="product-thumbnails-carousel-item-single product-thumbnails-carousel-item-single--visible"

data/app/views/spree/taxons/_subcategories.html.erb

@@ -1,7 +1,6 @@
 <% cache([base_cache_key, taxon, 'subcategories', permitted_product_params]) do %>
-  <% [taxon.parent, taxon].each do |current_taxon| %>
-    <% child_taxons = [current_taxon, *current_taxon.children] %>
-
+  <% [taxon.parent, taxon].compact.each do |current_taxon| %>
+    <% child_taxons = [current_taxon, *current_taxon.children.where(hide_from_nav: false)] %>
     <% if current_taxon.level > 0 && child_taxons.size > 1 %>
       <div class="d-flex justify-content-center position-sticky sticky-top-90px taxon-subcategories-wrapper">
         <div class="py-1 text-uppercase d-none d-xl-flex overflow-x taxon-subcategories">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc2
+  version: 4.1.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc2
+        version: 4.1.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc2
+        version: 4.1.0.rc3
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc2
+        version: 4.1.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc2
+        version: 4.1.0.rc3
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -340,6 +340,7 @@ files:
 - app/assets/stylesheets/spree/frontend/views/spree/shared/cart.scss
 - app/assets/stylesheets/spree/frontend/views/spree/shared/category_nav_bar.scss
 - app/assets/stylesheets/spree/frontend/views/spree/shared/delete_address_popup.scss
+- app/assets/stylesheets/spree/frontend/views/spree/shared/dropdown.scss
 - app/assets/stylesheets/spree/frontend/views/spree/shared/footer.scss
 - app/assets/stylesheets/spree/frontend/views/spree/shared/header.scss
 - app/assets/stylesheets/spree/frontend/views/spree/shared/login.scss