spree_core 5.1.0.rc1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a357b0d9005bb8d7ed5b4b56ebe020d34435ac15a402db9d650880ae01c38127
-  data.tar.gz: 729183094fa42d6d5b00632e5b9d44b61958643aef7b42d1b7931dd98c87b0f6
+  metadata.gz: 10a63ea31ea45db426f45aa13fb90de77dac8ab0a024f7812562aed34991b9e8
+  data.tar.gz: 2ca5104581c280ce3b1328e52bfd8988971012feb01287174b4afa3ea494917c
 SHA512:
-  metadata.gz: 49525a096671b7fce9970204619b1d05d7a421b3d6966b2ca139e492dda1ee2cd3a7339b3ee37ebbb4a31e2e93cdcfc49f8dffd6371ca91f813d9782259bf91f
-  data.tar.gz: faff9b9dd0388d354efcef394b6051951426824ee4d9e05ad5e6c3f952cf3eeba46ba40e631ee306f861529f840efb01e5b138075c188300bded5a88aec65d49
+  metadata.gz: f23f420db0bcced89590044a3b101754c934b06bc882adbe288163ef9b46166e829f79c824ad3eb83329ed8b6eb4e03aefcac8d1e5783eec42e7ba00ceb59dcb
+  data.tar.gz: d6c770cd94212ca2f919a62eeafc5bc58cc1440da8c3f98c9c6421c20fd12188995e0f93662225d0fb91d7afe769ae5488fc4b34360aeaa5fec2443e14216a49

data/app/models/spree/option_type.rb

@@ -48,7 +48,9 @@ module Spree
     #
     # Attributes
     #
-    accepts_nested_attributes_for :option_values, reject_if: ->(ov) { ov[:name].blank? || ov[:presentation].blank? }, allow_destroy: true
+    accepts_nested_attributes_for :option_values, reject_if: lambda { |ov|
+      ov[:id].blank? && (ov[:name].blank? || ov[:presentation].blank?)
+    }, allow_destroy: true
 
     #
     # Callbacks

data/app/models/spree/promotion/rules/item_total.rb

@@ -27,39 +27,39 @@ module Spree
             upper_limit_condition = true
           end
 
-          eligibility_errors.add(:base, ineligible_message_max) unless upper_limit_condition
-          eligibility_errors.add(:base, ineligible_message_min) unless lower_limit_condition
+          eligibility_errors.add(:base, ineligible_message_max(order)) unless upper_limit_condition
+          eligibility_errors.add(:base, ineligible_message_min(order)) unless lower_limit_condition
 
           eligibility_errors.empty?
         end
 
         private
 
-        def formatted_amount_min
-          Spree::Money.new(preferred_amount_min).to_s
+        def formatted_amount_min(order)
+          Spree::Money.new(preferred_amount_min, currency: order.currency).to_s
         end
 
-        def formatted_amount_max
+        def formatted_amount_max(order)
           if preferred_amount_max.present?
-            Spree::Money.new(preferred_amount_max).to_s
+            Spree::Money.new(preferred_amount_max, currency: order.currency).to_s
           else
             Spree.t('no_maximum')
           end
         end
 
-        def ineligible_message_max
+        def ineligible_message_max(order)
           if preferred_operator_max == 'lt'
-            eligibility_error_message(:item_total_more_than_or_equal, amount: formatted_amount_max)
+            eligibility_error_message(:item_total_more_than_or_equal, amount: formatted_amount_max(order))
           else
-            eligibility_error_message(:item_total_more_than, amount: formatted_amount_max)
+            eligibility_error_message(:item_total_more_than, amount: formatted_amount_max(order))
           end
         end
 
-        def ineligible_message_min
+        def ineligible_message_min(order)
           if preferred_operator_min == 'gte'
-            eligibility_error_message(:item_total_less_than, amount: formatted_amount_min)
+            eligibility_error_message(:item_total_less_than, amount: formatted_amount_min(order))
           else
-            eligibility_error_message(:item_total_less_than_or_equal, amount: formatted_amount_min)
+            eligibility_error_message(:item_total_less_than_or_equal, amount: formatted_amount_min(order))
           end
         end
       end

data/lib/spree/core/engine.rb

@@ -240,7 +240,9 @@ module Spree
         ]
 
         Rails.application.config.spree.translatable_resources = [
+          Spree::OptionType,
           Spree::Product,
+          Spree::Property,
           Spree::Taxon,
           Spree::Taxonomy,
           Spree::Store

data/lib/spree/core/version.rb

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

data/lib/spree/testing_support/capybara_config.rb

@@ -10,6 +10,7 @@ Capybara.configure do |config|
   config.match = :smart
   config.ignore_hidden_elements = true
 end
+Capybara.test_id = 'data-test-id'
 
 if ENV['WEBDRIVER'] == 'accessible'
   require 'capybara/accessible'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.1.0.rc1
+  version: 5.1.0
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-02 00:00:00.000000000 Z
+date: 2025-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -1382,9 +1382,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.rc1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.rc1
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0
 post_install_message:
 rdoc_options: []
 require_paths: