spree_frontend 4.2.0 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b202f99393b22f252f8c79ce9dbb68bdb3886df0095db558b7aeb54649d7442a
-  data.tar.gz: b6bf3f9b0dff2c97e90773fe58113d589711bb830ce921211b447b73b1a24631
+  metadata.gz: e5617e23cebabecc619b763e288fb37fe0f55b3eae53a0a224c4d90f8f6267b7
+  data.tar.gz: 5c6f46207edac502a335fd545f0b0a38f91ad4cc32c7444d2c3907e5c7579875
 SHA512:
-  metadata.gz: 6ca9c497131e513e80a043e7dae75e7e3dacff782fc0d4111fa1c4883c68db5db58f351a734065accb375855cb3e05ec3d080453777865cf5a51d81507fa103a
-  data.tar.gz: 459e4adc0b271ee193f9e99c7bec8b044d45ffc94449e897fcdc8ca1d1a2c696f13bc7adda5be001e59eaf5f3fdd07647c8a6b45890b1539990a5633393205da
+  metadata.gz: 071d2ae392116772ee81430b2a9206576cf2e1d2caef2793b872992ada9257461f0f0b5206813ba8a188889f7cce97487d2c777047a532a000534a74e87170d8
+  data.tar.gz: efca049f831a75eb370d29d09d1944d1fd644cae397f7a00aab511e31dfaf9ef05876c0cf150327f74532c7b951cbf770abab127b8f237e3a51bf41ee328ffa7

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

@@ -44,11 +44,11 @@
 
 Spree.routes.api_tokens = Spree.pathFor('api_tokens')
 Spree.routes.ensure_cart = Spree.pathFor('ensure_cart')
-Spree.routes.api_v2_storefront_cart_apply_coupon_code = Spree.pathFor('api/v2/storefront/cart/apply_coupon_code')
-Spree.routes.api_v2_storefront_cart_remove_coupon_code = Spree.pathFor('api/v2/storefront/cart/remove_coupon_code')
-Spree.routes.product = function(id) { return Spree.pathFor('products/' + id) }
-Spree.routes.product_related = function(id) { return Spree.pathFor('products/' + id + '/related') }
-Spree.routes.product_carousel = function (taxonId) { return Spree.pathFor('product_carousel/' + taxonId) }
+Spree.routes.api_v2_storefront_cart_apply_coupon_code = Spree.localizedPathFor('api/v2/storefront/cart/apply_coupon_code')
+Spree.routes.api_v2_storefront_cart_remove_coupon_code = function(couponCode) { return Spree.localizedPathFor('api/v2/storefront/cart/remove_coupon_code/' + couponCode) }
+Spree.routes.product = function(id) { return Spree.localizedPathFor('products/' + id) }
+Spree.routes.product_related = function(id) { return Spree.localizedPathFor('products/' + id + '/related') }
+Spree.routes.product_carousel = function (taxonId) { return Spree.localizedPathFor('product_carousel/' + taxonId) }
 Spree.routes.set_locale = function(locale) { return Spree.pathFor('locale/set?switch_to_locale=' + locale) }
 Spree.routes.set_currency = function(currency) { return Spree.pathFor('currency/set?switch_to_currency=' + currency) }
 
@@ -57,3 +57,26 @@ Spree.showProgressBar = function () {
   Turbolinks.controller.adapter.progressBar.setValue(0)
   Turbolinks.controller.adapter.progressBar.show()
 }
+
+Spree.clearCache = function () {
+  if (!Turbolinks.supported) { return }
+
+  Turbolinks.clearCache()
+}
+
+Spree.setCurrency = function (currency) {
+  Spree.clearCache()
+
+  var params = (new URL(window.location)).searchParams
+  if (currency === SPREE_DEFAULT_CURRENCY) {
+    params.delete('currency')
+  } else {
+    params.set('currency', currency)
+  }
+  var queryString = params.toString()
+  if (queryString !== '') { queryString = '?' + queryString }
+
+  SPREE_CURRENCY = currency
+
+  Turbolinks.visit(window.location.pathname + queryString, { action: 'replace' })
+}

data/app/assets/javascripts/spree/frontend/coupon_manager.js

@@ -49,7 +49,7 @@ CouponManager.prototype.sendRequest = function () {
   return $.ajax({
     async: false,
     method: 'PATCH',
-    url: Spree.routes.api_v2_storefront_cart_apply_coupon_code + '?locale=' + SPREE_LOCALE,
+    url: Spree.routes.api_v2_storefront_cart_apply_coupon_code,
     dataType: 'json',
     headers: {
       'X-Spree-Order-Token': SpreeAPI.orderToken
@@ -74,7 +74,7 @@ CouponManager.prototype.sendRemoveRequest = function () {
   return $.ajax({
     async: false,
     method: 'DELETE',
-    url: Spree.routes.api_v2_storefront_cart_remove_coupon_code + '/' + this.couponCode + '?locale=' + SPREE_LOCALE,
+    url: Spree.routes.api_v2_storefront_cart_remove_coupon_code(this.couponCode),
     dataType: 'json',
     headers: {
       'X-Spree-Order-Token': SpreeAPI.orderToken

data/app/assets/javascripts/spree/frontend/currency.js

@@ -1,11 +1,43 @@
-Spree.ready(function ($) {
-  var currencySelect = $('#currency-select select')
+document.addEventListener('turbolinks:load', function(event) {
+  // this condition checks if this is the first initial load of turbolinks application
+  if (!event.data.timing.visitStart) {
+    var currencySelect = document.querySelectorAll('select[name=switch_to_currency]')
 
-  if (currencySelect.length) {
-    currencySelect.on('change', function () {
-      currencySelect.attr('disabled')
-      Spree.showProgressBar()
-      window.location = Spree.routes.set_currency(this.value)
-    })
+    if (currencySelect.length) {
+      currencySelect.forEach(function (element) {
+        element.addEventListener('change', function () {
+          Spree.showProgressBar()
+          var newCurrency = this.value
+
+          // we need to make AJAX call here to the backend to set currency in session
+          fetch(Spree.routes.set_currency(newCurrency), {
+            method: 'GET'
+          }).then(function (response) {
+            switch (response.status) {
+              case 200:
+                Spree.setCurrency(newCurrency)
+                document.getElementById('internationalization-options-desktop').classList.remove('show')
+                break
+            }
+          })
+        })
+      })
+    }
+  }
+})
+
+// fix back button issue with different currency set
+// invalidate page if cached page has different currency then the current one
+document.addEventListener('turbolinks:load', function(event) {
+  if (SPREE_CURRENCY === SPREE_DEFAULT_CURRENCY) {
+    var regexAnyCurrency = new RegExp('currency=')
+    if (event.data.url.match(regexAnyCurrency) && !event.data.url.match(SPREE_CURRENCY)) {
+      Spree.setCurrency(SPREE_CURRENCY)
+    }
+  } else {
+    var regex = new RegExp('currency=' + SPREE_CURRENCY)
+    if (!event.data.url.match(regex)) {
+      Spree.setCurrency(SPREE_CURRENCY)
+    }
   }
 })

data/app/assets/javascripts/spree/frontend/locale.js

@@ -1,11 +1,13 @@
-Spree.ready(function ($) {
-  var localeSelect = $('#locale-select select')
+document.addEventListener('turbolinks:load', function () {
+  var localeSelect = document.querySelectorAll('select[name=switch_to_locale]')
 
   if (localeSelect.length) {
-    localeSelect.on('change', function () {
-      localeSelect.attr('disabled')
-      Spree.showProgressBar()
-      window.location = Spree.routes.set_locale(this.value)
+    localeSelect.forEach(function (element) {
+      element.addEventListener('change', function () {
+        Spree.clearCache()
+        Spree.showProgressBar()
+        this.form.submit()
+      })
     })
   }
 })

data/app/controllers/concerns/spree/locale_urls.rb

@@ -9,9 +9,7 @@ module Spree
     private
 
     def default_url_options
-      return super if locale_param.nil?
-
-      super.merge(locale: locale_param)
+      super.merge(locale: locale_param, currency: currency_param)
     end
 
     def redirect_to_default_locale

data/app/controllers/spree/currency_controller.rb

@@ -7,7 +7,11 @@ module Spree
         current_order&.update(currency: new_currency)
         session[:currency] = new_currency
       end
-      redirect_back_or_default(root_path(currency: new_currency))
+
+      respond_to do |format|
+        format.html { redirect_back fallback_location: spree.root_path(currency: new_currency) }
+        format.json { head :ok }
+      end
     end
   end
 end

data/app/controllers/spree/store_controller.rb

@@ -41,8 +41,10 @@ module Spree
       [
         current_store,
         current_currency,
-        I18n.locale
-      ]
+        I18n.locale,
+        try_spree_current_user.present?,
+        try_spree_current_user.try(:has_spree_role?, 'admin')
+      ].compact
     end
 
     def store_last_modified

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

@@ -1,5 +1,5 @@
 <% if defined?(should_render_currency_dropdown?) && should_render_currency_dropdown? %>
-  <%= form_tag spree.set_currency_path, method: :get, class: 'px-4 py-3 w-100', id: 'currency-select' do %>
+  <%= form_tag spree.set_currency_path, method: :get, class: 'px-4 py-3 w-100 currency-select' do %>
     <div class="form-group">
       <label for="switch_to_currency" class="dropdown-header text-center">
         <%= Spree.t(:choose_currency) %>

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

@@ -8,9 +8,6 @@
 <%= stylesheet_link_tag 'spree/frontend/all', media: 'screen', 'data-turbolinks-track': 'reload' %>
 <%= csrf_meta_tags %>
 <%= render 'spree/shared/paths' %>
-<script>
-  var SPREE_LOCALE = '<%= I18n.locale %>'
-  var SPREE_CURRENCY = '<%= current_currency %>'
-</script>
+<%= render 'spree/shared/locale_and_currency' %>
 <%= javascript_include_tag 'spree/frontend/all', defer: true, 'data-turbolinks-track': 'reload' %>
 <%= yield :head %>

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

@@ -0,0 +1,6 @@
+<script>
+  var SPREE_LOCALE = '<%= I18n.locale %>'
+  var SPREE_CURRENCY = '<%= current_currency %>'
+  var SPREE_DEFAULT_CURRENCY = '<%= current_store.default_currency %>'
+  var SPREE_DEFAULT_LOCALE = '<%= current_store.default_locale %>'
+</script>

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

@@ -1,5 +1,5 @@
 <% if should_render_locale_dropdown? %>
-  <%= form_tag spree.set_locale_path, method: :get, class: 'px-4 py-3 w-100', id: 'locale-select' do %>
+  <%= form_tag spree.set_locale_path, method: :get, class: 'px-4 py-3 w-100 locale-select' do %>
     <div class="form-group">
       <label for="switch_to_locale" class="dropdown-header text-center">
         <%= Spree.t('i18n.language') %>

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

@@ -34,7 +34,7 @@
           </div>
           <div class="row pt-5 justify-content-center align-items-center product-added-modal-product">
             <div class="col-4 col-sm-2 product-added-modal-product-image-container">
-              <img class="product-added-modal-product-image-container-image" src="data:," alt="<%= @product.name %>">
+              <img class="product-added-modal-product-image-container-image" src="data:," alt="<%= @product&.name %>">
             </div>
             <div class="col-8 col-sm-6 col-lg-4 py-1 product-added-modal-product-details">
               <div class="product-added-modal-product-details-name"></div>
@@ -48,7 +48,7 @@
           <div class="row pb-4 justify-content-center">
             <div class="col-12 col-lg-8">
               <%= link_to spree.checkout_path, class: 'btn btn-primary w-100 font-weight-bold text-uppercase product-added-modal-button', method: :get do %>
-                <%= Spree.t('pdp.checkout') %>
+                <%= Spree.t(:checkout) %>
               <% end %>
             </div>
           </div>

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.allowed_parameters = [:keywords, :page, :search, :taxon]
+  config.allowed_parameters = [:keywords, :search, :taxon]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.4
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-05-17 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
+        version: 4.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.4
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.4
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -739,6 +739,7 @@ files:
 - app/views/spree/shared/_line_item.html.erb
 - app/views/spree/shared/_link_to_account.html.erb
 - app/views/spree/shared/_link_to_cart.html.erb
+- app/views/spree/shared/_locale_and_currency.html.erb
 - app/views/spree/shared/_locale_dropdown.html.erb
 - app/views/spree/shared/_login.html.erb
 - app/views/spree/shared/_main_nav_bar.html.erb
@@ -792,9 +793,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
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.4
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.4
 post_install_message:
 rdoc_options: []
 require_paths: