Merge pull request #10156 from magento-gl/spartans_pr_27102025

[Spartans] BugFixes Delivery

Author: glo71317

app/code/Magento/Catalog/Model/ProductLink/Repository.php

@@ -139,7 +139,7 @@ public function save(\Magento\Catalog\Api\Data\ProductLinkInterface $entity)
                 . 'Please ensure the parent product SKU is provided and try again.'
             ));
         }
-        if (!$entity->getLinkedProductSku()) {
+        if ($entity->getLinkedProductSku() === null || $entity->getLinkedProductSku() === '') {
             throw new CouldNotSaveException(__('The linked product SKU is invalid. Verify the data and try again.'));
         }
         $linkedProduct = $this->productRepository->get($entity->getLinkedProductSku());

app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php

@@ -298,4 +298,16 @@ public function testDeleteWithNoSuchEntityException()
 
         $this->model->delete($entityMock);
     }
+
+    public function testSaveWithNullLinkedProductSku()
+    {
+        $this->expectException('Magento\Framework\Exception\CouldNotSaveException');
+        $this->expectExceptionMessage('The linked product SKU is invalid. Verify the data and try again.');
+
+        $entityMock = $this->createMock(\Magento\Catalog\Model\ProductLink\Link::class);
+        $entityMock->expects($this->any())->method('getSku')->willReturn('sku1');
+        $entityMock->expects($this->any())->method('getLinkedProductSku')->willReturn(null);
+
+        $this->model->save($entityMock);
+    }
 }

app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Sort/Position.php

@@ -69,6 +69,10 @@ public function build(AttributeAdapter $attribute, string $direction, RequestInt
             $fieldName = $this->fieldNameResolver->getFieldName($attribute);
         }
 
+        if ($fieldName !== '_script') {
+            $sortParams['unmapped_type'] = 'integer';
+        }
+
         return [$fieldName => $sortParams];
     }
 

app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/Sort/PositionTest.php

@@ -60,7 +60,10 @@ public function testBuildWithoutCategoryIds(): void
             ->willReturn('position_category_2');
 
         $result = $this->position->build($attributeMock, 'desc', $requestMock);
-        self::assertEquals(['position_category_2' => ['order' => 'desc']], $result);
+        self::assertEquals(
+            ['position_category_2' => ['order' => 'desc', 'unmapped_type' => 'integer']],
+            $result
+        );
     }
 
     /**
@@ -90,7 +93,10 @@ public function testBuildWithSingleCategoryId(): void
             ->willReturn('position_category_5');
 
         $result = $this->position->build($attributeMock, 'desc', $requestMock);
-        self::assertEquals(['position_category_5' => ['order' => 'desc']], $result);
+        self::assertEquals(
+            ['position_category_5' => ['order' => 'desc', 'unmapped_type' => 'integer']],
+            $result
+        );
     }
 
     /**

app/code/Magento/QuoteGraphQl/Plugin/Quote/ValidatePaymentOnPlaceOrder.php

@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Plugin\Quote;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Payment\Helper\Data as PaymentHelper;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Quote\Model\QuoteManagement;
+
+class ValidatePaymentOnPlaceOrder
+{
+    /**
+     * @param CartRepositoryInterface $cartRepository
+     * @param PaymentHelper $paymentHelper
+     */
+    public function __construct(
+        private CartRepositoryInterface $cartRepository,
+        private PaymentHelper $paymentHelper
+    ) {
+    }
+
+    /**
+     * Validate payment method
+     *
+     * @param QuoteManagement $subject
+     * @param int $cartId
+     * @param PaymentInterface|null $paymentMethod
+     * @return array
+     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforePlaceOrder(
+        QuoteManagement $subject,
+        $cartId,
+        ?PaymentInterface $paymentMethod = null
+    ): array {
+        $quote = $this->cartRepository->getActive((int)$cartId);
+
+        $payment = $quote->getPayment();
+        $code = $paymentMethod?->getMethod() ?: $payment->getMethod();
+
+        if (!$code) {
+            return [$cartId, $paymentMethod];
+        }
+
+        $methodInstance = $this->paymentHelper->getMethodInstance($code);
+        $methodInstance->setInfoInstance($payment);
+
+        if (!$methodInstance->isAvailable($quote)) {
+            throw new LocalizedException(__('The requested Payment Method is not available.'));
+        }
+
+        return [$cartId, $paymentMethod];
+    }
+}

app/code/Magento/QuoteGraphQl/Plugin/ShippingMethodValidationRulePlugin.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Plugin;
+
+use Magento\Quote\Model\ValidationRules\ShippingMethodValidationRule;
+use Magento\Quote\Model\Quote;
+use Magento\Framework\Validation\ValidationResult;
+use Magento\Framework\Validation\ValidationResultFactory;
+
+class ShippingMethodValidationRulePlugin
+{
+    /**
+     * @var ValidationResultFactory
+     */
+    private $validationResultFactory;
+
+    /**
+     * @param ValidationResultFactory $validationResultFactory
+     */
+    public function __construct(ValidationResultFactory $validationResultFactory)
+    {
+        $this->validationResultFactory = $validationResultFactory;
+    }
+
+    /**
+     * After plugin for validate method to ensure shipping method validity.
+     *
+     * @param ShippingMethodValidationRule $subject
+     * @param ValidationResult[] $result
+     * @param Quote $quote
+     * @return ValidationResult[]
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterValidate(
+        ShippingMethodValidationRule $subject,
+        array $result,
+        Quote $quote
+    ): array {
+        $shippingAddress = $quote->getShippingAddress();
+        if (!$shippingAddress || $quote->isVirtual()) {
+            return $result;
+        }
+
+        $shippingMethod = $shippingAddress->getShippingMethod();
+        $shippingRate = $shippingMethod ? $shippingAddress->getShippingRateByCode($shippingMethod) : null;
+        $validationResult = $shippingMethod && $shippingRate && $shippingAddress->requestShippingRates();
+
+        if ($validationResult) {
+            return $result;
+        }
+
+        $existing = $result[0] ?? null;
+        if ($existing instanceof ValidationResult && $existing->isValid()) {
+            $result[0] = $this->validationResultFactory->create([
+                'errors' => [__('The shipping method is missing. Select the shipping method and try again')]
+            ]);
+        }
+
+        return $result;
+    }
+}