solidus_frontend 3.0.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf5e18acd4c8ecbcf2cf401eb50c46e6d6b5bd84c7ffe3704c0b298f1308c574
-  data.tar.gz: 5f9cb36908fb080589a39cebf70da10c7ff38d2a023ee418e858aa73457dec58
+  metadata.gz: 56b88f80389643fc4578a3ec8ffe72e76fcee2314e43d0090d00eb7642d3c973
+  data.tar.gz: adf1607ab2f9fb5ebe8915b6acffbe2ef2f172f2bd39edb939f1623a8e04f745
 SHA512:
-  metadata.gz: 8fd1a9c0f68b3f5e67644ba34f861ecbb5b3ce87b63c5aded1f5c490d6bd8a5dc06f6879e44bb330d14a923b70c05aff4097d85b82926f52bc61c1cd47d79733
-  data.tar.gz: 10372dfccc8cc1885247b8e4063974fbecbde6e54cbe394a5dfe84df9c2a1ceaa9c532fd882114b192adbf7d21e1717db5d7404081372fc90ec2df395afc539e
+  metadata.gz: 42d221f8ffa233bc7ecb7120fbba65011045b3ce948b741fc763fbc7c4934be661f556241b16b201a12dbcf5db4609423ff49ae951e33286ed93bec0722cccef
+  data.tar.gz: bd87fbdecb7fa75fad17ace131d88ac6d28f8c7608e5aae9676f3b33bc2ee602eeedd99a2cb8e9f300b8d7db50240b92d8c5e198b200bfa6c49eb4e6130efc77

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -304,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Cart and storefront for the Solidus e-commerce project.