Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3830' into PR_2025_06_12_muntianu

Author: katmoon

app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.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\Vault\Model\Ui\Adminhtml;
@@ -200,15 +200,16 @@ public function getTokensComponents($vaultPaymentCode)
         if ($quote) {
             $websiteId = $quote->getStore()->getWebsite()->getId();
         }
-
         $this->searchCriteriaBuilder->addFilters(
             [
                 $this->filterBuilder->setField(PaymentTokenInterface::WEBSITE_ID)
                     ->setValue($websiteId)
                     ->create(),
+                $this->filterBuilder->setField(PaymentTokenInterface::WEBSITE_ID)
+                    ->setConditionType('null')
+                    ->create(),
             ]
         );
-
         $searchCriteria = $this->searchCriteriaBuilder->create();
 
         foreach ($this->paymentTokenRepository->getList($searchCriteria)->getItems() as $token) {

app/code/Magento/Vault/Test/Unit/Model/Ui/Adminhtml/TokensConfigProviderTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -581,10 +581,12 @@ private function createExpectedFilter($field, $value, $atIndex)
             ->method('setField')
             ->with($field)
             ->willReturnSelf();
-        $this->filterBuilder->expects(new MethodInvokedAtIndex($atIndex))
-            ->method('setValue')
-            ->with($value)
-            ->willReturnSelf();
+        if ($value !== null) {
+            $this->filterBuilder->expects(new MethodInvokedAtIndex($atIndex))
+                ->method('setValue')
+                ->with($value)
+                ->willReturnSelf();
+        }
         $this->filterBuilder->expects(new MethodInvokedAtIndex($atIndex))
             ->method('create')
             ->willReturn($filterObject);
@@ -623,11 +625,11 @@ private function getSearchCriteria($customerId, $entityId, $vaultProviderCode)
         );
 
         $isVisibleFilter = $this->createExpectedFilter(PaymentTokenInterface::IS_VISIBLE, 1, 4);
-        $websiteFilter = $this->createExpectedFilter(PaymentTokenInterface::WEBSITE_ID, 1, 5);
+        $websiteFilter1 = $this->createExpectedFilter(PaymentTokenInterface::WEBSITE_ID, 1, 5);
+        $websiteFilter2 = $this->createExpectedFilter(PaymentTokenInterface::WEBSITE_ID, null, 6);
 
-        $this->filterBuilder->expects(static::once())
+        $this->filterBuilder->expects(self::exactly(2))
             ->method('setConditionType')
-            ->with('gt')
             ->willReturnSelf();
 
         $this->searchCriteriaBuilder->expects(self::exactly(6))
@@ -639,7 +641,7 @@ private function getSearchCriteria($customerId, $entityId, $vaultProviderCode)
                     [$expiresAtFilter, $this->searchCriteriaBuilder],
                     [$isActiveFilter, $this->searchCriteriaBuilder],
                     [$isVisibleFilter, $this->searchCriteriaBuilder],
-                    [$websiteFilter, $this->searchCriteriaBuilder],
+                    [[$websiteFilter1, $websiteFilter2], $this->searchCriteriaBuilder],
                 ]
             );