Merge branch 'MAGETWO-58377' into 2.0-develop-pr1

Author: OlgaVasyltsun

app/code/Magento/Paypal/Model/Payflow/Transparent.php

@@ -6,15 +6,15 @@
 namespace Magento\Paypal\Model\Payflow;
 
 use Magento\Framework\DataObject;
-use Magento\Paypal\Model\Payflowpro;
-use Magento\Sales\Model\Order\Payment;
-use Magento\Paypal\Model\Payflow\Service\Gateway;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Payment\Model\Method\TransparentInterface;
-use Magento\Payment\Model\Method\ConfigInterfaceFactory;
 use Magento\Framework\Exception\State\InvalidTransitionException;
+use Magento\Payment\Model\InfoInterface;
+use Magento\Payment\Model\Method\ConfigInterfaceFactory;
+use Magento\Payment\Model\Method\TransparentInterface;
+use Magento\Paypal\Model\Payflow\Service\Gateway;
 use Magento\Paypal\Model\Payflow\Service\Response\Handler\HandlerInterface;
 use Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator;
+use Magento\Paypal\Model\Payflowpro;
 
 /**
  * Payflow Pro payment gateway model
@@ -112,23 +112,27 @@ public function validate()
     /**
      * Performs authorize transaction
      *
-     * @param \Magento\Payment\Model\InfoInterface|Object $payment
+     * @param InfoInterface|Object $payment
      * @param float $amount
      * @return $this
      * @throws InvalidTransitionException
      * @throws LocalizedException
      */
-    public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount)
+    public function authorize(InfoInterface $payment, $amount)
     {
+        /** @var DataObject $request */
         $request = $this->buildBasicRequest();
 
+        /** @var \Magento\Sales\Model\Order $order */
         $order = $payment->getOrder();
         $this->addRequestOrderInfo($request, $order);
         $request = $this->fillCustomerContacts($order, $request);
 
-        $request->setTrxtype(self::TRXTYPE_AUTH_ONLY);
-        $request->setOrigid($payment->getAdditionalInformation('pnref'));
-        $request->setAmt(round($amount, 2));
+        $token = $payment->getAdditionalInformation('pnref');
+        $request->setData('trxtype', self::TRXTYPE_AUTH_ONLY);
+        $request->setData('origid', $token);
+        $request->setData('amt', round($amount, 2));
+        $request->setData('currency', $order->getBaseCurrencyCode());
 
         $response = $this->postRequest($request, $this->getConfig());
         $this->processErrors($response);

app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php

@@ -121,7 +121,7 @@ protected function initializationAuthorizeMock()
         $this->orderMock = $this->getMockBuilder('Magento\Sales\Model\Order')
             ->setMethods([
                 'getCustomerId', 'getBillingAddress', 'getShippingAddress', 'getCustomerEmail',
-                'getId', 'getIncrementId'
+                'getId', 'getIncrementId', 'getBaseCurrencyCode'
             ])
             ->disableOriginalConstructor()
             ->getMock();
@@ -163,6 +163,9 @@ protected function buildRequestData()
         $this->paymentMock->expects($this->once())
             ->method('getOrder')
             ->willReturn($this->orderMock);
+        $this->orderMock->expects($this->once())
+            ->method('getBaseCurrencyCode')
+            ->willReturn('USD');
         $this->orderMock->expects($this->once())
             ->method('getBillingAddress')
             ->willReturn($this->addressBillingMock);