Merge branch '2.1-develop' of https://github.com/magento-qwerty/magento2ce into MAGETWO-70322

Author: Oleksandr Gorkun

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/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
 {
     /**

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -651,24 +651,52 @@ protected function addFilterGroupToCollection(
         Collection $collection
     ) {
         $fields = [];
-        $categoryFilter = [];
+
         foreach ($filterGroup->getFilters() as $filter) {
             $conditionType = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
+            $isApplied = $this->applyCustomFilter($collection, $filter, $conditionType);
 
-            if ($filter->getField() == 'category_id') {
-                $categoryFilter[$conditionType][] = $filter->getValue();
-                continue;
+            if (!$isApplied) {
+                $fields[] = ['attribute' => $filter->getField(), $conditionType => $filter->getValue()];
             }
-            $fields[] = ['attribute' => $filter->getField(), $conditionType => $filter->getValue()];
         }
 
-        if ($categoryFilter) {
+        if ($fields) {
+            $collection->addFieldToFilter($fields);
+        }
+    }
+
+    /**
+     * Apply custom filters to product collection.
+     *
+     * @param Collection $collection
+     * @param \Magento\Framework\Api\Filter $filter
+     * @param string $conditionType
+     * @return bool
+     */
+    private function applyCustomFilter(Collection $collection, \Magento\Framework\Api\Filter $filter, $conditionType)
+    {
+        if ($filter->getField() == 'category_id') {
+            $categoryFilter[$conditionType][] = $filter->getValue();
             $collection->addCategoriesFilter($categoryFilter);
+            return true;
         }
 
-        if ($fields) {
-            $collection->addFieldToFilter($fields);
+        if ($filter->getField() == 'store') {
+            $collection->addStoreFilter($filter->getValue());
+            return true;
         }
+
+        if ($filter->getField() == 'website_id') {
+            $value = $filter->getValue();
+            if (strpos($value, ',') !== false) {
+                $value = explode(',', $value);
+            }
+            $collection->addWebsiteFilter($value);
+            return true;
+        }
+
+        return false;
     }
 
     /**