NTR: load cart again if token has changed (#969)

Co-authored-by: Vitalij Mik <vitalij.mik@dasistweb.de>

src/Components/PaypalExpress/Route/FinishCheckoutRoute.php

@@ -109,9 +109,14 @@ public function finishCheckout(SalesChannelContext $context): FinishCheckoutResp
                 $mollieShippingAddress
             );
         }
-
+        $oldToken = $context->getToken();
         # create new account or find existing and login
-        $this->paypalExpress->prepareCustomer($shippingAddress, $context, $acceptedDataProtection, $billingAddress);
+        $context = $this->paypalExpress->prepareCustomer($shippingAddress, $context, $acceptedDataProtection, $billingAddress);
+
+        # read a new card after login
+        if ($context->getToken() !== $oldToken) {
+            $cart = $this->cartService->getCalculatedMainCart($context);
+        }
 
         # we have to update the cart extension before a new user is created and logged in, otherwise the extension is not saved
         $mollieShopwareCart = new MollieShopwareCart($cart);