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

Author: oshmyheliuk

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

@@ -55,6 +55,11 @@ abstract class AbstractConfig implements ConfigInterface
      */
     private $productMetadata;
 
+    /**
+     * @var string
+     */
+    private static $bnCode = 'Magento_Cart_%s';
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
@@ -329,12 +334,7 @@ public function isMethodSupportedForCountry($method = null, $countryCode = null)
      */
     public function getBuildNotationCode()
     {
-        $bnCode = $this->_scopeConfig->getValue(
-            'paypal/bncode',
-            ScopeInterface::SCOPE_STORE,
-            $this->_storeId
-        );
-        return sprintf($bnCode, $this->getProductMetadata()->getEdition());
+        return sprintf(self::$bnCode, $this->getProductMetadata()->getEdition());
     }
 
     /**

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_%s</bncode>
             <style>
                 <logo></logo>
             </style>