solidus_core 3.2.3 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc968f634c0e31f7ad3d1928133d5d682df2669617eaca7abdc87379228d7e30
-  data.tar.gz: a2e38014e3d24fe363651e7e27f5b8fa21b93105f1269e67adee3e20ec1665fa
+  metadata.gz: b7a2c88277ebda2afcdfced8c30f64602d6cc9bbb1839f47eab674e1e58ebd7f
+  data.tar.gz: 76b1cea1f67d9eff240ab277ceb2df51085e111224ead5c3343596e2dca0c15e
 SHA512:
-  metadata.gz: 8fbc377c572b99bb42d055b1479f2be9c5bca450019f70bef38adf76a3bfd69057c90824150036c7ed1330d9052f3916f09a48a252b85f31c0719f33f5d52c43
-  data.tar.gz: c57b6889ddf53bcf23fc1ed0012a9759ef72a031a72e1c8a8a838abfb8594b8f401bb17a973d17c37347aae44f37411181ab9a663e884659ebeb6122c06481c4
+  metadata.gz: fa93973896e2ad61b824e82f12a263594936a986db1c0bd4eb6689813e19d8cb1009d31d33201ca00ab6e524ad7cb31fc93f469932da842abc442470a8577c2e
+  data.tar.gz: 4d74fa5a9f2bbe435d22c247581762a97856c982e999f22d0886afb22bd624299a3ae77ed171b5ed42e9fafe1fab98e695d46c706e92d97763b803f0ec232a36

data/app/models/concerns/spree/default_price.rb

@@ -16,10 +16,12 @@ module Spree
 
     # Returns `#prices` prioritized for being considered as default price
     #
+    # @deprecated
     # @return [ActiveRecord::Relation<Spree::Price>]
     def currently_valid_prices
       prices.currently_valid
     end
+    deprecate :currently_valid_prices, deprecator: Spree::Deprecation
 
     # Returns {#default_price} or builds it from {Spree::Variant.default_price_attributes}
     #
@@ -33,7 +35,7 @@ module Spree
     # Select from {#prices} the one to be considered as the default
     #
     # This method works with the in-memory association, so non-persisted prices
-    # are taken into account. Discarded prices are also considered.
+    # are taken into account.
     #
     # A price is a candidate to be considered as the default when it meets
     # {Spree::Variant.default_price_attributes} criteria. When more than one candidate is
@@ -44,37 +46,11 @@ module Spree
     # @return [Spree::Price, nil]
     # @see Spree::Variant.default_price_attributes
     def default_price
-      prioritized_default(
-        prices_meeting_criteria_to_be_default(
-          (prices + prices.with_discarded).uniq
-        )
-      )
+      price_selector.price_for_options(Spree::Config.default_pricing_options)
     end
 
     def has_default_price?
       default_price.present? && !default_price.discarded?
     end
-
-    private
-
-    def prices_meeting_criteria_to_be_default(prices)
-      criteria = self.class.default_price_attributes.transform_keys(&:to_s)
-      prices.select do |price|
-        contender = price.attributes.slice(*criteria.keys)
-        criteria == contender
-      end
-    end
-
-    def prioritized_default(prices)
-      prices.min do |prev, succ|
-        contender_one, contender_two = [succ, prev].map do |item|
-          [
-            item.updated_at || Time.zone.now,
-            item.id || Float::INFINITY
-          ]
-        end
-        contender_one <=> contender_two
-      end
-    end
   end
 end

data/app/models/spree/variant/price_selector.rb

@@ -39,12 +39,29 @@ module Spree
       # @param [Spree::Variant::PricingOptions] price_options Pricing Options to abide by
       # @return [Spree::Price, nil] The most specific price for this set of pricing options.
       def price_for_options(price_options)
-        variant.currently_valid_prices.detect do |price|
+        sorted_prices_for(variant).detect do |price|
           (price.country_iso == price_options.desired_attributes[:country_iso] ||
            price.country_iso.nil?
           ) && price.currency == price_options.desired_attributes[:currency]
         end
       end
+
+      private
+
+      # Returns `#prices` prioritized for being considered as default price
+      #
+      # @return [Array<Spree::Price>]
+      def sorted_prices_for(variant)
+        variant.prices.select do |price|
+          variant.discarded? || price.kept?
+        end.sort_by do |price|
+          [
+            price.country_iso.nil? ? 0 : 1,
+            price.updated_at || Time.zone.now,
+            price.id || Float::INFINITY,
+          ]
+        end.reverse
+      end
     end
   end
 end

data/app/models/spree/variant.rb

@@ -23,7 +23,6 @@ module Spree
     after_discard do
       stock_items.discard_all
       images.destroy_all
-      prices.discard_all
     end
 
     attr_writer :rebuild_vat_prices
@@ -52,6 +51,7 @@ module Spree
     has_many :images, -> { order(:position) }, as: :viewable, dependent: :destroy, class_name: "Spree::Image"
 
     has_many :prices,
+      -> { with_discarded },
       class_name: 'Spree::Price',
       dependent: :destroy,
       inverse_of: :variant,

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "3.2.3"
+  VERSION = "3.2.4"
 
   def self.solidus_version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1020,7 +1020,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.3.19
+rubygems_version: 3.3.21
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.