From e8a4ae451a7efd027f187f1baabb03220309d927 Mon Sep 17 00:00:00 2001
From: KrasnoshchokBohdan <krasnoshchok.bohdan@gmail.com>
Date: Thu, 8 May 2025 15:32:50 +0300
Subject: [PATCH 1/3] magento/magento2#39861: Shipment email not sent when
 submitted from Admin Order view despite being enabled in store configuration

- adding storeId to canSendNewShipmentEmail method
---
 .../Shipping/Controller/Adminhtml/Order/Shipment/Save.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index 122ae505498ae..04757e22abfae 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -167,7 +167,8 @@ public function execute()
 
             $this->_saveShipment($shipment);
 
-            if (!empty($data['send_email']) && $this->salesData->canSendNewShipmentEmail()) {
+            if (!empty($data['send_email'])
+                && $this->salesData->canSendNewShipmentEmail($shipment->getOrder()->getStoreId())) {
                 $this->shipmentSender->send($shipment);
             }
 

From 97239feccdf2066d81ff173384addf6536646089 Mon Sep 17 00:00:00 2001
From: KrasnoshchokBohdan <krasnoshchok.bohdan@gmail.com>
Date: Thu, 8 May 2025 19:11:54 +0300
Subject: [PATCH 2/3] magento/magento2#39861: Shipment email not sent when
 submitted from Admin Order view despite being enabled in store configuration

- copyright
---
 .../Shipping/Controller/Adminhtml/Order/Shipment/Save.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index 04757e22abfae..0d871ac86ae79 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;

From 9a490525f97fdf0daa6b4eb88a0ee85f30936c7d Mon Sep 17 00:00:00 2001
From: KrasnoshchokBohdan
 <111579196+KrasnoshchokBohdan@users.noreply.github.com>
Date: Mon, 26 May 2025 12:03:39 +0300
Subject: [PATCH 3/3] Update Save.php

add comment
---
 .../Shipping/Controller/Adminhtml/Order/Shipment/Save.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index 0d871ac86ae79..4e279aaf04939 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -167,6 +167,7 @@ public function execute()
 
             $this->_saveShipment($shipment);
 
+            // Pass the specific store ID from the order to check if shipment emails are enabled for that store
             if (!empty($data['send_email'])
                 && $this->salesData->canSendNewShipmentEmail($shipment->getOrder()->getStoreId())) {
                 $this->shipmentSender->send($shipment);