Merge remote-tracking branch 'origin/MAGETWO-53714' into MPI-BUGFIXES

Author: viktym

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

@@ -5,10 +5,12 @@
  */
 namespace Magento\Paypal\Model;
 
+use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Payment\Model\Method\ConfigInterface;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Paypal\Model\Config;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class AbstractConfig
@@ -49,6 +51,16 @@ abstract class AbstractConfig implements ConfigInterface
      */
     protected $pathPattern;
 
+    /**
+     * @var ProductMetadataInterface
+     */
+    protected $productMetadata;
+
+    /**
+     * @var string
+     */
+    private static $bnCode = 'Magento_Cart_%s';
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
@@ -323,10 +335,20 @@ public function isMethodSupportedForCountry($method = null, $countryCode = null)
      */
     public function getBuildNotationCode()
     {
-        return $this->_scopeConfig->getValue(
-            'paypal/bncode',
-            ScopeInterface::SCOPE_STORE,
-            $this->_storeId
-        );
+        return sprintf(self::$bnCode, $this->getProductMetadata()->getEdition());
+    }
+
+    /**
+     * The getter function to get the ProductMetadata
+     *
+     * @return ProductMetadataInterface
+     * @deprecated
+     */
+    protected function getProductMetadata()
+    {
+        if ($this->productMetadata === null) {
+            $this->productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
+        }
+        return $this->productMetadata;
     }
 }

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

@@ -623,7 +623,7 @@ public function buildBasicRequest()
         $request->setPartner($this->getConfigData('partner'));
         $request->setPwd($this->getConfigData('pwd'));
         $request->setVerbosity($this->getConfigData('verbosity'));
-        $request->setData('BNCODE', $config->getBuildNotationCode());
+        $request->setData('BUTTONSOURCE', $config->getBuildNotationCode());
         $request->setTender(self::TENDER_CC);
 
         return $request;

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

@@ -8,6 +8,8 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface as ModelScopeInterface;
 use Magento\Payment\Model\MethodInterface;
+use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * Class AbstractConfigTest
@@ -290,10 +292,18 @@ public function testIsMethodActive()
 
     public function testGetBuildNotationCode()
     {
-        $this->scopeConfigMock->expects($this->once())
-            ->method('getValue')
-            ->with('paypal/bncode');
+        $productMetadata = $this->getMock(ProductMetadataInterface::class, [], [], '', false);
+        $productMetadata->expects($this->once())
+            ->method('getEdition')
+            ->will($this->returnValue('SomeEdition'));
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $objectManagerHelper->setBackwardCompatibleProperty(
+            $this->config,
+            'productMetadata',
+            $productMetadata
+        );
 
-        $this->config->getBuildNotationCode();
+        $this->assertEquals('Magento_Cart_SomeEdition', $this->config->getBuildNotationCode());
     }
 }

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

@@ -99,17 +99,6 @@ public function testGetCountryMethods()
         $this->assertNotContains(Config::METHOD_WPP_BML, $this->model->getCountryMethods('DE'));
     }
 
-    public function testGetBuildNotationCode()
-    {
-        $this->model->setMethod('payflow_direct');
-        $this->model->setStoreId(123);
-        $this->scopeConfig->expects($this->once())
-            ->method('getValue')
-            ->with('paypal/bncode', ScopeInterface::SCOPE_STORE, 123)
-            ->will($this->returnValue('some BN code'));
-        $this->assertEquals('some BN code', $this->model->getBuildNotationCode());
-    }
-
     public function testIsMethodActive()
     {
         $this->assertFalse($this->model->isMethodActive('payflow_direct'));

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

@@ -146,7 +146,7 @@ public function testInitialize()
                         'partner' => null,
                         'pwd' => null,
                         'verbosity' => null,
-                        'BNCODE' => 'build notation code',
+                        'BUTTONSOURCE' => 'build notation code',
                         'tender' => 'C',
                     ],
                     $this->returnSelf()

app/code/Magento/Paypal/etc/config.xml

@@ -8,7 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
         <paypal>
-            <bncode>Magento_Cart_Community</bncode>
             <style>
                 <logo></logo>
             </style>