We will be off from 27/1 (Monday) to 31/1 (Friday) (GMT +7) for our Tet Holiday (Lunar New Year) in our country

Commit 7af0ab37 authored by Rik ter Beek's avatar Rik ter Beek

Fixes #114 Fix ReceiptOrderLines for Adyen POS

parent 8aad0088
...@@ -49,6 +49,12 @@ class Pos extends \Magento\Payment\Block\Form ...@@ -49,6 +49,12 @@ class Pos extends \Magento\Payment\Block\Form
*/ */
protected $_adyenLogger; protected $_adyenLogger;
/**
* Currency factory
*
* @var \Magento\Directory\Model\CurrencyFactory
*/
protected $_currencyFactory;
/** /**
* Pos constructor. * Pos constructor.
...@@ -66,7 +72,8 @@ class Pos extends \Magento\Payment\Block\Form ...@@ -66,7 +72,8 @@ class Pos extends \Magento\Payment\Block\Form
\Magento\Sales\Model\OrderFactory $orderFactory, \Magento\Sales\Model\OrderFactory $orderFactory,
\Magento\Checkout\Model\Session $checkoutSession, \Magento\Checkout\Model\Session $checkoutSession,
\Adyen\Payment\Helper\Data $adyenHelper, \Adyen\Payment\Helper\Data $adyenHelper,
\Adyen\Payment\Logger\AdyenLogger $adyenLogger \Adyen\Payment\Logger\AdyenLogger $adyenLogger,
\Magento\Directory\Model\CurrencyFactory $currencyFactory
) { ) {
$this->_orderFactory = $orderFactory; $this->_orderFactory = $orderFactory;
$this->_checkoutSession = $checkoutSession; $this->_checkoutSession = $checkoutSession;
...@@ -75,6 +82,7 @@ class Pos extends \Magento\Payment\Block\Form ...@@ -75,6 +82,7 @@ class Pos extends \Magento\Payment\Block\Form
$this->_request = $context->getRequest(); $this->_request = $context->getRequest();
$this->_adyenHelper = $adyenHelper; $this->_adyenHelper = $adyenHelper;
$this->_adyenLogger = $adyenLogger; $this->_adyenLogger = $adyenLogger;
$this->_currencyFactory = $currencyFactory;
if (!$this->_order) { if (!$this->_order) {
$incrementId = $this->_getCheckout()->getLastRealOrderId(); $incrementId = $this->_getCheckout()->getLastRealOrderId();
...@@ -97,7 +105,7 @@ class Pos extends \Magento\Payment\Block\Form ...@@ -97,7 +105,7 @@ class Pos extends \Magento\Payment\Block\Form
{ {
$launchlink = ""; $launchlink = "";
try { try {
if($this->_order->getPayment()) if ($this->_order->getPayment())
{ {
$realOrderId = $this->_order->getRealOrderId(); $realOrderId = $this->_order->getRealOrderId();
...@@ -134,9 +142,10 @@ class Pos extends \Magento\Payment\Block\Form ...@@ -134,9 +142,10 @@ class Pos extends \Magento\Payment\Block\Form
$paymentAmount. "&originalCustomMerchantReference=". $paymentAmount. "&originalCustomMerchantReference=".
$merchantReference . "&originalCustomSessionId=".session_id()); $merchantReference . "&originalCustomSessionId=".session_id());
$launchlink = "adyen://payment?sessionId=".session_id()."&amount=".$paymentAmount. // Cash you can trigger by adding transactionType=CASH
"&currency=".$currencyCode."&merchantReference=".$merchantReference. $recurringParams . $launchlink = "adyen://payment?sessionId=".session_id() .
$receiptOrderLines . "&callback=".$callbackUrl . $extraParamaters; "&amount=".$paymentAmount."&currency=".$currencyCode."&merchantReference=".$merchantReference .
$recurringParams . $receiptOrderLines . "&callback=".$callbackUrl . $extraParamaters;
// cash not working see ticket // cash not working see ticket
// https://youtrack.is.adyen.com/issue/IOS-130#comment=102-20285 // https://youtrack.is.adyen.com/issue/IOS-130#comment=102-20285
...@@ -250,6 +259,7 @@ class Pos extends \Magento\Payment\Block\Form ...@@ -250,6 +259,7 @@ class Pos extends \Magento\Payment\Block\Form
"====== YOUR PAYMENT DETAILS ======||CB\n". "====== YOUR PAYMENT DETAILS ======||CB\n".
"---||C\n"; "---||C\n";
return $myReceiptOrderLines; return $myReceiptOrderLines;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment