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.

Fix NoMethodError applying a line-item promotion with a usage limit to a cart (#15045)

Matthew Kennedy0c4c73ef1c91
diff --git a/spree/core/app/models/spree/promotion/actions/create_item_adjustments.rb b/spree/core/app/models/spree/promotion/actions/create_item_adjustments.rb
index e2b96daaa5..d687ddb257 100644
--- a/spree/core/app/models/spree/promotion/actions/create_item_adjustments.rb
+++ b/spree/core/app/models/spree/promotion/actions/create_item_adjustments.rb
@@ -22,7 +22,7 @@ module Spree
# clamped against its line's remaining discounted base, so the order net
# can never go below zero.
def compute_amount(line_item)
- return 0 unless promotion.line_item_actionable?(line_item.order, line_item)
+ return 0 unless promotion.line_item_actionable?(line_item.owner, line_item)
[line_item.amount, compute(line_item)].min * -1
end
diff --git a/spree/core/spec/models/spree/promotion/actions/create_item_adjustments_spec.rb b/spree/core/spec/models/spree/promotion/actions/create_item_adjustments_spec.rb
index 373690df1c..8e897d269e 100644
--- a/spree/core/spec/models/spree/promotion/actions/create_item_adjustments_spec.rb
+++ b/spree/core/spec/models/spree/promotion/actions/create_item_adjustments_spec.rb
@@ -29,6 +29,22 @@ describe Spree::Promotion::Actions::CreateItemAdjustments, type: :model do
expect(action.perform(order: order, promotion: promotion)).to be(false)
expect(order.discounts.reload).to be_empty
end
+
+ context 'when the promotable is a cart' do
+ let(:cart) { create(:cart_with_line_items, line_items_count: 2, line_items_price: 10, store: promotion.store) }
+
+ it 'writes a discount per line item' do
+ expect(action.perform(order: cart, promotion: promotion)).to be(true)
+ expect(cart.discounts.reload.map(&:amount)).to eq([-3, -3])
+ end
+
+ it 'writes a discount per line item when the promotion has a usage limit' do
+ promotion.update!(usage_limit: 1)
+
+ expect(action.perform(order: cart, promotion: promotion)).to be(true)
+ expect(cart.discounts.reload.map(&:amount)).to eq([-3, -3])
+ end
+ end
end
describe '#compute_amount' do