spree_frontend 4.1.2 → 4.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 575b2f83c0a8cb36cf82451a19bf2fb51177a863d345182aac560734c3a49854
-  data.tar.gz: a00e080d764fef9d902486b2548a6038b31f7233815f37b2699f666963c285bc
+  metadata.gz: abeb5be8e52c16a43557e80432a4b557fd3b124aa11a1785092e7ea427230ba4
+  data.tar.gz: 1ce85a68e7844356ab07f5ed83266510ce743281f73c50a76718a7128eb60686
 SHA512:
-  metadata.gz: 27fc8567b1da5591a9c4246c7955a8b0063aeba243c429e51a590dff3596a7208e672c6b226d78d6854373a9f5499c861f8309ee73050ce68f9e2f3c98e78e0d
-  data.tar.gz: 78bff050019366d9b949fbc7c8eb495e25273eafe25c0735f1ca8ba4af0fa2e54a2494366ac13be419dcf721ea1d74e8bb41725848e3f1a49cd88ac2dcd05d05
+  metadata.gz: a941265f5cef8292aa3c7e239e0ce8ac79d0b4c0d93fe2d1ed6062bbd6639d3a20602fedb7f2dbdcf547ccb7edfabf516fb0917b8a7a261ea06c3be1c27400dc
+  data.tar.gz: 954fd27ccf2e62760b932385f619c3844b557147bf7f8a9d52bbe5a8e0ab52f252fb01c7ac8535887c86fcc1104c9b1141a28138f1a57869cbc3334467b2c0b4

data/app/assets/stylesheets/spree/frontend/views/spree/checkout/edit.scss

@@ -149,7 +149,7 @@
         }
         hr {
           margin: 0;
-          width: 33%;
+          flex: 1;
           border: 1px solid theme-color('info');
         }
       }

data/app/assets/stylesheets/spree/frontend/views/spree/orders/edit.scss

@@ -42,7 +42,7 @@
       }
     }
     &-continue-link {
-      margin-top: 234px;
+      margin-top: 100px;
       margin-bottom: 30px;
       @include media-breakpoint-up(sm) {
         padding: 20px 12px;

data/app/assets/stylesheets/spree/frontend/views/spree/products/index.scss

@@ -1,6 +1,6 @@
 .plp {
   &-not-found-header {
-    color: theme-color("dark-text");
+    color: $font-color;
     font-size: font-px-to-rem(18px);
     font-weight: 500;
     letter-spacing: 0.45px;
@@ -30,7 +30,7 @@
   }
 
   &-not-found-text {
-    color: theme-color("dark-text");
+    color: $font-color;
     margin-bottom: 350px;
     font-size: font-px-to-rem(14px);
     font-weight: 500;
@@ -50,7 +50,7 @@
     height: 60px;
     display: flex;
     align-items: center;
-    color: theme-color("dark-text");
+    color: $font-color;
     @include media-breakpoint-up("md") {
       font-size: font-px-to-rem(32px);
     }
@@ -68,7 +68,7 @@
     }
 
     &-buttons {
-      color: theme-color("dark-text");
+      color: $font-color;
       display: flex;
       align-items: center;
       justify-content: space-between;
@@ -92,7 +92,7 @@
     top: $spree-plp-filter-desktop-position;
     left: 0;
     &-card {
-      background-color: theme-color("light-background");
+      background-color: $primary-background;
       border: none;
       a:hover {
         text-decoration: none;
@@ -104,7 +104,7 @@
         }
       }
       &-header {
-        background-color: theme-color("light-background");
+        background-color: $primary-background;
         border-color: $global-border-style;
         cursor: pointer;
         font-size: font-px-to-rem(17px);
@@ -125,7 +125,7 @@
       }
       &-item {
         border: solid 1px $second-global-border;
-        color: theme-color("dark-text");
+        color: $font-color;
         font-size: font-px-to-rem(16px);
         font-weight: 500;
         &--selected {
@@ -154,7 +154,7 @@
         &-li--active {
           list-style: none;
           a {
-            color: theme-color("dark-text");
+            color: $font-color;
           }
         }
         &-li--active {
@@ -186,7 +186,7 @@
       }
     }
     a {
-      color: theme-color("dark-text");
+      color: $font-color;
       border-color: $global-border-style !important;
       padding: 5px 13px;
       min-width: 37px;
@@ -207,7 +207,7 @@
   }
 
   &-overlay {
-    color: theme-color("dark-text");
+    color: $font-color;
     position: fixed;
     width: 100%;
     height: 100%;
@@ -216,7 +216,7 @@
     right: 0;
     bottom: 0;
     z-index: 999;
-    background-color: theme-color("light-background");
+    background-color: $primary-background;
 
     &-header {
       height: 60px;
@@ -243,13 +243,13 @@
             height: 12px;
             margin-top: 2px;
             margin-left: 2px;
-            background-color: theme-color("secondary");
-            border: solid 1px theme-color("secondary");
+            background-color: $secondary-color;
+            border: solid 1px $secondary-color;
             border-radius: 50%;
           }
         }
         a {
-          color: theme-color("dark-text");
+          color: $font-color;
           &:hover {
             text-decoration: none;
           }
@@ -263,25 +263,25 @@
     &-card {
       border: none;
       border-top: solid 1px $global-border-style;
-      background-color: theme-color("light-background");
+      background-color: $primary-background;
       &-header.collapsed {
         .arrow {
           transform: rotate(90deg);
         }
       }
       &-header {
-        background-color: theme-color("light-background");
+        background-color: $primary-background;
         border-bottom: none;
         cursor: pointer;
         &-arrow {
-          color: theme-color("dark-test");
+          color: $font-color;
           transform: rotate(-90deg);
         }
       }
 
       &-item {
         border: solid 1px $second-global-border;
-        color: theme-color("dark-text");
+        color: $font-color;
         font-size: font-px-to-rem(13px);
         &--selected {
           border: solid 2px $secondary-color;
@@ -295,19 +295,24 @@
       }
     }
     &-buttons {
-      bottom: 30px;
+      background-color: $primary-background;
+      padding-bottom: 30px;
+      bottom: 0px;
     }
   }
 
   &-scroll {
     max-height: 100%;
     overflow-y: auto;
-    padding-bottom: 140px;
+    padding-bottom: 150px;
+    @include media-breakpoint-up('sm') {
+      padding-bottom: 220px;
+    }
   }
 
   &-empty-dot {
-    background-color: theme-color("light-background");
-    border: solid 1px theme-color("secondary");
+    background-color: $primary-background;
+    border: solid 1px $secondary-color;
     border-radius: 50%;
     display: inline-block;
     margin-right: 16px;

data/app/helpers/spree/frontend_helper.rb

@@ -101,7 +101,8 @@ module Spree
         end
       end
       content = content_tag('ul', raw(items.join("\n")), class: 'nav justify-content-between checkout-progress-steps', id: "checkout-step-#{@order.state}")
-      content << content_tag('div', raw('<hr /><hr /><hr />'), class: "checkout-progress-steps-line state-#{@order.state}")
+      hrs = '<hr />' * (states.length - 1)
+      content << content_tag('div', raw(hrs), class: "checkout-progress-steps-line state-#{@order.state}")
     end
 
     def flash_messages(opts = {})
@@ -230,14 +231,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">
@@ -55,7 +55,7 @@
     </div>
   <% end %>
 
-  <div class="container position-absolute text-center mb-2 plp-overlay-buttons pt-3">
+  <div class="container position-absolute text-center 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>

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

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

@@ -1,6 +1,6 @@
 <%# TODO: Use in cart %>
 <div class="d-flex quantity-select mx-auto mx-md-0">
   <%= button_tag '-', type: 'button', class: "border-right-0 flex-grow-0 flex-shrink-0 py-0 px-3 quantity-select-decrease" %>
-  <%= number_field_tag input_name, 1, min: 1, class: "p-0 flex-grow-1 flex-shrink-1 text-center form-control border-left-0 border-right-0 quantity-select-value", 'aria-label': Spree.t('pdp.quantity') %>
+  <%= number_field_tag input_name, 1, min: 1, max: maximum_quantity, class: "p-0 flex-grow-1 flex-shrink-1 text-center form-control border-left-0 border-right-0 quantity-select-value", 'aria-label': Spree.t('pdp.quantity') %>
   <%= button_tag '+', type: 'button', class: "border-left-0  flex-grow-0 flex-shrink-0 py-0 px-3 quantity-select-increase" %>
 </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.7
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-06-08 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.2
+        version: 4.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.1.7
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.1.7
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -515,7 +515,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.