Merge remote-tracking branch 'origin/MAGETWO-62621' into 2.1-develop-pr35

Author: StasKozar

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())
             );
         }
 

dev/tests/functional/tests/app/Magento/Authorizenet/Test/Repository/ConfigData.xml

@@ -71,5 +71,21 @@
                 <item name="value" xsi:type="number">0</item>
             </field>
         </dataset>
+        <dataset name="authorizenet_authorize_capture">
+            <field name="payment/authorizenet_directpost/payment_action" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">authorize_capture</item>
+            </field>
+        </dataset>
+        <dataset name="authorizenet_authorize_capture_rollback">
+            <field name="payment/authorizenet_directpost/payment_action" xsi:type="array">
+                <item name="scope" xsi:type="string">payment</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="string">authorize</item>
+            </field>
+        </dataset>
     </repository>
 </config>

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Info.php

@@ -29,6 +29,14 @@ class Info extends Block
      */
     protected $group = '//th[text()="Customer Group"]/following-sibling::*';
 
+    /**
+     * Item options.
+     *
+     * @var string
+     */
+    protected $itemOptions = '//div[@class=\'product-sku-block\' and contains(normalize-space(.), \'{SKU}\')]'
+        . '/following-sibling::*[@class="item-options"]';
+
     /**
      * Get email from the data inside block
      *
@@ -48,4 +56,29 @@ public function getCustomerGroup()
     {
         return $this->_rootElement->find($this->group, Locator::SELECTOR_XPATH)->getText();
     }
+
+    /**
+     * Get Product options.
+     *
+     * @param string $sku
+     * @return array
+     */
+    public function getProductOptions($sku)
+    {
+        $selector = str_replace('{SKU}', $sku, $this->itemOptions);
+        $productOption = $this->_rootElement->find($selector, Locator::SELECTOR_XPATH);
+        $result = [];
+        if ($productOption->isVisible()) {
+            $keyItem = $productOption->getElements('dt');
+            $valueItem = $productOption->getElements('dd');
+            foreach ($keyItem as $key => $item) {
+                $result[$item->getText()] = null;
+                if (isset($valueItem[$key])) {
+                    $result[$item->getText()] = $valueItem[$key]->getText();
+                }
+            }
+        }
+
+        return $result;
+    }
 }