Merge remote-tracking branch 'gl_magento2ce/AC-1228' into AC-1228

Author: rimple-saini

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

@@ -12,6 +12,7 @@
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Paypal\Model\Config as PaypalConfig;
 
 /**
  * Provides configuration values for PayPal in-context checkout
@@ -43,18 +44,25 @@ class SmartButtonConfig
      */
     private $sdkUrl;
 
+    /**
+     * @var PaypalConfig
+     */
+    private $paypalConfig;
+
     /**
      * @param ResolverInterface $localeResolver
      * @param ConfigFactory $configFactory
      * @param ScopeConfigInterface $scopeConfig
      * @param SdkUrl $sdkUrl
+     * @param PaypalConfig $paypalConfig
      * @param array $defaultStyles
      */
     public function __construct(
         ResolverInterface $localeResolver,
         ConfigFactory $configFactory,
         ScopeConfigInterface $scopeConfig,
         SdkUrl $sdkUrl,
+        PaypalConfig $paypalConfig,
         $defaultStyles = []
     ) {
         $this->localeResolver = $localeResolver;
@@ -63,6 +71,7 @@ public function __construct(
         $this->scopeConfig = $scopeConfig;
         $this->defaultStyles = $defaultStyles;
         $this->sdkUrl = $sdkUrl;
+        $this->paypalConfig = $paypalConfig;
     }
 
     /**
@@ -81,7 +90,10 @@ public function getConfig(string $page): array
             'styles' => $this->getButtonStyles($page),
             'isVisibleOnProductPage'  => (bool)$this->config->getValue('visible_on_product'),
             'isGuestCheckoutAllowed'  => $isGuestCheckoutAllowed,
-            'sdkUrl' => $this->sdkUrl->getUrl()
+            'sdkUrl' => $this->sdkUrl->getUrl(),
+            'dataAttributes' => [
+                'data-partner-attribution-id' => $this->paypalConfig->getBuildNotationCode()
+            ]
         ];
     }
 

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

@@ -42,8 +42,8 @@ class SmartButtonConfigTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->localeResolverMock = $this->getMockForAbstractClass(ResolverInterface::class);
-        $this->configMock = $this->getMockBuilder(Config::class)
+        $this->localeResolverMock   = $this->getMockForAbstractClass(ResolverInterface::class);
+        $this->configMock           = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -67,7 +67,8 @@ protected function setUp(): void
             $configFactoryMock,
             $scopeConfigMock,
             $sdkUrl,
-            $this->getDefaultStyles(),
+            $this->configMock,
+            $this->getDefaultStyles()
         );
     }
 

app/code/Magento/Paypal/Test/Unit/Model/_files/expected_style_config.php

@@ -27,7 +27,10 @@
             ],
             'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true,
-            'sdkUrl' => 'http://mock.url'
+            'sdkUrl' => 'http://mock.url',
+            'dataAttributes' => [
+                'data-partner-attribution-id' => ''
+            ]
         ]
     ],
     'checkout' => [
@@ -51,7 +54,10 @@
             ],
             'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true,
-            'sdkUrl' => 'http://mock.url'
+            'sdkUrl' => 'http://mock.url',
+            'dataAttributes' => [
+                'data-partner-attribution-id' => ''
+            ]
         ]
     ],
     'mini_cart' => [
@@ -74,7 +80,10 @@
             ],
             'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true,
-            'sdkUrl' => 'http://mock.url'
+            'sdkUrl' => 'http://mock.url',
+            'dataAttributes' => [
+                'data-partner-attribution-id' => ''
+            ]
         ]
     ],
     'product' => [
@@ -97,7 +106,10 @@
             ],
             'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true,
-            'sdkUrl' => 'http://mock.url'
+            'sdkUrl' => 'http://mock.url',
+            'dataAttributes' => [
+                'data-partner-attribution-id' => ''
+            ]
         ]
     ],
 ];

app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js

@@ -64,7 +64,7 @@ define([
     }
 
     return function (clientConfig, element) {
-        paypalSdk(clientConfig.sdkUrl).done(function (paypal) {
+        paypalSdk(clientConfig.sdkUrl, clientConfig.dataAttributes).done(function (paypal) {
             paypal.Buttons({
                 style: clientConfig.styles,
 

app/code/Magento/Paypal/view/frontend/web/js/in-context/paypal-sdk.js

@@ -12,8 +12,9 @@ define([
     /**
      * Loads the PayPal SDK object
      * @param {String} paypalUrl - the url of the PayPal SDK
+     * @param {Array} dataAttributes - Array of the Attributes for PayPal SDK Script tag
      */
-    return function loadPaypalScript(paypalUrl) {
+    return function loadPaypalScript(paypalUrl, dataAttributes) {
         //configuration for loaded PayPal script
         require.config({
             paths: {
@@ -23,6 +24,15 @@ define([
                 paypalSdk: {
                     exports: 'paypal'
                 }
+            },
+
+            /**
+             * Add attributes under Paypal SDK Script tag
+             */
+            onNodeCreated: function (node) {
+                $.each(dataAttributes, function (index, elem) {
+                    node.setAttribute(index, elem);
+                });
             }
         });