UPSTREAM FIX

magento2-40869: A later rule applying shipping discount after Discard subsequent rules

Community fix magento2-40869 merged into magento/magento2 on 2026-07-28, not in a release yet; applies cleanly to 34 releases from 2.4.6 to 2.4.9.

Fixes a later rule applying shipping discount after Discard subsequent rules edited

Pull request title: Discard subsequent rules for shipping amount
Pull request: magento/magento2#40869
Issues: #37985 human
Author: @aasim110
Merged: 2026-07-28
Fixed in: no release yet
Reported on: —
Categories: Order/Checkout, Shopping Cart
Components: magento/module-sales-rule

Labels

Area: Cart & Checkout
Component: Checkout
Priority: P2
Severity: —
Reported on (labels): 2.4.x

Issue

Title and steps come from the upstream issue and pull request.

Description

Discount in step 4 is incorrect: $70

Steps to reproduce

1. Create the first cart price rule:
Rule Information:
Active: Yes
Coupon: Specific Coupon
Coupon Code: 50OFF
Priority: 0
Condition: None
Actions
Apply: Percent of product price discount
Discount Amount: 50%
Maximum Qty Discount is Applied To: 0
Discount Qty Step (Buy X): 0
Apply to Shipping Amount: No
Discard subsequent rules: Yes

2. Create the second cart price rule
Rule Information:
Active: Yes
Coupon: No Coupon
Priority: 1
Condition:
If trial SKU is in cart
Actions
Apply: Percent of product price discount
Discount Amount: 100%
Maximum Qty Discount is Applied To: 1
Discount Qty Step (Buy X): 0
Apply to Shipping Amount: Yes
Discard subsequent rules: Yes

3. Add to cart 2 products: first product = trial SKU, second product = non-trial SKU.
The second rule applies
Trial SKU price: $20
Non-trial SKU price: $100
Shipping: $10
Subtotal: $130
Discount: -$30.00

4. Apply Discount Code: 50OFF
_The first rule is applied correctly but the second rule's shipping discount is applied incorrectly_
Trial SKU price: $20
Non-trial SKU price: $100
Shipping: $10
Subtotal: $130
Discount: -$70

Expected result

Discount in step 4 should be $60

Actual result

Discount in step 4 is incorrect: $70

Taken from the upstream issue.

Code match per tag

Each tag was checked with git apply --check against that tag's files. A clean match means the change applies; it is not a test result. Tags that already contain the fix are marked.

Line	Code match per tag	Tests
2.4.6	2.4.6 clean 2.4.6-p1 clean 2.4.6-p2 clean 2.4.6-p3 clean 2.4.6-p4 clean 2.4.6-p5 clean 2.4.6-p6 clean 2.4.6-p7 clean 2.4.6-p8 clean 2.4.6-p9 clean 2.4.6-p10 clean 2.4.6-p11 clean 2.4.6-p12 clean 2.4.6-p13 clean 2.4.6-p14 clean 2.4.6-p15 clean	2.4.6: no test data 2.4.6-p1: no test data 2.4.6-p2: no test data 2.4.6-p3: no test data 2.4.6-p4: no test data 2.4.6-p5: no test data 2.4.6-p6: no test data 2.4.6-p7: no test data 2.4.6-p8: no test data 2.4.6-p9: no test data 2.4.6-p10: no test data 2.4.6-p11: no test data 2.4.6-p12: no test data 2.4.6-p13: no test data 2.4.6-p14: no test data 2.4.6-p15: no test data
2.4.7	2.4.7 clean 2.4.7-p1 clean 2.4.7-p2 clean 2.4.7-p3 clean 2.4.7-p4 clean 2.4.7-p5 clean 2.4.7-p6 clean 2.4.7-p7 clean 2.4.7-p8 clean 2.4.7-p9 clean 2.4.7-p10 clean	2.4.7: no test data 2.4.7-p1: no test data 2.4.7-p2: no test data 2.4.7-p3: no test data 2.4.7-p4: no test data 2.4.7-p5: no test data 2.4.7-p6: no test data 2.4.7-p7: no test data 2.4.7-p8: no test data 2.4.7-p9: no test data 2.4.7-p10: test files do not apply to this release (test header adapted)unit: could not run before, could not run after
2.4.8	2.4.8 clean 2.4.8-p1 clean 2.4.8-p2 clean 2.4.8-p3 clean 2.4.8-p4 clean 2.4.8-p5 clean	2.4.8: no test data 2.4.8-p1: no test data 2.4.8-p2: no test data 2.4.8-p3: no test data 2.4.8-p4: no test data 2.4.8-p5: fails before, passes after (test header adapted)unit: fails before, passes after
2.4.9	2.4.9 clean	2.4.9: fails before, passes afterunit: fails before, passes after

Triage

Model @cf/cloudflare/clef. Probability this is a bug fix: 98.6%. Probability it is security relevant: 0.5%.

Show the model's answers and probabilities

Question	Answer	Probabilities	Confidence
Change kind	bugfix	bugfix 97.7%, refactor 0.9%, tests_only 0.5%, feature 0.4%, dependency 0.3%, docs_only 0.2%	94.7%
Area	checkout	checkout 94.8%, other 1.2%, admin 1.2%	88.4%
Reported version	unspecified	unspecified 42.3%, 2.4.8 1.8%, 2.4.9 1.5%	17.4%
Scope	0.61 of 2	0 51.3%, 1 36.2%, 2 12.5%	11.5%
Risk	1.29 of 2	2 53.8%, 0 24.4%, 1 21.8%	9.5%
Worth backporting	1.50 of 2	2 58.7%, 1 32.8%, 0 8.5%	18.9%

Download

For cweagans/composer-patches, choose a version below and download the bundle. Copy its magento2-40869/ folder into patches/composer/, merge composer.patches.json into composer.json, then run composer install. Test files are always removed; paths are relative to each package root, using the default -p1 level.

Bundle README (what the ZIP ships)

# magento2-40869

Community fix merged upstream into magento/magento2, adapted by magento.watch.
This is not a patch published by Adobe.

Pull request: https://github.com/magento/magento2/pull/40869
Issue: https://github.com/magento/magento2/issues/37985
Author: @aasim110
Source commit: 1e8308b501f35db687c03a0508317ade6efdb329
Modifications: test files and documentation removed, paths rewritten relative to each Composer package.
Licence: OSL-3.0 / AFL-3.0, as the original Magento Open Source code.
Maintainer: Łukasz Bajsarowicz (@lbajsarowicz)

Licence: Magento Open Source code under OSL-3.0 and AFL-3.0. The bundle carries the original author, source commit and the list of modifications.