solidus_frontend 3.0.3 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96539626adde6574b00a88af2e4dabbde2fb7323b6724637472a7fc01f1969b7
-  data.tar.gz: 6ea7ed3bbca2e786f44ff798da59d5b2d342c2ce86698f4bdf996e30f327a7cb
+  metadata.gz: e140e0960c2907f6729fefb5612daa0b2c34f00693b9851ec3915229ebe672c2
+  data.tar.gz: 1860d27ebff4f5951f747a3a063e88611efa1f09378a52e1eb62ebc4b413405e
 SHA512:
-  metadata.gz: d4bcff2dcb6fd4b18dcf484df2f638d167d92dbc6bb53b489ed96af6eccc45994d1891bb5cbdd25dd1c51ec486191e410b693b5b5c26299005bfd0249bee3804
-  data.tar.gz: 14ee2d12accadac5cc809714b943d811ba476f10bccd54ac633369585d98c6bd7e26c3a487c7f46fdd2edd02862c908d53abbfdb61efac0c444ce33fb48084af
+  metadata.gz: 3e627e7dd00147a94c3f66858fb4126a42484161e6e09c1a53bae5011587972a37a3e9050aa1b4bfcc2cd59ca356dbc2e0089392c21fd174a3c935af64d48b9b
+  data.tar.gz: 2163e129731a803a1ff87081f452165dd4760980d7ae02199275c1a8a320e5dd66bdc85efd6d93355142615be0cb1f188ea20b928af00b815f2dd1f7a4ba5b20

data/app/controllers/spree/locale_controller.rb

@@ -3,12 +3,11 @@
 module Spree
   class LocaleController < Spree::StoreController
     def set
-      available_locales = Spree.i18n_available_locales
       requested_locale = params[:switch_to_locale] || params[:locale]
 
-      if requested_locale && available_locales.map(&:to_s).include?(requested_locale)
-        session[set_user_language_locale_key] = requested_locale
+      if locale_is_available?(requested_locale)
         I18n.locale = requested_locale
+        session[set_user_language_locale_key] = requested_locale
         flash.notice = t('spree.locale_changed')
       else
         flash[:error] = t('spree.locale_not_changed')
@@ -16,5 +15,11 @@ module Spree
 
       redirect_to spree.root_path
     end
+
+    private
+
+    def locale_is_available?(locale)
+      locale && Spree.i18n_available_locales.include?(locale.to_sym)
+    end
   end
 end

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

@@ -7,7 +7,7 @@
         <ul>
           <% @product.variants_and_option_values_for(current_pricing_options).each_with_index do |variant, index| %>
             <li>
-              <%= radio_button_tag "variant_id", variant.id, index == 0, 'data-price' => variant.price_for(current_pricing_options)  %>
+              <%= radio_button_tag "variant_id", variant.id, index == 0, 'data-price' => variant.price_for_options(current_pricing_options)&.money %>
               <%= label_tag "variant_id_#{ variant.id }" do %>
                 <span class="variant-description">
                   <%= variant_options variant %>
@@ -28,13 +28,13 @@
       <%= hidden_field_tag "variant_id", @product.master.id %>
     <% end %>
 
-    <% if @product.price_for(current_pricing_options) and !@product.price.nil? %>
+    <% if @product.price_for_options(current_pricing_options) and !@product.price.nil? %>
       <div data-hook="product_price" class="columns five <%= !@product.has_variants? ? 'alpha' : 'omega' %>">
 
         <div id="product-price">
           <h6 class="product-section-title"><%= t('spree.price') %></h6>
           <div>
-            <span class="price selling" itemprop="price" content="<%= @product.price_for(current_pricing_options).to_d %>">
+            <span class="price selling" itemprop="price" content="<%= @product.price_for_options(current_pricing_options).amount %>">
               <%= display_price(@product) %>
             </span>
             <span itemprop="priceCurrency" content="<%= current_pricing_options.currency %>"></span>

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

@@ -32,7 +32,7 @@
           </div>
           <%= link_to truncate(product.name, length: 50), url, class: 'info', itemprop: "name", title: product.name %>
           <span itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-            <% if price = product.price_for(current_pricing_options) %>
+            <% if price = product.price_for_options(current_pricing_options)&.money %>
               <span class="price selling" itemprop="price" content="<%= price.to_d %>">
                 <%= price.to_html %>
               </span>

data/lib/spree/frontend/engine.rb

@@ -10,6 +10,10 @@ module Spree
       # Leave initializer empty for backwards-compatability. Other apps
       # might still rely on this event.
       initializer "spree.frontend.environment", before: :load_config_initializers do; end
+
+      config.after_initialize do
+        Spree::Frontend::Config.check_load_defaults_called('Spree::Frontend::Config')
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.3
 platform: ruby
 authors:
 - Solidus Team
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement