Merge pull request #291 from OXID-eSales/Incompatiblity_Klarna_plugin

7656: Fixed incompatibility with Klarna plugin

CHANGELOG.md

@@ -11,7 +11,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Fix admin block parent call, thanks to Alpha-Sys
 - Fix Errorlog-Message "Duplicate entry ..." + fix Update send PUI-Bankdata via Webhook
 - Fix PayPalExpress Reauth is necessary if the cart amount (total is greater than before) has changed during the checkout process
-- Fix, don't show vaulting-Boxes if it is deactivated in Backend 
+- Fix, don't show vaulting-Boxes if it is deactivated in Backend
+- [0007656](https://bugs.oxid-esales.com/view.php?id=7656): Fix incompatibility with Klarna-Module
 
 ### NEW
 - PayPal-Request-Id based on serialized body, no extra PayPal-Request-Id necessary anymore

src/Model/Order.php

@@ -265,9 +265,6 @@ protected function afterOrderCleanUp(Basket $basket, User $user): void
     // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
     protected function _executePayment(Basket $basket, $userpayment)
     {
-        //order number needs to be set before the payment is requested
-        $this->setOrderNumber();
-
         $paymentService = $this->getServiceFromContainer(PaymentService::class);
         $sessionPaymentId = (string) $paymentService->getSessionPaymentId();
 
@@ -284,6 +281,10 @@ protected function _executePayment(Basket $basket, $userpayment)
         //catch UAPM, Standard and Pay Later PayPal payments here
         if ($isPayPalUAPM || $isPayPalStandard || $isPayPalPayLater) {
             try {
+
+                //order number needs to be set before the payment is requested
+                $this->setOrderNumber();
+
                 if ($isPayPalUAPM) {
                     $redirectLink = $paymentService->doExecuteUAPMPayment($this, $basket);
                 } else {