merge magento/2.3-develop into magento-chaika/Chaika-PR-2019-08-29

Author: magento-cicd2

app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundTransactionStrategyCommand.php

@@ -59,19 +59,45 @@ public function execute(array $commandSubject): void
      * @param array $commandSubject
      * @return string
      * @throws CommandException
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     private function getCommand(array $commandSubject): string
     {
         $details = $this->commandPool->get('get_transaction_details')
             ->execute($commandSubject)
             ->get();
 
-        if ($details['transaction']['transactionStatus'] === 'capturedPendingSettlement') {
+        if ($this->canVoid($details, $commandSubject)) {
             return self::VOID;
-        } elseif ($details['transaction']['transactionStatus'] !== 'settledSuccessfully') {
+        }
+
+        if ($details['transaction']['transactionStatus'] !== 'settledSuccessfully') {
             throw new CommandException(__('This transaction cannot be refunded with its current status.'));
         }
 
         return self::REFUND;
     }
+
+    /**
+     * Checks if void command can be performed.
+     *
+     * @param array $details
+     * @param array $commandSubject
+     * @return bool
+     * @throws CommandException
+     */
+    private function canVoid(array $details, array $commandSubject) :bool
+    {
+        if ($details['transaction']['transactionStatus'] === 'capturedPendingSettlement') {
+            if ((float) $details['transaction']['authAmount'] !== (float) $commandSubject['amount']) {
+                throw new CommandException(
+                    __('The transaction has not been settled, a partial refund is not yet available.')
+                );
+            }
+
+            return true;
+        }
+
+        return false;
+    }
 }

app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/ClosePartialTransactionHandler.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AuthorizenetAcceptjs\Gateway\Response;
+
+use Magento\Sales\Model\Order\Payment;
+
+/**
+ * Determines that parent transaction should be close for partial refund operation.
+ */
+class ClosePartialTransactionHandler extends CloseTransactionHandler
+{
+    /**
+     * Whether parent transaction should be closed.
+     *
+     * @param Payment $payment
+     * @return bool
+     */
+    public function shouldCloseParentTransaction(Payment $payment)
+    {
+        return !(bool)$payment->getCreditmemo()->getInvoice()->canRefund();
+    }
+}

app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandler.php

@@ -47,7 +47,19 @@ public function handle(array $handlingSubject, array $response): void
 
         if ($payment instanceof Payment) {
             $payment->setIsTransactionClosed($this->closeTransaction);
-            $payment->setShouldCloseParentTransaction(true);
+            $payment->setShouldCloseParentTransaction($this->shouldCloseParentTransaction($payment));
         }
     }
+
+    /**
+     * Whether parent transaction should be closed.
+     *
+     * @param Payment $payment
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function shouldCloseParentTransaction(Payment $payment)
+    {
+        return true;
+    }
 }

app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Command/RefundTransactionStrategyCommandTest.php

@@ -62,20 +62,75 @@ public function testCommandWillVoidWhenTransactionIsPendingSettlement()
             ->method('execute');
 
         $this->commandPoolMock->method('get')
-            ->willReturnMap([
-                ['get_transaction_details', $this->transactionDetailsCommandMock],
-                ['void', $this->commandMock]
-            ]);
+            ->willReturnMap(
+                [
+                    [
+                        'get_transaction_details',
+                        $this->transactionDetailsCommandMock
+                    ],
+                    [
+                        'void',
+                        $this->commandMock
+                    ]
+                ]
+            );
 
         $this->transactionResultMock->method('get')
-            ->willReturn([
-                'transaction' => [
-                    'transactionStatus' => 'capturedPendingSettlement'
+            ->willReturn(
+                [
+                    'transaction' => [
+                        'transactionStatus' => 'capturedPendingSettlement',
+                        'authAmount' => '20.19',
+                    ]
                 ]
-            ]);
+            );
 
         $buildSubject = [
-            'foo' => '123'
+            'foo' => '123',
+            'amount' => '20.19',
+        ];
+
+        $this->transactionDetailsCommandMock->expects($this->once())
+            ->method('execute')
+            ->with($buildSubject)
+            ->willReturn($this->transactionResultMock);
+
+        $this->command->execute($buildSubject);
+    }
+
+    /**
+     * @expectedException \Magento\Payment\Gateway\Command\CommandException
+     * @expectedExceptionMessage The transaction has not been settled, a partial refund is not yet available.
+     */
+    public function testCommandWillThrowExceptionWhenVoidTransactionIsPartial()
+    {
+        // Assert command is executed
+        $this->commandMock->expects($this->never())
+            ->method('execute');
+
+        $this->commandPoolMock->method('get')
+            ->willReturnMap(
+                [
+                    [
+                        'get_transaction_details',
+                        $this->transactionDetailsCommandMock
+                    ],
+                ]
+            );
+
+        $this->transactionResultMock->method('get')
+            ->willReturn(
+                [
+                    'transaction' => [
+                        'transactionStatus' => 'capturedPendingSettlement',
+                        'authAmount' => '20.19',
+                    ]
+                ]
+            );
+
+        $buildSubject = [
+            'foo' => '123',
+            'amount' => '10.19',
         ];
 
         $this->transactionDetailsCommandMock->expects($this->once())
@@ -93,17 +148,27 @@ public function testCommandWillRefundWhenTransactionIsSettled()
             ->method('execute');
 
         $this->commandPoolMock->method('get')
-            ->willReturnMap([
-                ['get_transaction_details', $this->transactionDetailsCommandMock],
-                ['refund_settled', $this->commandMock]
-            ]);
+            ->willReturnMap(
+                [
+                    [
+                        'get_transaction_details',
+                        $this->transactionDetailsCommandMock
+                    ],
+                    [
+                        'refund_settled',
+                        $this->commandMock
+                    ]
+                ]
+            );
 
         $this->transactionResultMock->method('get')
-            ->willReturn([
-                'transaction' => [
-                    'transactionStatus' => 'settledSuccessfully'
+            ->willReturn(
+                [
+                    'transaction' => [
+                        'transactionStatus' => 'settledSuccessfully'
+                    ]
                 ]
-            ]);
+            );
 
         $buildSubject = [
             'foo' => '123'
@@ -128,16 +193,23 @@ public function testCommandWillThrowExceptionWhenTransactionIsInInvalidState()
             ->method('execute');
 
         $this->commandPoolMock->method('get')
-            ->willReturnMap([
-                ['get_transaction_details', $this->transactionDetailsCommandMock],
-            ]);
+            ->willReturnMap(
+                [
+                    [
+                        'get_transaction_details',
+                        $this->transactionDetailsCommandMock
+                    ],
+                ]
+            );
 
         $this->transactionResultMock->method('get')
-            ->willReturn([
-                'transaction' => [
-                    'transactionStatus' => 'somethingIsWrong'
+            ->willReturn(
+                [
+                    'transaction' => [
+                        'transactionStatus' => 'somethingIsWrong'
+                    ]
                 ]
-            ]);
+            );
 
         $buildSubject = [
             'foo' => '123'

app/code/Magento/AuthorizenetAcceptjs/etc/config.xml

@@ -24,6 +24,7 @@
                 <can_capture_partial>0</can_capture_partial>
                 <can_authorize>1</can_authorize>
                 <can_refund>1</can_refund>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
                 <can_capture>1</can_capture>
                 <can_void>1</can_void>
                 <can_accept_payment>1</can_accept_payment>

app/code/Magento/AuthorizenetAcceptjs/etc/di.xml

@@ -206,8 +206,7 @@
         <arguments>
             <argument name="handlers" xsi:type="array">
                 <item name="transaction_id" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\TransactionIdHandler</item>
-                <item name="close_parent_transaction" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\CloseParentTransactionHandler</item>
-                <item name="close_transaction" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\CloseTransactionHandler</item>
+                <item name="close_transaction" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\ClosePartialTransactionHandler</item>
             </argument>
         </arguments>
     </virtualType>

app/code/Magento/AuthorizenetAcceptjs/i18n/en_US.csv

@@ -19,3 +19,4 @@ Authorize.net,Authorize.net
 "ccLast4","Last 4 Digits of Card"
 "There was an error while trying to process the refund.","There was an error while trying to process the refund."
 "This transaction cannot be refunded with its current status.","This transaction cannot be refunded with its current status."
+"The transaction has not been settled, a partial refund is not yet available.","The transaction has not been settled, a partial refund is not yet available."

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>