update: implement browser back button handling and configuration for order cancellation

Author: vegimcarkaxhija

Controller/Redirect/Process.php

@@ -516,6 +516,22 @@ protected function handleFailed($statusCode)
         $this->removeCoupon();
         $this->removeAmastyGiftcardOnFailed();
 
+        // Detect browser back button scenario
+        $isBrowserBack = ($statusCode === $this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_CANCELLED_BY_USER'));
+
+        // Check configuration for browser back behavior
+        $store = $this->order->getStore();
+        $shouldCancelOnBrowserBack = (bool) $this->accountConfig->getCancelOnBrowserBack($store);
+
+        $this->logger->addDebug(sprintf(
+            '%s - Handle Failed Check | Order: %s | statusCode: %s | isBrowserBack: %s | shouldCancelOnBrowserBack: %s',
+            __METHOD__,
+            $this->order->getIncrementId(),
+            $statusCode,
+            var_export($isBrowserBack, true),
+            var_export($shouldCancelOnBrowserBack, true)
+        ));
+
         if (!$this->getSkipHandleFailedRecreate()) {
             if (!$this->quoteRecreate->recreate($this->quote, $this->response)) {
                 $this->logger->addError('Could not recreate the quote.');
@@ -534,7 +550,7 @@ protected function handleFailed($statusCode)
             $this->helper->getStatusCode('BUCKAROO_MAGENTO2_ORDER_FAILED') => 'Unfortunately an error occurred while processing your payment. Please try again. If this error persists, please choose a different payment method.',
             $this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_FAILED') => 'Unfortunately an error occurred while processing your payment. Please try again. If this error persists, please choose a different payment method.',
             $this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_REJECTED') => 'Unfortunately an error occurred while processing your payment. Please try again. If this error persists, please choose a different payment method.',
-            $this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_CANCELLED_BY_USER') => 'According to our system, you have canceled the payment. If this is not the case, please contact us.'
+            $this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_CANCELLED_BY_USER') => 'Payment cancelled. You can try again using the same or a different payment method.',
         ];
 
         $this->addErrorMessage(__($statusCodeAddErrorMessage[$statusCode] ?? 'An error occurred while processing your payment.'));
@@ -544,12 +560,45 @@ protected function handleFailed($statusCode)
             return $this->redirectFailure();
         }
 
-        // Cancel the order and log an error if it fails
-        if (!$this->cancelOrder($statusCode, $statusCodeAddErrorMessage[$statusCode])) {
-            $this->logger->addError('Could not cancel the order.');
+        // For browser back button, check configuration
+        if ($isBrowserBack && !$shouldCancelOnBrowserBack) {
+            $this->logger->addDebug(sprintf(
+                '%s - Browser Back Button Detected - Order left in pending state (config: cancel_on_browser_back = disabled). Quote recreated for retry. Order: %s',
+                __METHOD__,
+                $this->order->getIncrementId()
+            ));
+
+            // Add a status history comment to track this
+            $this->order->addCommentToStatusHistory(
+                __('Customer returned using browser back button. Order left pending for push notification.'),
+                false,
+                false
+            );
+            $this->order->save();
+
+        } else {
+            // For actual failures OR if config says to cancel on browser back, cancel the order as before
+            if ($isBrowserBack) {
+                $this->logger->addDebug(sprintf(
+                    '%s - Browser Back Button Detected - Order will be canceled (config: cancel_on_browser_back = enabled). Order: %s',
+                    __METHOD__,
+                    $this->order->getIncrementId()
+                ));
+            }
+
+            if (!$this->cancelOrder($statusCode, $statusCodeAddErrorMessage[$statusCode])) {
+                $this->logger->addError('Could not cancel the order.');
+            }
         }
 
-        $this->logger->addDebug(__METHOD__ . '|8|');
+        $this->logger->addDebug(sprintf(
+            '%s - Redirect Failure | Order: %s | isBrowserBack: %s | shouldCancelOnBrowserBack: %s',
+            __METHOD__,
+            $this->order->getIncrementId(),
+            var_export($isBrowserBack, true),
+            var_export($shouldCancelOnBrowserBack, true)
+        ));
+
         return $this->redirectFailure();
     }
 

Model/ConfigProvider/Account.php

@@ -39,6 +39,7 @@
  * @method mixed getSuccessRedirect()
  * @method mixed getFailureRedirect()
  * @method mixed getCancelOnFailed()
+ * @method mixed getCancelOnBrowserBack()
  * @method mixed getDigitalSignature()
  * @method mixed getDebugTypes()
  * @method mixed getDebugEmail()
@@ -69,6 +70,7 @@ class Account extends AbstractConfigProvider
     const XPATH_ACCOUNT_FAILURE_REDIRECT_TO_CHECKOUT    = 'buckaroo_magento2/account/failure_redirect_to_checkout';
     const XPATH_ACCOUNT_CANCEL_ON_FAILED                = 'buckaroo_magento2/account/cancel_on_failed';
     const XPATH_ACCOUNT_DIGITAL_SIGNATURE               = 'buckaroo_magento2/account/digital_signature';
+    const XPATH_ACCOUNT_CANCEL_ON_BROWSER_BACK          = 'buckaroo_magento2/account/cancel_on_browser_back';
     const XPATH_ACCOUNT_DEBUG_TYPES                     = 'buckaroo_magento2/account/debug_types';
     const XPATH_ACCOUNT_DEBUG_EMAIL                     = 'buckaroo_magento2/account/debug_email';
     const XPATH_ACCOUNT_LIMIT_BY_IP                     = 'buckaroo_magento2/account/limit_by_ip';
@@ -129,6 +131,7 @@ public function getConfig($store = null)
             'failure_redirect'                  => $this->getFailureRedirect($store),
             'failure_redirect_to_checkout'      => $this->getFailureRedirectToCheckout($store),
             'cancel_on_failed'                  => $this->getCancelOnFailed($store),
+            'cancel_on_browser_back'            => $this->getCancelOnBrowserBack($store),
             'digital_signature'                 => $this->getDigitalSignature($store),
             'debug_types'                       => $this->getDebugTypes($store),
             'debug_email'                       => $this->getDebugEmail($store),

Model/Method/AbstractMethod.php

@@ -793,6 +793,29 @@ public function order(InfoInterface $payment, $amount)
 
         $this->saveTransactionData($response[0], $payment, $this->closeOrderTransaction, true);
 
+        $order = $payment->getOrder();
+        if (!empty($order) && !empty($order->getId())) {
+            try {
+                $payment->save();
+
+                $this->logger2->addDebug(sprintf(
+                    '[%s] Payment transaction persisted successfully for order: %s, transaction ID: %s',
+                    __METHOD__,
+                    $order->getIncrementId(),
+                    $payment->getTransactionId()
+                ));
+            } catch (\Exception $e) {
+                $this->logger2->addError(sprintf(
+                    '[%s] Failed to persist payment transaction - Order: %s, Transaction ID: %s, Error: %s',
+                    __METHOD__,
+                    $order->getIncrementId(),
+                    $payment->getTransactionId(),
+                    $e->getMessage()
+                ));
+                throw $e;
+            }
+        }
+
         // SET REGISTRY BUCKAROO REDIRECT
         $this->_registry->unregister('buckaroo_response');
         $this->_registry->register('buckaroo_response', $response);
@@ -801,7 +824,6 @@ public function order(InfoInterface $payment, $amount)
             $this->setPaymentInTransit($payment, false);
         }
 
-        $order = $payment->getOrder();
         $this->helper->setRestoreQuoteLastOrder($order->getId());
 
         $this->eventManager->dispatch('buckaroo_order_after', ['order' => $order]);
@@ -2811,16 +2833,36 @@ private function cancelPreviousPendingOrder(InfoInterface $payment)
             $order = $orderRepository->get((int)$orderId);
 
             if($order->getState() === Order::STATE_NEW) {
-                $orderManagement = $this->objectManager->get(OrderManagementInterface::class);
-                $orderManagement->cancel($order->getEntityId());
-                $order->addCommentToStatusHistory(
-                    __('Canceled on browser back button')
-                )
-                ->setIsCustomerNotified(false)
-                ->setEntityName('invoice')
-                ->save();
-            }
+                $this->logger2->addDebug(sprintf(
+                    '[%s] Canceling previous pending order: %s (browser back scenario)',
+                    __METHOD__,
+                    $order->getIncrementId()
+                ));
 
+                try {
+                    $order->cancel()->save();
+
+                    $order->addCommentToStatusHistory(
+                        __('Canceled on browser back button - customer placed a new order.')
+                    )
+                        ->setIsCustomerNotified(false)
+                        ->save();
+
+                    $this->logger2->addDebug(sprintf(
+                        '[%s] Successfully canceled order: %s and restored stock',
+                        __METHOD__,
+                        $order->getIncrementId()
+                    ));
+                } catch (\Exception $e) {
+                    $this->logger2->addError(sprintf(
+                        '[%s] Failed to cancel order: %s - Error: %s',
+                        __METHOD__,
+                        $order->getIncrementId(),
+                        $e->getMessage()
+                    ));
+                    throw $e;
+                }
+            }
 
         } catch (\Throwable $th) {
             $this->logger2->addError(__METHOD__." ".(string)$th);