spree_frontend 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37be830d545f0048e569177412b10f6ef9368a46b8ca1a3f8da13f188c8df5bf
-  data.tar.gz: 886b84914f5b401fb0cd594bf3ea784570849e222e3e70d205407b4e7f8d8f03
+  metadata.gz: 970239d531b6d929609cf3c4d28f2c448840c5471293c6c26c1d50510a77f325
+  data.tar.gz: 323efddb286a2fcff39fe461a0b531afb9aed27b2e7b8f0ddc3a7424005f3c93
 SHA512:
-  metadata.gz: 8d4a75f1b67383c700d25433b9e226845a689dacddca8adee7708427a1ad6b8e352848ea50ef554f24cb53eb0080c093aedd962c74454ef3ff361b461257fe97
-  data.tar.gz: 6a69a8f0d055e450c851b34ef8f1a25faba37027200d8b0b659f18d817d767041cc0725bdaf8145e643d9e710c2e508c003bfac3aefdc6fed1b2879e379b3c78
+  metadata.gz: 599d44e41a5158490b33e78023191a0b50ba8c32701c7a189b718b65755ed4acc5953599dd5e9d87c84c6f19a04119cf2e7cac5542291d227601470b07eeb189
+  data.tar.gz: 63186815000d404797933b19cba9f4b80ed37c1ca43f65446a05e99f74e6ecca4b6a53c454160dfaa268eae88c3d6ac805d17c8e4bc5b73ff03eb5d3f2285e9e

data/app/helpers/spree/frontend_helper.rb

@@ -230,14 +230,16 @@ module Spree
       ]
     end
 
-    def filtering_params
-      static_filters = %w(keywords price sort_by)
+    def static_filters
+      @static_filters ||= Spree::Frontend::Config[:products_filters]
+    end
 
-      available_option_types.map(&:filter_param).concat(static_filters)
+    def filtering_params
+      @filtering_params ||= 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
+      @filtering_params_cache_key ||= params.permit(*filtering_params)&.reject { |_, v| v.blank? }&.to_param
     end
 
     def available_option_types_cache_key

data/app/helpers/spree/structured_data_helper.rb

@@ -22,10 +22,10 @@ module Spree
           name: product.name,
           image: structured_images(product),
           description: product.description,
-          sku: product.sku,
+          sku: structured_sku(product),
           offers: {
             '@type': 'Offer',
-            price: product.price_in(current_currency).amount,
+            price: product.default_variant.price_in(current_currency).amount,
             priceCurrency: current_currency,
             availability: product.in_stock? ? 'InStock' : 'OutOfStock',
             url: spree.product_url(product),
@@ -35,6 +35,10 @@ module Spree
       end
     end
 
+    def structured_sku(product)
+      product.default_variant.sku? ? product.default_variant.sku : product.sku
+    end
+
     def structured_images(product)
       image = default_image_for_product_or_variant(product)
 

data/app/models/spree/frontend_configuration.rb

@@ -2,6 +2,7 @@ module Spree
   class FrontendConfiguration < Preferences::Configuration
     preference :coupon_codes_enabled, :boolean, default: true # Determines if we show coupon code form at cart and checkout
     preference :locale, :string, default: Rails.application.config.i18n.default_locale
+    preference :products_filters, :array, default: %w(keywords price sort_by)
     preference :remember_me_enabled, :boolean, default: true
   end
 end

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

@@ -1,5 +1,25 @@
 <% @body_id = 'checkout-page' %>
 
+<%
+content_for :head do
+  agent = request.env['HTTP_USER_AGENT']
+  if agent =~ /Safari/ && !(agent =~ /Chrome/)
+%>
+  <script>
+    if (!!window.performance && window.performance.navigation.type === 2) {
+      window.location.reload();
+    }
+    window.onpageshow = function(event) {
+      if (event.persisted) {
+        window.location.reload()
+      }
+    }
+  </script>
+<%
+  end
+end
+%>
+
 <div id="checkout" class="container checkout" data-hook>
   <%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>
 

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

@@ -1,4 +1,4 @@
-<% cache base_cache_key + [available_option_types, permitted_params, @taxon&.id] do %>
+<% cache base_cache_key + [available_option_types_cache_key, filtering_params_cache_key, @taxon&.id] 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 card plp-filters-card">

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

@@ -1,7 +1,7 @@
 <% is_visible = params[:menu_open] ? 'block' : 'none' %>
 
 <div id="filter-by-overlay" class="d-lg-none plp-overlay" style="display: <%= is_visible %>;">
-  <% cache base_cache_key + [available_option_types, permitted_params, @taxon&.id] do %>
+  <% cache base_cache_key + [available_option_types_cache_key, filtering_params_cache_key, @taxon&.id] do %>
     <div class="plp-scroll">
       <div class="container">
         <div class="plp-overlay-header">

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

@@ -1,7 +1,8 @@
 <% permitted_params = params.permit(*filtering_params) %>
+<% products_empty = @products.empty? %>
 
 <div data-hook="search_results">
-  <% if @products.empty? %>
+  <% if products_empty %>
     <% if permitted_params[:keywords].present? && permitted_params.to_h.one? %>
       <%= render 'spree/products/no_results' %>
     <% else %>
@@ -40,6 +41,8 @@
 <%= render 'spree/products/filters_mobile', permitted_params: permitted_params %>
 <%= render 'spree/products/sort_mobile', permitted_params: permitted_params %>
 
-<% cache cache_key_for_products(@products, 'json-ld') do %>
-  <%= products_structured_data(@products) %>
+<% unless products_empty %>
+  <% cache cache_key_for_products(@products, 'json-ld') do %>
+    <%= products_structured_data(@products) %>
+  <% end %>
 <% end %>

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-05-06 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.5
+        version: 4.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.1.6
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement