spree_core 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a59c1e362e580d2884f8c82e1c15d2cdf057e21b1efc66e1ede10ef4e41883a8
-  data.tar.gz: cfe5bc95ed8d23c91c0c19dace8fe3d96b015cbcd97af1c38524b73c94797cac
+  metadata.gz: 5f9630450c68b8797b744c4f046769f568ebf50366a956fcbad41ede886c8419
+  data.tar.gz: 76d0ef19926855683298402e5ff729982be202b4c03fd021e4440ec7dc6d5185
 SHA512:
-  metadata.gz: 420dbd7fdd44e2a4fa1d68d4d9e78a2fc42062757fc9470e57277bb7599fc3883b9e01a8052e5d0c34fb784361a5bc2b1b0b8e0e7bd7342860412e09e5799e70
-  data.tar.gz: 6b45c3c66e49701c0830b59e51ecb1776563abf078fc0728080479799dbbda443b4191c5f3af934cb663cdda6e824564b5891ec805950e87f949f0011b34430c
+  metadata.gz: 604ae3a3334b1a70869577cbafa21eafb5c4953f280e6c9ef6b76b51e5b50b7dbe010b66681076019f55745e40448906e0668c9ee0dc4d8912759ae4fd7289b7
+  data.tar.gz: 6fb2f4a1d3b55e5974326ff473fa554757a8d5464c41cb2963af4ffef11e8f26250000c020075fa6dc70127a8267d908687490c9f62919d11ec6b18f56a512ed

data/app/assets/javascripts/spree.js

@@ -22,16 +22,20 @@ Spree.pathFor = function (path) {
 }
 
 Spree.localizedPathFor = function(path) {
-  if (typeof (SPREE_LOCALE) !== 'undefined') {
-    if (path.match(/api\/v/)) {
-      if (path.match(/\?/)) {
-        path = path + '&locale=' + SPREE_LOCALE
-      } else {
-        path = path + '?locale=' + SPREE_LOCALE
-      }
+  if (typeof (SPREE_LOCALE) !== 'undefined' && typeof (SPREE_CURRENCY) !== 'undefined') {
+    var fullUrl = new URL(Spree.pathFor(path))
+    var params = fullUrl.searchParams
+    var pathName = fullUrl.pathname
+
+    params.set('currency', SPREE_CURRENCY)
+
+    if (pathName.match(/api\/v/)) {
+      params.set('locale', SPREE_LOCALE)
     } else {
-      path = SPREE_LOCALE + '/' + path
+      pathName = SPREE_LOCALE + '/' + pathName
     }
+
+    path = pathName + '?' + params.toString()
   }
   return Spree.pathFor(path)
 }

data/app/helpers/spree/currency_helper.rb

@@ -12,7 +12,7 @@ module Spree
     def supported_currency_options
       return if current_store.nil?
 
-      current_store.supported_currencies_list.map(&:iso_code)
+      current_store.supported_currencies_list.map(&:iso_code).map { |currency| currency_presentation(currency) }
     end
 
     def should_render_currency_dropdown?
@@ -20,5 +20,15 @@ module Spree
 
       current_store.supported_currencies_list.size > 1
     end
+
+    def currency_symbol(currency)
+      ::Money::Currency.find(currency).symbol
+    end
+
+    def currency_presentation(currency)
+      label = [currency_symbol(currency), currency].compact.join(' ')
+
+      [label, currency]
+    end
   end
 end

data/lib/spree/core/controller_helpers/currency.rb

@@ -9,6 +9,7 @@ module Spree
           helper_method :supported_currencies_for_all_stores
           helper_method :current_currency
           helper_method :supported_currency?
+          helper_method :currency_param
         end
 
         def current_currency
@@ -41,6 +42,12 @@ module Spree
 
           supported_currencies.map(&:iso_code).include?(currency_iso_code.upcase)
         end
+
+        def currency_param
+          return if current_currency == current_store.default_currency
+
+          current_currency
+        end
       end
     end
   end

data/lib/spree/core/version.rb

@@ -1,5 +1,7 @@
 module Spree
+  VERSION = '4.2.1'.freeze
+
   def self.version
-    '4.2.0'
+    VERSION
   end
 end

data/lib/spree/testing_support/locale_helpers.rb

@@ -55,11 +55,18 @@ module Spree
 
       def open_i18n_menu
         find('#header #internationalization-button-desktop').click
+        expect(page).to have_selector('#internationalization-options-desktop')
+      end
+
+      def close_i18n_menu
+        find('#header #internationalization-button-desktop').click
+        expect(page).not_to have_selector('#internationalization-options-desktop')
       end
 
       def switch_to_currency(currency)
         open_i18n_menu
         select currency, from: 'switch_to_currency'
+        expect(page).to have_no_css '.turbolinks-progress-bar'
       end
 
       def switch_to_locale(locale)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -1175,9 +1175,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.1
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -1193,7 +1193,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.3
 signing_key:
 specification_version: 4
 summary: The bare bones necessary for Spree.