Redirect to confirmation page for POS (#1218)

Adyen · Nov 29, 2024 · 09b755e · 09b755e
1 parent 2da8193
commit 09b755e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/...idges/app_adyen_SFRA/cartridge/client/default/js/adyen_checkout/renderGenericComponent.js b/...idges/app_adyen_SFRA/cartridge/client/default/js/adyen_checkout/renderGenericComponent.js
@@ -263,8 +263,6 @@ export async function initializeCheckout() {
     paymentMethodsResponse.adyenDescriptions,
   );
 
-  renderPosTerminals(paymentMethodsResponse.adyenConnectedTerminals);
-
   renderGiftCardLogo(paymentMethodsResponse.imagePath);
 
   const firstPaymentMethod = document.querySelector(
@@ -275,6 +273,11 @@ export async function initializeCheckout() {
     helpers.displaySelectedMethod(firstPaymentMethod.value);
   }
 
+  if (paymentMethodsResponse.adyenConnectedTerminals) {
+    renderPosTerminals(paymentMethodsResponse.adyenConnectedTerminals);
+    document.querySelector('button[value="submit-payment"]').disabled = false;
+  }
+
   helpers.createShowConfirmationForm(
     window.ShowConfirmationPaymentFromComponent,
   );

diff --git a/...rtridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout_services/placeOrder.js b/...rtridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout_services/placeOrder.js
@@ -143,11 +143,11 @@ function placeOrder(req, res, next) {
     // Handles payment authorization
     var handlePaymentResult = adyenHelpers.handlePayments(order);
 
-    const mainPaymentInstrument = order.getPaymentInstruments(
-      AdyenHelper.getOrderMainPaymentInstrumentType(order)
-    )[0];
-
+    let mainPaymentInstrument;
     if (giftCardsAdded) {
+	mainPaymentInstrument = order.getPaymentInstruments(
+	    AdyenHelper.getOrderMainPaymentInstrumentType(order)
+	)[0];
         giftCardsAdded.forEach((giftCard) => {
             const divideBy = AdyenHelper.getDivisorForCurrency(mainPaymentInstrument.paymentTransaction.getAmount());
             const amount = {