Merge remote-tracking branch 'mainline/2.1-develop' into MAGETWO-83403-PR-11593

Author: Stanislav Idolov

CHANGELOG.md

@@ -1,4 +1,4 @@
-2.1.10-dev
+2.1.10
 =============
 * GitHub issues:
     * [#6718](https://github.com/magento/magento2/issues/6718) -- Custom composer modules break Component Manager (fixed in [#9692](https://github.com/magento/magento2/pull/9692))
@@ -18,6 +18,33 @@
     * [#5651](https://github.com/magento/magento2/issues/5651) -- Purchase date on admin screen is always *:07:00 (fixed in [#10260](https://github.com/magento/magento2/pull/10260))
     * [#9619](https://github.com/magento/magento2/issues/9619) -- Impossible to create Text Swatch 0 (Zero) (fixed in [#10282](https://github.com/magento/magento2/pull/10282))
     * [#10266](https://github.com/magento/magento2/issues/10266) -- Product Attributes - Size 0 (fixed in [#10282](https://github.com/magento/magento2/pull/10282))
+    * [#6622](https://github.com/magento/magento2/issues/6622) -- String wont translate: "Please enter a valid number in this field." (fixed in [#10745](https://github.com/magento/magento2/pull/10745))
+    * [#4883](https://github.com/magento/magento2/issues/4883) -- Not translated "Please enter a valid email address (Ex: johndoe@domain.com)." (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#5883](https://github.com/magento/magento2/issues/5883) -- Untranslatable string "Minimum length of this field must be equal..." (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#5861](https://github.com/magento/magento2/issues/5861) -- [Magento 2.1.0] Translation (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#5820](https://github.com/magento/magento2/issues/5820) -- js validation messages translation not working in customer account (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#5509](https://github.com/magento/magento2/issues/5509) -- Translate messages on password strength (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#6022](https://github.com/magento/magento2/issues/6022) -- Translation Issue on Magento 2.1v (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#5995](https://github.com/magento/magento2/issues/5995) -- JS translation not working for some fields (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#7525](https://github.com/magento/magento2/issues/7525) -- Magento 2.1.0 Js Translations Not Working (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#9967](https://github.com/magento/magento2/issues/9967) -- Some messages in Customer Account Create not translated (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#5519](https://github.com/magento/magento2/issues/5519) -- Getting PHP Fatal Error on  getPrice()  (fixed in [#10750](https://github.com/magento/magento2/pull/10750))
+    * [#10206](https://github.com/magento/magento2/issues/10206) -- Getting PHP Fatal Error on getPrice() (fixed in [#10750](https://github.com/magento/magento2/pull/10750))
+    * [#4387](https://github.com/magento/magento2/issues/4387) -- News From Date and Design Active From is set when setting Special Price for product. (fixed in [#10751](https://github.com/magento/magento2/pull/10751))
+    * [#7448](https://github.com/magento/magento2/issues/7448) -- Can't remove "Set Product as New From" value (fixed in [#10751](https://github.com/magento/magento2/pull/10751))
+    * [#3754](https://github.com/magento/magento2/issues/3754) -- Must override at least one static content file or custom theme static content won't deploy  (fixed in [#10753](https://github.com/magento/magento2/pull/10753))
+    * [#4725](https://github.com/magento/magento2/issues/4725) -- Static files are not generated for custom theme (fixed in [#10753](https://github.com/magento/magento2/pull/10753))
+    * [#7569](https://github.com/magento/magento2/issues/7569) -- Theme with no static files won't get deployed (fixed in [#10753](https://github.com/magento/magento2/pull/10753))
+    * [#7311](https://github.com/magento/magento2/issues/7311) -- Vimeo videos in product gallery do not work over https (fixed in [#10748](https://github.com/magento/magento2/pull/10748))
+    * [#8574](https://github.com/magento/magento2/issues/8574) -- Product Gallery Vimeo Videos Don't Play Over  HTTPS (fixed in [#10748](https://github.com/magento/magento2/pull/10748))
+    * [#6081](https://github.com/magento/magento2/issues/6081) -- Broken HTML in base template file (fixed in [#10934](https://github.com/magento/magento2/pull/10934))
+    * [#10510](https://github.com/magento/magento2/issues/10510) -- Magento 2.1.8 w/Sample Data is not responsive in categories with text containers (fixed in [#10929](https://github.com/magento/magento2/pull/10929))
+    * [#10738](https://github.com/magento/magento2/issues/10738) -- Empty attribute label is displayed on product page when other language used. (fixed in [#10932](https://github.com/magento/magento2/pull/10932))
+    * [#10417](https://github.com/magento/magento2/issues/10417) -- Wysywig editor shows broken image icons (fixed in [#11309](https://github.com/magento/magento2/pull/11309))
+    * [#10007](https://github.com/magento/magento2/issues/10007) -- ProductAlert: Product alerts not showing in admin side product edit page (fixed in [#11448](https://github.com/magento/magento2/pull/11448))
+    * [#10795](https://github.com/magento/magento2/issues/10795) -- Shipping method radios have duplicate IDs on cart page (fixed in [#11456](https://github.com/magento/magento2/pull/11456))
+    * [#10231](https://github.com/magento/magento2/issues/10231) -- Custom URL Rewrite Not working (fixed in [#11469](https://github.com/magento/magento2/pull/11469))
+    * [#11207](https://github.com/magento/magento2/issues/11207) -- Shipment API won't append comment to email (fixed in [#11386](https://github.com/magento/magento2/pull/11386))
 * GitHub pull requests:
     * [#9692](https://github.com/magento/magento2/pull/9692) -- Backport of MAGETWO-59256 for 2.1: Custom composer modules break Component Manager #6718 (by @JTimNolan)
     * [#9809](https://github.com/magento/magento2/pull/9809) -- Fix issue #6999: Configurable attribute cache was never hit (by @thlassche)
@@ -32,7 +59,31 @@
     * [#10188](https://github.com/magento/magento2/pull/10188) -- magento/magento2:#6175 Fixed Unable to generate unsecure URL if current URL is secure (by @arshadpkm)
     * [#10260](https://github.com/magento/magento2/pull/10260) -- Fix order date format in Orders Grid (by @ihor-sviziev)
     * [#10282](https://github.com/magento/magento2/pull/10282) -- 2.1 - Allow to use text swatch 0 (by @ihor-sviziev)
-    
+    * [#10482](https://github.com/magento/magento2/pull/10482) -- Updated root composer.json file with current release (by @okorshenko)
+    * [#10569](https://github.com/magento/magento2/pull/10569) -- Fix for url_rewrite on page delete via api (by @avdb)
+    * [#10695](https://github.com/magento/magento2/pull/10695) -- Fix checking active carrier against store (by @bardkalbakk)
+    * [#10714](https://github.com/magento/magento2/pull/10714) -- Bugfix - Multiple filter_url_params  (by @bardkalbakk)
+    * [#10745](https://github.com/magento/magento2/pull/10745) -- Backport of PR-5725 for Magento 2.1 - Fix translations issues in... (by @hostep)
+    * [#10747](https://github.com/magento/magento2/pull/10747) -- Backport of MAGETWO-55900 for Magento 2.1: [GitHub] Translate message… (by @hostep)
+    * [#10750](https://github.com/magento/magento2/pull/10750) -- Backport of MAGETWO-65607 for Magento 2.1: [GitHub][PR] Check return … (by @hostep)
+    * [#10751](https://github.com/magento/magento2/pull/10751) -- Backport of MAGETWO-52577 for Magento 2.1: [GitHub] Set Product as Ne… (by @hostep)
+    * [#10557](https://github.com/magento/magento2/pull/10557) -- [BUGFIX] Flat Category reindexList of AllChildren if the url_key of t… (by @lewisvoncken)
+    * [#10753](https://github.com/magento/magento2/pull/10753) -- Backport of MAGETWO-52102 for Magento 2.1: [Github] Custom theme stat… (by @hostep)
+    * [#10749](https://github.com/magento/magento2/pull/10749) -- Backport PR-9713 & PR-9711 for Magento 2.1 - Google Analytics fixes when Cookie Restrictions is enabled (by @hostep)
+    * [#10748](https://github.com/magento/magento2/pull/10748) -- Backport PR-7919 for Magento 2.1 - Using Dynamic Protocol Concatination (by @hostep)
+    * [#10934](https://github.com/magento/magento2/pull/10934) -- [Backport] Fixed unclosed span tag (by @Igloczek)
+    * [#10929](https://github.com/magento/magento2/pull/10929) -- #10510 - fix RWD with installed Sample Data (by @szafran89)
+    * [#10932](https://github.com/magento/magento2/pull/10932) -- Backport #10739 - fix for translated attribute label comparison. (by @Januszpl)
+    * [#11201](https://github.com/magento/magento2/pull/11201) -- Delete CallExit function for After plugin logic execution 2.1-develop [BackPort] (by @osrecio)
+    * [#11309](https://github.com/magento/magento2/pull/11309) -- [2.1-Develop] Fix #10417 (by @PieterCappelle)
+    * [#11448](https://github.com/magento/magento2/pull/11448) -- Show product alerts in admin product detail [backport 2.1] (by @raumatbel)
+    * [#10975](https://github.com/magento/magento2/pull/10975) -- Checkout page could hang for Javascript error (by @angelo983)
+    * [#11456](https://github.com/magento/magento2/pull/11456) -- Added carrier code to ID to distinguish shipping methods [backport 2.1] (by @peterjaap)
+    * [#11506](https://github.com/magento/magento2/pull/11506) -- [Backport-2.1] Retain additional cron history by default (by @mpchadwick)
+    * [#11361](https://github.com/magento/magento2/pull/11361) -- [Backport 2.1-develop] cron:install and cron:remove commands, support to manage multiple instances in the same crontab, based on installation directory (by @adrian-martinez-interactiv4)
+    * [#11386](https://github.com/magento/magento2/pull/11386) -- [Backport 2.1] Append shipment comment to shipment if appendComment is true (by @JeroenVanLeusden)
+    * [#11469](https://github.com/magento/magento2/pull/11469) -- FR#10231_21 Custom URL Rewrite Not working (by @mrodespin)    
+
 2.1.8
 =============
 * GitHub issues:

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

@@ -73,7 +73,8 @@ protected function _responseAction($area = 'frontend')
         $helper = $this->dataFactory->create($area);
 
         $params = [];
-        $data = $this->getRequest()->getPostValue();
+        $data = $this->getRequest()->getParams();
+
         /* @var $paymentMethod \Magento\Authorizenet\Model\DirectPost */
         $paymentMethod = $this->_objectManager->create('Magento\Authorizenet\Model\Directpost');
 
@@ -110,9 +111,8 @@ protected function _responseAction($area = 'frontend')
             $params['redirect'] = $helper->getRedirectIframeUrl($result);
         }
 
+        //registering parameter for iframe content
         $this->_coreRegistry->register(Iframe::REGISTRY_KEY, $params);
-        $this->_view->addPageLayoutHandles();
-        $this->_view->loadLayout(false)->renderLayout();
     }
 
     /**

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

@@ -52,7 +52,7 @@ public function __construct(
      * Response action.
      * Action for Authorize.net SIM Relay Request.
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
@@ -67,10 +67,11 @@ public function execute()
             $paymentMethod->validateResponse();
         } catch (LocalizedException $e) {
             $this->logger->critical($e->getMessage());
-            $this->_redirect('noroute');
-            return;
+
+            return $this->_redirect('noroute');
         }
         $this->_responseAction('adminhtml');
-        $this->resultFactory->create(ResultFactory::TYPE_PAGE);
+
+        return $this->resultFactory->create(ResultFactory::TYPE_PAGE);
     }
 }

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

@@ -12,10 +12,12 @@ class Response extends \Magento\Authorizenet\Controller\Directpost\Payment
      * Response action.
      * Action for Authorize.net SIM Relay Request.
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
         $this->_responseAction('frontend');
+
+        return $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_PAGE);
     }
 }

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

@@ -332,7 +332,7 @@ protected function buildRequest(\Magento\Framework\DataObject $payment)
                     ->setXCity($billing->getCity())
                     ->setXState($billing->getRegion())
                     ->setXZip($billing->getPostcode())
-                    ->setXCountry($billing->getCountry())
+                    ->setXCountry($billing->getCountryId())
                     ->setXPhone($billing->getTelephone())
                     ->setXFax($billing->getFax())
                     ->setXCustId($order->getCustomerId())
@@ -352,7 +352,7 @@ protected function buildRequest(\Magento\Framework\DataObject $payment)
                     ->setXShipToCity($shipping->getCity())
                     ->setXShipToState($shipping->getRegion())
                     ->setXShipToZip($shipping->getPostcode())
-                    ->setXShipToCountry($shipping->getCountry());
+                    ->setXShipToCountry($shipping->getCountryId());
             }
 
             $request->setXPoNum($payment->getPoNumber())

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

@@ -747,7 +747,11 @@ protected function processPaymentFraudStatus(\Magento\Sales\Model\Order\Payment
                 return $this;
             }
 
-            $payment->setIsFraudDetected(true);
+            $fdsFilterAction = (string)$fraudDetailsResponse->getFdsFilterAction();
+            if ($this->fdsFilterActionIsReportOnly($fdsFilterAction) === false) {
+                $payment->setIsFraudDetected(true);
+            }
+
             $payment->setAdditionalInformation('fraud_details', $fraudData);
         } catch (\Exception $e) {
             //this request is optional
@@ -993,4 +997,16 @@ private function getPsrLogger()
         }
         return $this->psrLogger;
     }
+
+    /**
+     * Checks if filter action is Report Only. Transactions that trigger this filter are processed as normal,
+     * but are also reported in the Merchant Interface as triggering this filter.
+     *
+     * @param string $fdsFilterAction
+     * @return bool
+     */
+    private function fdsFilterActionIsReportOnly($fdsFilterAction)
+    {
+        return $fdsFilterAction === (string)$this->dataHelper->getFdsFilterActionLabel('report');
+    }
 }

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

@@ -123,7 +123,7 @@ public function setDataFromOrder(
                 ->setXCity(strval($billing->getCity()))
                 ->setXState(strval($billing->getRegion()))
                 ->setXZip(strval($billing->getPostcode()))
-                ->setXCountry(strval($billing->getCountry()))
+                ->setXCountry(strval($billing->getCountryId()))
                 ->setXPhone(strval($billing->getTelephone()))
                 ->setXFax(strval($billing->getFax()))
                 ->setXCustId(strval($billing->getCustomerId()))
@@ -151,7 +151,7 @@ public function setDataFromOrder(
             )->setXShipToZip(
                 strval($shipping->getPostcode())
             )->setXShipToCountry(
-                strval($shipping->getCountry())
+                strval($shipping->getCountryId())
             );
         }
 

app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js

@@ -5,15 +5,16 @@
 define(
     [
         'jquery',
-        'Magento_Payment/js/view/payment/iframe'
+        'Magento_Payment/js/view/payment/iframe',
+        'mage/translate'
     ],
-    function ($, Component) {
+    function ($, Component, $t) {
         'use strict';
 
         return Component.extend({
             defaults: {
                 template: 'Magento_Authorizenet/payment/authorizenet-directpost',
-                timeoutMessage: 'Sorry, but something went wrong. Please contact the seller.'
+                timeoutMessage: $t('Sorry, but something went wrong. Please contact the seller.')
             },
             placeOrderHandler: null,
             validateHandler: null,

app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php

@@ -13,6 +13,7 @@
 /**
  * "Reset to Defaults" button renderer
  *
+ * @deprecated
  * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Reset extends \Magento\Config\Block\System\Config\Form\Field

app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php

@@ -9,6 +9,11 @@
  */
 namespace Magento\Backend\Test\Unit\Block\Page\System\Config\Robots;
 
+/**
+ * Class ResetTest
+ * @deprecated 
+ * @package Magento\Backend\Test\Unit\Block\Page\System\Config\Robots
+ */
 class ResetTest extends \PHPUnit_Framework_TestCase
 {
     /**