Merge pull request #473 from Adyen/PW-1405

PW-1405 Call to a member function getAdditionalInformation() on null

Merge pull request #473 from Adyen/PW-1405
PW-1405 Call to a member function getAdditionalInformation() on null
123304a4 · cyattilakiss · GitHub · 7c6eec15 · fa0ffb92 · 123304a4
Commit 123304a4 authored Jul 03, 2019 by cyattilakiss Committed by GitHub Jul 03, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

Controller/Process/Result.php Controller/Process/Result.php +4 -1

No files found.
--- a/Controller/Process/Result.php
+++ b/Controller/Process/Result.php
@@ -382,7 +382,10 @@ class Result extends \Magento\Framework\App\Action\Action

        $request = [];

-		if (!empty($this->_session->getLastRealOrder()->getPayment()->getAdditionalInformation("paymentData"))) {
+        if (!empty($this->_session->getLastRealOrder()) &&
+            !empty($this->_session->getLastRealOrder()->getPayment()) &&
+            !empty($this->_session->getLastRealOrder()->getPayment()->getAdditionalInformation("paymentData"))
+        ) {
            $request['paymentData'] = $this->_session->getLastRealOrder()->getPayment()->getAdditionalInformation("paymentData");
        }