spree_frontend 4.2.0.rc5 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c687a751a5affd4522bc602689a69466af4401bcda69b405b419dda929e737d
-  data.tar.gz: c8e4dbc7e128ab9d655ba9afdb60891d700224a9a5a8e62ab1f7d9720b30a9b2
+  metadata.gz: b202f99393b22f252f8c79ce9dbb68bdb3886df0095db558b7aeb54649d7442a
+  data.tar.gz: b6bf3f9b0dff2c97e90773fe58113d589711bb830ce921211b447b73b1a24631
 SHA512:
-  metadata.gz: 238f9fb68b0c36b60aee012683d1d33854fc1c9ed28fefc94e080fb194974b8a75d9c91b2634be22b98efac96cf136a4a34228658844aec166d117c1d0d062d1
-  data.tar.gz: c34ae40194f58f11d2dfdf1b8f89dc57c61b84e97cc2a13b18e1f8670ce841e0c9d2e87d65e780936912bd2ef478d933de50e019830332bc57ec53bfffa46ede
+  metadata.gz: 6ca9c497131e513e80a043e7dae75e7e3dacff782fc0d4111fa1c4883c68db5db58f351a734065accb375855cb3e05ec3d080453777865cf5a51d81507fa103a
+  data.tar.gz: 459e4adc0b271ee193f9e99c7bec8b044d45ffc94449e897fcdc8ca1d1a2c696f13bc7adda5be001e59eaf5f3fdd07647c8a6b45890b1539990a5633393205da

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

@@ -15,6 +15,8 @@
 //= require spree/frontend/api_tokens
 //= require spree/frontend/carousel-noconflict
 //= require spree/frontend/cart
+//= require spree/frontend/locale
+//= require spree/frontend/currency
 //= require spree/frontend/checkout
 //= require spree/frontend/checkout/address
 //= require spree/frontend/checkout/address_book
@@ -47,3 +49,11 @@ Spree.routes.api_v2_storefront_cart_remove_coupon_code = Spree.pathFor('api/v2/s
 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.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) }
+
+Spree.showProgressBar = function () {
+  if (!Turbolinks.supported) { return }
+  Turbolinks.controller.adapter.progressBar.setValue(0)
+  Turbolinks.controller.adapter.progressBar.show()
+}

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

@@ -1,6 +1,6 @@
 Spree.fetchAccount = function () {
   return $.ajax({
-    url: Spree.pathFor('account_link')
+    url: Spree.localizedPathFor('account_link')
   }).done(function (data) {
     Spree.accountFetched = true
     return $('#link-to-account').html(data)

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

@@ -123,7 +123,7 @@ Spree.ready(function ($) {
 
 Spree.fetchCart = function () {
   return $.ajax({
-    url: Spree.pathFor('cart_link')
+    url: Spree.localizedPathFor('cart_link')
   }).done(function (data) {
     Spree.cartFetched = true
     return $('#link-to-cart').html(data)

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

@@ -8,7 +8,7 @@ Spree.ready(function($) {
             $.ajax({
               async: false,
               method: 'GET',
-              url: Spree.pathFor('/api/v2/storefront/countries/' + countryId + '?include=checkout_zone_applicable_states'),
+              url: Spree.localizedPathFor('/api/v2/storefront/countries/' + countryId + '?include=checkout_zone_applicable_states'),
               dataType: 'json'
             }).done(function(data) {
               var json = data.included;

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,
+    url: Spree.routes.api_v2_storefront_cart_apply_coupon_code + '?locale=' + SPREE_LOCALE,
     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,
+    url: Spree.routes.api_v2_storefront_cart_remove_coupon_code + '/' + this.couponCode + '?locale=' + SPREE_LOCALE,
     dataType: 'json',
     headers: {
       'X-Spree-Order-Token': SpreeAPI.orderToken

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

@@ -0,0 +1,11 @@
+Spree.ready(function ($) {
+  var currencySelect = $('#currency-select select')
+
+  if (currencySelect.length) {
+    currencySelect.on('change', function () {
+      currencySelect.attr('disabled')
+      Spree.showProgressBar()
+      window.location = Spree.routes.set_currency(this.value)
+    })
+  }
+})

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

@@ -0,0 +1,11 @@
+Spree.ready(function ($) {
+  var localeSelect = $('#locale-select select')
+
+  if (localeSelect.length) {
+    localeSelect.on('change', function () {
+      localeSelect.attr('disabled')
+      Spree.showProgressBar()
+      window.location = Spree.routes.set_locale(this.value)
+    })
+  }
+})

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

@@ -1,6 +1,4 @@
 @import "spree/frontend/variables/variables";
-@import "spree/frontend/variables/bootstrap-overrides";
-@import "spree/frontend/variables/helper-variables";
 @import "bootstrap";
 @import "spree/frontend/bootstrap-patches";
 
@@ -32,7 +30,6 @@
 @import "spree/frontend/views/spree/errors/not_found";
 @import "spree/frontend/views/spree/shared/carousel/thumbnails";
 @import "spree/frontend/views/spree/shared/carousel/single";
-@import "spree/frontend/views/spree/shared/change_store";
 @import "spree/frontend/views/spree/home/index";
 @import "spree/frontend/views/spree/user_passwords/user_passwords";
 @import "spree/frontend/views/spree/user_sessions/new";

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

@@ -1,3 +1,4 @@
+// we're keeping this file for legacy installations relying on it
 $grid-gutter-width: 19px;
 $body-color: $font-color;
 $theme-colors: (

data/app/assets/stylesheets/spree/frontend/variables/helper-variables.scss

@@ -1,3 +1,4 @@
+// we're keeping this file for legacy installations relying on it
 $container-padding: 17px;
 $photo-width-to-height-ratio: 30001/ 37500;
 $photo-width-to-height-ratio-zoom: 28015 / 37500;

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

@@ -1,3 +1,4 @@
+// main spree variables
 $primary-color: #0074c2;
 $secondary-color: #4c4c4c;
 $primary-background: #ffffff;
@@ -18,3 +19,56 @@ $spree-header-max-width: 1440px;
 $spree-header-mobile-height: 50px;
 $spree-header-tablet-height: 75px;
 $spree-header-desktop-height: 75px;
+
+// bootstrap overrides
+$grid-gutter-width: 19px;
+$body-color: $font-color;
+$theme-colors: (
+  // standard bootstrap colors
+  "primary": $primary-color,
+  "secondary": $secondary-color,
+  "danger": #f53737,
+  "info": #999999,
+  "warning": #ffc107,
+  "light-secondary": #999999,
+  "borders": $second-global-border,
+  "dark-borders": $global-border-style,
+  "light-background": $primary-background,
+  "dark-text": $font-color,
+  "overlay": rgba(76, 76, 76, 0.5),
+  "shadow": rgba(0, 0, 0, 0.16)
+);
+$enable-rounded: false;
+$enable-shadows: false;
+$enable-gradients: false;
+$font-family-sans-serif: $font-family;
+$font-weight-medium: 500;
+.font-weight-medium {
+  font-weight: $font-weight-medium;
+}
+$btn-border-width: 2px;
+$modal-dialog-margin: 0;
+$grid-breakpoints: (
+  xs: 0,
+  sm: 576px,
+  md: 768px,
+  lg: 992px,
+  xl: 1200px
+);
+$container-max-widths: (
+  sm: 768px,
+  md: 992px,
+  lg: 1200px
+);
+
+// helper variables
+$container-padding: 17px;
+$photo-width-to-height-ratio: 30001/ 37500;
+$photo-width-to-height-ratio-zoom: 28015 / 37500;
+$thumbnails-carousel-single-height: 100% / $photo-width-to-height-ratio;
+$thumbnails-carousel-single-height-zoom: 100% /
+  $photo-width-to-height-ratio-zoom;
+$zoom-height-breakpoint: calc(
+  650px / #{$photo-width-to-height-ratio-zoom} + 102px * 2
+);
+$spree-plp-filter-desktop-position: $spree-header-desktop-height + 77px;

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

@@ -0,0 +1,23 @@
+module Spree
+  module LocaleUrls
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :redirect_to_default_locale
+    end
+
+    private
+
+    def default_url_options
+      return super if locale_param.nil?
+
+      super.merge(locale: locale_param)
+    end
+
+    def redirect_to_default_locale
+      return if params[:locale].blank? || supported_locale?(params[:locale])
+
+      redirect_to url_for(request.parameters.merge(locale: nil))
+    end
+  end
+end

data/app/controllers/spree/checkout_controller.rb

@@ -35,7 +35,7 @@ module Spree
         @order.temporary_address = !params[:save_user_address]
         unless @order.next
           flash[:error] = @order.errors.full_messages.join("\n")
-          redirect_to(checkout_state_path(@order.state)) && return
+          redirect_to(spree.checkout_state_path(@order.state)) && return
         end
 
         if @order.completed?
@@ -43,7 +43,7 @@ module Spree
           flash['order_completed'] = true
           redirect_to completion_route
         else
-          redirect_to checkout_state_path(@order.state)
+          redirect_to spree.checkout_state_path(@order.state)
         end
       else
         render :edit
@@ -77,7 +77,7 @@ module Spree
       if @order.state != correct_state && !skip_state_validation?
         flash.keep
         @order.update_column(:state, correct_state)
-        redirect_to checkout_state_path(@order.state)
+        redirect_to spree.checkout_state_path(@order.state)
       end
     end
 
@@ -108,7 +108,7 @@ module Spree
 
     def set_state_if_present
       if params[:state]
-        redirect_to checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state]) && !skip_state_validation?
+        redirect_to spree.checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state]) && !skip_state_validation?
         @order.state = params[:state]
       end
     end
@@ -129,8 +129,8 @@ module Spree
     end
 
     # Provides a route to redirect after order completion
-    def completion_route(custom_params = nil)
-      spree.order_path(@order, custom_params)
+    def completion_route(custom_params = {})
+      spree.order_path(@order, custom_params.merge(locale: locale_param))
     end
 
     def setup_for_current_state
@@ -174,14 +174,14 @@ module Spree
         params.delete(:payment_source)
 
         # Return to the Payments page if additional payment is needed.
-        redirect_to checkout_state_path(@order.state) and return if @order.payments.valid.sum(:amount) < @order.total
+        redirect_to spree.checkout_state_path(@order.state) and return if @order.payments.valid.sum(:amount) < @order.total
       end
     end
 
     def remove_store_credit_payments
       if params.key?(:remove_store_credit)
         remove_store_credit_service.call(order: @order)
-        redirect_to checkout_state_path(@order.state) and return
+        redirect_to spree.checkout_state_path(@order.state) and return
       end
     end
 

data/app/controllers/spree/currency_controller.rb

@@ -1,17 +1,13 @@
 module Spree
   class CurrencyController < StoreController
     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(currency: @currency.iso_code)
-      session[:currency] = params[:currency] if Spree::Config[:show_store_selector]
-      respond_to do |format|
-        format.json { render json: !@currency.nil? }
-        format.html do
-          # We want to go back to where we came from!
-          redirect_back_or_default(root_path)
-        end
+      new_currency = params[:switch_to_currency]&.upcase
+
+      if new_currency.present? && supported_currency?(new_currency)
+        current_order&.update(currency: new_currency)
+        session[:currency] = new_currency
       end
+      redirect_back_or_default(root_path(currency: new_currency))
     end
   end
 end

data/app/controllers/spree/locale_controller.rb

@@ -1,14 +1,31 @@
 module Spree
   class LocaleController < Spree::StoreController
+    def index
+      render :index, layout: false
+    end
+
     def set
-      session['user_return_to'] = request.referer if request.referer&.starts_with?('http://' + request.host)
-      if params[:locale] && I18n.available_locales.map(&:to_s).include?(params[:locale])
-        session[:locale] = I18n.locale = params[:locale]
-        flash.notice = Spree.t(:locale_changed)
+      new_locale = (params[:switch_to_locale] || params[:locale]).to_s
+
+      if new_locale.present? && supported_locale?(new_locale)
+        if should_build_new_url?
+          redirect_to BuildLocalizedRedirectUrl.call(
+            url: request.env['HTTP_REFERER'],
+            locale: new_locale,
+            default_locale: current_store.default_locale
+          ).value
+        else
+          redirect_to root_path(locale: new_locale)
+        end
       else
-        flash[:error] = Spree.t(:locale_not_changed)
+        redirect_to root_path
       end
-      redirect_back_or_default(spree.root_path)
+    end
+
+    private
+
+    def should_build_new_url?
+      request.env['HTTP_REFERER'].present? && request.env['HTTP_REFERER'] != request.env['REQUEST_URI']
     end
   end
 end

data/app/controllers/spree/orders_controller.rb

@@ -20,9 +20,9 @@ module Spree
           format.html do
             if params.key?(:checkout)
               @order.next if @order.cart?
-              redirect_to checkout_state_path(@order.checkout_steps.first)
+              redirect_to spree.checkout_state_path(@order.checkout_steps.first)
             else
-              redirect_to cart_path
+              redirect_to spree.cart_path
             end
           end
         end

data/app/controllers/spree/store_controller.rb

@@ -1,17 +1,23 @@
 module Spree
   class StoreController < Spree::BaseController
     include Spree::Core::ControllerHelpers::Order
+    include Spree::LocaleUrls
+
+    helper 'spree/locale'
+    helper 'spree/currency'
 
     skip_before_action :verify_authenticity_token, only: :ensure_cart, raise: false
 
+    before_action :redirect_to_default_locale
+
     def account_link
       render partial: 'spree/shared/link_to_account'
-      fresh_when(try_spree_current_user)
+      fresh_when(etag: [try_spree_current_user, I18n.locale])
     end
 
     def cart_link
       render partial: 'spree/shared/link_to_cart'
-      fresh_when(simple_current_order)
+      fresh_when(etag: [simple_current_order, I18n.locale])
     end
 
     def api_tokens

data/app/helpers/spree/addresses_helper.rb

@@ -65,9 +65,16 @@ module Spree
     end
 
     def user_available_addresses
-      return unless try_spree_current_user
+      @user_available_addresses ||= begin
+        return [] unless try_spree_current_user
 
-      try_spree_current_user.addresses.where(country: available_countries)
+        states = current_store.countries_available_for_checkout.each_with_object([]) do |country, memo|
+          memo << current_store.states_available_for_checkout(country)
+        end.flatten
+
+        try_spree_current_user.addresses.
+          where(country_id: states.pluck(:country_id).uniq)
+      end
     end
 
     def checkout_zone_applicable_states_for(country)

data/app/helpers/spree/frontend_helper.rb

@@ -7,26 +7,6 @@ module Spree
       @body_class
     end
 
-    def store_country_iso(store)
-      store ||= current_store
-      return unless store
-      return unless store.default_country
-
-      store.default_country.iso.downcase
-    end
-
-    def stores
-      @stores ||= Spree::Store.includes(:default_country).order(:id)
-    end
-
-    def store_currency_symbol(store)
-      store ||= current_store
-      return unless store
-      return unless store.default_currency
-
-      ::Money::Currency.find(store.default_currency).symbol
-    end
-
     def spree_breadcrumbs(taxon, _separator = '', product = nil)
       return '' if current_page?('/') || taxon.nil?
 
@@ -302,6 +282,12 @@ module Spree
       @color_option_type_name ||= Spree::OptionType.color&.name
     end
 
+    def country_flag_icon(country_iso_code = nil)
+      return if country_iso_code.blank?
+
+      content_tag :span, nil, class: "flag-icon flag-icon-#{country_iso_code.downcase}"
+    end
+
     private
 
     def formatted_price(value)