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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fix shipping rate selection to skip totals update for completed orders
Damian Legawiec7c28962d3dca
diff --git a/core/app/models/spree/shipment.rb b/core/app/models/spree/shipment.rbindex c2cb622fcc..8ee6864ff5 100644--- a/core/app/models/spree/shipment.rb+++ b/core/app/models/spree/shipment.rb@@ -350,11 +350,12 @@ module Spree# Reload associations to pick up the new selected shipping rateshipping_rates.resetassociation(:selected_shipping_rate).reset- # Update shipment cost and order totals+ # Update shipment cost and order totals only for incomplete orders (during checkout)+ # For completed orders, totals are managed separately (e.g., in tests or admin adjustments)+ return if order.completed?+update_amounts- order.updater.update_shipment_total- order.updater.update_adjustment_total- order.persist_totals+ order.set_shipments_costenddef set_up_inventory(state, variant, order, line_item, quantity = 1)diff --git a/core/lib/spree/testing_support/factories/order_factory.rb b/core/lib/spree/testing_support/factories/order_factory.rbindex c8973e951f..96cc9ff433 100644--- a/core/lib/spree/testing_support/factories/order_factory.rb+++ b/core/lib/spree/testing_support/factories/order_factory.rb@@ -75,8 +75,10 @@ FactoryBot.define dostate { 'complete' }after(:create) do |order, evaluator|- order.refresh_shipment_rates(evaluator.shipping_method_filter)+ # Set completed_at before refreshing shipment rates so order.completed? returns true+ # This prevents the shipping rate selection from recalculating order totalsorder.update_column(:completed_at, order.completed_at || Time.current)+ order.refresh_shipment_rates(evaluator.shipping_method_filter)endfactory :completed_order_with_pending_payment do