Merge pull request #286 from magento-mpi/MPI-bugfixes

Fixed issues: - MAGETWO-56344: [Github] #5902 Braintree doesn't work when using table prefixing - MAGETWO-55953: Exception occurs when tracking shipment with invalid FedEx tracking number - MAGETWO-56801: [GITHUB] Fixed column description for "website_id" column #4388 - MAGETWO-56745: [Github] PayPal Express Checkout "Display on Shopping Cart -> NO" does not work - MAGETWO-56467: Free shipping threshold fields are mixed up in UPS and Fedex configurations - MAGETWO-56342: [Github] #5910 Braintree sandbox errors when using alternative Merchant Account ID - MAGETWO-56115: [Github] #5857 Impossible to configure custom availability gateway validator - MAGETWO-54134: CE module depends on EE code - MAGETWO-56447: UPS not providing shipping rates for Puerto Rico
magento · Aug 26, 2016 · 8744435 · 8744435
2 parents 661a3a9 + 2653330
commit 8744435
Show file tree

Hide file tree

Showing 33 changed files with 2,230 additions and 858 deletions.
diff --git a/app/code/Magento/Braintree/Gateway/Config/Config.php b/app/code/Magento/Braintree/Gateway/Config/Config.php
@@ -193,4 +193,14 @@ public function getDynamicDescriptors()
         }
         return $values;
     }
+
+    /**
+     * Get Merchant account ID
+     *
+     * @return string
+     */
+    public function getMerchantAccountId()
+    {
+        return $this->getValue(self::KEY_MERCHANT_ACCOUNT_ID);
+    }
 }
diff --git a/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
@@ -87,7 +87,7 @@ public function build(array $buildSubject)
             self::ORDER_ID => $order->getOrderIncrementId()
         ];
 
-        $merchantAccountId = $this->config->getValue(Config::KEY_MERCHANT_ACCOUNT_ID);
+        $merchantAccountId = $this->config->getMerchantAccountId();
         if (!empty($merchantAccountId)) {
             $result[self::MERCHANT_ACCOUNT_ID] = $merchantAccountId;
         }

diff --git a/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Braintree\Model\Ui;
 
+use Magento\Braintree\Gateway\Request\PaymentDataBuilder;
 use Magento\Checkout\Model\ConfigProviderInterface;
 use Magento\Braintree\Gateway\Config\Config;
 use Magento\Braintree\Model\Adapter\BraintreeAdapter;
@@ -86,7 +87,14 @@ public function getConfig()
     public function getClientToken()
     {
         if (empty($this->clientToken)) {
-            $this->clientToken = $this->adapter->generate();
+            $params = [];
+
+            $merchantAccountId = $this->config->getMerchantAccountId();
+            if (!empty($merchantAccountId)) {
+                $params[PaymentDataBuilder::MERCHANT_ACCOUNT_ID] = $merchantAccountId;
+            }
+
+            $this->clientToken = $this->adapter->generate($params);
         }
 
         return $this->clientToken;

diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
@@ -133,8 +133,7 @@ public function testBuild()
             ->willReturnMap($additionalData);
 
         $this->configMock->expects(static::once())
-            ->method('getValue')
-            ->with(Config::KEY_MERCHANT_ACCOUNT_ID)
+            ->method('getMerchantAccountId')
             ->willReturn(self::MERCHANT_ACCOUNT_ID);
 
         $this->paymentDO->expects(static::once())

diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
@@ -18,8 +18,8 @@
 class ConfigProviderTest extends \PHPUnit_Framework_TestCase
 {
     const SDK_URL = 'https://js.braintreegateway.com/v2/braintree.js';
-
     const CLIENT_TOKEN = 'token';
+    const MERCHANT_ACCOUNT_ID = '245345';
 
     /**
      * @var Config|MockObject
@@ -76,11 +76,17 @@ public function testGetConfig($config, $expected)
 
     /**
      * @covers \Magento\Braintree\Model\Ui\ConfigProvider::getClientToken
+     * @dataProvider getClientTokenDataProvider
      */
-    public function testGetClientToken()
+    public function testGetClientToken($merchantAccountId, $params)
     {
+        $this->config->expects(static::once())
+            ->method('getMerchantAccountId')
+            ->willReturn($merchantAccountId);
+
         $this->braintreeAdapter->expects(static::once())
             ->method('generate')
+            ->with($params)
             ->willReturn(self::CLIENT_TOKEN);
 
         static::assertEquals(self::CLIENT_TOKEN, $this->configProvider->getClientToken());
@@ -140,4 +146,21 @@ public function getConfigDataProvider()
             ]
         ];
     }
+
+    /**
+     * @return array
+     */
+    public function getClientTokenDataProvider()
+    {
+        return [
+            [
+                'merchantAccountId' => '',
+                'params' => []
+            ],
+            [
+                'merchantAccountId' => self::MERCHANT_ACCOUNT_ID,
+                'params' => ['merchantAccountId' => self::MERCHANT_ACCOUNT_ID]
+            ]
+        ];
+    }
 }
diff --git a/app/code/Magento/CatalogInventory/Setup/InstallSchema.php b/app/code/Magento/CatalogInventory/Setup/InstallSchema.php
@@ -249,7 +249,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
                 5,
                 ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Is Divided into Multiple Boxes for Shipping'
+                'Website ID'
             )
             ->addIndex(
                 $installer->getIdxName(

diff --git a/app/code/Magento/CatalogInventory/etc/module.xml b/app/code/Magento/CatalogInventory/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CatalogInventory" setup_version="2.0.0">
+    <module name="Magento_CatalogInventory" setup_version="2.0.1">
         <sequence>
             <module name="Magento_Catalog"/>
         </sequence>

diff --git a/...code/Magento/Dhl/Model/Plugin/Rma/Block/Adminhtml/Rma/Edit/Tab/General/Shippingmethod.php b/...code/Magento/Dhl/Model/Plugin/Rma/Block/Adminhtml/Rma/Edit/Tab/General/Shippingmethod.php
diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json
@@ -16,8 +16,7 @@
         "lib-libxml": "*"
     },
     "suggest": {
-        "magento/module-checkout": "100.2.*",
-        "magento/module-rma": "100.2.*"
+        "magento/module-checkout": "100.2.*"
     },
     "type": "magento2-module",
     "version": "100.2.0-dev",

diff --git a/app/code/Magento/Dhl/etc/di.xml b/app/code/Magento/Dhl/etc/di.xml
@@ -9,8 +9,4 @@
     <type name="Magento\Checkout\Block\Cart\LayoutProcessor">
         <plugin name="checkout_cart_shipping_dhl" type="Magento\Dhl\Model\Plugin\Checkout\Block\Cart\Shipping"/>
     </type>
-    <type name="Magento\Rma\Block\Adminhtml\Rma\Edit\Tab\General\Shippingmethod">
-        <plugin name="rma_tab_shippingmethod_dhl"
-                type="Magento\Dhl\Model\Plugin\Rma\Block\Adminhtml\Rma\Edit\Tab\General\Shippingmethod"/>
-    </type>
 </config>