spree_frontend 4.2.0.rc2 → 4.2.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38163d04925f22790f12bdbbeb77beac79cdbd366c6ea04e065009b2fd9b82d1
-  data.tar.gz: b53af71727410e46e99acbbf972e13580fb3c41977508e41125c6b5718c8bfc4
+  metadata.gz: 5f81a05d74462180d47969190cd9b0ba32eeb896e776706f89f288b1e52167d0
+  data.tar.gz: f0d37b65f1b4a1bef39162049cc07f7201a9ba5b7417114867530c2f86a61c23
 SHA512:
-  metadata.gz: b8b342aa804b56453c2c7bc447cf52d664f097c16b04de44e5d0bd3c153314e9450806b167b3372b2483ebcd5ab312eac3c868ee6b852b03106aaa094e69794f
-  data.tar.gz: 2c2d42c10cbbd8e2dedd374693255c9c24044c84dcf2a3e641fe0aa57cadfe3552134139af193c35cd78b4f9ba2749072803d78bfc67775a8c6a4ecddccf1f58
+  metadata.gz: caa243750a89dcb5ee49b389c30b1dda7594e2ce46cbb98d3c83c558c6af5af4e3dfc07f33b4fcca9f21bbb21af8dfef2a8a8b61264f1939a4ce262273045ae0
+  data.tar.gz: 5853f04c6518d154deaffa26eff36966fe4a8486076cbf1143c03974cabc3502a9134239a439d8537a5254bf9cb934743a5692ba4b8486fb19f900429d95a028

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

@@ -1,16 +1,24 @@
-Spree.ready(function ($) {
-  Spree.onAddress = function () {
+Spree.ready(function($) {
+  Spree.onAddress = function() {
     if ($('#checkout_form_address').length) {
-      Spree.updateState = function (region) {
+      Spree.updateState = function(region) {
         var countryId = getCountryId(region)
         if (countryId != null) {
           if (Spree.Checkout[countryId] == null) {
             $.ajax({
-              async: false, method: 'GET', url: Spree.pathFor('/api/v2/storefront/countries/' + countryId + '?include=states'), dataType: 'json'
-            }).done(function (data) {
-              var json = data.included; var xStates = []
+              async: false,
+              method: 'GET',
+              url: Spree.pathFor('/api/v2/storefront/countries/' + countryId + '?include=checkout_zone_applicable_states'),
+              dataType: 'json'
+            }).done(function(data) {
+              var json = data.included;
+              var xStates = [];
               for (var i = 0; i < json.length; i++) {
-                var obj = json[i]; xStates.push({ 'id': obj.id, 'name': obj.attributes.name })
+                var obj = json[i];
+                xStates.push({
+                  id: obj.id,
+                  name: obj.attributes.name
+                })
               }
               Spree.Checkout[countryId] = {
                 states: xStates,
@@ -27,7 +35,7 @@ Spree.ready(function ($) {
         }
       }
 
-      Spree.toggleZipcode = function (data, region) {
+      Spree.toggleZipcode = function(data, region) {
         var requiredIndicator = $('span#required_marker').first().text()
         var zipcodeRequired = data.zipcode_required
         var zipcodePara = $('#' + region + 'zipcode')
@@ -49,7 +57,7 @@ Spree.ready(function ($) {
         }
       }
 
-      Spree.fillStates = function (data, region) {
+      Spree.fillStates = function(data, region) {
         var selected
         var statesRequired = data.states_required
         var states = data.states
@@ -63,64 +71,72 @@ Spree.ready(function ($) {
         if (states.length > 0) {
           selected = parseInt(stateSelect.val())
           stateSelect.html('')
-          $.each(states, function (idx, state) {
+          $.each(states, function(idx, state) {
             var opt = $(document.createElement('option')).attr('value', state.id).html(state.name)
             if (selected.toString(10) === state.id.toString(10)) {
               opt.prop('selected', true)
             }
             stateSelect.append(opt)
           })
-          stateSelect.prop('required', false)
-          stateSelect.prop('disabled', false).show()
-          stateLabel.addClass('state-select-label')
-          stateInput.hide().prop('disabled', true)
-          statePara.show()
-          stateSpanRequired.hide()
-          stateSelect.removeClass('required')
+          // If States are listed for the Country selected kill the input field
+          stateInput.hide()
+            .prop('disabled', true)
+            .prop('required', false)
+            .val('')
 
-          if (statesRequired) {
-            stateSelect.addClass('required')
-            stateSelectImg.show()
-            stateSpanRequired.show()
-            stateSelect.prop('required', true)
-          }
-          stateSelect.removeClass('hidden')
-          stateInput.removeClass('required')
+          // Activate the State select dropdown.
+          statePara.show()
+          stateSelect.prop('required', statesRequired)
+            .prop('disabled', false)
+            .show()
+          stateSelectImg.show()
+          stateLabel.addClass('state-select-label')
+          stateSpanRequired.toggle(statesRequired)
         } else {
-          stateSelect.hide().prop('disabled', true)
-          stateLabel.removeClass('state-select-label')
+          // If no States are listed in the database for the country selected
+          // and a State is not required => (United Kingdom).
+          // Kill the State selector and input field.
           stateSelectImg.hide()
-          stateInput.show()
+          stateSelect.hide()
+            .prop('disabled', true)
+            .prop('required', false)
+            .find('option').remove()
+
+          stateInput.prop('disabled', true)
+            .prop('required', false)
+            .hide()
+
+          // Toggle visibility of States parent element based on State required.
+          statePara.toggle(statesRequired)
+
           if (statesRequired) {
+            // If a State is required, but none are listed in the database
+            // for the country selected => (Hong Kong)
+            // Enable the State input field, set it to required.
+            stateInput.show()
+              .prop('disabled', false)
+              .prop('required', true)
             stateSpanRequired.show()
-            stateLabel.removeClass('state-select-label')
-            stateInput.addClass('required form-control')
-          } else {
-            stateInput.val('')
-            stateSpanRequired.hide()
-            stateInput.removeClass('required')
+            stateLabel.removeClass('state-select-label') // required for floating label
           }
-          statePara.toggle(!!statesRequired)
-          stateInput.prop('disabled', !statesRequired)
-          stateInput.removeClass('hidden')
-          stateSelect.removeClass('required')
         }
       }
-      $('#bcountry select').change(function () {
+      $('#bcountry select').change(function() {
         Spree.updateState('b')
       })
-      $('#scountry select').change(function () {
+      $('#scountry select').change(function() {
         Spree.updateState('s')
       })
       Spree.updateState('b')
 
       var orderUseBilling = $('input#order_use_billing')
-      orderUseBilling.change(function () {
+      orderUseBilling.change(function() {
         updateShippingFormState(orderUseBilling)
       })
       updateShippingFormState(orderUseBilling)
     }
-    function updateShippingFormState (orderUseBilling) {
+
+    function updateShippingFormState(orderUseBilling) {
       if (orderUseBilling.is(':checked')) {
         $('#shipping .inner').hide()
         $('#shipping .inner input, #shipping .inner select').prop('disabled', true)
@@ -130,7 +146,8 @@ Spree.ready(function ($) {
         Spree.updateState('s')
       }
     }
-    function getCountryId (region) {
+
+    function getCountryId(region) {
       return $('#' + region + 'country select').val()
     }
   }

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

@@ -255,7 +255,7 @@ function CartForm($, $cartForm) {
 
     this.$price.html(variant.display_price)
 
-    var compareAtPriceContent = shouldDisplayCompareAtPrice ? '<span class="mr-3">' + variant.display_compare_at_price + '</span>' : ''
+    var compareAtPriceContent = shouldDisplayCompareAtPrice ? variant.display_compare_at_price : ''
     this.$compareAtPrice.html(compareAtPriceContent)
   }
 

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

@@ -1,4 +1,5 @@
 $font-size-base-px: 16px; //assuming 16px is 1rem ($font-size-base: 1rem in Bootstrap 4)
+$x1: null;
 
 @function font-px-to-rem($target-font-size-px: $font-size-base-px) {
   @return $font-size-base * ( $target-font-size-px / $font-size-base-px );

data/app/assets/stylesheets/spree/frontend/variables/bootstrap-overrides.scss

@@ -35,6 +35,5 @@ $grid-breakpoints: (
 $container-max-widths: (
   sm: 768px,
   md: 992px,
-  lg: 1200px,
-  xl: 1200px
+  lg: 1200px
 );

data/app/controllers/spree/currency_controller.rb

@@ -3,7 +3,7 @@ module Spree
     def set
       @currency = supported_currencies.find { |currency| currency.iso_code == params[:currency] }
       # Make sure that we update the current order, so the currency change is reflected.
-      current_order&.update_attributes!(currency: @currency.iso_code)
+      current_order&.update(currency: @currency.iso_code)
       session[:currency] = params[:currency] if Spree::Config[:show_store_currency_selector]
       respond_to do |format|
         format.json { render json: !@currency.nil? }

data/app/controllers/spree/taxons_controller.rb

@@ -16,7 +16,7 @@ module Spree
     def product_carousel
       if stale?(etag: carousel_etag, last_modified: last_modified, public: true)
         load_products
-        if @products.any?
+        if @products.reload.any?
           render template: 'spree/taxons/product_carousel', layout: false
         else
           head :no_content

data/app/helpers/spree/addresses_helper.rb

@@ -10,7 +10,7 @@ module Spree
           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,
+                          class: ['spree-flat-input'].compact,
                           required: is_required,
                           placeholder: is_required ? "#{method_name} #{required}" : method_name,
                           aria: { label: method_name }) +
@@ -27,7 +27,7 @@ module Spree
       method_name = Spree.t(:zipcode)
       required = Spree.t(:required)
       form.text_field(:zipcode,
-                      class: [is_required ? 'required' : nil, 'spree-flat-input'].compact,
+                      class: ['spree-flat-input'].compact,
                       required: is_required,
                       placeholder: is_required ? "#{method_name} #{required}" : method_name,
                       aria: { label: Spree.t(:zipcode) }) +
@@ -41,14 +41,14 @@ module Spree
       country ||= Spree::Country.find(Spree::Config[:default_country_id])
       have_states = country.states.any?
       state_elements = [
-        form.collection_select(:state_id, country.states.order(:name),
+        form.collection_select(:state_id, checkout_zone_applicable_states_for(country).sort_by(&:name),
                               :id, :name,
                                { prompt: Spree.t(:state) },
-                               class: [have_states ? 'required' : 'hidden', 'spree-flat-select'].compact,
+                               class: ['spree-flat-select'].compact,
                                aria: { label: Spree.t(:state) },
                                disabled: !have_states) +
           form.text_field(:state_name,
-                          class: [!have_states ? 'required' : 'hidden', 'spree-flat-input'].compact,
+                          class: ['spree-flat-input'].compact,
                           aria: { label: Spree.t(:state) },
                           disabled: have_states,
                           placeholder: Spree.t(:state) + " #{Spree.t(:required)}") +
@@ -60,7 +60,7 @@ module Spree
                     class: [!have_states ? 'hidden' : nil, 'position-absolute spree-flat-select-arrow'].compact)
       ].join.tr('"', "'").delete("\n")
 
-      content_tag(:noscript, form.text_field(:state_name, class: 'required')) +
+      content_tag(:noscript, form.text_field(:state_name)) +
         javascript_tag("document.write(\"<span class='d-block position-relative'>#{state_elements.html_safe}</span>\");")
     end
 
@@ -69,5 +69,9 @@ module Spree
 
       try_spree_current_user.addresses.where(country: available_countries)
     end
+
+    def checkout_zone_applicable_states_for(country)
+      current_store.states_available_for_checkout(country)
+    end
   end
 end

data/app/views/spree/addresses/_form.html.erb

@@ -6,7 +6,7 @@
       <div id="<%= "#{address_id}country-selection" %>" class="d-block position-relative has-float-label">
         <%= address_form.collection_select :country_id, available_countries, :id, :name,
                                            { prompt: Spree.t(:country).upcase },
-                                           { class: 'required form-control spree-flat-select',
+                                           { class: 'form-control spree-flat-select',
                                              aria: { label: Spree.t(:country) } } %>
         <%= image_tag 'arrow.svg', class: 'position-absolute spree-flat-select-arrow' %>
         <%= address_form.label(Spree.t(:country), Spree.t(:country).upcase, class:'text-uppercase') %>

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

@@ -28,11 +28,9 @@
   <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="compare-at-price">
-          <% if should_display_compare_at_price %>
-            <span class="mr-3"><%= display_compare_at_price(default_variant) %></span>
-          <% end %>
-        </span>
+        <% if should_display_compare_at_price %>
+          <span class="compare-at-price mr-3"><%= display_compare_at_price(default_variant) %></span>
+        <% end %>
         <span class="price selling" content="<%= @product_price.to_d %>">
           <%= display_price(default_variant) %>
         </span>

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

@@ -1,5 +1,5 @@
 <% if Spree::Config.show_store_currency_selector && stores.size > 1 %>
-  <li class="change-store">
+  <li class="d-none d-xl-block change-store">
     <div class="dropdown navbar-right-dropdown">
       <button id="stores-button" type="button" data-toggle="dropdown" class="navbar-right-dropdown-toggle" aria-label="<%= Spree.t('nav_bar.change_country')%>">
         <%= icon(name: 'global',

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

@@ -41,8 +41,8 @@
             <% if current_store.contact_phone&.present? %>
               <div><%= Spree.t(:call_us_now) %><%= current_store.contact_phone %></div>
             <% end %>
-            <% if current_store.contact_email&.present? %>
-              <div><%= Spree.t(:email) %>: <%= current_store.contact_email %></div>
+            <% if current_store.customer_support_email&.present? %>
+              <div><%= Spree.t(:email) %>: <%= current_store.customer_support_email %></div>
             <% end %>
           </div>
         </div>

data/app/views/spree/users/_address.html.erb

@@ -9,7 +9,7 @@
     <%= "#{address.address1} #{address.address2}" %>,
   </div>
   <div>
-    <%= "#{address.city}, #{address.state&.abbr} #{address.zipcode}" %>,
+    <%= "#{address.city}, #{address.state_text} #{address.zipcode}" %>,
   </div>
   <div>
     <%= address.country.name %>

data/config/initializers/canonical_rails.rb

@@ -10,5 +10,5 @@ CanonicalRails.setup do |config|
   # Parameter spamming can cause index dilution by creating seemingly different URLs with identical or near-identical content.
   # Unless whitelisted, these parameters will be omitted
 
-  config.whitelisted_parameters = [:keywords, :page, :search, :taxon]
+  config.allowed_parameters = [:keywords, :page, :search, :taxon]
 end

data/spree_frontend.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'bootstrap',       '>= 4.3.1', '< 4.6.0'
   s.add_dependency 'glyphicons',      '~> 1.0.2'
-  s.add_dependency 'canonical-rails', '~> 0.2.5'
+  s.add_dependency 'canonical-rails', '~> 0.2.10'
   s.add_dependency 'inline_svg',      '~> 1.5'
   s.add_dependency 'jquery-rails',    '~> 4.3'
   s.add_dependency 'turbolinks',      '~> 5.2.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc2
+  version: 4.2.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc2
+        version: 4.2.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc2
+        version: 4.2.0.rc3
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc2
+        version: 4.2.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc2
+        version: 4.2.0.rc3
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -79,14 +79,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.10
 - !ruby/object:Gem::Dependency
   name: inline_svg
   requirement: !ruby/object:Gem::Requirement
@@ -783,9 +783,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc3
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc2
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc3
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -802,7 +802,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements:
 - none
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.