[change] (MAGE2-311) Add measures to avoid unexpected errors due fore…

…ign payment type.

Controller/Index/Redirect.php

@@ -172,7 +172,8 @@ public function execute()
             }
 
             // Check whether order was loaded correctly
-            if($order === null || $order->isEmpty()) {
+            $hasHeidelpayPayment = $this->orderHelper->hasHeidelpayPayment($order);
+            if($order === null || $order->isEmpty() || $order->isCanceled() || !$hasHeidelpayPayment) {
                 $this->_logger->error(
                     'Heidelpay - Redirect: Cannot receive order. Order creation might have failed.'
                 );

Helper/Order.php

@@ -2,7 +2,7 @@
 
 namespace Heidelpay\Gateway\Helper;
 
-
+use Heidelpay\Gateway\PaymentMethods\HeidelpayAbstractPaymentMethod;
 use Magento\Framework\App\Helper\AbstractHelper;
 use Magento\Framework\App\Helper\Context;
 use Magento\Framework\Data\Collection;
@@ -145,6 +145,25 @@ protected function fetchOrdersByQuoteId($quoteId): Collection
     }
 
 
-        return $orderList->getFirstItem();
+    /**
+     * Returns true if the payment of the order is part of this payment module.
+     *
+     * @param MagentoOrder $order
+     * @return bool
+     */
+    public function hasHeidelpayPayment(MagentoOrder $order): bool
+    {
+        $payment = $order->getPayment();
+        $returnVal = true;
+
+        if ($payment === null) {
+            $this->_logger->error('heidelpay - Empty payment.');
+            $returnVal = false;
+        } elseif (!$payment->getMethodInstance() instanceof HeidelpayAbstractPaymentMethod) {
+            $this->_logger->error('heidelpay - Not heidelpay payment.');
+            $returnVal = false;
+        }
+
+        return $returnVal;
     }
 }