Fixes #114 Fix ReceiptOrderLines for Adyen POS

7af0ab37 · Rik ter Beek · 8aad0088 · 7af0ab37
Commit 7af0ab37 authored May 19, 2017 by Rik ter Beek
Show whitespace changes
Inline Side-by-side

Showing with 15 additions and 5 deletions

Block/Redirect/Pos.php Block/Redirect/Pos.php +15 -5

No files found.
--- a/Block/Redirect/Pos.php
+++ b/Block/Redirect/Pos.php
@@ -49,6 +49,12 @@ class Pos extends \Magento\Payment\Block\Form
     */
    protected $_adyenLogger;

+    /**
+     * Currency factory
+     *
+     * @var \Magento\Directory\Model\CurrencyFactory
+     */
+    protected $_currencyFactory;

    /**
     * Pos constructor.
@@ -66,7 +72,8 @@ class Pos extends \Magento\Payment\Block\Form
        \Magento\Sales\Model\OrderFactory $orderFactory,
        \Magento\Checkout\Model\Session $checkoutSession,
        \Adyen\Payment\Helper\Data $adyenHelper,
-        \Adyen\Payment\Logger\AdyenLogger $adyenLogger
+        \Adyen\Payment\Logger\AdyenLogger $adyenLogger,
+        \Magento\Directory\Model\CurrencyFactory $currencyFactory
    ) {
        $this->_orderFactory = $orderFactory;
        $this->_checkoutSession = $checkoutSession;
@@ -75,6 +82,7 @@ class Pos extends \Magento\Payment\Block\Form
        $this->_request = $context->getRequest();
        $this->_adyenHelper = $adyenHelper;
        $this->_adyenLogger = $adyenLogger;
+        $this->_currencyFactory = $currencyFactory;

        if (!$this->_order) {
            $incrementId = $this->_getCheckout()->getLastRealOrderId();
@@ -97,7 +105,7 @@ class Pos extends \Magento\Payment\Block\Form
    {
        $launchlink = "";
        try {
-            if($this->_order->getPayment())
+            if ($this->_order->getPayment())
            {

                $realOrderId            = $this->_order->getRealOrderId();
@@ -134,9 +142,10 @@ class Pos extends \Magento\Payment\Block\Form
                    $paymentAmount. "&originalCustomMerchantReference=".
                    $merchantReference . "&originalCustomSessionId=".session_id());

-                $launchlink = "adyen://payment?sessionId=".session_id()."&amount=".$paymentAmount.
-                    "&currency=".$currencyCode."&merchantReference=".$merchantReference. $recurringParams .
-                    $receiptOrderLines .  "&callback=".$callbackUrl . $extraParamaters;
+                // Cash you can trigger by adding transactionType=CASH
+                $launchlink = "adyen://payment?sessionId=".session_id() .
+                    "&amount=".$paymentAmount."&currency=".$currencyCode."&merchantReference=".$merchantReference .
+                    $recurringParams . $receiptOrderLines .  "&callback=".$callbackUrl . $extraParamaters;

                // cash not working see ticket
                // https://youtrack.is.adyen.com/issue/IOS-130#comment=102-20285
@@ -250,6 +259,7 @@ class Pos extends \Magento\Payment\Block\Form
            "====== YOUR PAYMENT DETAILS ======||CB\n".
            "---||C\n";

+
        return $myReceiptOrderLines;
    }