spree_frontend 4.1.3 → 4.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d86ff5e025b67089cf9392a93b84465d0c950f635e0aa64b853880434e379ad
-  data.tar.gz: ed91603a662f3fc1e6d6a18d08748e5e1c0cc499607652b6b5cb7e8788eff4e2
+  metadata.gz: c2d3e1b2a20d956cabfccd9cec656802fb73f4476132fb671872547153f48119
+  data.tar.gz: 320b77ae82bac0ddefe481fcc204c57a66b2ef8d3150ab5aa8177d93aeb0397b
 SHA512:
-  metadata.gz: 7ee50ae2ae0a15cd68bf28f55820d528df630d9543301182027d60670f5e2ed1009476bd721b75c9c9be9870e2ecdd8ad82f808cd42346816a4e601a89f13200
-  data.tar.gz: 92d1c2ef2541949d5116f84a28cf5b254b823cdf4fb2c6c07d7d9b2110968aa103d9d2e5e3779c3335f733c8e80e5e2f3017b66db1e1cc9a3c3dd0f64321189f
+  metadata.gz: 74053b67c46b9e580641840f65244cde9e3e38b9a0947a704022734706d9bee8d94d63ff72806c9d37fd58ff0c52612967cc65e5e190c1d5ea3ff39c0901e65b
+  data.tar.gz: 2120bc4a5b8ebeb1c09713e6b5834f2d9c966cfe80d481d0a2025a433a82693353a64edcd714f53f2615437bc4c0d4d13bd25df23ad2cfeb912e4c3a5d1beb2f

data/app/assets/javascripts/spree/frontend/checkout/address_book.js

@@ -1,56 +1,54 @@
-(function ($) {
-  $(document).ready(function () {
-    if ($('.select_address').length > 0) {
-      $('input#order_use_billing').unbind('change')
+Spree.ready(function ($) {
+  if ($('.select_address').length > 0) {
+    $('input#order_use_billing').unbind('change');
 
-      hide_address_form('billing')
-      hide_address_form('shipping')
+    hide_address_form('billing');
+    hide_address_form('shipping');
 
-      if ($('input#order_use_billing').is(':checked')) {
-        $('#shipping .select_address').hide()
-      }
-
-      $('input#order_use_billing').click(function () {
-        if ($(this).is(':checked')) {
-          $('#shipping .select_address').hide()
-          hide_address_form('shipping')
-        } else {
-          $('#shipping .select_address').show()
-          if ($("input[name='order[ship_address_id]']:checked").val() == '0') {
-            show_address_form('shipping')
-          } else {
-            hide_address_form('shipping')
-          }
-        }
-      })
-
-      $("input[name='order[bill_address_id]']:radio").change(function () {
-        if ($("input[name='order[bill_address_id]']:checked").val() == '0') {
-          show_address_form('billing')
-        } else {
-          hide_address_form('billing')
-        }
-      })
+    if ($('input#order_use_billing').is(':checked')) {
+      $('#shipping .select_address').hide()
+    }
 
-      $("input[name='order[ship_address_id]']:radio").change(function () {
+    $('input#order_use_billing').click(function () {
+      if ($(this).is(':checked')) {
+        $('#shipping .select_address').hide()
+        hide_address_form('shipping')
+      } else {
+        $('#shipping .select_address').show()
         if ($("input[name='order[ship_address_id]']:checked").val() == '0') {
           show_address_form('shipping')
         } else {
           hide_address_form('shipping')
         }
-      })
-    }
-  })
+      }
+    });
+
+    $("input[name='order[bill_address_id]']:radio").change(function () {
+      if ($("input[name='order[bill_address_id]']:checked").val() == '0') {
+        show_address_form('billing')
+      } else {
+        hide_address_form('billing')
+      }
+    });
+
+    $("input[name='order[ship_address_id]']:radio").change(function () {
+      if ($("input[name='order[ship_address_id]']:checked").val() == '0') {
+        show_address_form('shipping')
+      } else {
+        hide_address_form('shipping')
+      }
+    })
+  }
 
-  function hide_address_form (address_type) {
-    $('#' + address_type + ' .inner').hide()
+  function hide_address_form(address_type) {
+    $('#' + address_type + ' .inner').hide();
     $('#' + address_type + ' .inner input').prop('disabled', true)
     $('#' + address_type + ' .inner select').prop('disabled', true)
   }
 
-  function show_address_form (address_type) {
-    $('#' + address_type + ' .inner').show()
+  function show_address_form(address_type) {
+    $('#' + address_type + ' .inner').show();
     $('#' + address_type + ' .inner input').prop('disabled', false)
     $('#' + address_type + ' .inner select').prop('disabled', false)
   }
-})(jQuery)
+});

data/app/assets/javascripts/spree/frontend/views/spree/products/cart_form.js

@@ -266,6 +266,12 @@ Spree.ready(function($) {
           Spree.showProductAddedModal(JSON.parse(
             $cartForm.attr('data-product-summary')
           ), Spree.variantById($cartForm, variantId))
+          $cartForm.trigger({
+            type: 'product_add_to_cart',
+            variant: Spree.variantById($cartForm, variantId),
+            quantity_increment: quantity,
+            cart: response.attributes
+          })
         },
         function(error) {
           if (typeof error === 'string' && error !== '') {

data/app/assets/stylesheets/spree/frontend/application.scss

@@ -47,6 +47,7 @@
 @import "spree/frontend/views/spree/shared/product";
 @import "spree/frontend/views/spree/products/show";
 @import "spree/frontend/views/spree/products/cart_form";
+@import "spree/frontend/views/spree/products/gallery_modal";
 @import "spree/frontend/views/spree/shared/product_added_modal";
 @import "spree/frontend/views/spree/shared/mobile_navigation";
 @import "spree/frontend/views/spree/shared/no_product_available";

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/gallery_modal.scss

@@ -0,0 +1,6 @@
+#picturesModal {
+  .close {
+    right: 0;
+    z-index: 3;
+  }
+}

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,20 @@ 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 additional_filters_partials
+      @additional_filters_partials ||= Spree::Frontend::Config[:additional_filters_partials]
+    end
+
+    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,8 @@ 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 :additional_filters_partials, :array, default: %w()
     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">
@@ -53,6 +53,10 @@
           <% end %>
         </div>
       </div>
+
+      <% additional_filters_partials.each do |partial| %>
+        <%= render "spree/products/filters/#{partial}", permitted_params: permitted_params %>
+      <% end %>
     </div>
   </div>
 <% end %>

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">
@@ -51,11 +51,15 @@
             </div>
           </div>
         </div>
+
+        <% additional_filters_partials.each do |partial| %>
+          <%= render "spree/products/filters/mobile/#{partial}", permitted_params: permitted_params %>
+        <% end %>
       </div>
     </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/_gallery_modal.html.erb

@@ -3,7 +3,7 @@
     <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 h-100">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <button type="button" class="close position-absolute" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">
               <%= icon(name: 'close',
                        classes: 'd-block d-lg-none',

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

@@ -10,7 +10,7 @@
         <% end %>
       </div>
       <div class="card-footer text-center">
-        <span class="price selling lead" content="<%= price.nil? 0 : price.to_d %>">
+        <span class="price selling lead" content="<%= price.nil? ? 0 : price.to_d %>">
           <%= display_price(product) %>
         </span>
         <span content="<%= current_currency %>"></span>

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/products/show.html.erb

@@ -38,7 +38,7 @@
 
     <%= render partial: 'gallery_modal' %>
   </div>
-  <div id="related-products" />
+  <div id="related-products"></div>
 
   <%= products_structured_data([@product]) %>
 

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>

data/spree_frontend.gemspec

@@ -5,16 +5,22 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_frontend'
   s.version     = Spree.version
-  s.summary     = 'Frontend e-commerce functionality for the Spree project.'
-  s.description = s.summary
-
-  s.required_ruby_version = '>= 2.5.0'
-
   s.author      = 'Sean Schofield'
   s.email       = 'sean@spreecommerce.com'
+  s.summary     = 'Frontend e-commerce functionality for the Spree project.'
+  s.description = s.summary
   s.homepage    = 'http://spreecommerce.org'
   s.license     = 'BSD-3-Clause'
 
+  s.metadata = {
+    "bug_tracker_uri"   => "https://github.com/spree/spree/issues",
+    "changelog_uri"     => "https://github.com/spree/spree/releases/tag/v#{s.version}",
+    "documentation_uri" => "https://guides.spreecommerce.org/",
+    "source_code_uri"   => "https://github.com/spree/spree/tree/v#{s.version}",
+  }
+
+  s.required_ruby_version = '>= 2.5.0'
+
   s.files        = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
   s.require_path = 'lib'
   s.requirements << 'none'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.8
 platform: ruby
 authors:
 - Sean Schofield
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-08-05 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.3
+        version: 4.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.3
+        version: 4.1.8
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.3
+        version: 4.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.3
+        version: 4.1.8
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -333,6 +333,7 @@ files:
 - app/assets/stylesheets/spree/frontend/views/spree/orders/edit.scss
 - app/assets/stylesheets/spree/frontend/views/spree/orders/show.scss
 - app/assets/stylesheets/spree/frontend/views/spree/products/cart_form.scss
+- app/assets/stylesheets/spree/frontend/views/spree/products/gallery_modal.scss
 - app/assets/stylesheets/spree/frontend/views/spree/products/index.scss
 - app/assets/stylesheets/spree/frontend/views/spree/products/show.scss
 - app/assets/stylesheets/spree/frontend/views/spree/shared/_color_select.scss
@@ -498,8 +499,12 @@ files:
 homepage: http://spreecommerce.org
 licenses:
 - BSD-3-Clause
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/spree/spree/issues
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.8
+  documentation_uri: https://guides.spreecommerce.org/
+  source_code_uri: https://github.com/spree/spree/tree/v4.1.8
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -515,8 +520,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.
 test_files: []