MC-41710: Build URL to paypal SDK

- Fix CR notes

Author: xmav

app/code/Magento/Paypal/Block/PayLater/Banner.php

@@ -87,8 +87,8 @@ private function getPayPalSdkUrl()
     private function getStyleAttributesConfig()
     {
         return array_replace(
-            ['data-pp-style-logo-position' => 'center'],
-            $this->payLaterConfig->getStyleConfig($this->placement)
+            ['data-pp-style-logo-position' => 'left'],
+            $this->payLaterConfig->getSectionConfig($this->placement, PayLaterConfig::CONFIG_KEY_STYLES)
         );
     }
 
@@ -100,6 +100,8 @@ private function getStyleAttributesConfig()
     private function isEnabled()
     {
         $enabled = $this->payLaterConfig->isEnabled($this->placement);
-        return $enabled && $this->payLaterConfig->getPositionConfig($this->placement) == $this->position;
+        return $enabled &&
+            $this->payLaterConfig->getSectionConfig($this->placement, PayLaterConfig::CONFIG_KEY_POSITION) ==
+                $this->position;
     }
 }

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

@@ -18,7 +18,15 @@
  */
 class PayLaterConfig
 {
-    const PLACEMENT_PRODUCT = 'product';
+    /**
+     * Configuration key for Styles settings
+     */
+    const CONFIG_KEY_STYLES = 'styles';
+
+    /**
+     * Configuration key for Position setting
+     */
+    const CONFIG_KEY_POSITION = 'position';
 
     /**
      * @var ScopeConfigInterface
@@ -34,27 +42,6 @@ public function __construct(
         $this->scopeConfig = $scopeConfig;
     }
 
-    /**
-     * Get configured styles for specified page
-     *
-     * @return array
-     */
-    public function getStyleConfig(string $placement): array
-    {
-        return $this->getSectionConfig($placement, 'style') ?? [];
-    }
-
-    /**
-     * Get configured Banner position on specified page
-     *
-     * @param string $placement
-     * @return mixed|string
-     */
-    public function getPositionConfig(string $placement)
-    {
-        return $this->getSectionConfig($placement, 'position') ?? '';
-    }
-
     /**
      * Check if Banner enabled for specified page
      *
@@ -67,10 +54,17 @@ public function isEnabled(string $placement)
         return $isPayLaterEnabled && $this->getSectionConfig($placement, 'display');
     }
 
-    private function getSectionConfig($section, $key)
+    /**
+     * Get config for a specific section and key
+     *
+     * @param string $section
+     * @param string $key
+     * @return array|mixed
+     */
+    public function getSectionConfig($section, $key)
     {
         $configMock = [
-            self::PLACEMENT_PRODUCT => [
+            'product' => [
                 'display' => 1,
                 'position' => 'header', // 'sidebar'
                 'style' => [

app/code/Magento/Paypal/Plugin/CheckoutIndex.php

@@ -9,6 +9,7 @@
 
 use Magento\Checkout\Controller\Index\Index;
 use Magento\Paypal\Model\Config;
+use Magento\Paypal\Model\ConfigFactory;
 use Magento\Paypal\Model\SdkUrl;
 
 /**
@@ -25,19 +26,18 @@ class CheckoutIndex
     /**
      * @var Config
      */
-    private $config;
+    private $configFactory;
 
     /**
      * @param SdkUrl $sdkUrl
      * @param Config $config
      */
     public function __construct(
         SdkUrl $sdkUrl,
-        Config $config
+        ConfigFactory $config
     ) {
         $this->sdkUrl = $sdkUrl;
-        $this->config = $config;
-        $this->config->setMethod(Config::METHOD_EXPRESS);
+        $this->configFactory = $config;
     }
 
     /**
@@ -50,7 +50,8 @@ public function __construct(
     public function beforeExecute(Index $subject)
     {
         // Check If PP SmartButtons enabled
-        if ((bool)(int) $this->config->getValue('in_context')) {
+        $config = $this->configFactory->create()->setMethod(Config::METHOD_EXPRESS);
+        if ((bool)(int) $config->getValue('in_context')) {
             $this->sdkUrl->setQueryParam('commit', 'true');
         }