Merge pull request #65 from virtua-wkogut/feature/SP-302

SP-302 Fix checkout issue
bitpay · Nov 4, 2022 · 6b22a22 · 6b22a22
2 parents 4a3586b + daeb8a3
commit 6b22a22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Model/BPRedirect.php b/Model/BPRedirect.php
@@ -20,6 +20,7 @@
 use Magento\Framework\UrlInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Framework\App\ResponseFactory;
+use Magento\Framework\View\Result\Page;
 
 class BPRedirect
 {
@@ -67,14 +68,14 @@ public function __construct(
         $this->logger = $logger;
     }
 
-    public function execute()
+    public function execute(Page $page)
     {
         $orderId = $this->checkoutSession->getData('last_order_id');
         $order = $this->orderInterface->load($orderId);
         $incrementId = $order->getIncrementId();
         $baseUrl = $this->config->getBaseUrl();
         if ($order->getPayment()->getMethodInstance()->getCode() !== Config::BITPAY_PAYMENT_METHOD_NAME) {
-            return;
+            return $page;
         }
 
         try {

diff --git a/Plugin/Onepage/SuccessPlugin.php b/Plugin/Onepage/SuccessPlugin.php
@@ -18,6 +18,6 @@ public function afterExecute(
         \Magento\Checkout\Controller\Onepage\Success $subject,
         \Magento\Framework\View\Result\Page $page
     ) {
-        $this->bpRedirect->execute();
+        return $this->bpRedirect->execute($page);
     }
 }