Merge pull request #19 from ndeet/fix-redirect

Fix error on redirect if invoice already settled.
btcpayserver · Jul 5, 2023 · 1564f30 · 1564f30
2 parents 86b24c0 + f83576a
commit 1564f30
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Controller/Redirect/ReturnAfterPayment.php b/Controller/Redirect/ReturnAfterPayment.php
@@ -103,14 +103,15 @@ public function execute()
                 $invoice = $this->btcPayService->getInvoice($btcPayInvoiceId, $btcPayStoreId, $magentoStoreId);
                 $isInvoiceExpired = $invoice->isExpired();
                 $isInvoiceProcessing = $invoice->isProcessing();
+                $isInvoiceSettled = $invoice->isSettled();
             }
         } else {
             // Order cannot be found
             $order = null;
         }
 
         if ($order && $valid) {
-            if ($isInvoiceProcessing) {
+            if ($isInvoiceProcessing || $isInvoiceSettled) {
                 $this->checkoutSession->setLastQuoteId($order->getQuoteId());
                 $this->checkoutSession->setLastSuccessQuoteId($order->getQuoteId());
                 $this->checkoutSession->setLastOrderId($order->getId());