Connect shipping rates to shipments earlier in Stock::Coordinator

This will give the estimator the information it needs to calculate
taxes correctly in the pending tax work.

core/app/models/spree/stock/coordinator.rb

@@ -10,9 +10,7 @@ def initialize(order, inventory_units = nil)
  end
 
  def shipments
- packages.map do |package|
- package.to_shipment.tap { |s| s.address = order.ship_address }
- end
+ packages.map(&:shipment)
  end
 
  private
@@ -21,6 +19,9 @@ def packages
  packages = build_location_configured_packages
  packages = build_packages(packages)
  packages = prioritize_packages(packages)
+ packages.each do |package|
+ package.shipment = package.to_shipment.tap { |s| s.address = order.ship_address }
+ end
  packages = estimate_packages(packages)
  validate_packages(packages)
  packages
@@ -122,7 +123,7 @@ def prioritize_packages(packages)
  def estimate_packages(packages)
  estimator = Spree::Config.stock.estimator_class.new(order)
  packages.each do |package|
- package.shipping_rates = estimator.shipping_rates(package)
+ package.shipment.shipping_rates = estimator.shipping_rates(package)
  end
  packages
  end

core/app/models/spree/stock/estimator.rb

@@ -46,7 +46,10 @@ def calculate_shipping_rates(package)
  end
 
  if cost
- rate = shipping_method.shipping_rates.new(cost: cost)
+ rate = shipping_method.shipping_rates.new(
+ cost: cost,
+ shipment: package.shipment
+ )
  rate.tax_rate = tax_rate if tax_rate
  end
 

core/app/models/spree/stock/package.rb

@@ -2,14 +2,13 @@ module Spree
  module Stock
  class Package
  attr_reader :stock_location, :contents
- attr_accessor :shipping_rates
+ attr_accessor :shipment
 
  # @param stock_location [Spree::StockLocation] the stock location this package originates from
  # @param contents [Array<Spree::Stock::ContentItem>] the contents of this package
  def initialize(stock_location, contents = [])
  @stock_location = stock_location
  @contents = contents
- @shipping_rates = []
  end
 
  # Adds an inventory unit to this package.
@@ -124,7 +123,6 @@ def to_shipment
 
  Spree::Shipment.new(
  stock_location: stock_location,
- shipping_rates: shipping_rates,
  inventory_units: contents.map(&:inventory_unit)
  )
  end

core/spec/models/spree/stock/package_spec.rb

@@ -97,9 +97,9 @@ def build_inventory_unit
  subject.add build_inventory_unit, :backordered
 
  shipping_method = build(:shipping_method)
- subject.shipping_rates = [Spree::ShippingRate.new(shipping_method: shipping_method, cost: 10.00, selected: true)]
 
  shipment = subject.to_shipment
+ shipment.shipping_rates = [Spree::ShippingRate.new(shipping_method: shipping_method, cost: 10.00, selected: true)]
  expect(shipment.stock_location).to eq subject.stock_location
  expect(shipment.inventory_units.size).to eq 3