UPSTREAM FIX

magento2-39897: Admin shipment email is not sent when only the order's store has it enabled

Community fix magento2-39897 merged into magento/magento2 on 2025-09-09, released in 2.4.9; applies cleanly to 33 releases from 2.4.6 to 2.4.8-p5.

Admin shipment email is not sent when only the order's store has it enabled edited

Pull request title: Shipment email not sent when submitted from Admin Order view despite being enabled in store configuration
Pull request: magento/magento2#39897
Issues: #39861 human
Author: @KrasnoshchokBohdan
Merged: 2025-09-09
Fixed in: 2.4.9
Reported on: 2.4.7-p5
Categories: Emails, Order/Checkout
Components: magento/module-shipping

Labels

Area: Order
Component: Email
Priority: P2
Severity: —
Reported on (labels): 2.4.7-p5

Issue

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

Description

No shipment confirmation email is sent because the system checks the default store configuration instead of the store configuration where the order was placed.

Steps to reproduce

1. Set up a multi-store configuration where the default store has shipment emails disabled
2. Create an order in a secondary store that has shipment emails enabled
3. Go to Admin > Sales > Orders
4. Open the order from the secondary store
5. Click on "Ship" button
6. Fill in shipment details and check "Email Copy of Shipment"
7. Submit the shipment

Expected result

The system should send a shipment confirmation email as it is enabled in the store configuration where the order was placed.

Actual result

No shipment confirmation email is sent because the system checks the default store configuration instead of the store configuration where the order was placed.

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: fails before, passes afterunit: fails before, passes 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 afterunit: fails before, passes after
2.4.9	2.4.9 conflictcontains the fix	2.4.9: no test data

Triage

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

Show the model's answers and probabilities

Question	Answer	Probabilities	Confidence
Change kind	bugfix	bugfix 96.4%, refactor 1.0%, tests_only 1.0%, feature 0.7%, dependency 0.5%, docs_only 0.4%	91.4%
Area	admin	admin 45.2%, checkout 41.4%, other 3.8%	29.0%
Reported version	2.4.7-p5	2.4.7-p5 55.8%, 2.4.7 13.3%, 2.4.7-p6 1.8%	32.3%
Scope	0.79 of 2	1 48.0%, 0 36.4%, 2 15.6%	8.1%
Risk	0.19 of 2	0 85.1%, 1 10.9%, 2 4.0%	60.6%
Worth backporting	1.76 of 2	2 79.8%, 1 16.4%, 0 3.8%	49.8%

Download

For cweagans/composer-patches, choose a version below and download the bundle. Copy its magento2-39897/ 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-39897

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/39897
Issue: https://github.com/magento/magento2/issues/39861
Author: @KrasnoshchokBohdan
Source commit: 4517c351f7729f3aae49d1e16dbe586af0468c27
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.