Merge branch 'MAGETWO-55676' into MPI-PR

Author: rliukshyn

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/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/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php

@@ -3,34 +3,42 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 namespace Magento\Paypal\Block\Adminhtml\System\Config\Fieldset;
 
+use Magento\Backend\Block\Template;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
+
 /**
- * Renderer for PayPal banner in System Configuration
- * @author      Magento Core Team <core@magentocommerce.com>
+ * Class Hint adds "Configuration Details" link to payment configuration.
+ * `<comment>` node must be defined in `<group>` node and contain some link.
  */
-class Hint extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
+class Hint extends Template implements RendererInterface
 {
     /**
      * @var string
+     * @deprecated
      */
     protected $_template = 'Magento_Paypal::system/config/fieldset/hint.phtml';
 
     /**
-     * Render fieldset html
-     *
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return string
      */
-    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    public function render(AbstractElement $element)
     {
-        $elementOriginalData = $element->getOriginalData();
-        if (isset($elementOriginalData['help_link'])) {
-            $this->setHelpLink($elementOriginalData['help_link']);
+        $html = '';
+
+        if ($element->getComment()) {
+            $html .= sprintf('<tr id="row_%s">', $element->getHtmlId());
+            $html .= '<td colspan="1"><p class="note"><span>';
+            $html .= sprintf(
+                '<a href="%s" target="_blank">Configuration Details</a>',
+                $element->getComment()
+            );
+            $html .= '</span></p></td></tr>';
         }
-        return $this->toHtml();
+
+        return $html;
     }
 }

app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php

@@ -87,6 +87,7 @@ protected function _getHeaderTitleHtml($element)
         if ($element->getComment()) {
             $html .= '<span class="heading-intro">' . $element->getComment() . '</span>';
         }
+        $html .= '<div class="config-alt"></div>';
         $html .= '</div>';
 
         $disabledAttributeString = $this->_isPaymentEnabled($element) ? '' : ' disabled="disabled"';
@@ -149,4 +150,33 @@ protected function _isCollapseState($element)
     {
         return false;
     }
+
+    /**
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    protected function _getExtraJs($element)
+    {
+        $script = "require(['jquery', 'prototype'], function(jQuery){
+            window.paypalToggleSolution = function (id, url) {
+                var doScroll = false;
+                Fieldset.toggleCollapse(id, url);
+                if ($(this).hasClassName(\"open\")) {
+                    $$(\".with-button button.button\").each(function(anotherButton) {
+                        if (anotherButton != this && $(anotherButton).hasClassName(\"open\")) {
+                            $(anotherButton).click();
+                            doScroll = true;
+                        }
+                    }.bind(this));
+                }
+                if (doScroll) {
+                    var pos = Element.cumulativeOffset($(this));
+                    window.scrollTo(pos[0], pos[1] - 45);
+                }
+            }
+        });";
+
+        return $this->_jsHelper->getScript($script);
+    }
 }

app/code/Magento/Paypal/Model/Config/StructurePlugin.php

@@ -5,6 +5,12 @@
  */
 namespace Magento\Paypal\Model\Config;
 
+use Magento\Config\Model\Config\ScopeDefiner;
+use Magento\Config\Model\Config\Structure;
+use Magento\Config\Model\Config\Structure\Element\Section;
+use Magento\Config\Model\Config\Structure\ElementInterface;
+use Magento\Paypal\Helper\Backend as BackendHelper;
+
 class StructurePlugin
 {
     /**
@@ -13,12 +19,12 @@ class StructurePlugin
     const REQUEST_PARAM_COUNTRY = 'paypal_country';
 
     /**
-     * @var \Magento\Paypal\Helper\Backend
+     * @var BackendHelper
      */
     protected $_helper;
 
     /**
-     * @var \Magento\Config\Model\Config\ScopeDefiner
+     * @var ScopeDefiner
      */
     protected $_scopeDefiner;
 
@@ -40,12 +46,12 @@ class StructurePlugin
     ];
 
     /**
-     * @param \Magento\Config\Model\Config\ScopeDefiner $scopeDefiner
-     * @param \Magento\Paypal\Helper\Backend $helper
+     * @param ScopeDefiner $scopeDefiner
+     * @param BackendHelper $helper
      */
     public function __construct(
-        \Magento\Config\Model\Config\ScopeDefiner $scopeDefiner,
-        \Magento\Paypal\Helper\Backend $helper
+        ScopeDefiner $scopeDefiner,
+        BackendHelper $helper
     ) {
         $this->_scopeDefiner = $scopeDefiner;
         $this->_helper = $helper;
@@ -69,14 +75,14 @@ public static function getPaypalConfigCountries($addOther = false)
     /**
      * Substitute payment section with PayPal configs
      *
-     * @param \Magento\Config\Model\Config\Structure $subject
+     * @param Structure $subject
      * @param \Closure $proceed
      * @param array $pathParts
-     * @return \Magento\Config\Model\Config\Structure\ElementInterface
+     * @return ElementInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundGetElementByPathParts(
-        \Magento\Config\Model\Config\Structure $subject,
+        Structure $subject,
         \Closure $proceed,
         array $pathParts
     ) {
@@ -89,10 +95,11 @@ public function aroundGetElementByPathParts(
                 $pathParts[0] = 'payment_other';
             }
         }
-        /** @var \Magento\Config\Model\Config\Structure\ElementInterface $result */
+        /** @var ElementInterface $result */
         $result = $proceed($pathParts);
         if ($isSectionChanged && isset($result)) {
-            if ($result instanceof \Magento\Config\Model\Config\Structure\Element\Section) {
+            if ($result instanceof Section) {
+                $this->restructurePayments($result);
                 $result->setData(array_merge(
                     $result->getData(),
                     ['showInDefault' => true, 'showInWebsite' => true, 'showInStore' => true]
@@ -101,4 +108,63 @@ public function aroundGetElementByPathParts(
         }
         return $result;
     }
+
+    /**
+     * Changes payment config structure.
+     * Groups which have `displayIn` element, transfer to appropriate group.
+     * Groups without `displayIn` transfer to other payment methods group.
+     *
+     * @param Section $result
+     * @return void
+     */
+    private function restructurePayments(Section $result)
+    {
+        $sectionMap = [
+            'account' => [],
+            'recommended_solutions' => [],
+            'other_paypal_payment_solutions' => [],
+            'other_payment_methods' => []
+        ];
+
+        $configuration = $result->getData();
+
+        foreach ($configuration['children'] as $section => $data) {
+            if (array_key_exists($section, $sectionMap)) {
+                $sectionMap[$section] = $data;
+            } elseif ($displayIn = $this->getDisplayInSection($section, $data)) {
+                $sectionMap[$displayIn['parent']]['children'][$displayIn['section']] = $displayIn['data'];
+            } else {
+                $sectionMap['other_payment_methods']['children'][$section] = $data;
+            }
+        }
+
+        $configuration['children'] = $sectionMap;
+        $result->setData($configuration, $this->_scopeDefiner->getScope());
+    }
+
+    /**
+     * Recursive search of `displayIn` element in node children
+     *
+     * @param string $section
+     * @param array $data
+     * @return array|null
+     */
+    private function getDisplayInSection($section, $data)
+    {
+        if (is_array($data) && array_key_exists('displayIn', $data)) {
+            return [
+                'parent' => $data['displayIn'],
+                'section' => $section,
+                'data' => $data
+            ];
+        }
+
+        if (array_key_exists('children', $data)) {
+            foreach ($data['children'] as $childSection => $childData) {
+                return $this->getDisplayInSection($childSection, $childData);
+            }
+        }
+
+        return null;
+    }
 }

app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/HintTest.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Fieldset;
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Class HintTest
+ */
+class HintTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Hint
+     */
+    private $block;
+
+    /**
+     * @var AbstractElement|MockObject
+     */
+    private $element;
+
+    protected function setUp()
+    {
+        $om = new ObjectManager($this);
+
+        $this->element = $this->getMockBuilder(AbstractElement::class)
+            ->setMethods(['getComment', 'getHtmlId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->block = $om->getObject(Hint::class);
+    }
+
+    /**
+     * @covers \Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint::render
+     */
+    public function testRender()
+    {
+        $expected = '<tr id="row_payment"><td colspan="1"><p class="note"><span>';
+        $expected .= '<a href="http://test.com" target="_blank">Configuration Details</a>';
+        $expected .= '</span></p></td></tr>';
+
+        $this->element->expects(static::exactly(2))
+            ->method('getComment')
+            ->willReturn('http://test.com');
+
+        $this->element->expects(static::once())
+            ->method('getHtmlId')
+            ->willReturn('payment');
+
+        static::assertSame($expected, $this->block->render($this->element));
+    }
+
+    /**
+     * @covers \Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint::render
+     */
+    public function testRenderEmptyComment()
+    {
+        $this->element->expects(static::once())
+            ->method('getComment')
+            ->willReturn('');
+
+        $this->element->expects(static::never())
+            ->method('getHtmlId');
+
+        static::assertSame('', $this->block->render($this->element));
+    }
+}