spree_core 5.3.5 → 5.4.0.beta

data/app/models/spree/price_rules/market_rule.rb

@@ -0,0 +1,19 @@
+module Spree
+  module PriceRules
+    class MarketRule < Spree::PriceRule
+      preference :market_ids, :array, default: []
+
+      def applicable?(context)
+        return false unless context.market
+        return true if preferred_market_ids.empty?
+
+        # Compare as strings to support both integer and UUID primary keys
+        preferred_market_ids.map(&:to_s).include?(context.market.id.to_s)
+      end
+
+      def self.description
+        'Apply pricing based on the market'
+      end
+    end
+  end
+end

data/app/models/spree/product.rb

@@ -20,12 +20,14 @@
 
 module Spree
   class Product < Spree.base_class
+    has_prefix_id :prod # Stripe: prod_
+
     acts_as_paranoid
     acts_as_taggable_on :tags, :labels
     normalizes :name, with: ->(value) { value&.to_s&.squish&.presence }
 
     include Spree::ProductScopes
-    include Spree::MultiStoreResource
+    include Spree::StoreScopedResource
     include Spree::TranslatableResource
     include Spree::MemoizedData
     include Spree::Metafields
@@ -117,6 +119,8 @@ module Spree
     has_many :variant_images, -> { order(:position) }, source: :images, through: :variants_including_master
     has_many :variant_images_without_master, -> { order(:position) }, source: :images, through: :variants
 
+    belongs_to :thumbnail, class_name: 'Spree::Image', optional: true
+
     has_many :option_value_variants, class_name: 'Spree::OptionValueVariant', through: :variants
     has_many :option_values, class_name: 'Spree::OptionValue', through: :variants
 
@@ -230,11 +234,12 @@ module Spree
 
     alias options product_option_types
 
-    self.whitelisted_ransackable_attributes = %w[description name slug discontinue_on status]
+    self.whitelisted_ransackable_attributes = %w[description name slug discontinue_on status available_on created_at updated_at]
     self.whitelisted_ransackable_associations = %w[taxons stores variants_including_master master variants tags labels
                                                    shipping_category classifications option_types properties]
     self.whitelisted_ransackable_scopes = %w[not_discontinued search_by_name in_taxon price_between
-                                             multi_search in_stock_items out_of_stock_items]
+                                             multi_search in_stock_items out_of_stock_items with_option_value_ids
+                                             ascend_by_price descend_by_price]
 
     [
       :sku, :barcode, :weight, :height, :width, :depth, :is_master, :dimensions_unit, :weight_unit
@@ -252,6 +257,9 @@ module Spree
     delegate :display_amount, :display_price, :has_default_price?, :track_inventory?,
              :display_compare_at_price, :images, to: :default_variant
 
+    # Rails doesn't provide _id methods for has_one associations by default
+    delegate :id, to: :master, prefix: true, allow_nil: true
+
     alias master_images images
 
     state_machine :status, initial: :draft do
@@ -290,12 +298,12 @@ module Spree
 
     # Can't use short form block syntax due to https://github.com/Netflix/fast_jsonapi/issues/259
     def purchasable?
-      @purchasable ||= default_variant.purchasable? || variants.in_stock_or_backorderable.any?
+      @purchasable ||= default_variant.purchasable? || variants.any?(&:purchasable?)
     end
 
     # Can't use short form block syntax due to https://github.com/Netflix/fast_jsonapi/issues/259
     def in_stock?
-      @in_stock ||= default_variant.in_stock? || variants.in_stock.any?
+      @in_stock ||= default_variant.in_stock? || variants.any?(&:in_stock?)
     end
 
     # Can't use short form block syntax due to https://github.com/Netflix/fast_jsonapi/issues/259
@@ -362,9 +370,10 @@ module Spree
     end
 
     # Returns default Image for Product.
+    # Uses cached thumbnail_id which is updated when images are added/removed/reordered.
     # @return [Spree::Image, nil]
     def default_image
-      variant_for_images&.primary_image
+      thumbnail
     end
 
     # Backward compatibility for Spree 5.2 and earlier.
@@ -390,6 +399,13 @@ module Spree
       variant_for_images&.image_count || 0
     end
 
+    # Updates the thumbnail_id to the first image from variant_images.
+    # Called when images are added, removed, or reordered on any variant.
+    def update_thumbnail!
+      first_image = variant_images.order(:position).first
+      update_column(:thumbnail_id, first_image&.id)
+    end
+
     # Finds first variant with images using preloaded data when available.
     # @return [Spree::Variant, nil]
     def find_variant_with_images
@@ -598,15 +614,13 @@ module Spree
                          nil
                        elsif Spree.use_translations?
                          taxons.joins(:taxonomy).
-                            join_translation_table(Taxonomy).
-                            find_by(Taxonomy.translation_table_alias => { name: Spree.t(:taxonomy_brands_name) })
-                        else
-                          if taxons.loaded?
-                            taxons.find { |taxon| taxon.taxonomy.name == Spree.t(:taxonomy_brands_name) }
-                          else
-                            taxons.joins(:taxonomy).find_by(Taxonomy.table_name => { name: Spree.t(:taxonomy_brands_name) })
-                          end
-                        end
+                           join_translation_table(Taxonomy).
+                           find_by(Taxonomy.translation_table_alias => { name: Spree.t(:taxonomy_brands_name) })
+                       elsif taxons.loaded?
+                         taxons.find { |taxon| taxon.taxonomy.name == Spree.t(:taxonomy_brands_name) }
+                       else
+                         taxons.joins(:taxonomy).find_by(Taxonomy.table_name => { name: Spree.t(:taxonomy_brands_name) })
+                       end
     end
 
     # Returns the brand name for the product
@@ -638,12 +652,10 @@ module Spree
                               join_translation_table(Taxonomy).
                               order(depth: :desc).
                               find_by(Taxonomy.translation_table_alias => { name: Spree.t(:taxonomy_categories_name) })
+                          elsif taxons.loaded?
+                            taxons.find { |taxon| taxon.taxonomy.name == Spree.t(:taxonomy_categories_name) }
                           else
-                            if taxons.loaded?
-                              taxons.find { |taxon| taxon.taxonomy.name == Spree.t(:taxonomy_categories_name) }
-                            else
-                              taxons.joins(:taxonomy).order(depth: :desc).find_by(Taxonomy.table_name => { name: Spree.t(:taxonomy_categories_name) })
-                            end
+                            taxons.joins(:taxonomy).order(depth: :desc).find_by(Taxonomy.table_name => { name: Spree.t(:taxonomy_categories_name) })
                           end
     end
 
@@ -691,15 +703,15 @@ module Spree
     def to_csv(store = nil)
       store ||= stores.default || stores.first
       properties_for_csv = if Spree::Config[:product_properties_enabled]
-        Spree::Property.order(:position).flat_map do |property|
-          [
-            property.name,
-            product_properties.find { |pp| pp.property_id == property.id }&.value
-          ]
-        end
-      else
-        []
-      end
+                             Spree::Property.order(:position).flat_map do |property|
+                               [
+                                 property.name,
+                                 product_properties.find { |pp| pp.property_id == property.id }&.value
+                               ]
+                             end
+                           else
+                             []
+                           end
       metafields_for_csv ||= Spree::MetafieldDefinition.for_resource_type('Spree::Product').order(:namespace, :key).map do |mf_def|
         metafields.find { |mf| mf.metafield_definition_id == mf_def.id }&.csv_value
       end

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

@@ -30,7 +30,7 @@ module Spree
 
         def validate_eligibility_by_country_iso(order)
           country_iso = order.ship_address&.country_iso
-          return true if country_iso == (preferred_country_iso || order.store.default_country_iso)
+          return true if country_iso == (preferred_country_iso || order.store.default_market&.default_country&.iso)
 
           eligibility_errors.add(:base, eligibility_error_message(:wrong_country))
           false

data/app/models/spree/promotion.rb

@@ -1,6 +1,8 @@
 module Spree
   class Promotion < Spree.base_class
-    include Spree::MultiStoreResource
+    has_prefix_id :promo  # Spree-specific: promotion
+
+    include Spree::StoreScopedResource
     include Spree::Metafields
     include Spree::Metadata
     if defined?(Spree::Security::Promotions)

data/app/models/spree/promotion_action.rb

@@ -2,6 +2,8 @@
 # PromotionActions perform the necessary tasks when a promotion is activated by an event and determined to be eligible.
 module Spree
   class PromotionAction < Spree.base_class
+    has_prefix_id :pact
+
     acts_as_paranoid
 
     belongs_to :promotion, class_name: 'Spree::Promotion', touch: true

data/app/models/spree/promotion_category.rb

@@ -1,5 +1,7 @@
 module Spree
   class PromotionCategory < Spree.base_class
+    has_prefix_id :procat
+
     validates :name, presence: true
     has_many :promotions
   end

data/app/models/spree/promotion_rule.rb

@@ -1,6 +1,8 @@
 # Base class for all promotion rules
 module Spree
   class PromotionRule < Spree.base_class
+    has_prefix_id :prorule
+
     belongs_to :promotion, class_name: 'Spree::Promotion', inverse_of: :promotion_rules, touch: true
 
     delegate :stores, to: :promotion

data/app/models/spree/prototype.rb

@@ -1,5 +1,7 @@
 module Spree
   class Prototype < Spree.base_class
+    has_prefix_id :proto
+
     include Spree::Metadata
 
     has_many :property_prototypes, class_name: 'Spree::PropertyPrototype'

data/app/models/spree/refund.rb

@@ -1,5 +1,7 @@
 module Spree
   class Refund < Spree.base_class
+    has_prefix_id :re  # Stripe: re_
+
     include Spree::Metafields
     include Spree::Metadata
     if defined?(Spree::Security::Refunds)
@@ -34,10 +36,6 @@ module Spree
 
     delegate :order, :currency, to: :payment
 
-    def amount=(amount)
-      self[:amount] = Spree::LocalizedNumber.parse(amount)
-    end
-
     def money
       Spree::Money.new(amount, currency: currency)
     end

data/app/models/spree/refund_reason.rb

@@ -1,5 +1,7 @@
 module Spree
   class RefundReason < Spree.base_class
+    has_prefix_id :rr
+
     include Spree::NamedType
 
     RETURN_PROCESSING_REASON = 'Return processing'

data/app/models/spree/reimbursement/credit.rb

@@ -1,5 +1,7 @@
 module Spree
   class Reimbursement::Credit < Spree.base_class
+    has_prefix_id :rcred
+
     class_attribute :default_creditable_class
     self.default_creditable_class = nil
 

data/app/models/spree/reimbursement.rb

@@ -1,5 +1,7 @@
 module Spree
   class Reimbursement < Spree.base_class
+    has_prefix_id :reimb
+
     include Spree::Core::NumberGenerator.new(prefix: 'RI', length: 9)
     include Spree::NumberIdentifier
     include Spree::Reimbursement::Emails

data/app/models/spree/reimbursement_type.rb

@@ -1,5 +1,7 @@
 module Spree
   class ReimbursementType < Spree.base_class
+    has_prefix_id :rtype
+
     include Spree::NamedType
 
     KINDS = %w(Spree::ReimbursementType::Credit

data/app/models/spree/report.rb

@@ -1,5 +1,7 @@
 module Spree
   class Report < Spree.base_class
+    has_prefix_id :rep
+
     include Spree::SingleStoreResource
     include Spree::VendorConcern if defined?(Spree::VendorConcern)
 
@@ -32,7 +34,7 @@ module Spree
     has_one_attached :attachment, service: Spree.private_storage_service_name
 
     def event_serializer_class
-      Spree::Events::ReportSerializer
+      'Spree::Api::V3::ReportSerializer'.safe_constantize
     end
 
     def self.report_type

data/app/models/spree/return_authorization.rb

@@ -1,5 +1,7 @@
 module Spree
   class ReturnAuthorization < Spree.base_class
+    has_prefix_id :ra
+
     include Spree::Core::NumberGenerator.new(prefix: 'RA', length: 9)
     include Spree::NumberIdentifier
 

data/app/models/spree/return_authorization_reason.rb

@@ -1,5 +1,7 @@
 module Spree
   class ReturnAuthorizationReason < Spree.base_class
+    has_prefix_id :rar
+
     include Spree::NamedType
 
     has_many :return_authorizations, dependent: :restrict_with_error

data/app/models/spree/return_item.rb

@@ -1,5 +1,7 @@
 module Spree
   class ReturnItem < Spree.base_class
+    has_prefix_id :ri
+
     COMPLETED_RECEPTION_STATUSES = %w(received given_to_customer)
 
     class_attribute :return_eligibility_validator

data/app/models/spree/role.rb

@@ -1,5 +1,7 @@
 module Spree
   class Role < Spree.base_class
+    has_prefix_id :role
+
     include Spree::UniqueName
 
     ADMIN_ROLE = 'admin'

data/app/models/spree/shipment.rb

@@ -2,9 +2,10 @@ require 'ostruct'
 
 module Spree
   class Shipment < Spree.base_class
+    has_prefix_id :ship  # Spree-specific: shipment
+
     include Spree::Core::NumberGenerator.new(prefix: 'H', length: 11)
     include Spree::NumberIdentifier
-    include Spree::NumberAsParam
     include Spree::Metafields
     include Spree::Metadata
     if defined?(Spree::Security::Shipments)
@@ -346,6 +347,15 @@ module Spree
       shipping_rates.update_all(selected: false, updated_at: Time.current)
       shipping_rates.update(id, selected: true)
       save!
+      # Reload associations to pick up the new selected shipping rate
+      shipping_rates.reset
+      association(:selected_shipping_rate).reset
+      # Update shipment cost and order totals only for incomplete orders (during checkout)
+      # For completed orders, totals are managed separately (e.g., in tests or admin adjustments)
+      return if order.completed?
+
+      update_amounts
+      order.set_shipments_cost
     end
 
     def set_up_inventory(state, variant, order, line_item, quantity = 1)

data/app/models/spree/shipping_category.rb

@@ -1,5 +1,7 @@
 module Spree
   class ShippingCategory < Spree.base_class
+    has_prefix_id :scat
+
     DIGITAL_NAME = 'Digital'
 
     include Spree::UniqueName

data/app/models/spree/shipping_method.rb

@@ -1,5 +1,7 @@
 module Spree
   class ShippingMethod < Spree.base_class
+    has_prefix_id :shpm  # Spree-specific: shipping method
+
     acts_as_paranoid
     include Spree::CalculatedAdjustments
     include Spree::Metafields

data/app/models/spree/shipping_method_category.rb

@@ -1,5 +1,7 @@
 module Spree
   class ShippingMethodCategory < Spree.base_class
+    has_prefix_id :smcat
+
     belongs_to :shipping_method, class_name: 'Spree::ShippingMethod'
     belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :shipping_method_categories
   end

data/app/models/spree/shipping_rate.rb

@@ -1,5 +1,7 @@
 module Spree
   class ShippingRate < Spree.base_class
+    has_prefix_id :shpr  # Spree-specific: shipping rate
+
     belongs_to :shipment, class_name: 'Spree::Shipment'
     belongs_to :tax_rate, -> { with_deleted }, class_name: 'Spree::TaxRate'
     belongs_to :shipping_method, -> { with_deleted }, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates

data/app/models/spree/state_change.rb

@@ -1,5 +1,7 @@
 module Spree
   class StateChange < Spree.base_class
+    has_prefix_id :sc
+
     belongs_to :user, class_name: "::#{Spree.user_class}", optional: true
     belongs_to :stateful, polymorphic: true
 

data/app/models/spree/stock_item.rb

@@ -1,5 +1,7 @@
 module Spree
   class StockItem < Spree.base_class
+    has_prefix_id :si
+
     acts_as_paranoid
 
     include Spree::Metafields

data/app/models/spree/stock_location.rb

@@ -1,5 +1,7 @@
 module Spree
   class StockLocation < Spree.base_class
+    has_prefix_id :sloc  # Spree-specific: stock location
+
     include Spree::UniqueName
     if defined?(Spree::Security::StockLocations)
       include Spree::Security::StockLocations

data/app/models/spree/stock_movement.rb

@@ -1,5 +1,7 @@
 module Spree
   class StockMovement < Spree.base_class
+    has_prefix_id :sm
+
     QUANTITY_LIMITS = {
       max: 2**31 - 1,
       min: -2**31

data/app/models/spree/stock_transfer.rb

@@ -1,8 +1,9 @@
 module Spree
   class StockTransfer < Spree.base_class
+    has_prefix_id :st
+
     include Spree::Core::NumberGenerator.new(prefix: 'T')
     include Spree::NumberIdentifier
-    include Spree::NumberAsParam
     include Spree::Metafields
     include Spree::Metadata