MAGETWO-53714: BNCODE is not send in PayPal solutions properly for CE and EE

Author: oshmyheliuk

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

@@ -5,6 +5,7 @@
  */
 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;
@@ -49,6 +50,11 @@ abstract class AbstractConfig implements ConfigInterface
      */
     protected $pathPattern;
 
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadata;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
@@ -323,10 +329,25 @@ public function isMethodSupportedForCountry($method = null, $countryCode = null)
      */
     public function getBuildNotationCode()
     {
-        return $this->_scopeConfig->getValue(
+        $bnCode = $this->_scopeConfig->getValue(
             'paypal/bncode',
             ScopeInterface::SCOPE_STORE,
             $this->_storeId
         );
+        return sprintf($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/etc/config.xml

@@ -8,7 +8,7 @@
 <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>
+            <bncode>Magento_Cart_%s</bncode>
             <style>
                 <logo></logo>
             </style>