Skip to content

Commit 9e9fec6

Browse files
committed
AC-1228::BN Code for all Paypal methods
1 parent d016e79 commit 9e9fec6

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

app/code/Magento/Paypal/Model/SmartButtonConfig.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use Magento\Framework\Locale\ResolverInterface;
1313
use Magento\Store\Model\ScopeInterface;
1414
use Magento\Store\Model\StoreManagerInterface;
15-
use Magento\Paypal\Model\Payflowpro;
15+
use Magento\Paypal\Model\Config as PaypalConfig;
1616

1717
/**
1818
* Provides configuration values for PayPal in-context checkout
@@ -45,24 +45,24 @@ class SmartButtonConfig
4545
private $sdkUrl;
4646

4747
/**
48-
* @var Payflowpro
48+
* @var PaypalConfig
4949
*/
50-
private $payflowpro;
50+
private $paypalConfig;
5151

5252
/**
5353
* @param ResolverInterface $localeResolver
5454
* @param ConfigFactory $configFactory
5555
* @param ScopeConfigInterface $scopeConfig
5656
* @param SdkUrl $sdkUrl
57-
* @param Payflowpro $payflowpro
57+
* @param PaypalConfig $paypalConfig
5858
* @param array $defaultStyles
5959
*/
6060
public function __construct(
6161
ResolverInterface $localeResolver,
6262
ConfigFactory $configFactory,
6363
ScopeConfigInterface $scopeConfig,
6464
SdkUrl $sdkUrl,
65-
Payflowpro $payflowpro,
65+
PaypalConfig $paypalConfig,
6666
$defaultStyles = []
6767
) {
6868
$this->localeResolver = $localeResolver;
@@ -71,7 +71,7 @@ public function __construct(
7171
$this->scopeConfig = $scopeConfig;
7272
$this->defaultStyles = $defaultStyles;
7373
$this->sdkUrl = $sdkUrl;
74-
$this->payflowpro = $payflowpro;
74+
$this->paypalConfig = $paypalConfig;
7575
}
7676

7777
/**
@@ -86,14 +86,13 @@ public function getConfig(string $page): array
8686
Data::XML_PATH_GUEST_CHECKOUT,
8787
ScopeInterface::SCOPE_STORE
8888
);
89-
$config = $this->payflowpro->getConfig();
9089
return [
9190
'styles' => $this->getButtonStyles($page),
9291
'isVisibleOnProductPage' => (bool)$this->config->getValue('visible_on_product'),
9392
'isGuestCheckoutAllowed' => $isGuestCheckoutAllowed,
9493
'sdkUrl' => $this->sdkUrl->getUrl(),
9594
'dataAttributes' => [
96-
'data-partner-attribution-id' => ($config) ? $config->getBuildNotationCode() : ''
95+
'data-partner-attribution-id' => $this->paypalConfig->getBuildNotationCode()
9796
]
9897
];
9998
}

app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Magento\Store\Model\StoreManagerInterface;
1717
use PHPUnit\Framework\MockObject\MockObject;
1818
use PHPUnit\Framework\TestCase;
19-
use Magento\Paypal\Model\Payflowpro;
2019

2120
/**
2221
* Test for smart button config
@@ -38,11 +37,6 @@ class SmartButtonConfigTest extends TestCase
3837
*/
3938
private $configMock;
4039

41-
/**
42-
* @var MockObject
43-
*/
44-
private $payflowproMock;
45-
4640
/**
4741
* @inheritDoc
4842
*/
@@ -52,7 +46,6 @@ protected function setUp(): void
5246
$this->configMock = $this->getMockBuilder(Config::class)
5347
->disableOriginalConstructor()
5448
->getMock();
55-
$this->payflowproMock = $this->createMock(Payflowpro::class);
5649

5750
/** @var ScopeConfigInterface|MockObject $scopeConfigMock */
5851
$scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
@@ -74,7 +67,7 @@ protected function setUp(): void
7467
$configFactoryMock,
7568
$scopeConfigMock,
7669
$sdkUrl,
77-
$this->payflowproMock,
70+
$this->configMock,
7871
$this->getDefaultStyles()
7972
);
8073
}

0 commit comments

Comments
 (0)