Merge branch 'PR-MPI-S76' into MAGETWO-31043

Conflicts:
	app/code/Magento/Paypal/Model/Config.php
	dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
	dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart.php

Author: Alexander Makeev

app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js

@@ -20,6 +20,9 @@ directPost.prototype = {
         var prepare = function (event, method) {
             if (method === 'authorizenet_directpost') {
                 this.preparePayment();
+            } else {
+                jQuery('#edit_form')
+                    .off('submitOrder.authorizenet');
             }
         };
         this.iframeId = iframeId;
@@ -76,7 +79,7 @@ directPost.prototype = {
         this.changeInputOptions('autocomplete', 'off');
         jQuery('#edit_form')
             .off('submitOrder')
-            .on('submitOrder', this.submitAdminOrder.bind(this));
+            .on('submitOrder.authorizenet', this.submitAdminOrder.bind(this));
         if ($(this.iframeId)) {
             // Temporary solution will be removed after refactoring Authorize.Net (sales) functionality
             jQuery('.scalable.save:not(disabled)').removeAttr('onclick');

app/code/Magento/Backend/App/AbstractAction.php

@@ -102,7 +102,7 @@ public function __construct(Action\Context $context)
      */
     protected function _isAllowed()
     {
-        return $this->_authorization->isAllowed(self::ADMIN_RESOURCE);
+        return $this->_authorization->isAllowed(static::ADMIN_RESOURCE);
     }
 
     /**

app/code/Magento/Backend/Model/Locale/Manager.php

@@ -26,22 +26,30 @@ class Manager
      * @var \Magento\Framework\TranslateInterface
      */
     protected $_translator;
+    
+    /**
+     * @var \Magento\Backend\App\ConfigInterface
+     */
+    protected $_backendConfig;
 
     /**
      * Constructor
      *
      * @param \Magento\Backend\Model\Session $session
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\TranslateInterface $translator
+     * @param \Magento\Backend\App\ConfigInterface $backendConfig
      */
     public function __construct(
         \Magento\Backend\Model\Session $session,
         \Magento\Backend\Model\Auth\Session $authSession,
-        \Magento\Framework\TranslateInterface $translator
+        \Magento\Framework\TranslateInterface $translator,
+        \Magento\Backend\App\ConfigInterface $backendConfig
     ) {
         $this->_session = $session;
         $this->_authSession = $authSession;
         $this->_translator = $translator;
+        $this->_backendConfig = $backendConfig;
     }
 
     /**
@@ -53,28 +61,40 @@ public function __construct(
     public function switchBackendInterfaceLocale($localeCode)
     {
         $this->_session->setSessionLocale(null);
-
+        
         $this->_authSession->getUser()->setInterfaceLocale($localeCode);
-
+        
         $this->_translator->setLocale($localeCode)->loadData(null, true);
-
+        
         return $this;
     }
 
+    /**
+     * Get general interface locale 
+     *
+     * @return string
+     */
+    public function getGeneralLocale()
+    {
+        return $this->_backendConfig->getValue('general/locale/code');
+    }
+
     /**
      * Get user interface locale stored in session data
      *
      * @return string
      */
     public function getUserInterfaceLocale()
     {
-        $interfaceLocale = \Magento\Framework\Locale\Resolver::DEFAULT_LOCALE;
-
         $userData = $this->_authSession->getUser();
+        $interfaceLocale = \Magento\Framework\Locale\Resolver::DEFAULT_LOCALE;
+        
         if ($userData && $userData->getInterfaceLocale()) {
             $interfaceLocale = $userData->getInterfaceLocale();
+        } elseif ($this->getGeneralLocale()) {
+            $interfaceLocale = $this->getGeneralLocale();
         }
-
+        
         return $interfaceLocale;
     }
 }

app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php

@@ -15,7 +15,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
     protected $_model;
 
     /**
-     * @var \Magento\Framework\TranslateInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\TranslateInterface
      */
     protected $_translator;
 
@@ -25,9 +25,14 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
     protected $_session;
 
     /**
-     * @var \Magento\Backend\Model\Auth\Session
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Auth\Session
      */
     protected $_authSession;
+    
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\App\ConfigInterface
+     */
+    protected $_backendConfig;
 
     protected function setUp()
     {
@@ -40,7 +45,9 @@ protected function setUp()
             '',
             false
         );
-
+        
+        $this->_backendConfig = $this->getMockForAbstractClass('Magento\Backend\App\ConfigInterface', [], '', false);
+        
         $userMock = new \Magento\Framework\DataObject();
 
         $this->_authSession->expects($this->any())->method('getUser')->will($this->returnValue($userMock));
@@ -54,7 +61,8 @@ protected function setUp()
         $this->_model = new \Magento\Backend\Model\Locale\Manager(
             $this->_session,
             $this->_authSession,
-            $this->_translator
+            $this->_translator,
+            $this->_backendConfig
         );
     }
 
@@ -102,4 +110,17 @@ public function testGetUserInterfaceLocale()
 
         $this->assertEquals($locale, 'de_DE');
     }
+
+    /**
+     * @covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
+     */
+    public function testGetUserInterfaceGeneralLocale()
+    {
+        $this->_backendConfig->expects($this->any())
+            ->method('getValue')
+            ->with('general/locale/code')
+            ->willReturn('test_locale');
+        $locale = $this->_model->getUserInterfaceLocale();
+        $this->assertEquals($locale, 'test_locale');
+    }
 }

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

@@ -414,16 +414,16 @@
             </group>
             <group id="security" translate="label" type="text" sortOrder="35" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Security</label>
-                <field id="use_form_key" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="use_form_key" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Add Secret Key to URLs</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Admin\Usesecretkey</backend_model>
                 </field>
-                <field id="use_case_sensitive_login" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="use_case_sensitive_login" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Login is Case Sensitive</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="session_lifetime" translate="label comment" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="session_lifetime" translate="label comment" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Admin Session Lifetime (seconds)</label>
                     <comment>Values less than 60 are ignored.</comment>
                     <validate>validate-digits</validate>

app/code/Magento/BraintreeTwo/Block/Adminhtml/Form/Field/Cctypes.php renamed to app/code/Magento/BraintreeTwo/Block/Adminhtml/Form/Field/CcTypes.php

@@ -5,25 +5,25 @@
  */
 namespace Magento\BraintreeTwo\Block\Adminhtml\Form\Field;
 
+use Magento\BraintreeTwo\Helper\CcType;
 use Magento\Framework\View\Element\Context;
 use Magento\Framework\View\Element\Html\Select;
-use Magento\BraintreeTwo\Helper\CcType;
 
 /**
- * Class Cctypes
+ * Class CcTypes
  */
-class Cctypes extends Select
+class CcTypes extends Select
 {
     /**
-     * @var \
+     * @var CcType
      */
     private $ccTypeHelper;
 
     /**
      * Constructor
      *
-     * @param \Magento\Framework\View\Element\Context $context
-     * @param \Magento\BraintreeTwo\Helper\CcType $ccTypeHelper
+     * @param Context $context
+     * @param CcType $ccTypeHelper
      * @param array $data
      */
     public function __construct(

app/code/Magento/BraintreeTwo/Block/Adminhtml/Form/Field/Countries.php

@@ -15,15 +15,15 @@
 class Countries extends Select
 {
     /**
-     * @var \Magento\BraintreeTwo\Helper\Country
+     * @var Country
      */
     private $countryHelper;
 
     /**
      * Constructor
      *
-     * @param \Magento\Framework\View\Element\Context $context
-     * @param \Magento\BraintreeTwo\Helper\Country $countryHelper
+     * @param Context $context
+     * @param Country $countryHelper
      * @param array $data
      */
     public function __construct(Context $context, Country $countryHelper, array $data = [])

app/code/Magento/BraintreeTwo/Block/Adminhtml/Form/Field/CountryCreditCard.php

@@ -5,28 +5,28 @@
  */
 namespace Magento\BraintreeTwo\Block\Adminhtml\Form\Field;
 
-use Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray;
 use Magento\Framework\DataObject;
+use Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray;
 
 /**
  * Class CountryCreditCard
  */
 class CountryCreditCard extends AbstractFieldArray
 {
     /**
-     * @var \Magento\BraintreeTwo\Block\Adminhtml\Form\Field\Countries
+     * @var Countries
      */
     protected $countryRenderer = null;
 
     /**
-     * @var \Magento\BraintreeTwo\Block\Adminhtml\Form\Field\CcTypes
+     * @var CcTypes
      */
     protected $ccTypesRenderer = null;
 
     /**
      * Returns renderer for country element
      * 
-     * @return \Magento\BraintreeTwo\Block\Adminhtml\Form\Field\Countries
+     * @return Countries
      */
     protected function getCountryRenderer()
     {
@@ -43,13 +43,13 @@ protected function getCountryRenderer()
     /**
      * Returns renderer for country element
      * 
-     * @return \Magento\BraintreeTwo\Block\Adminhtml\Form\Field\Cctypes
+     * @return CcTypes
      */
     protected function getCcTypesRenderer()
     {
         if (!$this->ccTypesRenderer) {
             $this->ccTypesRenderer = $this->getLayout()->createBlock(
-                Cctypes::class,
+                CcTypes::class,
                 '',
                 ['data' => ['is_render_to_js_template' => true]]
             );
@@ -84,7 +84,7 @@ protected function _prepareToRender()
     /**
      * Prepare existing row data object
      *
-     * @param \Magento\Framework\DataObject $row
+     * @param DataObject $row
      * @return void
      */
     protected function _prepareArrayRow(DataObject $row)
@@ -102,6 +102,5 @@ protected function _prepareArrayRow(DataObject $row)
             }
         }
         $row->setData('option_extra_attrs', $options);
-        return;
     }
 }

app/code/Magento/BraintreeTwo/Block/Customer/CardRenderer.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\BraintreeTwo\Block\Customer;
+
+use Magento\BraintreeTwo\Model\Ui\ConfigProvider;
+use Magento\Framework\View\Element\Template;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Block\AbstractCardRenderer;
+
+class CardRenderer extends AbstractCardRenderer
+{
+    /**
+     * Can render specified token
+     *
+     * @param PaymentTokenInterface $token
+     * @return boolean
+     */
+    public function canRender(PaymentTokenInterface $token)
+    {
+        return $token->getPaymentMethodCode() === ConfigProvider::CODE;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNumberLast4Digits()
+    {
+        return $this->getTokenDetails()['maskedCC'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getExpDate()
+    {
+        return $this->getTokenDetails()['expirationDate'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getIconUrl()
+    {
+        return $this->getIconForType($this->getTokenDetails()['type'])['url'];
+    }
+
+    /**
+     * @return int
+     */
+    public function getIconHeight()
+    {
+        return $this->getIconForType($this->getTokenDetails()['type'])['height'];
+    }
+
+    /**
+     * @return int
+     */
+    public function getIconWidth()
+    {
+        return $this->getIconForType($this->getTokenDetails()['type'])['width'];
+    }
+}