solidus_frontend 3.0.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efca505352efdc61ad54ec4ac875c9fd16b62db6abe4c46ae12abeecfaf405dd
-  data.tar.gz: c06399b590c2421361499238948b846210f254ffb4a68c91a9329a3eba963316
+  metadata.gz: f289929d3460d4484d300423868c64d4f858460257b8d2aad21178e0f0b45db9
+  data.tar.gz: 0f25b4c832ddcc38b7e19561f3a184eb8ca7c909c5bd2320eaf1d197f8b96e5f
 SHA512:
-  metadata.gz: e0038661f1c4211ec84e4985d2cd6fbd4e63dac8c73046ea4f4a0772d516a02f1084c56df478b963c47595aa756e3b5295b825b06c96d35a810121115b45a9cf
-  data.tar.gz: d97af5f5fad0a2ead939d81d6e81193ae9a7931881d57deb4340f3d36ce284cebafe02520f889e10fff3b4636d109bddf1e93f704f54de9272f457e021bbb117
+  metadata.gz: 67281d0cb334e3777d8da03288534edcd156d8249418856e96c8f3f5a2bbc0eea008432bae9ae4c7ff881d4d4d885188c7f9a0e7e880bcca9d10029afca9e9ce
+  data.tar.gz: 6ace3d8824f91576f9beee4d3cb284e7b17f9824b8f4c6b9c167ce619abf3bfdffc62c1eafe4f5e84ca9247d5849f8b819a86db67bc2e08e38180a196a3fe52e

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.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2021-09-20 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.0
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.1
 - !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.2.20
 signing_key:
 specification_version: 4
 summary: Cart and storefront for the Solidus e-commerce project.