Merge remote-tracking branch 'mainline/develop' into pr-368

Author: Victor Rad

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/view/adminhtml/templates/media/uploader.phtml

@@ -38,6 +38,9 @@ require([
 
     $('#fileupload').fileupload({
         dataType: 'json',
+        formData: {
+            'form_key': window.FORM_KEY
+        },
         dropZone: '[data-tab-panel=image-management]',
         sequentialUploads: true,
         acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,

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'];
+    }
+}

app/code/Magento/BraintreeTwo/Block/Form.php

@@ -9,7 +9,6 @@
 use Magento\BraintreeTwo\Gateway\Config\Config as GatewayConfig;
 use Magento\BraintreeTwo\Model\Adminhtml\Source\CcType;
 use Magento\BraintreeTwo\Model\Ui\ConfigProvider;
-use Magento\Checkout\Model\ConfigProviderInterface;
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Payment\Block\Form\Cc;
 use Magento\Payment\Model\Config;
@@ -37,17 +36,17 @@ class Form extends Cc
     protected $ccType;
 
     /**
-     * @var ConfigProviderInterface
+     * @var VaultPaymentInterface
      */
-    protected $vaultConfigProvider;
+    protected $vaultService;
 
     /**
      * @param Context $context
      * @param Config $paymentConfig
      * @param Quote $sessionQuote
      * @param GatewayConfig $gatewayConfig
      * @param CcType $ccType
-     * @param ConfigProviderInterface $vaultConfigProvider
+     * @param VaultPaymentInterface $vaultService
      * @param array $data
      */
     public function __construct(
@@ -56,14 +55,14 @@ public function __construct(
         Quote $sessionQuote,
         GatewayConfig $gatewayConfig,
         CcType $ccType,
-        ConfigProviderInterface $vaultConfigProvider,
+        VaultPaymentInterface $vaultService,
         array $data = []
     ) {
         parent::__construct($context, $paymentConfig, $data);
         $this->sessionQuote = $sessionQuote;
         $this->gatewayConfig = $gatewayConfig;
         $this->ccType = $ccType;
-        $this->vaultConfigProvider = $vaultConfigProvider;
+        $this->vaultService = $vaultService;
     }
 
     /**
@@ -92,8 +91,7 @@ public function useCvv()
      */
     public function isVaultEnabled()
     {
-        $vault = $this->vaultConfigProvider->getConfig()[VaultPaymentInterface::CODE];
-        return $vault['is_enabled'] && $vault['vault_provider_code'] == ConfigProvider::CODE;
+        return $this->vaultService->isActiveForPayment(ConfigProvider::CODE);
     }
 
     /**