Merge branch 'develop' of github.com:magento/magento2ce into PR

Author: Karpenko, Oleksandr

app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php

@@ -24,6 +24,11 @@ class RiskDataHandler implements HandlerInterface
      */
     const RISK_DATA_DECISION = 'riskDataDecision';
 
+    /**
+     * Risk data Review status
+     */
+    private static $statusReview = 'Review';
+
     /**
      * @var SubjectReader
      */
@@ -62,5 +67,10 @@ public function handle(array $handlingSubject, array $response)
 
         $payment->setAdditionalInformation(self::RISK_DATA_ID, $transaction->riskData->id);
         $payment->setAdditionalInformation(self::RISK_DATA_DECISION, $transaction->riskData->decision);
+
+        // mark payment as fraud
+        if ($transaction->riskData->decision === self::$statusReview) {
+            $payment->setIsFraudDetected(true);
+        }
     }
 }

app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php

@@ -5,12 +5,12 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Response;
 
-use Braintree\RiskData;
 use Braintree\Transaction;
-use Magento\Sales\Model\Order\Payment;
 use Magento\Braintree\Gateway\Helper\SubjectReader;
 use Magento\Braintree\Gateway\Response\RiskDataHandler;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+use Magento\Sales\Model\Order\Payment;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class RiskDataHandlerTest
@@ -25,99 +25,95 @@ class RiskDataHandlerTest extends \PHPUnit_Framework_TestCase
     private $riskDataHandler;
 
     /**
-     * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
+     * @var SubjectReader|MockObject
      */
-    private $subjectReaderMock;
+    private $subjectReader;
 
     /**
      * Set up
      */
     protected function setUp()
     {
-        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
+        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
             ->disableOriginalConstructor()
+            ->setMethods(['readPayment', 'readTransaction'])
             ->getMock();
 
-        $this->riskDataHandler = new RiskDataHandler($this->subjectReaderMock);
+        $this->riskDataHandler = new RiskDataHandler($this->subjectReader);
     }
 
     /**
-     * Run test for handle method
+     * Test for handle method
+     * @covers \Magento\Braintree\Gateway\Response\RiskDataHandler::handle
+     * @param string $riskDecision
+     * @param boolean $isFraud
+     * @dataProvider riskDataProvider
      */
-    public function testHandle()
+    public function testHandle($riskDecision, $isFraud)
     {
-        $paymentData = $this->getPaymentDataObjectMock();
-        $transaction = $this->getBraintreeTransactionMock();
+        /** @var Payment|MockObject $payment */
+        $payment = $this->getMockBuilder(Payment::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setAdditionalInformation', 'setIsFraudDetected'])
+            ->getMock();
+        /** @var PaymentDataObjectInterface|MockObject $paymentDO */
+        $paymentDO = $this->getMock(PaymentDataObjectInterface::class);
+        $paymentDO->expects(self::once())
+            ->method('getPayment')
+            ->willReturn($payment);
+
+        $transaction = Transaction::factory([
+            'riskData' => [
+                'id' => 'test-id',
+                'decision' => $riskDecision
+            ]
+        ]);
 
         $response = [
             'object' => $transaction
         ];
         $handlingSubject = [
-            'payment' =>$paymentData,
+            'payment' => $paymentDO,
         ];
 
-        $this->subjectReaderMock->expects(self::once())
+        $this->subjectReader->expects(static::once())
             ->method('readPayment')
             ->with($handlingSubject)
-            ->willReturn($paymentData);
-        $this->subjectReaderMock->expects(self::once())
+            ->willReturn($paymentDO);
+        $this->subjectReader->expects(static::once())
             ->method('readTransaction')
             ->with($response)
             ->willReturn($transaction);
 
-        $this->riskDataHandler->handle($handlingSubject, $response);
-    }
-
-    /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    private function getBraintreeTransactionMock()
-    {
-        $transaction = \Braintree\Transaction::factory([]);
-        $transaction->_set(
-            'riskData',
-            RiskData::factory(
-                [
-                    'id' => 'test-id',
-                    'decision' => 'test-decision',
-                ]
-            )
-        );
-
-        return $transaction;
-    }
-
-    /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    private function getPaymentDataObjectMock()
-    {
-        $mock = $this->getMockBuilder(PaymentDataObjectInterface::class)
-            ->getMockForAbstractClass();
+        $payment->expects(static::at(0))
+            ->method('setAdditionalInformation')
+            ->with(RiskDataHandler::RISK_DATA_ID, 'test-id');
+        $payment->expects(static::at(1))
+            ->method('setAdditionalInformation')
+            ->with(RiskDataHandler::RISK_DATA_DECISION, $riskDecision);
 
-        $mock->expects(static::once())
-            ->method('getPayment')
-            ->willReturn($this->getPaymentMock());
+        if (!$isFraud) {
+            $payment->expects(static::never())
+                ->method('setIsFraudDetected');
+        } else {
+            $payment->expects(static::once())
+                ->method('setIsFraudDetected')
+                ->with(true);
+        }
 
-        return $mock;
+        $this->riskDataHandler->handle($handlingSubject, $response);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * Get list of variations to test fraud
+     * @return array
      */
-    private function getPaymentMock()
+    public function riskDataProvider()
     {
-        $paymentMock = $this->getMockBuilder(Payment::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $paymentMock->expects(self::at(0))
-            ->method('setAdditionalInformation')
-            ->with(RiskDataHandler::RISK_DATA_ID, 'test-id');
-        $paymentMock->expects(self::at(1))
-            ->method('setAdditionalInformation')
-            ->with(RiskDataHandler::RISK_DATA_DECISION, 'test-decision');
-
-        return $paymentMock;
+        return [
+            ['decision' => 'Not Evaluated', 'isFraud' => false],
+            ['decision' => 'Approve', 'isFraud' => false],
+            ['decision' => 'Review', 'isFraud' => true],
+        ];
     }
 }

app/code/Magento/Braintree/etc/adminhtml/system.xml

@@ -8,17 +8,14 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <section id="payment">
-            <group id="braintree_section" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Braintree</label>
-                <comment><![CDATA[Accept credit/debit cards and PayPal in your Magento store. No setup or monthly fees and your customers never leave your store to complete the purchase.]]></comment>
-                <attribute type="expanded">1</attribute>
-                <fieldset_css>complex braintree-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group</frontend_model>
-                <group id="braintree" translate="label" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label><![CDATA[&nbsp;]]></label>
+            <group id="braintree_section" sortOrder="6" showInDefault="0" showInWebsite="0" showInStore="0">
+                <group id="braintree" translate="label comment" type="text" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Braintree</label>
+                    <comment><![CDATA[Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase.]]></comment>
+                    <fieldset_css>complex braintree-section</fieldset_css>
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
                     <attribute type="activity_path">payment/braintree/active</attribute>
-                    <more_url>https://articles.braintreepayments.com/guides/magento/configuration</more_url>
+                    <attribute type="displayIn">recommended_solutions</attribute>
                     <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Enable this Solution</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -43,8 +40,11 @@
                             <group id="braintree_required"/>
                         </requires>
                     </field>
+                    <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
+                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/braintree.html</comment>
+                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
+                    </group>
                     <group id="braintree_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="5">
-                        <comment><![CDATA[<a href="https://www.braintreegateway.com/login" target="_blank">Click here to login to your existing Braintree account</a>. Or to setup a new account and accept payments on your website, <a href="https://apply.braintreegateway.com/signup/us" target="_blank">click here to signup for a Braintree account</a>.<br><br>Powered by <a href="https://www.braintreepayments.com/features/hosted-fields" target="_blank">Braintree v.zero with Hosted Fields</a> latest technology. Hosted Fields are small, transparent iframes that replace the sensitive credit card inputs in your checkout flow - helping you meet the latest data security requirements while ensuring your customization doesn't suffer. <a href="https://www.braintreepayments.com/features/hosted-fields" target="_blank">Find out more</a>.]]></comment>
                         <label>Basic Braintree Settings</label>
                         <attribute type="expanded">1</attribute>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>

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

@@ -26,6 +26,8 @@
                 <can_void>1</can_void>
                 <can_cancel>1</can_cancel>
                 <can_edit>1</can_edit>
+                <can_review_payment>1</can_review_payment>
+                <can_deny_payment>1</can_deny_payment>
                 <cctypes>AE,VI,MC,DI,JCB,CUP,DN,MI</cctypes>
                 <useccv>1</useccv>
                 <cctypes_braintree_mapper><![CDATA[{"american-express":"AE","discover":"DI","jcb":"JCB","mastercard":"MC","master-card":"MC","visa":"VI","maestro":"MI","diners-club":"DN","unionpay":"CUP"}]]></cctypes_braintree_mapper>

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

@@ -133,6 +133,7 @@
                 <item name="void" xsi:type="string">BraintreeVoidCommand</item>
                 <item name="refund" xsi:type="string">BraintreeRefundCommand</item>
                 <item name="cancel" xsi:type="string">BraintreeVoidCommand</item>
+                <item name="deny_payment" xsi:type="string">BraintreeVoidCommand</item>
             </argument>
         </arguments>
     </virtualType>

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

@@ -164,4 +164,5 @@ Debug,Debug
 "europe_bank_accout","Europe bank account"
 "credit_card","Credit card"
 "apple_pay_card","Apple pay card"
-"android_pay_card","Android pay card"
+"android_pay_card","Android pay card"
+"Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase.","Accept credit/debit cards and PayPal in your Magento store.<br/>No setup or monthly fees and your customers never leave your store to complete the purchase."

app/code/Magento/Braintree/view/adminhtml/web/styles.css

@@ -3,5 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-.braintree-section .entry-edit-head > .config-heading .heading strong {padding-left:150px;background:url(images/braintree_logo.png) no-repeat 0 0 / 145px auto;line-height:36px;}
-.braintree-section .entry-edit-head > .config-heading:before {background: url("images/braintree_allinone.png") no-repeat 0 0 / 100% auto;content: "";display: inline;float: right;height: 35px;width: 280px;}
+.braintree-section .heading {display: inline-block; background: url("images/braintree_logo.png") no-repeat 0 50% / 18rem auto; padding-left: 20rem;}
+.braintree-section .button-container {display: inline-block; float: right;}
+.braintree-section .config-alt {background: url("images/braintree_allinone.png") no-repeat scroll 0 0 / 100% auto; height: 28px; margin: 0.5rem 0 0; width: 230px;}

app/code/Magento/Catalog/Model/Product/TierPriceManagement.php

@@ -12,6 +12,7 @@
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\TemporaryStateExceptionInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -137,6 +138,10 @@ public function add($sku, $customerGroupId, $price, $qty)
         try {
             $this->productRepository->save($product);
         } catch (\Exception $e) {
+            if ($e instanceof TemporaryStateExceptionInterface) {
+                // temporary state exception must be already localized
+                throw $e;
+            }
             throw new CouldNotSaveException(__('Could not save group price'));
         }
         return true;

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -14,6 +14,9 @@
 use Magento\Framework\Api\ImageContentValidatorInterface;
 use Magento\Framework\Api\ImageProcessorInterface;
 use Magento\Framework\Api\SortOrder;
+use Magento\Framework\DB\Adapter\ConnectionException;
+use Magento\Framework\DB\Adapter\DeadlockException;
+use Magento\Framework\DB\Adapter\LockWaitException;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -535,6 +538,24 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
             unset($this->instances[$product->getSku()]);
             unset($this->instancesById[$product->getId()]);
             $this->resourceModel->save($product);
+        } catch (ConnectionException $exception) {
+            throw new \Magento\Framework\Exception\TemporaryState\CouldNotSaveException(
+                __('Database connection error'),
+                $exception,
+                $exception->getCode()
+            );
+        } catch (DeadlockException $exception) {
+            throw new \Magento\Framework\Exception\TemporaryState\CouldNotSaveException(
+                __('Database deadlock found when trying to get lock'),
+                $exception,
+                $exception->getCode()
+            );
+        } catch (LockWaitException $exception) {
+            throw new \Magento\Framework\Exception\TemporaryState\CouldNotSaveException(
+                __('Database lock wait timeout exceeded'),
+                $exception,
+                $exception->getCode()
+            );
         } catch (\Magento\Eav\Model\Entity\Attribute\Exception $exception) {
             throw \Magento\Framework\Exception\InputException::invalidFieldValue(
                 $exception->getAttributeCode(),

app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php

@@ -12,6 +12,7 @@
 
 use Magento\Customer\Model\GroupManagement;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\TemporaryState\CouldNotSaveException;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -393,6 +394,30 @@ public function testSetThrowsExceptionIfCantSave()
         $this->service->add('product_sku', 1, 100, 2);
     }
 
+    /**
+     * @expectedException \Magento\Framework\Exception\TemporaryState\CouldNotSaveException
+     */
+    public function testAddRethrowsTemporaryStateExceptionIfRecoverableErrorOccurred()
+    {
+        $group = $this->getMock(\Magento\Customer\Model\Data\Group::class, [], [], '', false);
+        $group->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $this->productMock
+            ->expects($this->once())
+            ->method('getData')
+            ->with('tier_price')
+            ->will($this->returnValue([]));
+        $this->groupRepositoryMock->expects($this->once())
+            ->method('getById')
+            ->willReturn($group);
+        $this->repositoryMock->expects($this->once())
+            ->method('save')
+            ->willThrowException(new CouldNotSaveException(__('Lock wait timeout')));
+
+        $this->service->add('product_sku', 1, 100, 2);
+    }
+
     /**
      * @param string|int $price
      * @param string|float $qty