Merge remote-tracking branch 'origin/AC-15074' into spartans_pr_29082025

Author: glo60612

app/code/Magento/Sales/Model/Order.php

@@ -4703,12 +4703,12 @@ private function isVisibleCustomerMiddlename(): bool
      */
     private function isVisibleCustomerPrefix(): bool
     {
-        $prefixShowValue = $this->scopeConfig->getValue(
+        $value = $this->scopeConfig->getValue(
             'customer/address/prefix_show',
             ScopeInterface::SCOPE_STORE
         );
 
-        return $prefixShowValue !== Nooptreq::VALUE_NO;
+        return in_array($value, [Nooptreq::VALUE_OPTIONAL, Nooptreq::VALUE_REQUIRED], true);
     }
 
     /**
@@ -4718,12 +4718,12 @@ private function isVisibleCustomerPrefix(): bool
      */
     private function isVisibleCustomerSuffix(): bool
     {
-        $prefixShowValue = $this->scopeConfig->getValue(
+        $value = $this->scopeConfig->getValue(
             'customer/address/suffix_show',
             ScopeInterface::SCOPE_STORE
         );
 
-        return $prefixShowValue !== Nooptreq::VALUE_NO;
+        return in_array($value, [Nooptreq::VALUE_OPTIONAL, Nooptreq::VALUE_REQUIRED], true);
     }
 
     //@codeCoverageIgnoreEnd

app/code/Magento/Sales/Test/Unit/Model/OrderTest.php

@@ -40,6 +40,7 @@
 use Magento\Sales\Model\ResourceModel\Order\Status\History\CollectionFactory as HistoryCollectionFactory;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Config\Model\Config\Source\Nooptreq;
 
 /**
  * Test class for \Magento\Sales\Model\Order
@@ -439,6 +440,14 @@ public function testGetCustomerName(array $expectedData)
         $this->order->setCustomerMiddlename($expectedData['middle_name']);
         $this->order->setCustomerSuffix($expectedData['customer_suffix']);
         $this->order->setCustomerPrefix($expectedData['customer_prefix']);
+        // Ensure prefix/suffix are visible to match expected strings.
+        $this->scopeConfigMock->method('getValue')->willReturnCallback(function ($path) {
+            if ($path === 'customer/address/prefix_show' || $path === 'customer/address/suffix_show') {
+                return Nooptreq::VALUE_REQUIRED;
+            }
+            return null;
+        });
+
         $this->scopeConfigMock->expects($this->exactly($expectedData['invocation']))
             ->method('isSetFlag')
             ->willReturn(true);

dev/tests/integration/testsuite/Magento/Sales/Model/OrderPrefixSuffixVisibilityTest.php

@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model;
+
+use Magento\Config\Model\Config\Source\Nooptreq;
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests visibility of customer prefix/suffix via Order::getCustomerName(),
+ * covering null (unset), empty string, optional and required config values.
+ *
+ * @magentoDbIsolation enabled
+ */
+class OrderPrefixSuffixVisibilityTest extends TestCase
+{
+    private const XML_PATH_PREFIX_SHOW = 'customer/address/prefix_show';
+    private const XML_PATH_SUFFIX_SHOW = 'customer/address/suffix_show';
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private ObjectManagerInterface $om;
+
+    protected function setUp(): void
+    {
+        $this->om = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @dataProvider visibilityCases
+     */
+    public function testPrefixVisibility(?string $value, bool $setValue, bool $expectedVisible): void
+    {
+        // Ensure suffix never interferes in this test
+        $this->setConfig(self::XML_PATH_SUFFIX_SHOW, Nooptreq::VALUE_NO);
+
+        if ($setValue) {
+            $this->setConfig(self::XML_PATH_PREFIX_SHOW, $value);
+        }
+        // If not set, path remains unset (null), simulating the reported case.
+
+        $order = $this->makeOrder('Dr', 'John', 'Doe', 'Jr'); // suffix ignored here
+        $expected = $expectedVisible ? 'Dr John Doe' : 'John Doe';
+
+        $this->assertSame($expected, $order->getCustomerName());
+    }
+
+    /**
+     * @dataProvider visibilityCases
+     */
+    public function testSuffixVisibility(?string $value, bool $setValue, bool $expectedVisible): void
+    {
+        // Ensure prefix never interferes in this test
+        $this->setConfig(self::XML_PATH_PREFIX_SHOW, Nooptreq::VALUE_NO);
+
+        if ($setValue) {
+            $this->setConfig(self::XML_PATH_SUFFIX_SHOW, $value);
+        }
+        // If not set, path remains unset (null), simulating the reported case.
+
+        $order = $this->makeOrder('Dr', 'John', 'Doe', 'Jr'); // prefix ignored here
+        $expected = $expectedVisible ? 'John Doe Jr' : 'John Doe';
+
+        $this->assertSame($expected, $order->getCustomerName());
+    }
+
+    public static function visibilityCases(): array
+    {
+        return [
+            // value, setValue, expectedVisible
+            'unset_null_defaults_to_no' => [null, false, false], // path not set → null
+            'explicit_empty_string_no'  => [Nooptreq::VALUE_NO, true, false], // ''
+            'optional_visible'          => [Nooptreq::VALUE_OPTIONAL, true, true], // 'opt'
+            'required_visible'          => [Nooptreq::VALUE_REQUIRED, true, true], // 'req'
+        ];
+    }
+
+    private function makeOrder(string $prefix, string $first, string $last, string $suffix): Order
+    {
+        /** @var Order $order */
+        $order = $this->om->create(Order::class);
+        $order->setCustomerPrefix($prefix);
+        $order->setCustomerFirstname($first);
+        $order->setCustomerLastname($last);
+        $order->setCustomerSuffix($suffix);
+        // Middlename left null to avoid affecting formatting.
+        return $order;
+    }
+
+    private function setConfig(
+        string $path,
+        ?string $value,
+        string $scope = ScopeInterface::SCOPE_STORE,
+        string $scopeCode = 'default'
+    ): void {
+        $this->om->get(MutableScopeConfigInterface::class)->setValue($path, $value, $scope, $scopeCode);
+    }
+}