spree_core 6.0.0.beta4 → 6.0.0.rc2

data/app/models/spree/import_row.rb

@@ -1,5 +1,7 @@
 module Spree
   class ImportRow < Spree.base_class
+    publishes_events :completed, :failed
+
     has_prefix_id :imrow
 
     # Set event prefix for ImportRow
@@ -41,8 +43,6 @@ module Spree
     # Scopes
     #
     scope :pending_and_failed, -> { where(status: %i[pending failed]) }
-    scope :completed, -> { where(status: :completed) }
-    scope :failed, -> { where(status: :failed) }
     scope :processed, -> { where(status: %i[completed failed]) }
     # Rows still legitimately blocking import completion: `pending` (not started) or
     # `processing` with a recent updated_at (worker still alive). Orphaned `processing`

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

@@ -25,6 +25,7 @@ module Spree
         { name: 'track_inventory', label: 'Track Inventory' },
         { name: 'inventory_count', label: 'Inventory Count' },
         { name: 'inventory_backorderable', label: 'Inventory Backorderable' },
+        { name: 'stock_location', label: 'Stock Location' },
         { name: 'tax_category', label: 'Tax Category' },
         { name: 'product_type', label: 'Product Type' },
         { name: 'hs_code', label: 'HS Code' },

data/app/models/spree/integration.rb

@@ -10,6 +10,9 @@ module Spree
 
     include Spree::SingleStoreResource
     include Spree::PreferenceSchema
+    include Spree::SecretPreferences
+    include Spree::ProviderListing
+
 
     # Spree::Current.integrations snapshots the active set for the request;
     # connecting or deactivating one mid-request (the activate-and-verify
@@ -58,25 +61,12 @@ module Spree
     attr_accessor :connection_error_message
 
     # Associates the integration to a group.
-    # The name here will be used as Spree.t key to display the group name.
+    # The name is read as a translation key under +spree.+ to display the group name.
     # Leave blank to leave the integration ungrouped.
     def self.integration_group
       nil
     end
 
-    # Logo shown on the gallery card: an absolute URL to publicly hosted
-    # brand assets, or a `data:` URI for gems that want to be self-contained
-    # (works air-gapped, no CSP domain to allowlist). Anything an `<img src>`
-    # accepts. Deliberately not an asset-pipeline path — integration gems
-    # must not force an asset pipeline onto headless API hosts. Hosted logos
-    # are a courtesy, not a guarantee: the dashboard falls back to a letter
-    # avatar when unset or unreachable.
-    #
-    # @return [String, nil]
-    def self.logo_url
-      nil
-    end
-
     # One-line marketing description shown on the integration's gallery card.
     # Localize by shipping a Rails translation instead (or additionally):
     # `spree.integrations.<api_type>.description` wins over this fallback.
@@ -92,7 +82,7 @@ module Spree
     #
     # @return [String, nil]
     def self.human_description
-      Spree.t("integrations.#{api_type}.description", default: description)
+      I18n.t("spree.integrations.#{api_type}.description", default: description)
     end
 
     # Wire entries for the admin types-discovery endpoint — every registered
@@ -107,8 +97,8 @@ module Spree
           name: klass.integration_name,
           group: klass.integration_group,
           description: klass.human_description,
-          logo_url: klass.logo_url,
-          preference_schema: klass.serialized_preference_schema
+          **klass.provider_listing,
+          schema: klass.preference_json_schema
         }
       end.sort_by { |entry| entry[:name] }
     end
@@ -172,7 +162,7 @@ module Spree
       return if Spree.integrations.empty?
       return if Spree.integrations.map(&:to_s).include?(type)
 
-      errors.add(:type, :integration_type_not_registered, message: Spree.t('errors.messages.integration_type_not_registered'))
+      errors.add(:type, :integration_type_not_registered, message: I18n.t('spree.errors.messages.integration_type_not_registered'))
     end
 
     # On :base, not :active — the seller's message ("This api key is no
@@ -182,7 +172,7 @@ module Spree
     def must_connect_when_activating
       return if can_connect?
 
-      errors.add(:base, connection_error_message.presence || Spree.t('errors.messages.integration_connection_failed'))
+      errors.add(:base, connection_error_message.presence || I18n.t('spree.errors.messages.integration_connection_failed'))
     end
   end
 end

data/app/models/spree/invitation.rb

@@ -1,5 +1,7 @@
 module Spree
   class Invitation < Spree.base_class
+    publishes_events :accepted, :created, :resent
+
     has_prefix_id :inv
 
     has_secure_token
@@ -32,8 +34,6 @@ module Spree
     #
     # Scopes
     #
-    scope :pending, -> { where(status: 'pending') }
-    scope :accepted, -> { where(status: 'accepted') }
     scope :not_expired, -> { where('expires_at > ?', Time.current) }
 
     #
@@ -144,7 +144,7 @@ module Spree
 
     def invitee_is_not_inviter
       if invitee == inviter
-        errors.add(:invitee, :same_as_inviter, message: Spree.t('errors.messages.same_as_inviter'))
+        errors.add(:invitee, :same_as_inviter, message: I18n.t('spree.errors.messages.same_as_inviter'))
       end
     end
 
@@ -154,7 +154,7 @@ module Spree
       return if role.blank? || resource.blank?
       return if role.resource == resource
 
-      errors.add(:role, :invitation_role_resource_mismatch, message: Spree.t(:invitation_role_resource_mismatch))
+      errors.add(:role, :invitation_role_resource_mismatch, message: I18n.t('spree.invitation_role_resource_mismatch'))
     end
 
     def invitee_already_exists
@@ -165,7 +165,7 @@ module Spree
       return if user_to_check.blank?
 
       if resource.role_users.exists?(user: user_to_check)
-        errors.add(:email, :already_a_member, message: Spree.t('errors.messages.already_a_member'))
+        errors.add(:email, :already_a_member, message: I18n.t('spree.errors.messages.already_a_member'))
       end
     end
 

data/app/models/spree/line_item.rb

@@ -63,7 +63,7 @@ module Spree
     #   https://github.com/spree/spree/issues/2695#issuecomment-143314161
     validates :quantity, numericality: {
       in: 0..DB_INTEGER_MAX,
-      only_integer: true, message: Spree.t('validation.must_be_int')
+      only_integer: true, message: I18n.t('spree.validation.must_be_int')
     }
 
     validates :price, numericality: true
@@ -119,7 +119,7 @@ module Spree
 
     self.whitelisted_ransackable_associations = %w[variant order tax_category]
     self.whitelisted_ransackable_attributes = %w[variant_id order_id tax_category_id quantity
-                                                 price cost_price cost_currency adjustment_total
+                                                 price cost_price adjustment_total
                                                  additional_tax_total discount_total included_tax_total
                                                  pre_tax_amount taxable_adjustment_total
                                                  non_taxable_adjustment_total]
@@ -231,7 +231,7 @@ module Spree
     #
     # @return [BigDecimal]
     def amount
-      price * quantity
+      Spree::Money::Rounding.to_currency(price * quantity, currency)
     end
 
     # Returns the compare at amount (compare at price * quantity) of the line item
@@ -260,6 +260,17 @@ module Spree
     alias discounted_money display_discounted_amount
     alias discounted_amount taxable_amount
 
+    # What +units+ of this line cost the customer after discounts. Multiplied
+    # before dividing, so all of a line's units together come to the whole line.
+    #
+    # @param units [Integer]
+    # @return [BigDecimal] rounded to the currency, never negative
+    def discounted_amount_for(units)
+      return BigDecimal(0) if quantity.to_i.zero?
+
+      Spree::Money::Rounding.to_currency([discounted_amount, 0].max * units.to_i / quantity, currency)
+    end
+
     # Returns the amount this line item is taxed on. Whole-order promotions
     # are distributed to line-item Discount rows at application time, so the
     # discounted amount already carries the line's share. Never negative.
@@ -485,7 +496,7 @@ module Spree
     end
 
     def exactly_one_owner
-      errors.add(:base, :exactly_one_of_cart_or_order, message: Spree.t('errors.messages.exactly_one_of_cart_or_order')) unless [order, cart].compact.one?
+      errors.add(:base, :exactly_one_of_cart_or_order, message: I18n.t('spree.errors.messages.exactly_one_of_cart_or_order')) unless [order, cart].compact.one?
     end
   end
 end

data/app/models/spree/locale.rb

@@ -1,3 +1,5 @@
+require 'csv'
+
 module Spree
   # Virtual model for a supported locale. Wraps a locale +code+ and exposes its
   # display name, layout direction, and whether it is a store's default — the
@@ -21,16 +23,17 @@ module Spree
       code = self.code.to_s
 
       if I18n.exists?('spree.i18n.this_file_language', locale: code, fallback: false)
-        return normalize_name(Spree.t('i18n.this_file_language', locale: code))
-      end
-
-      if defined?(SpreeI18n::Locale) && (name = SpreeI18n::Locale.local_language_name(code))
-        return normalize_name(name)
+        return normalize_name(I18n.t('spree.i18n.this_file_language', locale: code))
       end
 
-      return 'English' if code == 'en'
+      name = self.class.language_names[code.downcase] || self.class.language_names[language_code]
+      name ? normalize_name(name) : code
+    end
 
-      code
+    # Each language's name in that language ("Deutsch", "日本語"), keyed by code.
+    # @return [Hash{String => String}]
+    def self.language_names
+      @language_names ||= ::CSV.read(File.expand_path('../../../config/language_names.csv', __dir__)).to_h { |row| [row[0], row[2]] }
     end
 
     # Select label, e.g. "EN — English".
@@ -88,7 +91,7 @@ module Spree
 
     private
 
-    # Strip a trailing " (CODE)" suffix from Spree I18n locale labels. Uses
+    # Strip a trailing " (CODE)" suffix from a locale file's own name. Uses
     # plain string ops rather than a regex to avoid polynomial backtracking on
     # adversarial input (ReDoS).
     def normalize_name(name)

data/app/models/spree/market.rb

@@ -8,6 +8,9 @@ module Spree
     acts_as_paranoid
     acts_as_list scope: :store_id
 
+    self.whitelisted_ransackable_attributes = %w[currency default_locale]
+    search_by :name
+
     #
     # Associations
     #
@@ -69,11 +72,14 @@ module Spree
     # An unregistered class name would only fail at checkout, when a customer is
     # waiting on a total. The list is read at validation time so a provider gem
     # loaded after boot still counts.
+    normalizes :tax_provider, with: ->(value) { Spree::ApiTyped.class_name_for(Spree.tax_providers, value) }
     validates :tax_provider,
               inclusion: { in: ->(_market) { Spree.tax_providers.map(&:to_s) } },
               allow_blank: true
     validates :currency, presence: true
+    normalizes :default_locale, with: ->(value) { value.to_s.strip.presence }
     validates :default_locale, presence: true
+    validates_with Spree::LocaleCodesValidator, attributes: %i[default_locale supported_locales]
     validates :countries, presence: true
 
     #
@@ -141,7 +147,7 @@ module Spree
     #
     # @return [Array<String>]
     def supported_locales_list
-      @supported_locales_list ||= (supported_locales.to_s.split(',').map(&:strip) << default_locale).compact.uniq.sort
+      @supported_locales_list ||= (supported_locales.to_s.split(',').map(&:strip) << default_locale).compact_blank.uniq.sort
     end
 
     # Accepts an Array of locale codes and persists them as a comma-separated
@@ -152,7 +158,7 @@ module Spree
     # @param value [Array<String>, String, nil]
     def supported_locales=(value)
       @supported_locales_list = nil
-      normalized = value.is_a?(Array) ? value.compact.uniq.reject(&:blank?).join(',') : value
+      normalized = value.is_a?(Array) ? value.map { |code| code.to_s.strip }.reject(&:empty?).uniq.join(',') : value
       super(normalized)
     end
 

data/app/models/spree/media.rb

@@ -31,15 +31,6 @@ module Spree
     EXTERNAL_URL_CUSTOM_FIELD_KEY = 'external.url'
     MEDIA_TYPES = %w[image video external_video].freeze
 
-    # Domain attributes a client may write, shared by every write path — the
-    # media endpoints and the inline `media:` list on a product. Each path adds
-    # its own transport keys (an upload's signed id, a row id) on top. Adding a
-    # field here reaches both, so it can't be dropped on the one a client uses.
-    WRITABLE_ATTRIBUTES = %i[
-      alt position media_type external_video_url poster_signed_id
-      focal_point_x focal_point_y
-    ].freeze
-
     after_initialize { self.media_type ||= 'image' }
 
     belongs_to :viewable, polymorphic: true, touch: true, optional: true
@@ -93,6 +84,7 @@ module Spree
 
     self.whitelisted_ransackable_attributes = %w[alt media_type created_at updated_at]
     self.whitelisted_ransackable_scopes = %w[attached unattached filename_cont]
+    self.ransackable_scope_types = { 'attached' => 'boolean', 'unattached' => 'boolean' }
 
     delegate :key, :attached?, :variant, :variable?, :blob, :filename, :variation, to: :attachment
 

data/app/models/spree/newsletter_subscriber.rb

@@ -6,6 +6,9 @@ module Spree
     include Spree::SingleStoreResource
 
     publishes_lifecycle_events
+    publishes_event :verified
+    publishes_events :subscription_requested, :unsubscribe_requested,
+                     serializer: 'Spree::Api::V3::NewsletterSubscriberRequestEventSerializer'
 
     has_secure_token :verification_token
 
@@ -45,6 +48,7 @@ module Spree
     #
     self.whitelisted_ransackable_attributes = %w[email verified_at]
     self.whitelisted_ransackable_scopes = %w[verified unverified]
+    self.ransackable_scope_types = %w[verified unverified].index_with('boolean')
 
     def accepts_email_marketing
       return customer.accepts_email_marketing if customer.present?

data/app/models/spree/option_type.rb

@@ -24,7 +24,8 @@ module Spree
     self.whitelisted_ransackable_scopes = %w[search_by_name]
     # `label` is what admin surfaces display, so it has to be filterable —
     # matching Spree::OptionValue, which already allows it.
-    self.whitelisted_ransackable_attributes = %w[label name]
+    self.whitelisted_ransackable_attributes = %w[label name kind]
+    search_by :name, :label
 
     normalizes :name, with: ->(value) { value&.to_s&.squish&.presence }
 

data/app/models/spree/option_value.rb

@@ -18,7 +18,8 @@ module Spree
     #
     # Attachments
     #
-    has_one_attached :image
+    has_one_attached :image, service: Spree.public_storage_service_name
+    signed_id_attachments :image
 
     #
     # Associations