solidus_frontend 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18d412fff110d97ee160aa8f7bc83418eb585f10c4a8e1ed8a4b3d1abdb4dd2f
-  data.tar.gz: 2b50f48fea6d6b4bd8bd7b5c7eb4068704a08fc089b41d596a4d53475d69ea57
+  metadata.gz: 62653584365f7feb30418391dae86ad065d9873f86edb921dec1432198f0c9d5
+  data.tar.gz: dcb5c77f653b65f24836cafbb04d88bf3a282d763e2b5b0416a39bd491efa8c4
 SHA512:
-  metadata.gz: b9f0588e0fef4ae348febcb40dbe1a7486976fa82f3b1b0b83d8ed87ac5525a84e147e0f2aa9c00ce286139aed65b9dfec9464b9734d328c9ee67a3cce13fdb0
-  data.tar.gz: 0d41c9a0131aa52669f147f1e216653a09db4d73770ef90136b97980f46c6f609299e231b1a642af69b3ce1817776db5b302f5f33d90b9ff902c40250eef41ea
+  metadata.gz: 9763134a7d86ff644b5e8025d2aa62c243bbcab708610d834451fe2304a4fb97105ef4c5758906861b7c27e3ffc74adec170653255902ef3eec5a0043d71e25a
+  data.tar.gz: aa17b59fe8c6967a4499cd1ddb871c8f043ce66d364dcbfbcd507e6757b13886cc3a5b1f26279726c23e9f2e7ac8790dae83a8cf52695fc836f05a1d5883dec7

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.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Solidus Team
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement