MAGETWO-69073: Functional Improvements for Magento 2.1.7

Author: duhon

app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php

@@ -6,8 +6,48 @@
  */
 namespace Magento\Authorizenet\Controller\Directpost\Payment;
 
+use Magento\Authorizenet\Helper\DataFactory;
+use Magento\Authorizenet\Model\Directpost;
+use Magento\Authorizenet\Model\DirectpostFactory;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Registry;
+use Psr\Log\LoggerInterface;
+
 class BackendResponse extends \Magento\Authorizenet\Controller\Directpost\Payment
 {
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var DirectpostFactory
+     */
+    private $directpostFactory;
+
+    /**
+     * BackendResponse constructor.
+     *
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param DataFactory $dataFactory
+     * @param DirectpostFactory $directpostFactory
+     * @param LoggerInterface|null $logger
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        DataFactory $dataFactory,
+        DirectpostFactory $directpostFactory = null,
+        LoggerInterface $logger = null
+    ) {
+        parent::__construct($context, $coreRegistry, $dataFactory);
+        $this->directpostFactory = $directpostFactory ?: $this->_objectManager->create(DirectpostFactory::class);
+        $this->logger = $logger ?: $this->_objectManager->get(LoggerInterface::class);
+    }
+
     /**
      * Response action.
      * Action for Authorize.net SIM Relay Request.
@@ -16,6 +56,21 @@ class BackendResponse extends \Magento\Authorizenet\Controller\Directpost\Paymen
      */
     public function execute()
     {
+        $data = $this->getRequest()->getParams();
+        /** @var Directpost $paymentMethod */
+        $paymentMethod = $this->directpostFactory->create();
+        if (!empty($data['store_id'])) {
+            $paymentMethod->setStore($data['store_id']);
+        }
+        $paymentMethod->setResponseData($data);
+        try {
+            $paymentMethod->validateResponse();
+        } catch (LocalizedException $e) {
+            $this->logger->critical($e->getMessage());
+            $this->_redirect('noroute');
+            return;
+        }
         $this->_responseAction('adminhtml');
+        $this->resultFactory->create(ResultFactory::TYPE_PAGE);
     }
 }

app/code/Magento/Braintree/view/adminhtml/ui_component/braintree_report.xml

@@ -12,6 +12,7 @@
             <item name="deps" xsi:type="string">braintree_report.braintree_report_data_source</item>
         </item>
         <item name="spinner" xsi:type="string">braintree_report_columns</item>
+        <item name="acl" xsi:type="string">Magento_Braintree::settlement_report</item>
     </argument>
     <dataSource name="braintree_report_data_source">
         <argument name="dataProvider" xsi:type="configurableObject">

app/code/Magento/Braintree/view/adminhtml/web/js/vault.js

@@ -109,7 +109,7 @@ define([
 
             $('body').trigger('processStart');
 
-            $.get(self.nonceUrl, {
+            $.getJSON(self.nonceUrl, {
                 'public_hash': self.publicHash
             }).done(function (response) {
                 self.setPaymentDetails(response.paymentMethodNonce);

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal-vault.js

@@ -49,7 +49,7 @@ define([
             var self = this;
 
             fullScreenLoader.startLoader();
-            $.get(self.nonceUrl, {
+            $.getJSON(self.nonceUrl, {
                 'public_hash': self.publicHash
             })
                 .done(function (response) {

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js

@@ -69,7 +69,7 @@ define([
             var self = this;
 
             fullScreenLoader.startLoader();
-            $.get(self.nonceUrl, {
+            $.getJSON(self.nonceUrl, {
                 'public_hash': self.publicHash
             })
                 .done(function (response) {

app/code/Magento/Bundle/view/adminhtml/ui_component/bundle_product_listing.xml

@@ -12,6 +12,7 @@
             <item name="deps" xsi:type="string">bundle_product_listing.bundle_product_listing_data_source</item>
         </item>
         <item name="spinner" xsi:type="string">product_columns</item>
+        <item name="acl" xsi:type="string">Magento_Catalog::products</item>
     </argument>
     <dataSource name="bundle_product_listing_data_source">
         <argument name="dataProvider" xsi:type="configurableObject">

app/code/Magento/Catalog/Block/Product/View/Attributes.php

@@ -12,6 +12,7 @@
 namespace Magento\Catalog\Block\Product\View;
 
 use Magento\Catalog\Model\Product;
+use Magento\Framework\Phrase;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 class Attributes extends \Magento\Framework\View\Element\Template
@@ -86,7 +87,7 @@ public function getAdditionalData(array $excludeAttr = [])
                     $value = $this->priceCurrency->convertAndFormat($value);
                 }
 
-                if (is_string($value) && strlen($value)) {
+                if (($value instanceof Phrase || is_string($value)) && strlen($value)) {
                     $data[$attribute->getAttributeCode()] = [
                         'label' => __($attribute->getStoreLabel()),
                         'value' => $value,

app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php

@@ -28,24 +28,34 @@ class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product
      */
     protected $resultForwardFactory;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param Action\Context $context
      * @param Builder $productBuilder
      * @param Initialization\StockDataFilter $stockFilter
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         Product\Builder $productBuilder,
         Initialization\StockDataFilter $stockFilter,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
-        \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+        \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null
     ) {
         $this->stockFilter = $stockFilter;
         parent::__construct($context, $productBuilder);
         $this->resultPageFactory = $resultPageFactory;
         $this->resultForwardFactory = $resultForwardFactory;
+        $this->storeManager = $storeManager ?: $this->_objectManager->get(
+            \Magento\Store\Model\StoreManagerInterface::class
+        );
     }
 
     /**
@@ -60,6 +70,10 @@ public function execute()
         }
 
         $product = $this->productBuilder->build($this->getRequest());
+
+        $store = $this->storeManager->getStore($product->getStoreId());
+        $this->storeManager->setCurrentStore($store->getCode());
+
         $this->_eventManager->dispatch('catalog_product_new_action', ['product' => $product]);
 
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */

app/code/Magento/Catalog/Controller/Adminhtml/Product/Reload.php

@@ -5,13 +5,37 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Backend reload of product create/edit form
  */
 class Reload extends \Magento\Catalog\Controller\Adminhtml\Product
 {
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param Context $context
+     * @param Builder $productBuilder
+     * @param StoreManagerInterface|null $storeManager
+     */
+    public function __construct(
+        Context $context,
+        Builder $productBuilder,
+        StoreManagerInterface $storeManager = null
+    ) {
+        parent::__construct($context, $productBuilder);
+
+        $this->storeManager = $storeManager ?: $this->_objectManager->get(
+            StoreManagerInterface::class
+        );
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -23,11 +47,15 @@ public function execute()
 
         $product = $this->productBuilder->build($this->getRequest());
 
+        $store = $this->storeManager->getStore($product->getStoreId());
+        $this->storeManager->setCurrentStore($store->getCode());
+
         /** @var \Magento\Framework\View\Result\Layout $resultLayout */
         $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
         $resultLayout->getLayout()->getUpdate()->addHandle(['catalog_product_' . $product->getTypeId()]);
         $resultLayout->getLayout()->getUpdate()->removeHandle('default');
         $resultLayout->setHeader('Content-Type', 'application/json', true);
+
         return $resultLayout;
     }
 }

app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php

@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Model\Indexer\Product\Flat;
 
 use Magento\Catalog\Model\Indexer\Product\Flat\Table\BuilderInterfaceFactory;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class TableBuilder
@@ -47,14 +48,18 @@ class TableBuilder
     /**
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper
      * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param BuilderInterfaceFactory|null $tableBuilderFactory
      */
     public function __construct(
         \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper,
-        \Magento\Framework\App\ResourceConnection $resource
+        \Magento\Framework\App\ResourceConnection $resource,
+        BuilderInterfaceFactory $tableBuilderFactory = null
     ) {
         $this->_productIndexerHelper = $productIndexerHelper;
         $this->resource = $resource;
         $this->_connection = $resource->getConnection();
+        $this->tableBuilderFactory = $tableBuilderFactory ?:
+            ObjectManager::getInstance()->get(BuilderInterfaceFactory::class);
     }
 
     /**
@@ -128,13 +133,13 @@ protected function _createTemporaryTable($tableName, array $columns, $valueField
         $valueTables = [];
         if (!empty($columns)) {
             $valueTableName = $tableName . $valueFieldSuffix;
-            $temporaryTableBuilder = $this->getTableBuilderFactory()->create(
+            $temporaryTableBuilder = $this->tableBuilderFactory->create(
                 [
                     'connection' => $this->_connection,
                     'tableName' => $tableName
                 ]
             );
-            $valueTemporaryTableBuilder = $this->getTableBuilderFactory()->create(
+            $valueTemporaryTableBuilder = $this->tableBuilderFactory->create(
                 [
                     'connection' => $this->_connection,
                     'tableName' => $valueTableName
@@ -349,27 +354,14 @@ protected function _fillTemporaryTable(
         }
     }
 
-    /**
-     * @return BuilderInterfaceFactory
-     */
-    private function getTableBuilderFactory()
-    {
-        if (null === $this->tableBuilderFactory) {
-            $this->tableBuilderFactory = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(BuilderInterfaceFactory::class);
-        }
-
-        return $this->tableBuilderFactory;
-    }
-
     /**
      * @return \Magento\Framework\EntityManager\MetadataPool
      */
     private function getMetadataPool()
     {
         if (null === $this->metadataPool) {
-            $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get('Magento\Framework\EntityManager\MetadataPool');
+            $this->metadataPool = ObjectManager::getInstance()
+                ->get(\Magento\Framework\EntityManager\MetadataPool::class);
         }
         return $this->metadataPool;
     }