spree_frontend 4.1.4 → 4.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c953a108231a986a2298e2a51cfaea5520ba18100b1ad6a2f9b90f3e9019ff0
-  data.tar.gz: d4dfe20a874982c13793bc35e3a3718812b223b97e0955906fa5e07d96db3c95
+  metadata.gz: fc9ae077f860cfee19b527c0d75cd1573fef9020a4c01c22f9fb0ea64a269942
+  data.tar.gz: 77813cd0667511c0761ba05ba0d3f21dff25df6d42edaa2f3923f06e0929e8f4
 SHA512:
-  metadata.gz: 9fb7d2a689d7ffc0ba283542eeb62af36d79501b9d3db36d01315bad1ecc842a40e0e10724ac3f3669ee6bab70f300ac4f9e95f373716199347308ccaa3b1eb0
-  data.tar.gz: 1f12786620901d2bc41ed6d368c9e69db5e5afa1690275d891963e79b1207c442fc46dca9b8223abc2a87168af40ce3eae71c87111be183531f9462ff8154013
+  metadata.gz: 53a5b1f5bb22505755fe8351a52aff8492bf0ce83e420e0ff7199993fbc5774d70ceb07440e18a8ab1120c4bab4599914bbb460e903c41626de175f1763be75d
+  data.tar.gz: 9c8a55d2b12d064099b5c994433498f0ae8bd1efb803d6d149b96eb9df95dc5720010354a4f752cc039ddba125ba7c59a9892e02e75fe3ec46a62a77b5c75b8b

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

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

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

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/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.4
+  version: 4.1.9
 platform: ruby
 authors:
 - Sean Schofield
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2020-08-28 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.4
+        version: 4.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.4
+        version: 4.1.9
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.4
+        version: 4.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.4
+        version: 4.1.9
 - !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.9
+  documentation_uri: https://guides.spreecommerce.org/
+  source_code_uri: https://github.com/spree/spree/tree/v4.1.9
+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: []