spree_core 4.2.0 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a59c1e362e580d2884f8c82e1c15d2cdf057e21b1efc66e1ede10ef4e41883a8
-  data.tar.gz: cfe5bc95ed8d23c91c0c19dace8fe3d96b015cbcd97af1c38524b73c94797cac
+  metadata.gz: 73a956aa0f5f8359d02e3804606a880d73af297547ef3eca07066e7ee244a728
+  data.tar.gz: 55cb848ec873396022bcaa67b8d8f6281ce4dd2d48dd1692e59f72e012c0dd13
 SHA512:
-  metadata.gz: 420dbd7fdd44e2a4fa1d68d4d9e78a2fc42062757fc9470e57277bb7599fc3883b9e01a8052e5d0c34fb784361a5bc2b1b0b8e0e7bd7342860412e09e5799e70
-  data.tar.gz: 6b45c3c66e49701c0830b59e51ecb1776563abf078fc0728080479799dbbda443b4191c5f3af934cb663cdda6e824564b5891ec805950e87f949f0011b34430c
+  metadata.gz: '0749dcc7a17168458bfa742d9f4df1ad99c2f642fd6a4654be232cc8b75c8f72f73286effb135909a17bbcc27d5bdf7932f75c073068eb1492d4159f23793a66'
+  data.tar.gz: 8ddae63ba67bf3c68492f80605646176bb82bdb2ca1d80ffa3139cafca4402d4156e9f14d15353bff0b7d7fa1f72cd340b4dbf826697ee0b995c64383bfcf5a2

data/app/assets/javascripts/spree.js

@@ -22,16 +22,19 @@ 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 = (this.mountedAt()) + SPREE_LOCALE + '/' + path
     }
+    return fullUrl.origin + 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/app/models/spree/address.rb

@@ -25,6 +25,8 @@ module Spree
     ADDRESS_FIELDS = %w(firstname lastname company address1 address2 city state zipcode country phone)
     EXCLUDED_KEYS_FOR_COMPARISION = %w(id updated_at created_at deleted_at label user_id)
 
+    scope :not_deleted, -> { where(deleted_at: nil) }
+
     belongs_to :country, class_name: 'Spree::Country'
     belongs_to :state, class_name: 'Spree::State', optional: true
     belongs_to :user, class_name: Spree.user_class.name, optional: true

data/app/models/spree/product.rb

@@ -102,8 +102,9 @@ module Spree
       validates :meta_title
     end
     with_options presence: true do
-      validates :name, :shipping_category
-      validates :price, if: proc { Spree::Config[:require_master_price] }
+      validates :name
+      validates :shipping_category, if: :requires_shipping_category?
+      validates :price, if: :requires_price?
     end
 
     validates :slug, presence: true, uniqueness: { allow_blank: true, case_sensitive: false }
@@ -485,5 +486,13 @@ module Spree
         instance_variable_set(:"@#{v}", nil)
       end
     end
+
+    def requires_price?
+      Spree::Config[:require_master_price]
+    end
+
+    def requires_shipping_category?
+      true
+    end
   end
 end

data/config/locales/en.yml

@@ -1615,7 +1615,7 @@ en:
       code_help: "Store unique identifier, which is an abbreviated version of the store’s name (used as the layout directory name, and also helpful for separating templates by store)"
       checkout_zone_help: "Selecting zone will limit to which Countries or States products are shipped.
         For more information <a href='https://guides.spreecommerce.org/user/configuration/configuring_geography.html#zones' target='_blank' class='alert-link'>please see documentation</a>"
-      locales_help: "Install <a href='https://github.com/spree-contrib/spree_i18n target='_blank' class='alert-link'>Spree I18n extension</a> to add more locales"
+      locales_help: "Install <a href='https://github.com/spree-contrib/spree_i18n' target='_blank' class='alert-link'>Spree I18n extension</a> to add more locales"
       social_help: "If you want to link to your social accounts in the footer part of your website please fill below fields"
       default_country_help: "This is the Country that will be pre-selected on the Checkout Address form"
       footer_help: "This content is visible in the footer section of your Store"

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.4'.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.4
 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-05-17 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.4
   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.4
 post_install_message:
 rdoc_options: []
 require_paths: