Skip to content

Commit f1c7064

Browse files
committed
Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3830' into PR_2025_06_12_muntianu
2 parents bcf7cd7 + 1e41ddf commit f1c7064

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66

77
namespace Magento\Vault\Model\Ui\Adminhtml;
@@ -200,15 +200,16 @@ public function getTokensComponents($vaultPaymentCode)
200200
if ($quote) {
201201
$websiteId = $quote->getStore()->getWebsite()->getId();
202202
}
203-
204203
$this->searchCriteriaBuilder->addFilters(
205204
[
206205
$this->filterBuilder->setField(PaymentTokenInterface::WEBSITE_ID)
207206
->setValue($websiteId)
208207
->create(),
208+
$this->filterBuilder->setField(PaymentTokenInterface::WEBSITE_ID)
209+
->setConditionType('null')
210+
->create(),
209211
]
210212
);
211-
212213
$searchCriteria = $this->searchCriteriaBuilder->create();
213214

214215
foreach ($this->paymentTokenRepository->getList($searchCriteria)->getItems() as $token) {

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -581,10 +581,12 @@ private function createExpectedFilter($field, $value, $atIndex)
581581
->method('setField')
582582
->with($field)
583583
->willReturnSelf();
584-
$this->filterBuilder->expects(new MethodInvokedAtIndex($atIndex))
585-
->method('setValue')
586-
->with($value)
587-
->willReturnSelf();
584+
if ($value !== null) {
585+
$this->filterBuilder->expects(new MethodInvokedAtIndex($atIndex))
586+
->method('setValue')
587+
->with($value)
588+
->willReturnSelf();
589+
}
588590
$this->filterBuilder->expects(new MethodInvokedAtIndex($atIndex))
589591
->method('create')
590592
->willReturn($filterObject);
@@ -623,11 +625,11 @@ private function getSearchCriteria($customerId, $entityId, $vaultProviderCode)
623625
);
624626

625627
$isVisibleFilter = $this->createExpectedFilter(PaymentTokenInterface::IS_VISIBLE, 1, 4);
626-
$websiteFilter = $this->createExpectedFilter(PaymentTokenInterface::WEBSITE_ID, 1, 5);
628+
$websiteFilter1 = $this->createExpectedFilter(PaymentTokenInterface::WEBSITE_ID, 1, 5);
629+
$websiteFilter2 = $this->createExpectedFilter(PaymentTokenInterface::WEBSITE_ID, null, 6);
627630

628-
$this->filterBuilder->expects(static::once())
631+
$this->filterBuilder->expects(self::exactly(2))
629632
->method('setConditionType')
630-
->with('gt')
631633
->willReturnSelf();
632634

633635
$this->searchCriteriaBuilder->expects(self::exactly(6))
@@ -639,7 +641,7 @@ private function getSearchCriteria($customerId, $entityId, $vaultProviderCode)
639641
[$expiresAtFilter, $this->searchCriteriaBuilder],
640642
[$isActiveFilter, $this->searchCriteriaBuilder],
641643
[$isVisibleFilter, $this->searchCriteriaBuilder],
642-
[$websiteFilter, $this->searchCriteriaBuilder],
644+
[[$websiteFilter1, $websiteFilter2], $this->searchCriteriaBuilder],
643645
]
644646
);
645647

0 commit comments

Comments
 (0)