Skip to content

Commit c1112a3

Browse files
committed
ACP2E-862: Cash on Delivery method is visible even if it is not allowed for that particular country
1 parent 7e765a9 commit c1112a3

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

app/code/Magento/Tax/Model/TaxConfigProvider.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use Magento\Checkout\Model\ConfigProviderInterface;
99
use Magento\Tax\Helper\Data as TaxHelper;
1010
use Magento\Framework\App\Config\ScopeConfigInterface;
11-
use Magento\Checkout\Model\Session as CheckoutSession;
1211

1312
class TaxConfigProvider implements ConfigProviderInterface
1413
{
@@ -27,26 +26,18 @@ class TaxConfigProvider implements ConfigProviderInterface
2726
*/
2827
protected $scopeConfig;
2928

30-
/**
31-
* @var CheckoutSession
32-
*/
33-
protected $checkoutSession;
34-
3529
/**
3630
* @param TaxHelper $taxHelper
3731
* @param Config $taxConfig
38-
* @param CheckoutSession $checkoutSession
3932
* @param ScopeConfigInterface $scopeConfig
4033
*/
4134
public function __construct(
4235
TaxHelper $taxHelper,
4336
Config $taxConfig,
44-
CheckoutSession $checkoutSession,
4537
ScopeConfigInterface $scopeConfig
4638
) {
4739
$this->taxHelper = $taxHelper;
4840
$this->taxConfig = $taxConfig;
49-
$this->checkoutSession = $checkoutSession;
5041
$this->scopeConfig = $scopeConfig;
5142
}
5243

app/code/Magento/Tax/Test/Unit/Model/TaxConfigProviderTest.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
namespace Magento\Tax\Test\Unit\Model;
99

10-
use Magento\Checkout\Model\Session;
1110
use Magento\Framework\App\Config\ScopeConfigInterface;
1211
use Magento\Quote\Model\Quote;
1312
use Magento\Store\Model\ScopeInterface;
@@ -29,11 +28,6 @@ class TaxConfigProviderTest extends TestCase
2928
*/
3029
protected $taxConfigMock;
3130

32-
/**
33-
* @var MockObject
34-
*/
35-
protected $checkoutSessionMock;
36-
3731
/**
3832
* @var MockObject
3933
*/
@@ -53,14 +47,11 @@ protected function setUp(): void
5347
{
5448
$this->taxHelperMock = $this->createMock(Data::class);
5549
$this->taxConfigMock = $this->createMock(Config::class);
56-
$this->checkoutSessionMock = $this->createMock(Session::class);
5750
$this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
5851
$this->quoteMock = $this->createMock(Quote::class);
59-
$this->checkoutSessionMock->expects($this->any())->method('getQuote')->willReturn($this->quoteMock);
6052
$this->model = new TaxConfigProvider(
6153
$this->taxHelperMock,
6254
$this->taxConfigMock,
63-
$this->checkoutSessionMock,
6455
$this->scopeConfigMock
6556
);
6657
}

0 commit comments

Comments
 (0)