fix TypeError Constants::isAmazonPayment()

Author: mariolorenz

CHANGELOG.md

@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - DeliveryCountries only restricted by merchant
 - [0007778](https://bugs.oxid-esales.com/view.php?id=7778): onOrderSend in Admin only for AmazonOrders
 - [0007791](https://bugs.oxid-esales.com/view.php?id=7791): Fix Call to a member function getActiveCountry() on bool
+- [0007790](https://bugs.oxid-esales.com/view.php?id=7790): TypeError Constants::isAmazonPayment(): Argument #1 ($paymentId) must be of type string, null given
 
 ## [2.1.6] - 2024-08-15
 

src/Controller/OrderController.php

@@ -126,10 +126,9 @@ public function execute()
         $basket = Registry::getSession()->getBasket();
         $exclude = Registry::get(Config::class)->isAmazonExcluded('');
 
-        $paymentId = $basket->getPaymentId();
+        $paymentId = $basket->getPaymentId() ?: '';
         $isAmazonPayment = Constants::isAmazonPayment($paymentId);
 
-
         /** @var string $amazonSessionId */
         $amazonSessionId = Registry::getRequest()->getRequestParameter(Constants::CHECKOUT_REQUEST_PARAMETER_ID);
         if (!empty($amazonSessionId)) {
@@ -192,7 +191,7 @@ public function execute()
     protected function _validateTermsAndConditions()
     {
         $basket = $this->getBasket();
-        $paymentId = $basket->getPaymentId();
+        $paymentId = $basket->getPaymentId() ?: '';
         $isAmazonPayment = Constants::isAmazonPayment($paymentId);
         $isAmazonExpress = Constants::isAmazonExpressPayment($paymentId);