magento/magento2#39861: Shipment email not sent when submitted from Admin Order view despite being enabled in store configuration #39897

KrasnoshchokBohdan · 2025-05-08T12:42:21Z

Description (*)

\Magento\Shipping\Controller\Adminhtml\Order\Shipment\Save::execute

if (!empty($data['send_email']) && $this->salesData->canSendNewShipmentEmail()) {
                $this->shipmentSender->send($shipment);
 }

without the right 'store id' checks only default config value

Related Pull Requests

Fixed Issues (if relevant)

Fixes Shipment email not sent when submitted from Admin Order view despite being enabled in store configuration #39861

Manual testing scenarios (*)

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

Questions or comments

Contribution checklist (*)

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
README.md files for modified modules are updated and included in the pull request if any README.md predefined sections require an update
All automated tests passed successfully (all builds are green)

…r view despite being enabled in store configuration - adding storeId to canSendNewShipmentEmail method

m2-assistant · 2025-05-08T12:42:25Z

Hi @KrasnoshchokBohdan. Thank you for your contribution!
Here are some useful tips on how you can test your changes using Magento test environment.
❗ Automated tests can be triggered manually with an appropriate comment:

@magento run all tests - run or re-run all required tests against the PR changes
@magento run <test-build(s)> - run or re-run specific test build(s)
For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names.

Allowed build names are:

Database Compare
Functional Tests CE
Functional Tests EE
Functional Tests B2B
Integration Tests
Magento Health Index
Sample Data Tests CE
Sample Data Tests EE
Sample Data Tests B2B
Static Tests
Unit Tests
WebAPI Tests
Semantic Version Checker

You can find more information about the builds here
ℹ️ Run only required test builds during development. Run all test builds before sending your pull request for review.

For more details, review the Code Contributions documentation.
Join Magento Community Engineering Slack and ask your questions in #github channel.

KrasnoshchokBohdan · 2025-05-08T12:43:40Z

@magento run all tests

…r view despite being enabled in store configuration - copyright

KrasnoshchokBohdan · 2025-05-08T16:14:13Z

@magento run all tests

Copilot

Pull Request Overview

This pull request addresses an issue where the shipment email was not sent from the Admin Order view due to a missing store-specific configuration check. The changes include updating the logic to pass the store ID to the email sending check and updating the file header copyright notice.

Added store-specific check by passing $shipment->getOrder()->getStoreId() to canSendNewShipmentEmail().
Updated file header copyright from Magento to Adobe.

Comments suppressed due to low confidence (1)

app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php:3

[nitpick] Verify that the updated copyright notice aligns with Magento's licensing policies, as the change from Magento to Adobe may need confirmation.

* Copyright 2015 Adobe

app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php

add comment

KrasnoshchokBohdan · 2025-05-26T09:05:14Z

@magento run all tests

engcom-Hotel · 2025-07-03T06:30:03Z

@magento run all tests

engcom-Hotel

Hello @KrasnoshchokBohdan,

Thanks for the contribution!

The changes looks good to us, but please add some automated test in accordance to the DOD.

Thanks

…r view despite being enabled in store configuration - Add unit tests for shipment email sending with store-specific logic

engcom-Hotel · 2025-07-15T07:36:00Z

@magento run all tests

engcom-Bravo · 2025-07-22T09:53:28Z

@magento run all tests

engcom-Bravo · 2025-07-22T11:12:05Z

Hi @KrasnoshchokBohdan,

Thanks for the collaboration & contribution!

✔️ QA Passed

Preconditions:

Install fresh Magento 2.4-develop

Steps to reproduce

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

Before: ✖️

No mails regarding shipments

After: ✔️

Builds are failed. Hence, moving this PR to Extended Testing.

Thanks.

engcom-Charlie · 2025-07-24T06:25:05Z

@magento run all tests

engcom-Charlie · 2025-07-24T09:10:54Z

@magento run Functional Tests CE, Integration Tests, Unit Tests

engcom-Charlie · 2025-07-24T13:01:40Z

@magento run Integration Tests

engcom-Charlie · 2025-07-25T07:17:30Z

@magento run Integration Tests

engcom-Charlie · 2025-07-25T10:00:12Z

The build is green now, hence moving this to Merge In Progress.

app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php

app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php

engcom-Hotel · 2025-08-06T10:34:13Z

@magento run all tests

Den4ik

Looks good

engcom-Hotel · 2025-08-08T07:02:44Z

Moving it to Merge in progress

magento#39861: Shipment email not sent when submitted from Admin Orde…

e8a4ae4

…r view despite being enabled in store configuration - adding storeId to canSendNewShipmentEmail method

Merge branch '2.4-develop' into fix-for-issue-39861

ce4f372

KrasnoshchokBohdan and others added 2 commits May 8, 2025 19:11

magento#39861: Shipment email not sent when submitted from Admin Orde…

97239fe

…r view despite being enabled in store configuration - copyright

Merge branch '2.4-develop' into fix-for-issue-39861

11610d5

engcom-Hotel added the Priority: P2 A defect with this priority could have functionality issues which are not to expectations. label May 12, 2025

ct-prd-projects-boards-automation bot added this to Pull Requests Dashboard May 12, 2025

github-project-automation bot moved this to Pending Review in Pull Requests Dashboard May 12, 2025

ct-prd-projects-boards-automation bot added Progress: pending review labels May 12, 2025

ihor-sviziev requested a review from Copilot May 22, 2025 17:19

ct-prd-projects-boards-automation bot added Progress: review and removed Progress: pending review labels May 22, 2025

ct-prd-projects-boards-automation bot moved this from Pending Review to Review in Progress in Pull Requests Dashboard May 22, 2025

Copilot AI reviewed May 22, 2025

View reviewed changes

app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php Show resolved Hide resolved

KrasnoshchokBohdan added 2 commits May 26, 2025 12:03

Update Save.php

9a49052

add comment

Merge branch '2.4-develop' into fix-for-issue-39861

44fce98

sidolov added partners-contribution Pull Request is created by Magento Partner Partner: Perspective labels May 28, 2025

Merge branch '2.4-develop' into fix-for-issue-39861

4c29e85

engcom-Hotel self-requested a review July 3, 2025 08:52

engcom-Hotel requested changes Jul 3, 2025

View reviewed changes

engcom-Hotel added the Progress: needs update label Jul 3, 2025

ct-prd-projects-boards-automation bot removed the Progress: review label Jul 3, 2025

ct-prd-projects-boards-automation bot moved this from Review in Progress to Changes Requested in Pull Requests Dashboard Jul 3, 2025

magento#39861: Shipment email not sent when submitted from Admin Orde…

cbfe66a

…r view despite being enabled in store configuration - Add unit tests for shipment email sending with store-specific logic

engcom-Hotel approved these changes Jul 15, 2025

View reviewed changes

ct-prd-projects-boards-automation bot removed the Progress: review label Jul 15, 2025

ct-prd-projects-boards-automation bot moved this from Review in Progress to Ready for Testing in Community Dashboard Jul 15, 2025

ct-prd-projects-boards-automation bot added the Progress: ready for testing label Jul 15, 2025

engcom-Bravo self-assigned this Jul 22, 2025

engcom-Bravo moved this from Ready for Testing to Testing in Progress in Community Dashboard Jul 22, 2025

Merge branch '2.4-develop' into fix-for-issue-39861

df64fdd

engcom-Bravo moved this from Testing in Progress to Extended testing (optional) in Community Dashboard Jul 22, 2025

engcom-Charlie self-assigned this Jul 24, 2025

Merge branch '2.4-develop' into fix-for-issue-39861

b14ad00

engcom-Charlie moved this from Extended testing (optional) to Merge in Progress in Community Dashboard Jul 25, 2025

Den4ik reviewed Aug 5, 2025

View reviewed changes

app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php Outdated Show resolved Hide resolved

app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php Outdated Show resolved Hide resolved

engcom-Hotel added 3 commits August 6, 2025 16:01

Merge branch '2.4-develop' into fix-for-issue-39861

4517c35

Den4ik approved these changes Aug 6, 2025

View reviewed changes

ct-prd-projects-boards-automation bot moved this from Merge in Progress to Ready for Testing in Community Dashboard Aug 6, 2025

engcom-Hotel moved this from Ready for Testing to Merge in Progress in Community Dashboard Aug 8, 2025

magento-devops-reposync-svc merged commit 2c0ca5f into magento:2.4-develop Sep 9, 2025
10 of 12 checks passed

ct-prd-projects-boards-automation bot moved this from Merge in Progress to Recently Merged in Community Dashboard Sep 9, 2025

magento/magento2#39861: Shipment email not sent when submitted from Admin Order view despite being enabled in store configuration #39897

magento/magento2#39861: Shipment email not sent when submitted from Admin Order view despite being enabled in store configuration #39897

Uh oh!

Conversation

KrasnoshchokBohdan commented May 8, 2025 • edited by ihor-sviziev Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

Manual testing scenarios (*)

Questions or comments

Contribution checklist (*)

Uh oh!

m2-assistant bot commented May 8, 2025

Uh oh!

KrasnoshchokBohdan commented May 8, 2025

Uh oh!

KrasnoshchokBohdan commented May 8, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

KrasnoshchokBohdan commented May 26, 2025

Uh oh!

engcom-Hotel commented Jul 3, 2025

Uh oh!

engcom-Hotel left a comment

Choose a reason for hiding this comment

Uh oh!

engcom-Hotel commented Jul 15, 2025

Uh oh!

engcom-Bravo commented Jul 22, 2025

Uh oh!

engcom-Bravo commented Jul 22, 2025

✔️ QA Passed

Uh oh!

engcom-Charlie commented Jul 24, 2025

Uh oh!

engcom-Charlie commented Jul 24, 2025

Uh oh!

engcom-Charlie commented Jul 24, 2025

Uh oh!

engcom-Charlie commented Jul 25, 2025

Uh oh!

engcom-Charlie commented Jul 25, 2025

Uh oh!

Uh oh!

Uh oh!

engcom-Hotel commented Aug 6, 2025

Uh oh!

Den4ik left a comment

Choose a reason for hiding this comment

Uh oh!

engcom-Hotel commented Aug 8, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

KrasnoshchokBohdan commented May 8, 2025 •

edited by ihor-sviziev

Loading