spree_core 4.2.3.1 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0c372dea2c75fd41b1007170fd71a99bec886b2ea9de47bf69c155d1f9e44e1
-  data.tar.gz: fd41eb8af4537f2a3fa12c52005a4fd6f2d7854dd097e355d5a748a73f6f777a
+  metadata.gz: 73a956aa0f5f8359d02e3804606a880d73af297547ef3eca07066e7ee244a728
+  data.tar.gz: 55cb848ec873396022bcaa67b8d8f6281ce4dd2d48dd1692e59f72e012c0dd13
 SHA512:
-  metadata.gz: 621917d1e07ccf5c72a0947efe43c96ab48aa3c4f9cb85e4c0e78d4d5427f81ff41284af6f2d738cfa4df5a563daf5b24ac1a70ec66756ea765b78bd8c66d6e0
-  data.tar.gz: 148e557777a9f21d7bc7e366498fa7ecbea69b3aa0f6286d62c0e1ef389af98499a07910581b6dbe5ec89e37219e4651dc7f52109d0b54638666aa3b590509e3
+  metadata.gz: '0749dcc7a17168458bfa742d9f4df1ad99c2f642fd6a4654be232cc8b75c8f72f73286effb135909a17bbcc27d5bdf7932f75c073068eb1492d4159f23793a66'
+  data.tar.gz: 8ddae63ba67bf3c68492f80605646176bb82bdb2ca1d80ffa3139cafca4402d4156e9f14d15353bff0b7d7fa1f72cd340b4dbf826697ee0b995c64383bfcf5a2

data/app/assets/javascripts/spree.js

@@ -32,9 +32,9 @@ Spree.localizedPathFor = function(path) {
     if (pathName.match(/api\/v/)) {
       params.set('locale', SPREE_LOCALE)
     } else {
-      pathName = SPREE_LOCALE + '/' + path
+      pathName = (this.mountedAt()) + SPREE_LOCALE + '/' + path
     }
-    return fullUrl.origin + (this.mountedAt()) + pathName + '?' + params.toString()
+    return fullUrl.origin + pathName + '?' + params.toString()
   }
   return Spree.pathFor(path)
 }

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/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.2.3.1'.freeze
+  VERSION = '4.2.4'.freeze
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.2.3.1
+  version: 4.2.4
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-05 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.3.1
+  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.3.1
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.4
 post_install_message:
 rdoc_options: []
 require_paths: