spree_core 5.3.6 → 5.4.0.beta

data/app/models/spree/fulfilment_changer.rb

@@ -85,8 +85,14 @@ module Spree
 
     def reduce_units_quantities(reduced_quantity, units)
       units.each do |unit|
-        unit.quantity > reduced_quantity ? unit.update(quantity: unit.quantity - reduced_quantity) : unit.destroy!
-        reduced_quantity -= unit.quantity
+        if unit.quantity > reduced_quantity
+          unit.update(quantity: unit.quantity - reduced_quantity)
+          reduced_quantity = 0
+        else
+          reduced_quantity -= unit.quantity
+          unit.destroy!
+        end
+        break if reduced_quantity.zero?
       end
       reduced_quantity
     end

data/app/models/spree/gateway/bogus.rb

@@ -84,6 +84,66 @@ module Spree
       CreditCard
     end
 
+    def session_required?
+      true
+    end
+
+    def payment_session_class
+      PaymentSessions::Bogus
+    end
+
+    def create_payment_session(order:, amount: nil, external_data: {})
+      payment_session_class.create(
+        order: order,
+        payment_method: self,
+        amount: amount.presence || order.total_minus_store_credits,
+        currency: order.currency,
+        status: 'pending',
+        external_id: "bogus_#{SecureRandom.hex(12)}",
+        external_data: external_data.merge('client_secret' => "bogus_secret_#{SecureRandom.hex(8)}"),
+        customer: order.user
+      )
+    end
+
+    def update_payment_session(payment_session:, amount: nil, external_data: {})
+      attrs = {}
+      attrs[:amount] = amount if amount.present?
+      attrs[:external_data] = payment_session.external_data.merge(external_data) if external_data.present?
+      payment_session.update(attrs)
+    end
+
+    def complete_payment_session(payment_session:, params: {})
+      payment_session.complete
+    end
+
+    def setup_session_supported?
+      true
+    end
+
+    def create_payment_setup_session(customer:, external_data: {})
+      payment_setup_sessions.create(
+        customer: customer,
+        status: 'pending',
+        external_id: "bogus_seti_#{SecureRandom.hex(12)}",
+        external_client_secret: "bogus_seti_secret_#{SecureRandom.hex(8)}",
+        external_data: external_data
+      )
+    end
+
+    def complete_payment_setup_session(setup_session:, params: {})
+      credit_card = CreditCard.create!(
+        user: setup_session.customer,
+        payment_method: self,
+        name: 'Bogus Card',
+        last_digits: '4242',
+        month: '12',
+        year: 1.year.from_now.year.to_s,
+        gateway_customer_profile_id: "BGS-#{Array.new(6) { rand(6) }.join}"
+      )
+      setup_session.update!(payment_source: credit_card)
+      setup_session.complete
+    end
+
     def actions
       %w(capture void credit)
     end

data/app/models/spree/gateway_customer.rb

@@ -1,5 +1,7 @@
 module Spree
   class GatewayCustomer < Spree.base_class
+    has_prefix_id :gcus
+
     belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
     belongs_to :user, class_name: Spree.user_class.to_s
 

data/app/models/spree/gift_card.rb

@@ -1,5 +1,7 @@
 module Spree
   class GiftCard < Spree.base_class
+    has_prefix_id :gc
+
     extend DisplayMoney
     include Spree::SingleStoreResource
     include Spree::Metafields

data/app/models/spree/gift_card_batch.rb

@@ -1,5 +1,7 @@
 module Spree
   class GiftCardBatch < Spree.base_class
+    has_prefix_id :gcb
+
     extend DisplayMoney
     include Spree::SingleStoreResource
 
@@ -30,10 +32,6 @@ module Spree
 
     money_methods :amount
 
-    def amount=(amount)
-      self[:amount] = Spree::LocalizedNumber.parse(amount)
-    end
-
     self.whitelisted_ransackable_attributes = %w[prefix]
 
     def generate_gift_cards

data/app/models/spree/image.rb

@@ -5,6 +5,9 @@ module Spree
     include Spree::ImageMethods
 
     after_commit :touch_product_variants, if: :should_touch_product_variants?, on: :update
+    after_commit :update_variant_thumbnail, on: [:create, :destroy]
+    after_commit :update_variant_thumbnail_on_reorder, on: :update, if: :saved_change_to_position?
+    after_commit :update_variant_thumbnail_on_viewable_change, on: :update, if: :saved_change_to_viewable_id?
 
     after_create :increment_viewable_image_count
     after_destroy :decrement_viewable_image_count
@@ -84,5 +87,20 @@ module Spree
       Spree::Variant.decrement_counter(:image_count, viewable_id)
       Spree::Product.decrement_counter(:total_image_count, viewable.product_id)
     end
+
+    def update_variant_thumbnail
+      return unless viewable.is_a?(Spree::Variant)
+
+      viewable.update_thumbnail!
+      viewable.product.update_thumbnail!
+    end
+
+    def update_variant_thumbnail_on_reorder
+      update_variant_thumbnail
+    end
+
+    def update_variant_thumbnail_on_viewable_change
+      update_variant_thumbnail
+    end
   end
 end

data/app/models/spree/import.rb

@@ -2,9 +2,9 @@ require 'csv'
 
 module Spree
   class Import < Spree.base_class
-    include Spree::NumberIdentifier
-    include Spree::NumberAsParam
+    has_prefix_id :imp
 
+    include Spree::NumberIdentifier
     include Spree::Core::NumberGenerator.new(prefix: 'IM')
 
     publishes_lifecycle_events
@@ -226,7 +226,7 @@ module Spree
     end
 
     def event_serializer_class
-      Spree::Events::ImportSerializer
+      'Spree::Api::V3::ImportSerializer'.safe_constantize
     end
 
     class << self
@@ -250,6 +250,8 @@ module Spree
 
       # eg. Spree::Imports::Orders => Spree::Order
       def model_class
+        return Spree.user_class if to_s == 'Spree::Imports::Customers'
+
         klass = "Spree::#{to_s.demodulize.singularize}".safe_constantize
 
         raise NameError, "Missing model class for #{self}" unless klass

data/app/models/spree/import_mapping.rb

@@ -1,5 +1,7 @@
 module Spree
   class ImportMapping < Spree.base_class
+    has_prefix_id :immap
+
     #
     # Associations
     #

data/app/models/spree/import_row.rb

@@ -1,5 +1,7 @@
 module Spree
   class ImportRow < Spree.base_class
+    has_prefix_id :imrow
+
     # Set event prefix for ImportRow
     self.event_prefix = 'import_row'
 

data/app/models/spree/import_schemas/customers.rb

@@ -0,0 +1,21 @@
+module Spree
+  module ImportSchemas
+    class Customers < Spree::ImportSchema
+      FIELDS = [
+        { name: 'email', label: 'Email', required: true },
+        { name: 'first_name', label: 'First Name' },
+        { name: 'last_name', label: 'Last Name' },
+        { name: 'phone', label: 'Phone' },
+        { name: 'accepts_email_marketing', label: 'Accepts Email Marketing' },
+        { name: 'tags', label: 'Tags' },
+        { name: 'company', label: 'Company' },
+        { name: 'address1', label: 'Address 1' },
+        { name: 'address2', label: 'Address 2' },
+        { name: 'city', label: 'City' },
+        { name: 'province_code', label: 'Province Code' },
+        { name: 'country_code', label: 'Country Code' },
+        { name: 'zip', label: 'Zip' }
+      ].freeze
+    end
+  end
+end

data/app/models/spree/imports/customers.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Imports
+    class Customers < Spree::Import
+      def row_processor_class
+        Spree::Imports::RowProcessors::Customer
+      end
+    end
+  end
+end

data/app/models/spree/integration.rb

@@ -1,5 +1,7 @@
 module Spree
   class Integration < Spree.base_class
+    has_prefix_id :int
+
     include Spree::SingleStoreResource
 
     #

data/app/models/spree/inventory_unit.rb

@@ -1,5 +1,7 @@
 module Spree
   class InventoryUnit < Spree.base_class
+    has_prefix_id :iu
+
     extend Spree::DisplayMoney
 
     with_options inverse_of: :inventory_units do

data/app/models/spree/invitation.rb

@@ -1,5 +1,7 @@
 module Spree
   class Invitation < Spree.base_class
+    has_prefix_id :inv
+
     has_secure_token
     acts_as_paranoid
 
@@ -121,13 +123,11 @@ module Spree
     def invitee_already_exists
       return if resource.blank?
 
-      exists = if invitee.present?
-                resource.users.include?(invitee)
-              else
-                resource.users.exists?(email: email)
-              end
+      # Check role_users directly for better performance and to avoid potential source_type issues
+      user_to_check = invitee || Spree.admin_user_class.find_by(email: email)
+      return if user_to_check.blank?
 
-      if exists
+      if resource.role_users.exists?(user: user_to_check)
         errors.add(:email, 'already exists')
       end
     end

data/app/models/spree/legacy_admin_user.rb

@@ -0,0 +1,31 @@
+# Default implementation of AdminUser for staff/admin accounts.
+# This class is separate from LegacyUser to support distinct customer vs staff models.
+require 'bcrypt'
+
+module Spree
+  class LegacyAdminUser < Spree.base_class
+    include Spree::AdminUserMethods
+
+    self.table_name = 'spree_admin_users'
+
+    attr_accessor :password, :password_confirmation
+
+    validates :email, presence: true, uniqueness: { case_sensitive: false }
+
+    before_save :encrypt_password, if: :password
+
+    # Simple password validation for testing purposes
+    # In production, Spree.admin_user_class should be overridden with a proper auth solution (e.g., Devise)
+    def valid_password?(check_password)
+      return false if encrypted_password.blank?
+
+      BCrypt::Password.new(encrypted_password) == check_password
+    end
+
+    private
+
+    def encrypt_password
+      self.encrypted_password = BCrypt::Password.create(password)
+    end
+  end
+end

data/app/models/spree/legacy_user.rb

@@ -1,4 +1,6 @@
-# Default implementation of User.  This class is intended to be modified by extensions (ex. spree_auth_devise)
+# Default implementation of User.
+require 'bcrypt'
+
 module Spree
   class LegacyUser < Spree.base_class
     include Spree::UserAddress
@@ -10,5 +12,21 @@ module Spree
     attr_accessor :password, :password_confirmation
 
     validates :email, presence: true, uniqueness: { case_sensitive: false }
+
+    before_save :encrypt_password, if: :password
+
+    # Simple password validation for testing purposes
+    # In production, Spree.user_class should be overridden with a proper auth solution (e.g., Devise)
+    def valid_password?(check_password)
+      return false if encrypted_password.blank?
+
+      BCrypt::Password.new(encrypted_password) == check_password
+    end
+
+    private
+
+    def encrypt_password
+      self.encrypted_password = BCrypt::Password.create(password)
+    end
   end
 end

data/app/models/spree/line_item.rb

@@ -1,5 +1,7 @@
 module Spree
   class LineItem < Spree.base_class
+    has_prefix_id :li  # Spree-specific: line item
+
     include Spree::Metafields
     include Spree::Metadata
 
@@ -28,10 +30,12 @@ module Spree
 
     validates :variant, :order, presence: true
 
+    DB_INTEGER_MAX = (2**31) - 1
+
     # numericality: :less_than_or_equal_to validation is due to the restriction at the database level
     #   https://github.com/spree/spree/issues/2695#issuecomment-143314161
     validates :quantity, numericality: {
-      in: 0..DatabaseTypeUtilities.maximum_value_for(:integer),
+      in: 0..DB_INTEGER_MAX,
       only_integer: true, message: Spree.t('validation.must_be_int')
     }
 
@@ -47,8 +51,15 @@ module Spree
 
     after_create :update_tax_charge
 
-    delegate :name, :description, :sku, :should_track_inventory?, :product, :options_text, :slug, :product_id, :dimensions_unit, :weight_unit, to: :variant
-    delegate :brand, :category, to: :product
+    delegate :sku, :should_track_inventory?, :product, :options_text, :slug, :product_id, :dimensions_unit, :weight_unit, :option_values, to: :variant
+    delegate :name, :description, :brand, :category, to: :product
+
+    # Returns the thumbnail image for this line item
+    # Prefers variant thumbnail, falls back to product thumbnail
+    # @return [Spree::Image, nil]
+    def thumbnail
+      variant.thumbnail || product.thumbnail
+    end
     delegate :tax_zone, to: :order
     delegate :digital?, :can_supply?, to: :variant
 
@@ -217,7 +228,7 @@ module Spree
     #
     # @return [Integer]
     def maximum_quantity
-      @maximum_quantity ||= variant.backorderable? ? Spree::DatabaseTypeUtilities.maximum_value_for(:integer) : variant.total_on_hand
+      @maximum_quantity ||= variant.backorderable? ? DB_INTEGER_MAX : variant.total_on_hand
     end
 
     # Returns true if the line item variant has digital assets

data/app/models/spree/log_entry.rb

@@ -1,5 +1,7 @@
 module Spree
   class LogEntry < Spree.base_class
+    has_prefix_id :log
+
     if defined?(Spree::Security::LogEntries)
       include Spree::Security::LogEntries
     end

data/app/models/spree/market.rb

@@ -0,0 +1,83 @@
+module Spree
+  class Market < Spree.base_class
+    has_prefix_id :mkt
+
+    include Spree::SingleStoreResource
+
+    acts_as_paranoid
+    acts_as_list scope: :store_id
+
+    #
+    # Associations
+    #
+    belongs_to :store, class_name: 'Spree::Store', touch: true
+    has_many :market_countries, class_name: 'Spree::MarketCountry', dependent: :destroy
+    has_many :countries, through: :market_countries, class_name: 'Spree::Country'
+
+    #
+    # Validations
+    #
+    validates :store, presence: true
+    validates :name, presence: true, uniqueness: { scope: spree_base_uniqueness_scope + [:store_id] }
+    validates :currency, presence: true
+    validates :default_locale, presence: true
+    validates :countries, presence: true
+
+    #
+    # Callbacks
+    #
+    before_save :ensure_single_default
+
+    #
+    # Scopes
+    #
+    scope :default, -> { where(default: true) }
+
+    # Find the market that contains the given country for a store
+    #
+    # @param country [Spree::Country] the country to look up
+    # @param store [Spree::Store] the store to scope to
+    # @return [Spree::Market, nil]
+    def self.for_country(country, store:)
+      return nil unless country && store
+
+      joins(:market_countries)
+        .where(store_id: store.id)
+        .where(spree_market_countries: { country_id: country.id })
+        .order(:position)
+        .first
+    end
+
+    # Returns the default market for a store, or falls back to the first by position
+    #
+    # @param store [Spree::Store]
+    # @return [Spree::Market, nil]
+    def self.default_for_store(store)
+      return nil unless store
+
+      store.markets.default.first || store.markets.order(:position).first
+    end
+
+    # Returns the first country by name from this market's countries
+    #
+    # @return [Spree::Country, nil]
+    def default_country
+      countries.order(:name).first
+    end
+
+    # Returns supported locales as an array, always including default_locale
+    #
+    # @return [Array<String>]
+    def supported_locales_list
+      @supported_locales_list ||= (supported_locales.to_s.split(',').map(&:strip) << default_locale).compact.uniq.sort
+    end
+
+    private
+
+    def ensure_single_default
+      return unless default? && default_changed?
+
+      self.class.where(store_id: store_id, default: true).where.not(id: id).update_all(default: false)
+    end
+  end
+end

data/app/models/spree/market_country.rb

@@ -0,0 +1,25 @@
+module Spree
+  class MarketCountry < Spree.base_class
+    self.table_name = 'spree_market_countries'
+
+    belongs_to :market, class_name: 'Spree::Market'
+    belongs_to :country, class_name: 'Spree::Country'
+
+    validates :market, :country, presence: true
+    validates :country_id, uniqueness: { scope: :market_id }
+    validate :country_covered_by_shipping_zone
+
+    private
+
+    def country_covered_by_shipping_zone
+      return if market.blank? || country.blank?
+
+      store = market.store
+      return if store.blank?
+
+      unless store.countries_with_shipping_coverage.exists?(id: country.id)
+        errors.add(:country, :not_in_shipping_zone)
+      end
+    end
+  end
+end

data/app/models/spree/metafield.rb

@@ -1,5 +1,7 @@
 module Spree
   class Metafield < Spree.base_class
+    has_prefix_id :mf
+
     #
     # Associations
     #

data/app/models/spree/metafield_definition.rb

@@ -1,5 +1,7 @@
 module Spree
   class MetafieldDefinition < Spree.base_class
+    has_prefix_id :mfdef
+
     include Spree::DisplayOn
 
     DISPLAY = [:both, :back_end]

data/app/models/spree/newsletter_subscriber.rb

@@ -2,6 +2,8 @@ require_dependency 'spree/newsletter_subscriber/emails'
 
 module Spree
   class NewsletterSubscriber < Spree.base_class
+    has_prefix_id :sub
+
     include Spree::NewsletterSubscriber::Emails
     include Spree::Metafields
 

data/app/models/spree/option_type.rb

@@ -1,5 +1,7 @@
 module Spree
   class OptionType < Spree.base_class
+    has_prefix_id :opt  # Spree-specific: option type
+
     COLOR_NAMES = %w[color colour].freeze
 
     include Spree::ParameterizableName

data/app/models/spree/option_value.rb

@@ -1,5 +1,7 @@
 module Spree
   class OptionValue < Spree.base_class
+    has_prefix_id :optval  # Spree-specific: option value
+
     include Spree::ParameterizableName
     include Spree::Metafields
     include Spree::Metadata

data/app/models/spree/order/address_book.rb

@@ -79,7 +79,8 @@ module Spree
       end
 
       def find_existing_address(attributes)
-        address_attributes = attributes.except(:state_name)
+        # Exclude virtual attributes that are handled by Address model callbacks
+        address_attributes = attributes.except(:state_name, :country_iso, :state_abbr)
         state_name = attributes[:state_name]
 
         scope = Spree::Address.not_deleted.where(address_attributes)