Rendering the confirm form if order is already processed (#1052)

Adyen · Feb 26, 2024 · ef352d4 · ef352d4
1 parent f9473ea
commit ef352d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...int_adyen_SFRA/cartridge/controllers/middlewares/adyen/__tests__/showConfirmation.test.js b/...int_adyen_SFRA/cartridge/controllers/middlewares/adyen/__tests__/showConfirmation.test.js
@@ -59,12 +59,13 @@ describe('Show Confirmation', () => {
   })
 
   it('should not continue processing when order is not open or failed', () => {
-    const URLUtils = require('dw/web/URLUtils');
+    const adyenCheckout = require('*/cartridge/scripts/adyenCheckout');
     req.querystring.merchantReference = 4;
     const adyenHelper = require('*/cartridge/scripts/util/adyenHelper');
     adyenHelper.getOrderMainPaymentInstrumentType.mockReturnValue('AdyenComponent');
     showConfirmation(req, res, jest.fn());
-    expect(URLUtils.url.mock.calls[0][0]).toEqual('Cart-Show');
+    expect(res.render.mock.calls[0][0]).toEqual('orderConfirmForm');
+    expect(adyenCheckout.doPaymentsDetailsCall).not.toBeCalled();
   })
 
   test.each(['Authorised', 'Pending', 'Received'])(

diff --git a/src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/adyen/showConfirmation.js b/src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/adyen/showConfirmation.js
@@ -90,7 +90,10 @@ function showConfirmation(req, res, next) {
       AdyenLogs.info_log(
         'ShowConfirmation called for an order which has already been processed. This is likely to be caused by shoppers using the back button after order confirmation',
       );
-      res.redirect(URLUtils.url('Cart-Show'));
+      res.render('orderConfirmForm', {
+        orderID: order.orderNo,
+        orderToken: order.orderToken,
+      });
       return next();
     }