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.

Fixed `LineItem#shipping_cost` to always return a value

Damian Legawiecea258df14469
diff --git a/core/app/models/spree/line_item.rb b/core/app/models/spree/line_item.rb
index 5f55455cbb..e186bee37e 100644
--- a/core/app/models/spree/line_item.rb
+++ b/core/app/models/spree/line_item.rb
@@ -143,7 +143,7 @@ module Spree
def shipping_cost
shipments.sum do |shipment|
# Skip cancelled shipments
- next if shipment.canceled?
+ return BigDecimal('0') if shipment.canceled?
# Get all inventory units in this shipment for this line item
line_item_units = shipment.inventory_units.where(line_item_id: id).count
@@ -152,7 +152,8 @@ module Spree
total_units = shipment.inventory_units.count
# Calculate proportional shipping cost
- next BigDecimal('0') if total_units.zero?
+ return BigDecimal('0') if total_units.zero? || line_item_units.zero? || shipment.cost.zero?
+
shipment.cost * (line_item_units.to_d / total_units)
end
end
diff --git a/core/spec/models/spree/line_item_spec.rb b/core/spec/models/spree/line_item_spec.rb
index d81e803067..f4a6aa96f4 100644
--- a/core/spec/models/spree/line_item_spec.rb
+++ b/core/spec/models/spree/line_item_spec.rb
@@ -455,10 +455,31 @@ describe Spree::LineItem, type: :model do
describe '#shipping_cost' do
let(:line_item) { create(:line_item) }
let(:inventory_unit) { create(:inventory_unit, line_item: line_item) }
- let!(:shipment) { create(:shipment, inventory_units: [inventory_unit], cost: 10) }
+ let(:shipment) { create(:shipment, inventory_units: [inventory_unit], cost: 10) }
it 'returns the shipping cost for the line item' do
+ shipment
expect(line_item.shipping_cost).to eq(10)
end
+
+ context 'when the shipment is canceled' do
+ it 'returns 0' do
+ shipment.cancel!
+ expect(line_item.shipping_cost).to eq(0)
+ end
+ end
+
+ context 'when the shipment is not present' do
+ it 'returns 0' do
+ expect(line_item.shipping_cost).to eq(0)
+ end
+ end
+
+ context 'when the shipment cost is 0' do
+ it 'returns 0' do
+ shipment.update(cost: 0)
+ expect(line_item.shipping_cost).to eq(0)
+ end
+ end
end
end