Merge remote-tracking branch 'mpi/MC-19538' into Chaika-PR-2019-08-27

Author: veloraven

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

@@ -15,9 +15,27 @@
 class AddPaypalShortcuts implements ObserverInterface
 {
     /**
-     * Block class
+     * Alias for mini-cart block.
      */
-    const PAYPAL_SHORTCUT_BLOCK = \Magento\Braintree\Block\Paypal\Button::class;
+    private const PAYPAL_MINICART_ALIAS = 'mini_cart';
+
+    /**
+     * Alias for shopping cart page.
+     */
+    private const PAYPAL_SHOPPINGCART_ALIAS = 'shopping_cart';
+
+    /**
+     * @var string[]
+     */
+    private $buttonBlocks;
+
+    /**
+     * @param string[] $buttonBlocks
+     */
+    public function __construct(array $buttonBlocks = [])
+    {
+        $this->buttonBlocks = $buttonBlocks;
+    }
 
     /**
      * Add Braintree PayPal shortcut buttons
@@ -35,7 +53,13 @@ public function execute(Observer $observer)
         /** @var ShortcutButtons $shortcutButtons */
         $shortcutButtons = $observer->getEvent()->getContainer();
 
-        $shortcut = $shortcutButtons->getLayout()->createBlock(self::PAYPAL_SHORTCUT_BLOCK);
+        if ($observer->getData('is_shopping_cart')) {
+            $shortcut = $shortcutButtons->getLayout()
+                ->createBlock($this->buttonBlocks[self::PAYPAL_SHOPPINGCART_ALIAS]);
+        } else {
+            $shortcut = $shortcutButtons->getLayout()
+                ->createBlock($this->buttonBlocks[self::PAYPAL_MINICART_ALIAS]);
+        }
 
         $shortcutButtons->addShortcut($shortcut);
     }

app/code/Magento/Braintree/Test/Unit/Observer/AddPaypalShortcutsTest.php

@@ -19,9 +19,17 @@
  */
 class AddPaypalShortcutsTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * Tests PayPal shortcuts observer.
+     */
     public function testExecute()
     {
-        $addPaypalShortcuts = new AddPaypalShortcuts();
+        $addPaypalShortcuts = new AddPaypalShortcuts(
+            [
+                'mini_cart' => 'Minicart-block',
+                'shopping_cart' => 'Shoppingcart-block'
+            ]
+        );
 
         /** @var Observer|\PHPUnit_Framework_MockObject_MockObject $observerMock */
         $observerMock = $this->getMockBuilder(Observer::class)
@@ -60,7 +68,7 @@ public function testExecute()
 
         $layoutMock->expects(self::once())
             ->method('createBlock')
-            ->with(AddPaypalShortcuts::PAYPAL_SHORTCUT_BLOCK)
+            ->with('Minicart-block')
             ->willReturn($blockMock);
 
         $shortcutButtonsMock->expects(self::once())

app/code/Magento/Braintree/etc/frontend/di.xml

@@ -55,6 +55,23 @@
             <argument name="payment" xsi:type="object">BraintreePayPalFacade</argument>
         </arguments>
     </type>
+    <virtualType name="Magento\Braintree\Block\Paypal\ButtonShoppingCartVirtual" type="Magento\Braintree\Block\Paypal\Button">
+        <arguments>
+            <argument name="data" xsi:type="array">
+                <item name="template" xsi:type="string">Magento_Braintree::paypal/button_shopping_cart.phtml</item>
+                <item name="alias" xsi:type="string">braintree.paypal.mini-cart</item>
+                <item name="button_id" xsi:type="string">braintree-paypal-mini-cart</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Braintree\Observer\AddPaypalShortcuts">
+        <arguments>
+            <argument name="buttonBlocks" xsi:type="array">
+                <item name="mini_cart" xsi:type="string">Magento\Braintree\Block\Paypal\Button</item>
+                <item name="shopping_cart" xsi:type="string">Magento\Braintree\Block\Paypal\ButtonShoppingCartVirtual</item>
+            </argument>
+        </arguments>
+    </type>
 
     <type name="Magento\Braintree\Model\Ui\PayPal\ConfigProvider">
         <arguments>

app/code/Magento/Braintree/view/frontend/templates/paypal/button_shopping_cart.phtml

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var \Magento\Braintree\Block\Paypal\Button $block
+ */
+
+$id = $block->getContainerId() . random_int(0, PHP_INT_MAX);
+
+$config = [
+    'Magento_Braintree/js/paypal/button_shopping_cart' => [
+        'id' => $id,
+        'clientToken' => $block->getClientToken(),
+        'displayName' => $block->getMerchantName(),
+        'actionSuccess' => $block->getActionSuccess(),
+        'environment' => $block->getEnvironment()
+    ]
+];
+
+?>
+<div data-mage-init='<?= /* @noEscape */ json_encode($config); ?>'
+    class="paypal checkout paypal-logo braintree-paypal-logo<?= /* @noEscape */ $block->getContainerId(); ?>-container">
+    <div data-currency="<?= /* @noEscape */ $block->getCurrency(); ?>"
+       data-locale="<?= /* @noEscape */ $block->getLocale(); ?>"
+       data-amount="<?= /* @noEscape */ $block->getAmount(); ?>"
+       id="<?= /* @noEscape */ $id; ?>"
+       class="action-braintree-paypal-logo">
+    </div>
+</div>

app/code/Magento/Braintree/view/frontend/web/js/paypal/button_shopping_cart.js

@@ -0,0 +1,36 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define(
+    [
+        'Magento_Braintree/js/paypal/button',
+        'Magento_Checkout/js/model/quote',
+        'domReady!'
+    ],
+    function (
+        Component,
+        quote
+    ) {
+        'use strict';
+
+        return Component.extend({
+
+            /**
+             * Overrides amount with a value from quote.
+             *
+             * @returns {Object}
+             * @private
+             */
+            getClientConfig: function (data) {
+                var config = this._super(data);
+
+                if (config.amount !== quote.totals()['base_grand_total']) {
+                    config.amount = quote.totals()['base_grand_total'];
+                }
+
+                return config;
+            }
+        });
+    }
+);