spree_core 6.0.0.beta4 → 6.0.0.rc2

data/app/models/spree/calculator/shipping/flat_rate.rb

@@ -1,24 +1,22 @@
-require_dependency 'spree/shipping_calculator'
-
 module Spree
   module Calculator::Shipping
     class FlatRate < ShippingCalculator
       include Spree::Calculator::CurrencyAmounts
 
-      preference :amount, :decimal, default: 0
+      preference :amount, :money, default: 0
       # @deprecated Together with the single `amount`, superseded by the
       #   per-currency `amounts` hash; kept as the fallback for its own
       #   currency so upgraded stores quote unchanged.
-      preference :currency, :string, default: -> { Spree::Store.default.default_currency }
+      preference :currency, :string, format: :currency, default: -> { Spree::Store.default.default_currency }
 
-      preference :minimum_item_total, :decimal, default: nil, nullable: true, deprecated: 'Use a Spree::DeliveryMethodRules rule on the delivery method instead; removed in Spree 6.1.'
-      preference :maximum_item_total, :decimal, default: nil, nullable: true, deprecated: 'Use a Spree::DeliveryMethodRules rule on the delivery method instead; removed in Spree 6.1.'
+      preference :minimum_item_total, :money, default: nil, nullable: true, deprecated: 'Use a Spree::DeliveryMethodRules rule on the delivery method instead; removed in Spree 6.1.'
+      preference :maximum_item_total, :money, default: nil, nullable: true, deprecated: 'Use a Spree::DeliveryMethodRules rule on the delivery method instead; removed in Spree 6.1.'
 
       preference :minimum_weight, :decimal, default: nil, nullable: true, deprecated: 'Use a Spree::DeliveryMethodRules rule on the delivery method instead; removed in Spree 6.1.'
       preference :maximum_weight, :decimal, default: nil, nullable: true, deprecated: 'Use a Spree::DeliveryMethodRules rule on the delivery method instead; removed in Spree 6.1.'
 
       def self.description
-        Spree.t(:shipping_flat_rate_per_order)
+        I18n.t('spree.shipping_flat_rate_per_order')
       end
 
       def compute_package(package)

data/app/models/spree/calculator/shipping/flexi_rate.rb

@@ -1,12 +1,10 @@
-require_dependency 'spree/shipping_calculator'
-
 module Spree
   module Calculator::Shipping
     class FlexiRate < ShippingCalculator
-      preference :first_item,      :decimal, default: 0.0
-      preference :additional_item, :decimal, default: 0.0
+      preference :first_item,      :money, default: 0.0
+      preference :additional_item, :money, default: 0.0
       preference :max_items,       :integer, default: 0
-      preference :currency,        :string,  default: -> { Spree::Store.default.default_currency }
+      preference :currency,        :string,  format: :currency, default: -> { Spree::Store.default.default_currency }
 
       # Single-currency amounts: quoting another currency would mislabel
       # the configured numbers, so the method stays hidden there.
@@ -15,7 +13,7 @@ module Spree
       end
 
       def self.description
-        Spree.t(:shipping_flexible_rate)
+        I18n.t('spree.shipping_flexible_rate')
       end
 
       def compute_package(package)

data/app/models/spree/calculator/shipping/per_item.rb

@@ -1,15 +1,13 @@
-require_dependency 'spree/shipping_calculator'
-
 module Spree
   module Calculator::Shipping
     class PerItem < ShippingCalculator
       include Spree::Calculator::CurrencyAmounts
 
-      preference :amount, :decimal, default: 0
-      preference :currency, :string, default: -> { Spree::Store.default.default_currency }
+      preference :amount, :money, default: 0
+      preference :currency, :string, format: :currency, default: -> { Spree::Store.default.default_currency }
 
       def self.description
-        Spree.t(:shipping_flat_rate_per_item)
+        I18n.t('spree.shipping_flat_rate_per_item')
       end
 
       def compute_package(package)

data/app/models/spree/calculator/shipping/price_sack.rb

@@ -1,12 +1,10 @@
-require_dependency 'spree/shipping_calculator'
-
 module Spree
   module Calculator::Shipping
     class PriceSack < ShippingCalculator
-      preference :minimal_amount, :decimal, default: 0
-      preference :normal_amount, :decimal, default: 0
-      preference :discount_amount, :decimal, default: 0
-      preference :currency, :string, default: -> { Spree::Store.default.default_currency }
+      preference :minimal_amount, :money, default: 0
+      preference :normal_amount, :money, default: 0
+      preference :discount_amount, :money, default: 0
+      preference :currency, :string, format: :currency, default: -> { Spree::Store.default.default_currency }
 
       # Single-currency amounts: quoting another currency would mislabel
       # the configured numbers, so the method stays hidden there.
@@ -15,7 +13,7 @@ module Spree
       end
 
       def self.description
-        Spree.t(:shipping_price_sack)
+        I18n.t('spree.shipping_price_sack')
       end
 
       def compute_package(package)

data/app/models/spree/calculator/tiered_flat_rate.rb

@@ -1,42 +1,25 @@
-require_dependency 'spree/calculator'
-
 module Spree
   class Calculator::TieredFlatRate < Calculator
-    preference :base_amount, :decimal, default: 0
-    preference :currency, :string, default: -> { Spree::Store.default.default_currency }
-    preference :tiers, :hash, default: {}
-
-    before_validation do
-      # Convert tier values to decimals. Strings don't do us much good.
-      if preferred_tiers.is_a?(Hash)
-        self.preferred_tiers = Hash[*preferred_tiers.flatten.map(&:to_f)]
-      end
-    end
+    include Spree::Calculator::Tiers
 
-    validate :preferred_tiers_content
+    preference :base_amount, :money, default: 0
+    preference :currency, :string, format: :currency, default: -> { Spree::Store.default.default_currency }
 
     def self.description
-      Spree.t(:tiered_flat_rate)
+      I18n.t('spree.tiered_flat_rate')
     end
 
     def compute(object = nil)
       return 0 unless object&.currency.present?
       return 0 unless preferred_currency.casecmp(object.currency.upcase).zero?
 
-      base, amount = preferred_tiers.sort.reverse.detect { |b, _| object.amount >= b }
-      amount || preferred_base_amount
+      tier_value_for(object.amount) || preferred_base_amount
     end
 
     private
 
-    def preferred_tiers_content
-      if preferred_tiers.is_a? Hash
-        unless preferred_tiers.keys.all? { |k| k.is_a?(Numeric) && k > 0 }
-          errors.add(:base, :keys_should_be_positive_number)
-        end
-      else
-        errors.add(:preferred_tiers, :should_be_hash)
-      end
+    def validate_tier_values(values)
+      errors.add(:preferred_tiers, :values_should_be_number) unless values.all? { |value| value && value >= 0 }
     end
   end
 end

data/app/models/spree/calculator/tiered_percent.rb

@@ -1,45 +1,27 @@
-require_dependency 'spree/calculator'
-
 module Spree
   class Calculator::TieredPercent < Calculator
-    preference :base_percent, :decimal, default: 0
-    preference :tiers, :hash, default: {}
+    include Spree::Calculator::Tiers
 
-    before_validation do
-      # Convert tier values to decimals. Strings don't do us much good.
-      if preferred_tiers.is_a?(Hash)
-        self.preferred_tiers = Hash[*preferred_tiers.flatten.map(&:to_f)]
-      end
-    end
+    preference :base_percent, :decimal, default: 0
 
     validates :preferred_base_percent, numericality: {
       greater_than_or_equal_to: 0,
       less_than_or_equal_to: 100
     }
-    validate :preferred_tiers_content
 
     def self.description
-      Spree.t(:tiered_percent)
+      I18n.t('spree.tiered_percent')
     end
 
     def compute(object)
-      base, percent = preferred_tiers.sort.reverse.detect { |b, _| object.amount >= b }
-      (object.amount * (percent || preferred_base_percent) / 100).round(2)
+      percent = tier_value_for(object.amount) || preferred_base_percent
+      Spree::Money::Rounding.to_currency(object.amount * percent / 100, object.try(:currency))
     end
 
     private
 
-    def preferred_tiers_content
-      if preferred_tiers.is_a? Hash
-        unless preferred_tiers.keys.all? { |k| k.is_a?(Numeric) && k > 0 }
-          errors.add(:base, :keys_should_be_positive_number)
-        end
-        unless preferred_tiers.values.all? { |k| k.is_a?(Numeric) && k >= 0 && k <= 100 }
-          errors.add(:base, :values_should_be_percent)
-        end
-      else
-        errors.add(:preferred_tiers, :should_be_hash)
-      end
+    def validate_tier_values(values)
+      errors.add(:preferred_tiers, :values_should_be_percent) unless values.all? { |value| value&.between?(0, 100) }
     end
   end
 end

data/app/models/spree/cart.rb

@@ -36,6 +36,7 @@ module Spree
     include Spree::Purchase::Validations
     include Spree::Purchase::Totals
     include Spree::Purchase::Lifecycle
+    include Spree::Purchase::DeprecatedAliases
 
     # Concurrency is manual (the API's OrderLock semantics — compare
     # client-sent version, 409 on mismatch); Rails auto-locking must not
@@ -54,16 +55,7 @@ module Spree
                   :discount_total, :fee_total, :delivery_total, :total, :payment_total, :outstanding_balance,
                   :tax_total, :pre_tax_item_amount, :pre_tax_total, :amount_due
 
-    alias display_promo_total display_discount_total
-    alias display_ship_total display_delivery_total
-    alias_attribute :ship_total, :delivery_total
-
     belongs_to :customer, class_name: "::#{Spree.customer_class}", optional: true
-    # Order-parity aliases — shared Cart/Order code (services, Purchase
-    # concerns) reads #user; the cart column is customer_id.
-    alias_method :user, :customer
-    alias_method :user=, :customer=
-    alias_attribute :user_id, :customer_id
     # Codes are stored stripped + lowercased so lookups stay case-insensitive;
     # normalizes also applies to finder values.
     normalizes :coupon_code, with: ->(code) { code.to_s.strip.downcase.presence }
@@ -87,6 +79,8 @@ module Spree
       end
     end
     has_many :fulfillment_items, through: :fulfillments, class_name: 'Spree::FulfillmentItem'
+    # Legacy name (5.x carts were orders) — removed in 6.1
+    has_many :shipments, -> { order(:created_at, :id) }, class_name: 'Spree::Fulfillment', inverse_of: :cart, deprecated: true
     has_many :order_promotions, class_name: 'Spree::OrderPromotion', inverse_of: :cart, dependent: :destroy
     has_many :promotions, through: :order_promotions, class_name: 'Spree::Promotion'
     has_many :payments, class_name: 'Spree::Payment', inverse_of: :cart, dependent: :destroy
@@ -167,10 +161,18 @@ module Spree
 
     # Idempotent delivery-proposal rebuild — replaces the destructive
     # order-side create_proposed_fulfillments. Open fulfillments are rebuilt from
-    # the current items/address; nothing here touches a completed cart.
-    def rebuild_fulfillments!
+    # the current items/address; nothing here touches a completed cart. Until
+    # deliveries can be proposed the cart gets none: preselecting the pickup
+    # rate that is all a destination-less quote finds would choose pickup for
+    # a customer who had not been offered anything.
+    #
+    # @param keep_selection [Boolean] false when the destination changed: a
+    #   choice made for one address is not a choice for another
+    def rebuild_fulfillments!(keep_selection: true)
       return if completed?
 
+      previous_selections = keep_selection ? fulfillments.selected_rates_by_stock_location : {}
+
       discounts.for_fulfillments.delete_all
       tax_lines.for_fulfillments.delete_all
       fees.for_fulfillments.delete_all
@@ -179,6 +181,7 @@ module Spree
       DeliveryRate.where(fulfillment_id: fulfillment_ids).delete_all
       fulfillments.delete_all
       fulfillment_items.reset
+      return fulfillments.reload unless can_propose_deliveries?
 
       # Appended rather than assigned: setting `cart` on each proposal already
       # files it under this cart's `fulfillments` (the association is
@@ -188,6 +191,7 @@ module Spree
       Spree::Stock::Coordinator.new(self).fulfillments.each do |fulfillment|
         fulfillment.address_id = ship_address_id
         fulfillment.order = nil
+        fulfillment.carry_over_selection(previous_selections.fetch(fulfillment.stock_location_id, []))
         fulfillments << fulfillment
       end
       prune_undeliverable_fulfillments!
@@ -206,7 +210,7 @@ module Spree
       self.warnings |= affected_line_items.map do |line_item|
         {
           code: 'delivery_unavailable',
-          message: Spree.t('cart_line_item.delivery_unavailable', li_name: line_item.name),
+          message: I18n.t('spree.cart_line_item.delivery_unavailable', li_name: line_item.name),
           line_item_id: line_item.prefixed_id
         }
       end
@@ -214,7 +218,7 @@ module Spree
 
     def ensure_available_delivery_rates
       if fulfillments.empty? || fulfillments.any? { |fulfillment| fulfillment.delivery_rates.blank? }
-        errors.add(:base, :items_cannot_be_shipped, message: Spree.t(:items_cannot_be_shipped))
+        errors.add(:base, :items_cannot_be_shipped, message: I18n.t('spree.items_cannot_be_shipped'))
         return false
       end
       true
@@ -229,7 +233,6 @@ module Spree
         updated_at: Time.current
       )
     end
-    alias set_shipments_cost set_fulfillments_cost
 
     def ensure_updated_fulfillments
       rebuild_fulfillments! unless completed?
@@ -238,7 +241,11 @@ module Spree
     # Re-prices, re-taxes and rebuilds delivery proposals — the
     # recalculation-on-write replacement for transition-triggered rebuilds.
     # Called by Carts::Update after address/market changes.
-    def recalculate_for_address_change!
+    #
+    # @param keep_selection [Boolean] true when the parcel still goes where it
+    #   did (a market change, a corrected phone number), so the chosen
+    #   delivery is kept and quoted again
+    def recalculate_for_address_change!(keep_selection: false)
       # One provider round for the whole cart, and persisted: a per-item loop
       # would ask an external pricing system once per line, and nothing here
       # saves the line items — rebuild_fulfillments! and recalculate_totals!
@@ -251,8 +258,7 @@ module Spree
       raise Spree::Pricing::PriceResolution::ProviderUnavailable, result.error.to_s if result.failure?
 
       Spree::Carts::PriceItems.apply(result.value)
-      rebuild_fulfillments!
-      set_fulfillments_cost
+      rebuild_fulfillments!(keep_selection: keep_selection)
       recalculate_totals!
     end
 
@@ -269,11 +275,27 @@ module Spree
       reload
     end
 
+    # The variants this cart's buyer may order: the channel's live
+    # publications, narrowed to the catalogs the cart's company, customer
+    # group or channel resolve to. Status, stock and currency are left to the
+    # add and checkout checks, which explain a refusal rather than reading as
+    # not found.
+    #
+    # @return [ActiveRecord::Relation<Spree::Variant>]
+    def orderable_variants
+      products = Spree.products_for_context_service.call(
+        store: store, channel: channel, customer: customer, company: resolved_company,
+        base: store.products.not_discontinued_on(channel)
+      ).value
+
+      Spree::Variant.for_products(products)
+    end
+
     # Removes out-of-stock/discontinued items and populates warnings
     # (mirrors Order#remove_out_of_stock_items!).
     def remove_out_of_stock_items!
       existing_warnings = warnings
-      result = Spree::Carts::RemoveOutOfStockItems.call(cart: self)
+      result = Spree.cart_remove_out_of_stock_items_service.call(cart: self)
       return self unless result.success?
 
       cart, _messages, new_warnings = result.value
@@ -281,5 +303,43 @@ module Spree
       cart
     end
 
+    # Whether this cart shows a batch coupon code it does not hold — used,
+    # taken by another cart or order, or given up by one — and so can never
+    # discount it.
+    #
+    # @return [Boolean]
+    def coupon_code_unavailable?
+      code = read_attribute(:coupon_code)
+      return false if code.blank?
+
+      record = Spree::CouponCode.where(promotion_id: store.promotions.select(:id)).find_by(code: code)
+      record.present? && record.cart_id != id
+    end
+
+    # Drops an entered batch coupon code this cart no longer holds, and warns
+    # the shopper, who otherwise sees the discount vanish.
+    #
+    # @return [Spree::Cart]
+    def remove_unavailable_coupon_code!
+      return self unless coupon_code_unavailable?
+
+      # The lock refuses unsaved attributes and reloads the cart, so this
+      # request's warnings are set aside and put back.
+      existing_warnings = warnings
+      clear_attribute_changes([:warnings])
+      removed = with_lock do
+        # Checked under the lock, as the completion claim itself is: a
+        # completing cart's code sits on its draft order while the payment
+        # runs, and a failed payment hands it back.
+        next false if completion_claimed? || !coupon_code_unavailable?
+
+        Spree.coupon_handler.new(self, enable_gift_cards: false).remove(read_attribute(:coupon_code))
+        true
+      end
+      self.warnings = existing_warnings
+      self.warnings |= [{ code: 'coupon_code_unavailable', message: I18n.t('spree.coupon_code_unavailable') }] if removed
+      self
+    end
+
   end
 end

data/app/models/spree/catalog.rb

@@ -86,6 +86,7 @@ module Spree
     scope :by_position, -> { ordered }
 
     self.whitelisted_ransackable_attributes = %w[name active]
+    search_by :name
 
     # The catalogs that apply to a purchase node, nearest node first: the
     # node's own assignments before its parent's, catalog position breaking

data/app/models/spree/catalog_price.rb

@@ -80,13 +80,6 @@ module Spree
       break_count.to_i.positive?
     end
 
-    # The amount as the wire carries it — see CatalogPriceTier#display_value.
-    #
-    # @return [String]
-    def display_value
-      amount.to_s
-    end
-
     # @return [Spree::Money]
     def money
       Spree::Money.new(amount, currency: currency)

data/app/models/spree/catalog_price_tier.rb

@@ -15,14 +15,6 @@ module Spree
 
     validates :min_quantity, numericality: { greater_than: 1 }
 
-    # The amount as the wire carries it — a string, like every other
-    # money-shaped value, since a float would round the merchant's figure.
-    #
-    # @return [String]
-    def display_value
-      amount.to_s
-    end
-
     # @return [Spree::Money]
     def money
       Spree::Money.new(amount, currency: currency)

data/app/models/spree/category.rb

@@ -61,6 +61,7 @@ module Spree
     #
     has_one_attached :image, service: Spree.public_storage_service_name
     has_one_attached :square_image, service: Spree.public_storage_service_name
+    signed_id_attachments :image, :square_image
     # The slots double as media-library placements, so an upload here is
     # visible and reusable there (Spree::HasLibraryMedia).
     has_library_media :image, :square_image
@@ -133,8 +134,9 @@ module Spree
     #  Ransack
     #
     self.whitelisted_ransackable_associations = %w[parent]
-    self.whitelisted_ransackable_attributes = %w[name permalink automatic depth is_root children_count
+    self.whitelisted_ransackable_attributes = %w[name permalink automatic depth children_count
                                                  products_count pretty_name parent_id]
+    search_by :name, :pretty_name
 
     #
     # Translations

data/app/models/spree/channel/gating.rb

@@ -17,8 +17,9 @@ module Spree
         # Empty -> falls back to the Store-level preference. Both are `nullable`
         # so a blank write stays nil (inherit) rather than coercing to "" or
         # false, while an explicit value remains a channel override.
-        preference :storefront_access, :string, default: nil, nullable: true
+        preference :storefront_access, :string, default: nil, nullable: true, choices: STOREFRONT_ACCESS
         preference :guest_checkout, :boolean, default: nil, nullable: true
+        exposes_preferences :storefront_access, :guest_checkout
 
         validate :storefront_access_must_be_valid
       end
@@ -58,7 +59,7 @@ module Spree
         return if STOREFRONT_ACCESS.include?(value.to_s)
 
         errors.add(
-          :preferred_storefront_access, :invalid_storefront_access, message: Spree.t(:invalid_storefront_access, scope: [:errors, :messages], default: 'is not a valid storefront access level')
+          :preferred_storefront_access, :invalid_storefront_access, message: I18n.t('spree.errors.messages.invalid_storefront_access')
         )
       end
     end

data/app/models/spree/channel.rb

@@ -14,9 +14,10 @@ module Spree
     include Spree::Channel::Gating
 
     # Empty -> falls back to the Store-level preference.
-    preference :order_routing_strategy, :string, default: nil
+    preference :order_routing_strategy, :string, default: nil,
+                                                 parse_on_set: ->(value) { Spree::ApiTyped.class_name_for(Spree.order_routing.strategies, value) }
+    exposes_preferences :order_routing_strategy
 
-    belongs_to :store, class_name: 'Spree::Store'
 
     has_many :orders, class_name: 'Spree::Order', inverse_of: :channel, dependent: :nullify
     has_many :order_routing_rules, class_name: 'Spree::OrderRoutingRule', dependent: :destroy
@@ -59,6 +60,7 @@ module Spree
     scope :default, -> { where(default: true) }
 
     self.whitelisted_ransackable_attributes = %w[name code active default store_id]
+    search_by :name
 
     # Publishes the given products on this channel by creating/upserting ProductPublications.
     # Optionally sets the publication window; if not given, the products will be published immediately
@@ -163,7 +165,7 @@ module Spree
       return unless default?
       return if destroyed_by_association.present?
 
-      errors.add(:base, :cannot_delete_default_channel, message: Spree.t('errors.messages.cannot_delete_default_channel'))
+      errors.add(:base, :cannot_delete_default_channel, message: I18n.t('spree.errors.messages.cannot_delete_default_channel'))
       throw :abort
     end
 
@@ -176,7 +178,7 @@ module Spree
       return unless api_keys.active.exists?
       return if destroyed_by_association.present?
 
-      errors.add(:base, :cannot_delete_channel_with_active_api_keys, message: Spree.t('errors.messages.cannot_delete_channel_with_active_api_keys'))
+      errors.add(:base, :cannot_delete_channel_with_active_api_keys, message: I18n.t('spree.errors.messages.cannot_delete_channel_with_active_api_keys'))
       throw :abort
     end
 

data/app/models/spree/claim.rb

@@ -16,8 +16,10 @@ module Spree
     include Spree::HasStatus
     include Spree::HasCustomFields
     include Spree::Metadata
+    include Spree::PostSale::Taxation
 
     publishes_lifecycle_events
+    publishes_events :approved, :canceled, :denied, :opened, :resolved
 
     has_status :open, :approved, :resolved, :denied, :canceled, default: :open
 
@@ -25,7 +27,6 @@ module Spree
     # stays closed — an unrecognised value would silently do nothing.
     RESOLUTIONS = %w[refund replacement refund_and_replacement].freeze
 
-    belongs_to :store, class_name: 'Spree::Store'
     belongs_to :order, class_name: 'Spree::Order', inverse_of: :claims
     belongs_to :reason, class_name: 'Spree::ClaimReason', optional: true, inverse_of: :claims
     acted_by :created_by
@@ -43,6 +44,7 @@ module Spree
     delegate :currency, to: :order
 
     self.whitelisted_ransackable_attributes = %w[number status created_at]
+    search_by :number
     self.whitelisted_ransackable_associations = %w[order reason]
 
     def refund_total
@@ -59,6 +61,21 @@ module Spree
       end
     end
 
+    # The tax inside {#refunded_line_amounts}, for the lines whose tax is
+    # recorded: each line's refund carries its tax in proportion to what the
+    # customer paid for it.
+    #
+    # @return [Hash{Integer => BigDecimal}] line item id => tax
+    def refunded_line_taxes
+      claim_line_items.each_with_object(Hash.new(0)) do |line, taxes|
+        next unless line.settles_tax? && line.paid_amount.positive?
+
+        taxes[line.line_item_id] += Spree::Money::Rounding.to_currency(
+          line.tax_total * line.refund_amount.to_d / line.paid_amount, currency
+        )
+      end
+    end
+
     def display_refund_total
       Spree::Money.new(refund_total, currency: currency)
     end
@@ -66,5 +83,9 @@ module Spree
     def replacement_line_items
       claim_line_items.select(&:send_replacement)
     end
+
+    def taxed_lines
+      claim_line_items
+    end
   end
 end

data/app/models/spree/claim_line_item.rb

@@ -2,6 +2,8 @@ module Spree
   # One problem item on a {Spree::Claim}, and how it is being made right:
   # money back, a replacement, or both.
   class ClaimLineItem < Spree.base_class
+    include Spree::PostSale::TaxedLine
+
     has_prefix_id :cli
 
     belongs_to :claim, class_name: 'Spree::Claim', inverse_of: :claim_line_items
@@ -20,16 +22,45 @@ module Spree
 
     delegate :order, :currency, to: :claim
 
-    # What the customer paid for the affected units, after discounts — the
-    # ceiling for a refund on this line.
+    extend Spree::DisplayMoney
+    money_methods :refund_amount, :paid_amount, :pre_tax_amount, :included_tax_total,
+                  :additional_tax_total, :tax_total
+
+    # What the customer paid for the affected units, after discounts and with
+    # the tax charged on top of the price — the ceiling for a refund on this
+    # line, which is entered tax included. A claim opened before claims
+    # carried tax has none, so its ceiling is unchanged.
+    #
+    # @return [BigDecimal]
     def paid_amount
-      return 0 if line_item.nil? || line_item.quantity.to_i.zero?
+      discounted_amount + additional_tax_total
+    end
 
-      (line_item.amount / line_item.quantity) * quantity.to_i
+    # @return [BigDecimal] the affected units before tax
+    def pre_tax_amount
+      discounted_amount - included_tax_total
     end
 
-    def display_refund_amount
-      Spree::Money.new(refund_amount, currency: currency)
+    def tax_total
+      included_tax_total + additional_tax_total
+    end
+
+    # Nothing is given back on a claim that was denied or withdrawn.
+    #
+    # @return [Integer]
+    def credited_quantity
+      claim.denied? || claim.canceled? ? 0 : quantity.to_i
+    end
+
+    # @return [BigDecimal]
+    def credited_worth
+      paid_amount
+    end
+
+    # @return [void]
+    def fold_tax_lines!
+      included, additional = tax_totals_from(tax_lines.credits.reload)
+      update_columns(included_tax_total: included, additional_tax_total: additional)
     end
 
     # What actually ships when the claim is resolved with a replacement.
@@ -39,6 +70,10 @@ module Spree
 
     private
 
+    def discounted_amount
+      line_item&.discounted_amount_for(quantity) || 0
+    end
+
     def set_variant_from_line_item
       self.variant ||= line_item&.variant
     end

data/app/models/spree/collection.rb

@@ -58,7 +58,6 @@ module Spree
     #
     # Associations
     #
-    belongs_to :store, class_name: 'Spree::Store'
 
     has_many :product_collections, class_name: 'Spree::ProductCollection', dependent: :destroy_async, inverse_of: :collection
     has_many :products, through: :product_collections
@@ -73,6 +72,7 @@ module Spree
     #
     has_one_attached :image, service: Spree.public_storage_service_name
     has_one_attached :square_image, service: Spree.public_storage_service_name
+    signed_id_attachments :image, :square_image
     # The slots double as media-library placements, so an upload here is
     # visible and reusable there (Spree::HasLibraryMedia).
     has_library_media :image, :square_image
@@ -102,6 +102,7 @@ module Spree
     # Ransack
     #
     self.whitelisted_ransackable_attributes = %w[permalink automatic sort_order products_count]
+    search_by :name
 
     #
     # Automatic (rule-based) membership