spree_core 6.0.0.beta4 → 6.0.0.rc1

data/app/models/spree/base.rb

@@ -23,24 +23,20 @@ class Spree::Base < ApplicationRecord
   # rather than assigning, so extensions don't clobber each other.
   class_attribute :additional_permitted_attributes, instance_writer: false, default: [].freeze
 
+  # The Seller API's counterpart, kept separate because sellers write a
+  # narrower set than operators: an attribute an extension makes writable for
+  # admins stays admin-only unless it is also declared here.
+  #
+  #   Spree::Product.additional_seller_permitted_attributes += [:brand_id]
+  class_attribute :additional_seller_permitted_attributes, instance_writer: false, default: [].freeze
+
   # Backfills preferences added to the class after this row was last saved, so
-  # a reader never sees nil for a newly defined preference. Assigning
-  # unconditionally would dirty every record on load: `preferences` is a
-  # YAML-serialized Hash, so the dirty check compares the serialized string and
-  # the merge reorders keys even when nothing changed — which is enough to make
-  # `with_lock` refuse the record ("unpersisted changes").
+  # a reader never sees nil for a newly defined preference. Only missing keys
+  # are assigned: assigning unconditionally would dirty every record on load,
+  # which is enough to make `with_lock` refuse the record ("unpersisted
+  # changes").
   after_initialize do
-    if has_attribute?(:preferences) && !preferences.nil?
-      missing = default_preferences.except(*preferences.keys)
-      self.preferences = preferences.merge(missing) if missing.any?
-    end
-  end
-
-  # only for backwards compatibility with Kaminari
-  if defined?(Kaminari) && Kaminari.config.page_method_name != :page
-    def self.page(num)
-      send Kaminari.config.page_method_name, num
-    end
+    backfill_default_preferences if has_attribute?(:preferences) && !preferences.nil?
   end
 
   self.abstract_class = true
@@ -115,9 +111,10 @@ class Spree::Base < ApplicationRecord
   # read through the parent (a plain `Spree::Export` row, a factory that sets
   # `type` as an attribute, a query on the base relation).
   #
-  # Resolves against `available_types` where the class defines it, so an
-  # unrecognized column value passes through untouched rather than being
-  # constantized.
+  # Resolves against the class's type registry where it has one, so an
+  # unrecognized column value (an extension no longer installed) is never
+  # constantized — it is shortened the same way instead, never sent as a class
+  # name.
   #
   # @param type [String, nil] value of the STI `type` column
   # @return [String]
@@ -125,9 +122,33 @@ class Spree::Base < ApplicationRecord
     return api_type if type.blank?
 
     type = type.to_s
-    return type unless respond_to?(:available_types)
+    api_type_registry.find { |klass| klass.to_s == type }&.api_type || type.demodulize.underscore
+  end
+
+  # Inverse of {.api_type_for}: the STI `type` column value for a wire
+  # shorthand, or nil when no registered subclass answers to it. Lookup is
+  # registry-driven, so a request can never name a class outside the family.
+  #
+  # @param api_type [String, nil] e.g. `"orders"`
+  # @return [String, nil] e.g. `"Spree::Exports::Orders"`
+  def self.class_name_for_api_type(api_type)
+    return nil if api_type.blank?
 
-    available_types.find { |klass| klass.to_s == type }&.api_type || type
+    api_type_registry.find { |klass| klass.api_type == api_type.to_s }&.to_s
+  end
+
+  # The subclasses a typed family accepts — `registered_subclasses` for the
+  # preference-schema families, `available_types` for exports and imports.
+  #
+  # @return [Array<Class>]
+  def self.api_type_registry
+    if subclass_registry
+      registered_subclasses
+    elsif respond_to?(:available_types)
+      Array(available_types)
+    else
+      []
+    end
   end
 
   # Shorthand for a *polymorphic* `*_type` column (`owner_type`,
@@ -138,10 +159,37 @@ class Spree::Base < ApplicationRecord
   #
   # @param type [String, Class, nil] value of the polymorphic type column
   # @return [String, nil]
+  #
+  # The configured customer and admin user classes always answer `customer`
+  # and `admin_user`, so a host app's own `User` class does not change the
+  # contract.
   def self.polymorphic_api_type(type)
     return nil if type.blank?
 
-    type.to_s.demodulize.underscore
+    type = type.to_s
+    return 'customer' if type == Spree.customer_class(constantize: false)
+    return 'admin_user' if type == Spree.admin_user_class(constantize: false)
+
+    type.demodulize.underscore
+  end
+
+  # Inverse of {.polymorphic_api_type}: the class name a polymorphic `*_type`
+  # column stores for a wire shorthand. Matches against `candidates` when the
+  # caller knows what the column may reference (always prefer that); otherwise
+  # against the configured customer and admin user classes, then the
+  # `Spree::` model of that name. Never constantizes the input.
+  #
+  # @param api_type [String, nil] e.g. `"purchase_order"`
+  # @param candidates [Array<Class, String>, nil] classes the column may hold
+  # @return [String, nil] e.g. `"Spree::PurchaseOrder"`
+  def self.polymorphic_type_for(api_type, candidates = nil)
+    token = api_type.to_s
+    return nil unless token.match?(/\A[a-z][a-z0-9_]*\z/)
+
+    candidates ||= [Spree.customer_class(constantize: false),
+                    Spree.admin_user_class(constantize: false),
+                    "Spree::#{token.camelize}"]
+    candidates.map(&:to_s).find { |name| polymorphic_api_type(name) == token }
   end
 
   # Prefixed id for a polymorphic reference, encoded from the columns without

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

@@ -1,11 +1,9 @@
-require_dependency 'spree/calculator'
-
 module Spree
   class Calculator::FlatPercentItemTotal < Calculator
     preference :flat_percent, :decimal, default: 0
 
     def self.description
-      Spree.t(:flat_percent)
+      I18n.t('spree.flat_percent')
     end
 
     def compute(object)

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

@@ -1,5 +1,3 @@
-require_dependency 'spree/calculator'
-
 module Spree
   class Calculator::FlatRate < Calculator
     preference :amount, :decimal, default: 0
@@ -7,7 +5,7 @@ module Spree
     preference :apply_only_on_full_priced_items, :boolean, default: false
 
     def self.description
-      Spree.t(:flat_rate_per_order)
+      I18n.t('spree.flat_rate_per_order')
     end
 
     def compute(object = nil)

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

@@ -1,5 +1,3 @@
-require_dependency 'spree/calculator'
-
 module Spree
   class Calculator::FlexiRate < Calculator
     preference :first_item,      :decimal, default: 0.0
@@ -9,7 +7,7 @@ module Spree
     preference :apply_only_on_full_priced_items, :boolean, default: false
 
     def self.description
-      Spree.t(:flexible_rate)
+      I18n.t('spree.flexible_rate')
     end
 
     def self.available?(_object)

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

@@ -5,7 +5,7 @@ module Spree
       preference :apply_only_on_full_priced_items, :boolean, default: false
 
       def self.description
-        Spree.t(:percent_per_item)
+        I18n.t('spree.percent_per_item')
       end
 
       def compute(object)

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

@@ -1,5 +1,3 @@
-require_dependency 'spree/calculator'
-
 module Spree
   class Calculator::PriceSack < Calculator
     preference :minimal_amount, :decimal, default: 0
@@ -8,7 +6,7 @@ module Spree
     preference :currency, :string, default: -> { Spree::Store.default.default_currency }
 
     def self.description
-      Spree.t(:price_sack)
+      I18n.t('spree.price_sack')
     end
 
     # as object we always get line items, as calculable we have Coupon, ShippingMethod

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

@@ -1,5 +1,3 @@
-require_dependency 'spree/shipping_calculator'
-
 module Spree
   module Calculator::Shipping
     class DigitalDelivery < ShippingCalculator
@@ -9,7 +7,7 @@ module Spree
       preference :currency, :string, default: -> { Spree::Store.default.default_currency }
 
       def self.description
-        Spree.t('digital.digital_delivery')
+        I18n.t('spree.digital.digital_delivery')
       end
 
       def compute_package(package = nil)

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

@@ -1,12 +1,10 @@
-require_dependency 'spree/shipping_calculator'
-
 module Spree
   module Calculator::Shipping
     class FlatPercentItemTotal < ShippingCalculator
       preference :flat_percent, :decimal, default: 0
 
       def self.description
-        Spree.t(:flat_percent)
+        I18n.t('spree.flat_percent')
       end
 
       def compute_package(package)

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

@@ -1,5 +1,3 @@
-require_dependency 'spree/shipping_calculator'
-
 module Spree
   module Calculator::Shipping
     class FlatRate < ShippingCalculator
@@ -18,7 +16,7 @@ module Spree
       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,5 +1,3 @@
-require_dependency 'spree/shipping_calculator'
-
 module Spree
   module Calculator::Shipping
     class FlexiRate < ShippingCalculator
@@ -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,5 +1,3 @@
-require_dependency 'spree/shipping_calculator'
-
 module Spree
   module Calculator::Shipping
     class PerItem < ShippingCalculator
@@ -9,7 +7,7 @@ module Spree
       preference :currency, :string, 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,5 +1,3 @@
-require_dependency 'spree/shipping_calculator'
-
 module Spree
   module Calculator::Shipping
     class PriceSack < ShippingCalculator
@@ -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
+    include Spree::Calculator::Tiers
+
     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
-
-    validate :preferred_tiers_content
 
     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
+      (object.amount * percent / 100).round(2)
     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/channel/gating.rb

@@ -58,7 +58,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,9 @@ 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) }
 
-    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
@@ -163,7 +163,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 +176,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
@@ -59,6 +60,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 +82,9 @@ module Spree
     def replacement_line_items
       claim_line_items.select(&:send_replacement)
     end
+
+    def taxed_lines
+      claim_line_items
+    end
   end
 end