Merge remote-tracking branch 'm2/2.1' into 2.1-develop

Author: Sergey Shvets

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/Authorizenet/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.4",
+    "version": "100.1.5",
     "license": [
         "proprietary"
     ],

app/code/Magento/Braintree/composer.json

@@ -24,7 +24,7 @@
         "magento/module-checkout-agreements": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.5",
+    "version": "100.1.6",
     "license": [
         "proprietary"
     ],

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/composer.json

@@ -25,7 +25,7 @@
         "magento/module-bundle-sample-data": "Sample Data version:100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.2",
+    "version": "100.1.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

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/AbstractProduct.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Block\Product;
 
-use Magento\Framework\App\ObjectManager;
-
 /**
  * Class AbstractProduct
  * @SuppressWarnings(PHPMD.NumberOfChildren)
@@ -99,13 +97,9 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
     /**
      * @param Context $context
      * @param array $data
-     * @param ImageBlockBuilder|null $imageBlockBuilder
      */
-    public function __construct(
-        Context $context,
-        array $data = [],
-        ImageBlockBuilder $imageBlockBuilder = null
-    ) {
+    public function __construct(\Magento\Catalog\Block\Product\Context $context, array $data = [])
+    {
         $this->_imageHelper = $context->getImageHelper();
         $this->imageBuilder = $context->getImageBuilder();
         $this->_compareProduct = $context->getCompareProduct();
@@ -117,10 +111,6 @@ public function __construct(
         $this->_mathRandom = $context->getMathRandom();
         $this->reviewRenderer = $context->getReviewRenderer();
         $this->stockRegistry = $context->getStockRegistry();
-        $this->assign(
-            'imageBlockBuilder',
-            $imageBlockBuilder ?: ObjectManager::getInstance()->get(ImageBlockBuilder::class)
-        );
         parent::__construct($context, $data);
     }
 

app/code/Magento/Catalog/Block/Product/ImageBlockBuilder.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/Block/Product/View/Attributes.php

@@ -63,13 +63,15 @@ public function getGalleryImages()
                 );
                 $image->setData(
                     'medium_image_url',
-                    $this->_imageHelper->init($product, 'product_page_image_medium_no_frame')
+                    $this->_imageHelper->init($product, 'product_page_image_medium')
+                        ->constrainOnly(true)->keepAspectRatio(true)->keepFrame(false)
                         ->setImageFile($image->getFile())
                         ->getUrl()
                 );
                 $image->setData(
                     'large_image_url',
-                    $this->_imageHelper->init($product, 'product_page_image_large_no_frame')
+                    $this->_imageHelper->init($product, 'product_page_image_large')
+                        ->constrainOnly(true)->keepAspectRatio(true)->keepFrame(false)
                         ->setImageFile($image->getFile())
                         ->getUrl()
                 );