Merge remote-tracking branch 'magento2/merchant_beta' into MAGETWO-43648

Author: Maxim Medinskiy

CHANGELOG.md

@@ -1,3 +1,76 @@
+1.0.0-beta4
+=============
+* Fixed bugs:
+    * Fixed an issue with Paypal WebAPI exception error when placing order within PayPal Payments Pro
+    * Fixed an issue with wrong links on multi website store
+    * Fixed an issue where unable to set a date limit on a promotion for 2016 onwards
+    * Fixed an issue with saving promotions
+    * Fixed an issue with option to pay with Paypal account for Payments Pro when configured on website level
+    * Fixed an issue with search results after filtering
+    * Fixed an issue with catalog product import
+    * Fixed an issue with configurable product special price
+    * Fixed an issue where unable to change type for color and size swatches
+    * Fixed an issue with selected filters on layered navigation
+    * Fixed an issue with related products block
+    * Fixed an issue with product alert for out of stock
+    * Fixed an issue with product selection in Products->Catalog results in no products selected
+    * Fixed an issue where unable to remove item from Minicart
+    * Fixed an issue where unable to deploy to production without downtime
+    * Fixed an issue with minicart inconsistent behavior between http and https
+    * Fixed an issue with CMS page preview on frontend
+    * Fixed an issue where discounts is not showing in the order summary at the shipping section in the checkout
+* Search improvements:    
+    * Improve Catalog Performance. Quick Search
+* GitHub issues and requests:
+    * [#1705](https://github.com/magento/magento2/issues/1705) -- Remove item from Minicart does not work
+    * [#1704](https://github.com/magento/magento2/issues/1704) -- Minicart inconsistant behavior between http and https
+      
+
+1.0.0-beta3
+=============
+* Fixed bugs:
+    * Fixed an issue with cms block cache if the block was added via layout xml
+    * Fixed an issue with error message after click "Get Payment Update" for order placed within Authorize.net Direct Post with incorrect url in "Transaction Details Url"
+    * Fixed an issue where unable to import images for configurable products
+    * Fixed an issue where product links API does not return the linked product's sku and position with flat tables turned on
+    * Fixed an issue where unable to run the CLI tool after the DI compilation
+    * Fixed an issue where copies of LESS source files are created instead of symlinks in client side less compilation
+* Various improvements:
+    * Stores and stores loading improvements
+    * Created APIs to retrieve store information
+    * Added the ability to send the purge requests for multiple servers
+* GitHub issues and requests:
+    * [#1679](https://github.com/magento/magento2/issues/1679) -- Cannot run php bin/magento setup:di:compile (have to delete contents of var/di) first
+    * [#1510](https://github.com/magento/magento2/issues/1510) -- Multisite does not work when Full Page Cache is enabled (FPC ignores MAGE_RUN_CODE)
+    
+1.0.0-beta2
+=============
+* Fixed bugs:
+    * Fixed an issue where unable to export custom product attributes
+    * Fixed an issue where customer account page in Admin produces exception
+    * Fixed an issue where import validation is failed in case of import products for multiple websites
+    * Unable to import or export products with multi-select attributes
+    * Fixed an issue where DI compilation fails on class keyword
+    * Fixed an issue where UK PayPal Website Payments Pro Hosted Solution doesn't work
+    * Fixed an issue where US PayPal payment methods are not working
+    * Fixed an issue where Authorize.net does not work in production mode
+    * Fixed an issue where widgets are not rendered on the CMS preview page
+    * Fixed an issue where CMS page preview not works when changing store view
+    * Fixed an issue where minicart is not cleared after placing an order via PayPal
+    * Fixed an issue where is not possible to use Authorize.net payment on checkout
+    * Fixed an issue where multiple stores at different paths rendering wrong store base_url
+    * Fixed an issue where unable to change the product attribute set (Product Template)
+    * Fixed an issue where there is address validation for guest customer
+    * Fixed an issue where no way to set password for customer after placing order
+
+1.0.0-beta1
+=============
+* Fixed bugs:
+    * Fixed an issue where custom attribute with 'Show on Storefront' = Yes makes the customer edit form empty
+    * Fixed an issue where product import loses images
+    * Fixed an issue where images are not uploaded with import procedure
+    * Fixed JS error when click 'Go to Checkout' button
+
 1.0.0-beta
 =============
 * Framework improvements:

Gruntfile.js

@@ -15,6 +15,9 @@ module.exports = function (grunt) {
     [
         taskDir + '/mage-minify',
         taskDir + '/deploy',
+        taskDir + '/black-list-generator',
+        taskDir + '/clean-black-list',
+        taskDir + '/static',
         'time-grunt'
     ].forEach(function (task) {
         require(task)(grunt);

app/code/Magento/AdminNotification/composer.json

@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "1.0.0-beta",
-        "magento/module-backend": "1.0.0-beta",
-        "magento/module-media-storage": "1.0.0-beta",
-        "magento/framework": "1.0.0-beta",
+        "magento/module-store": "1.0.0-beta4",
+        "magento/module-backend": "1.0.0-beta4",
+        "magento/module-media-storage": "1.0.0-beta4",
+        "magento/framework": "1.0.0-beta4",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "1.0.0-beta",
+    "version": "1.0.0-beta4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -3,18 +3,18 @@
   "description": "N/A",
   "require": {
     "php": "~5.5.0|~5.6.0",
-    "magento/module-catalog": "1.0.0-beta",
-    "magento/module-catalog-inventory": "1.0.0-beta",
-    "magento/module-eav": "1.0.0-beta",
-    "magento/module-import-export": "1.0.0-beta",
-    "magento/module-catalog-import-export": "1.0.0-beta",
-    "magento/module-customer": "1.0.0-beta",
-    "magento/module-store": "1.0.0-beta",
-    "magento/framework": "1.0.0-beta",
+    "magento/module-catalog": "1.0.0-beta4",
+    "magento/module-catalog-inventory": "1.0.0-beta4",
+    "magento/module-eav": "1.0.0-beta4",
+    "magento/module-import-export": "1.0.0-beta4",
+    "magento/module-catalog-import-export": "1.0.0-beta4",
+    "magento/module-customer": "1.0.0-beta4",
+    "magento/module-store": "1.0.0-beta4",
+    "magento/framework": "1.0.0-beta4",
     "magento/magento-composer-installer": "*"
   },
   "type": "magento2-module",
-  "version": "1.0.0-beta",
+  "version": "1.0.0-beta4",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

app/code/Magento/Authorization/composer.json

@@ -3,12 +3,12 @@
     "description": "Authorization module provides access to Magento ACL functionality.",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-backend": "1.0.0-beta",
-        "magento/framework": "1.0.0-beta",
+        "magento/module-backend": "1.0.0-beta4",
+        "magento/framework": "1.0.0-beta4",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "1.0.0-beta",
+    "version": "1.0.0-beta4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Authorizenet/Model/Authorizenet.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Authorizenet\Model;
 
+use Magento\Payment\Model\Method\Logger;
+
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
@@ -54,6 +56,8 @@ abstract class Authorizenet extends \Magento\Payment\Model\Method\Cc
 
     const RESPONSE_REASON_CODE_PENDING_REVIEW_DECLINED = 254;
 
+    const PAYMENT_UPDATE_STATUS_CODE_SUCCESS = 'Ok';
+
     /**
      * Transaction fraud state key
      */
@@ -95,6 +99,11 @@ abstract class Authorizenet extends \Magento\Payment\Model\Method\Cc
      */
     protected $transactionDetails = [];
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $_debugReplacePrivateDataKeys = ['merchantAuthentication', 'x_login'];
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -364,11 +373,11 @@ protected function buildRequest(\Magento\Framework\Object $payment)
      */
     protected function postRequest(\Magento\Authorizenet\Model\Request $request)
     {
-        $debugData = ['request' => $request->getData()];
         $result = $this->responseFactory->create();
         $client = new \Magento\Framework\HTTP\ZendClient();
-        $uri = $this->getConfigData('cgi_url');
-        $client->setUri($uri ? $uri : self::CGI_URL);
+        $url = $this->getConfigData('cgi_url') ?: self::CGI_URL;
+        $debugData = ['url' => $url, 'request' => $request->getData()];
+        $client->setUri($url);
         $client->setConfig(['maxredirects' => 0, 'timeout' => 30]);
 
         foreach ($request->getData() as $key => $value) {
@@ -381,21 +390,21 @@ protected function postRequest(\Magento\Authorizenet\Model\Request $request)
 
         try {
             $response = $client->request();
+            $responseBody = $response->getBody();
+            $debugData['response'] = $responseBody;
         } catch (\Exception $e) {
             $result->setXResponseCode(-1)
                 ->setXResponseReasonCode($e->getCode())
                 ->setXResponseReasonText($e->getMessage());
 
-            $debugData['result'] = $result->getData();
-            $this->_debug($debugData);
             throw new \Magento\Framework\Exception\LocalizedException(
                 $this->dataHelper->wrapGatewayError($e->getMessage())
             );
+        } finally {
+            $this->_debug($debugData);
         }
 
-        $responseBody = $response->getBody();
         $r = explode(self::RESPONSE_DELIM_CHAR, $responseBody);
-
         if ($r) {
             $result->setXResponseCode((int)str_replace('"', '', $r[0]))
                 ->setXResponseReasonCode((int)str_replace('"', '', $r[2]))
@@ -413,10 +422,6 @@ protected function postRequest(\Magento\Authorizenet\Model\Request $request)
                 __('Something went wrong in the payment gateway.')
             );
         }
-
-        $debugData['result'] = $result->getData();
-        $this->_debug($debugData);
-
         return $result;
     }
 
@@ -473,24 +478,35 @@ protected function loadTransactionDetails($transactionId)
         );
 
         $client = new \Magento\Framework\HTTP\ZendClient();
-        $uri = $this->getConfigData('cgi_url_td');
-        $client->setUri($uri ? $uri : self::CGI_URL_TD);
+        $url = $this->getConfigData('cgi_url_td') ?: self::CGI_URL_TD;
+        $client->setUri($url);
         $client->setConfig(['timeout' => 45]);
         $client->setHeaders(['Content-Type: text/xml']);
         $client->setMethod(\Zend_Http_Client::POST);
         $client->setRawData($requestBody);
 
-        $debugData = ['request' => $requestBody];
+        $debugData = ['url' => $url, 'request' => $this->removePrivateDataFromXml($requestBody)];
 
         try {
             $responseBody = $client->request()->getBody();
-            $debugData['result'] = $responseBody;
-            $this->_debug($debugData);
+            $debugData['response'] = $responseBody;
             libxml_use_internal_errors(true);
             $responseXmlDocument = new \Magento\Framework\Simplexml\Element($responseBody);
             libxml_use_internal_errors(false);
         } catch (\Exception $e) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Payment updating error.'));
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Unable to get transaction details. Try again later.')
+            );
+        } finally {
+            $this->_debug($debugData);
+        }
+
+        if (!isset($responseXmlDocument->messages->resultCode)
+            || $responseXmlDocument->messages->resultCode != static::PAYMENT_UPDATE_STATUS_CODE_SUCCESS
+        ) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Unable to get transaction details. Try again later.')
+            );
         }
 
         $this->transactionDetails[$transactionId] = $responseXmlDocument;
@@ -509,4 +525,20 @@ protected function getTransactionDetails($transactionId)
             ? $this->transactionDetails[$transactionId]
             : $this->loadTransactionDetails($transactionId);
     }
+
+    /**
+     * Remove nodes with private data from XML string
+     *
+     * Uses values from $_debugReplacePrivateDataKeys property
+     *
+     * @param string $xml
+     * @return string
+     */
+    protected function removePrivateDataFromXml($xml)
+    {
+        foreach ($this->getDebugReplacePrivateDataKeys() as $key) {
+            $xml = preg_replace(sprintf('~(?<=<%s>).*?(?=</%s>)~', $key, $key), Logger::DEBUG_KEYS_MASK, $xml);
+        }
+        return $xml;
+    }
 }

app/code/Magento/Authorizenet/Model/Directpost.php

@@ -718,17 +718,21 @@ protected function processOrder(\Magento\Sales\Model\Order $order)
      */
     protected function processPaymentFraudStatus(\Magento\Sales\Model\Order\Payment $payment)
     {
-        $fraudDetailsResponse = $payment->getMethodInstance()
-            ->fetchTransactionFraudDetails($this->getResponse()->getXTransId());
-        $fraudData = $fraudDetailsResponse->getData();
+        try {
+            $fraudDetailsResponse = $payment->getMethodInstance()
+                ->fetchTransactionFraudDetails($this->getResponse()->getXTransId());
+            $fraudData = $fraudDetailsResponse->getData();
 
-        if (empty($fraudData)) {
-            $payment->setIsFraudDetected(false);
-            return $this;
-        }
+            if (empty($fraudData)) {
+                $payment->setIsFraudDetected(false);
+                return $this;
+            }
 
-        $payment->setIsFraudDetected(true);
-        $payment->setAdditionalInformation('fraud_details', $fraudData);
+            $payment->setIsFraudDetected(true);
+            $payment->setAdditionalInformation('fraud_details', $fraudData);
+        } catch (\Exception $e) {
+            //this request is optional
+        }
 
         return $this;
     }
@@ -741,23 +745,27 @@ protected function processPaymentFraudStatus(\Magento\Sales\Model\Order\Payment
      */
     protected function addStatusComment(\Magento\Sales\Model\Order\Payment $payment)
     {
-        $transactionId = $this->getResponse()->getXTransId();
-        $data = $payment->getMethodInstance()->getTransactionDetails($transactionId);
-        $transactionStatus = (string)$data->transaction->transactionStatus;
-        $fdsFilterAction = (string)$data->transaction->FDSFilterAction;
-
-        if ($payment->getIsTransactionPending()) {
-            $message = 'Amount of %1 is pending approval on the gateway.<br/>'
-                . 'Transaction "%2" status is "%3".<br/>'
-                . 'Transaction FDS Filter Action is "%4"';
-            $message = __(
-                $message,
-                $payment->getOrder()->getBaseCurrency()->formatTxt($this->getResponse()->getXAmount()),
-                $transactionId,
-                $this->dataHelper->getTransactionStatusLabel($transactionStatus),
-                $this->dataHelper->getFdsFilterActionLabel($fdsFilterAction)
-            );
-            $payment->getOrder()->addStatusHistoryComment($message);
+        try {
+            $transactionId = $this->getResponse()->getXTransId();
+            $data = $payment->getMethodInstance()->getTransactionDetails($transactionId);
+            $transactionStatus = (string)$data->transaction->transactionStatus;
+            $fdsFilterAction = (string)$data->transaction->FDSFilterAction;
+
+            if ($payment->getIsTransactionPending()) {
+                $message = 'Amount of %1 is pending approval on the gateway.<br/>'
+                    . 'Transaction "%2" status is "%3".<br/>'
+                    . 'Transaction FDS Filter Action is "%4"';
+                $message = __(
+                    $message,
+                    $payment->getOrder()->getBaseCurrency()->formatTxt($this->getResponse()->getXAmount()),
+                    $transactionId,
+                    $this->dataHelper->getTransactionStatusLabel($transactionStatus),
+                    $this->dataHelper->getFdsFilterActionLabel($fdsFilterAction)
+                );
+                $payment->getOrder()->addStatusHistoryComment($message);
+            }
+        } catch (\Exception $e) {
+            //this request is optional
         }
         return $this;
     }