Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Quote carrier rates against the cart's own address

Damian Legawiec8f1ac0d69f14
diff --git a/spree/core/app/models/spree/fulfillment.rb b/spree/core/app/models/spree/fulfillment.rb
index 90cd53e058..5f48b293ee 100644
--- a/spree/core/app/models/spree/fulfillment.rb
+++ b/spree/core/app/models/spree/fulfillment.rb
@@ -597,6 +597,7 @@ module Spree
def to_package
package = Stock::Package.new(stock_location)
+ package.owner = owner
fulfillment_items.includes(:variant).joins(:variant).group_by(&:status).each do |status, units|
package.add_multiple units, status.to_sym
end
diff --git a/spree/core/app/models/spree/stock/package.rb b/spree/core/app/models/spree/stock/package.rb
index 3ea036236a..9444e0f6c5 100644
--- a/spree/core/app/models/spree/stock/package.rb
+++ b/spree/core/app/models/spree/stock/package.rb
@@ -3,6 +3,10 @@ module Spree
class Package
attr_reader :stock_location, :contents
attr_accessor :delivery_rates
+ # The cart or order this package is being quoted for. Set when a
+ # fulfillment builds the package; nil for proposed packages the
+ # coordinator builds before anything is persisted.
+ attr_writer :owner
def initialize(stock_location, contents = [])
@stock_location = stock_location
@@ -10,6 +14,19 @@ module Spree
@delivery_rates = []
end
+ # Who this package is for.
+ #
+ # Prefers the owner the fulfillment supplied over walking to
+ # `inventory_unit.order`: during checkout a fulfillment belongs to a
+ # Cart, while its units can still carry an order_id from elsewhere, and
+ # following that returns a stranger's order — whose ship address would
+ # then stand in for the customer's.
+ #
+ # @return [Spree::Cart, Spree::Order, nil]
+ def owner
+ @owner || order
+ end
+
# @deprecated Use {#delivery_rates}; removed in 6.1.
def shipping_rates
Spree::Deprecation.warn('Spree::Stock::Package#shipping_rates is deprecated and will be removed in Spree 6.1. Use #delivery_rates instead.')
diff --git a/spree/providers/easypost/app/models/spree_easypost/delivery_rate_provider.rb b/spree/providers/easypost/app/models/spree_easypost/delivery_rate_provider.rb
index 60e6532895..5775494675 100644
--- a/spree/providers/easypost/app/models/spree_easypost/delivery_rate_provider.rb
+++ b/spree/providers/easypost/app/models/spree_easypost/delivery_rate_provider.rb
@@ -68,7 +68,7 @@ module SpreeEasyPost
# @return [Array<Spree::DeliveryRateProvider::Estimate>]
def estimates(package)
return [] if integration.nil?
- return [] if package.order.ship_address.nil?
+ return [] if package.owner&.ship_address.nil?
rates = begin
easypost_shipment(package).rates
@@ -94,10 +94,10 @@ module SpreeEasyPost
# One shipment-create returns rates for every carrier and service, so all
# delivery methods sharing this provider within a request reuse it.
def easypost_shipment(package)
- cache_key = [:easypost_shipment, store.id, package.stock_location.id, package.order.id]
+ cache_key = [:easypost_shipment, store.id, package.stock_location.id, package.owner.id]
Spree::Current.provider_cache[cache_key] ||= integration.client.shipment.create(
from_address: address_params(package.stock_location),
- to_address: address_params(package.order.ship_address),
+ to_address: address_params(package.owner.ship_address),
parcel: parcel_params(package)
)
end