Merge remote-tracking branch 'origin/develop' into MAGETWO-54458

Author: xmav

app/code/Magento/Backend/Model/View/Result/Redirect.php

@@ -10,6 +10,7 @@
 use Magento\Backend\Model\UrlInterface;
 use Magento\Framework\App;
 use Magento\Framework\App\ActionFlag;
+use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
 
 class Redirect extends \Magento\Framework\Controller\Result\Redirect
 {
@@ -56,7 +57,7 @@ public function setRefererOrBaseUrl()
     /**
      * {@inheritdoc}
      */
-    protected function render(App\ResponseInterface $response)
+    protected function render(HttpResponseInterface $response)
     {
         $this->session->setIsUrlNotice($this->actionFlag->get('', AbstractAction::FLAG_IS_URLS_CHECKED));
         return parent::render($response);

app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml

@@ -69,6 +69,9 @@
                             <item name="fit" xsi:type="boolean">false</item>
                             <item name="label" xsi:type="string">Search String</item>
                             <item name="showFallbackReset" xsi:type="boolean">false</item>
+                            <item name="validation" xsi:type="array">
+                                <item name="required-entry" xsi:type="boolean">true</item>
+                            </item>
                         </item>
                     </argument>
                 </field>
@@ -82,6 +85,9 @@
                             <item name="fit" xsi:type="boolean">false</item>
                             <item name="label" xsi:type="string">Theme Name</item>
                             <item name="showFallbackReset" xsi:type="boolean">false</item>
+                            <item name="validation" xsi:type="array">
+                                <item name="required-entry" xsi:type="boolean">true</item>
+                            </item>
                         </item>
                     </argument>
                 </field>

app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/cells/action-delete.html

@@ -11,5 +11,5 @@
                 title: $parent.deleteButtonLabel
             }
         ">
-    <span data-bind="text: $parent.deleteButtonLabel"></span>
+    <span translate="$parent.deleteButtonLabel"></span>
 </button>

app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

@@ -16,7 +16,7 @@
                 class="action-secondary"
                 type="button"
                 click="processingAddChild.bind($data, false, false, false)">
-            <span text="addButtonLabel"/>
+            <span translate="addButtonLabel"/>
         </button>
     </div>
 
@@ -30,7 +30,7 @@
      css="element.setClasses(element)"
      attr="'data-index': index">
     <label if="element.label" class="admin__field-label" attr="for: element.uid">
-        <span text="element.label"/>
+        <span translate="element.label"/>
     </label>
 
     <div class="admin__field-control" data-role="grid-wrapper">
@@ -51,7 +51,7 @@
 
                         <th repeat="foreach: labels, item: '$label'"
                             class="data-grid-th"
-                            text="$label().label"
+                            translate="$label().label"
                             visible="$label().visible"
                             disable="$label().disabled"
                             css="setClasses($label())">

app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php

@@ -166,16 +166,25 @@ private function isExpiredAuthorization(OrderPaymentInterface $payment)
      */
     private function isExistsCaptureTransaction(OrderPaymentInterface $payment)
     {
-        $filters[] = $this->filterBuilder->setField('payment_id')
-            ->setValue($payment->getId())
-            ->create();
+        $this->searchCriteriaBuilder->addFilters(
+            [
+                $this->filterBuilder
+                    ->setField('payment_id')
+                    ->setValue($payment->getId())
+                    ->create(),
+            ]
+        );
 
-        $filters[] = $this->filterBuilder->setField('txn_type')
-            ->setValue(TransactionInterface::TYPE_CAPTURE)
-            ->create();
+        $this->searchCriteriaBuilder->addFilters(
+            [
+                $this->filterBuilder
+                    ->setField('txn_type')
+                    ->setValue(TransactionInterface::TYPE_CAPTURE)
+                    ->create(),
+            ]
+        );
 
-        $searchCriteria = $this->searchCriteriaBuilder->addFilters($filters)
-            ->create();
+        $searchCriteria = $this->searchCriteriaBuilder->create();
 
         $count = $this->transactionRepository->getList($searchCriteria)->getTotalCount();
         return (boolean) $count;

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/Command/CaptureStrategyCommandTest.php

@@ -374,7 +374,7 @@ private function buildSearchCriteria()
             ->willReturnSelf();
 
         $searchCriteria = new SearchCriteria();
-        $this->searchCriteriaBuilder->expects(static::once())
+        $this->searchCriteriaBuilder->expects(static::exactly(2))
             ->method('addFilters')
             ->willReturnSelf();
         $this->searchCriteriaBuilder->expects(static::once())

app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php

@@ -80,7 +80,7 @@ public function testBuild()
         $paymentExtension = $this->getMockBuilder(OrderPaymentExtension::class)
             ->setMethods(['getVaultPaymentToken'])
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMockForAbstractClass();
 
         $paymentToken = $this->getMockBuilder(PaymentToken::class)
             ->disableOriginalConstructor()

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>