Merge remote-tracking branch 'origin/AC-13917-3' into cia-2.4.9-alpha1-develop-bugfix-04282025

Author: nishant04412

app/code/Magento/Quote/Plugin/ValidateQuoteOrigOrder.php

@@ -1,7 +1,17 @@
 <?php
-/**
- * Copyright 2024 Adobe
+/************************************************************************
+ * Copyright 2025 Adobe
  * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ***********************************************************************
  */
 
 declare(strict_types=1);
@@ -45,10 +55,10 @@ public function beforeSave(
         CartRepositoryInterface $cartRepository,
         CartInterface $quote
     ): void {
-        if ($orderId = $quote->getOrigOrderId()) {
-            $order = $this->orderRepository->get($orderId);
+        if ($quote->getOrigOrderId() && $quote->getCustomerId()) {
+            $order = $this->orderRepository->get((int)$quote->getOrigOrderId());
             $orderCustomer = (int)$order->getCustomerId();
-            if ($quote->getCustomerId() !== $orderCustomer) {
+            if ((int)$quote->getCustomerId() !== $orderCustomer) {
                 throw new NoSuchEntityException(__('Please check input parameters.'));
             }
         }

app/code/Magento/Quote/etc/di.xml

@@ -184,4 +184,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Api\CartRepositoryInterface">
+        <plugin name="quoteValidateOrderId" type="Magento\Quote\Plugin\ValidateQuoteOrigOrder"/>
+    </type>
 </config>

app/code/Magento/Quote/etc/webapi_rest/di.xml

@@ -20,9 +20,6 @@
         <plugin name="updateQuoteStoreId" type="Magento\Quote\Model\Quote\Plugin\UpdateQuoteStoreId" />
         <plugin name="validateQuoteAddress" type="Magento\Quote\Plugin\QuoteAddress" />
     </type>
-    <type name="Magento\Quote\Api\CartRepositoryInterface">
-        <plugin name="quoteValidateOrderId" type="Magento\Quote\Plugin\ValidateQuoteOrigOrder"/>
-    </type>
     <type name="Magento\Quote\Model\QuoteValidator">
         <plugin name="error_redirect_processor" type="Magento\Quote\Plugin\Webapi\Model\ErrorRedirectProcessor" />
     </type>