MAGETWO-44289: Broken HTML and Javascript on enabled MSRP and PayPal EC

- Merge remote-tracking branch 'mainline/develop' into PR
- Conflicts: app/code/Magento/Braintree/view/frontend/web/js/button/braintree-paypal.js

Author: Volodymyr Zaets

app/code/Magento/Braintree/Controller/PayPal/GetButtonData.php

@@ -12,6 +12,7 @@
 
 class ConfigProvider extends CcGenericConfigProvider
 {
+
     /**
      * @var string[]
      */
@@ -97,8 +98,7 @@ public function getStoredCards()
      */
     protected function getCcAvailableCcTypes()
     {
-        $country = $this->checkoutSession->getQuote()->getBillingAddress()->getCountryId();
-        return $this->dataHelper->getCcAvailableCardTypes($country);
+        return $this->dataHelper->getCcAvailableCardTypes();
     }
 
     /**
@@ -185,7 +185,7 @@ public function getConfig()
                     'isCcDetectionEnabled' => $this->config->isCcDetectionEnabled(),
                     'availableCardTypes' => $this->getCcAvailableCcTypes(),
                     'braintreeDataJs'=> $this->config->getBraintreeDataJs(),
-                    'ajaxGenerateNonceUrl' => $this->getAjaxGenerateNonceUrl(),
+                    'ajaxGenerateNonceUrl' => $this->getAjaxGenerateNonceUrl()
                 ],
             ],
         ]);

app/code/Magento/Braintree/Model/ConfigProvider.php

@@ -42,9 +42,12 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
+        $isMiniCart = !$observer->getEvent()->getIsCatalogProduct();
+
         //Don't display shortcut on product view page
         if (!$this->methodPayPal->isActive() ||
-            !$this->paypalConfig->isShortcutCheckoutEnabled()) {
+            !$this->paypalConfig->isShortcutCheckoutEnabled() ||
+            !$isMiniCart) {
             return;
         }
 
@@ -57,7 +60,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             '',
             [
                 'data' => [
-                    Shortcut::MINI_CART_FLAG_KEY => !$observer->getEvent()->getIsCatalogProduct()
+                    Shortcut::MINI_CART_FLAG_KEY => $isMiniCart
                 ]
             ]
         );

app/code/Magento/Braintree/Observer/AddPaypalShortcuts.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Braintree\Test\Unit\Model;
 
+use Magento\Braintree\Model\ConfigProvider;
 use Magento\Braintree\Model\PaymentMethod;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
@@ -193,16 +194,6 @@ public function testGetConfig(
             ->method('generatePaymentMethodToken')
             ->willReturnMap($tokenNonceMap);
 
-        $quoteMock = $this->getMockBuilder('\Magento\Quote\Model\Quote')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $quoteMock->expects($this->once())
-            ->method('getBillingAddress')
-            ->willReturn(new \Magento\Framework\DataObject(['country_id' => 'US']));
-        $this->checkoutSessionMock->expects($this->once())
-            ->method('getQuote')
-            ->willReturn($quoteMock);
-
         $cardTypeMap = [
             ['Visa', 'VI'],
             ['Master Card', 'MA'],
@@ -272,7 +263,7 @@ public function getConfigDataProvider()
                             'isCcDetectionEnabled' => true,
                             'availableCardTypes' => $this->availableCardTypes,
                             'braintreeDataJs'=> 'https://js.braintreegateway.com/v1/braintree-data.js',
-                            'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL,
+                            'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL
                         ],
                     ],
                 ]
@@ -347,7 +338,7 @@ public function getConfigDataProvider()
                             'isCcDetectionEnabled' => true,
                             'availableCardTypes' => $this->availableCardTypes,
                             'braintreeDataJs'=> 'https://js.braintreegateway.com/v1/braintree-data.js',
-                            'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL,
+                            'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL
                         ],
                     ],
                 ]
@@ -422,7 +413,7 @@ public function getConfigDataProvider()
                             'isCcDetectionEnabled' => true,
                             'availableCardTypes' => $this->availableCardTypes,
                             'braintreeDataJs'=> 'https://js.braintreegateway.com/v1/braintree-data.js',
-                            'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL,
+                            'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL
                         ],
                     ],
                 ]
@@ -466,7 +457,7 @@ public function getConfigDataProvider()
                             'isCcDetectionEnabled' => true,
                             'availableCardTypes' => $this->availableCardTypes,
                             'braintreeDataJs'=> 'https://js.braintreegateway.com/v1/braintree-data.js',
-                            'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL,
+                            'ajaxGenerateNonceUrl' => self::PAYMENT_NONCE_GENERATION_URL
                         ],
                     ],
                 ]