Merchant reference set for PayPal Express

jest/sfccCartridgeMocks.js

@@ -240,6 +240,7 @@ jest.mock('*/cartridge/adyen/utils/adyenHelper', () => ({
     })),
     isAdyenGivingAvailable: jest.fn(() => true),
     isApplePay: jest.fn(() => true),
+    isPayPalExpress: jest.fn(() => false),
     getAdyenGivingConfig: jest.fn(() => true),
     getApplicationInfo: jest.fn(() => ({
       externalPlatform: { version: 'SFRA' },

metadata/site_import/meta/system-objecttype-extensions.xml

@@ -44,6 +44,14 @@
                 <externally-managed-flag>false</externally-managed-flag>
                 <min-length>0</min-length>
             </attribute-definition>
+            <attribute-definition attribute-id="Adyen_paypalExpressResponse">
+                <display-name xml:lang="x-default">Adyen PayPal Express Response</display-name>
+                <description xml:lang="x-default">PayPal Express response used to render the confirmation form</description>
+                <type>text</type>
+                <mandatory-flag>false</mandatory-flag>
+                <externally-managed-flag>false</externally-managed-flag>
+                <min-length>0</min-length>
+            </attribute-definition>
         </custom-attribute-definitions>
         <group-definitions>
             <attribute-group group-id="AdyenPayments">
@@ -53,6 +61,7 @@
                 <attribute attribute-id="Adyen_paymentMethod"/>
                 <attribute attribute-id="Adyen_value"/>
                 <attribute attribute-id="Adyen_donationAmount"/>
+                <attribute attribute-id="Adyen_paypalExpressResponse"/>
             </attribute-group>
         </group-definitions>
     </type-extension>

src/cartridges/app_adyen_SFRA/cartridge/client/default/js/paypalExpress.js

@@ -19,8 +19,6 @@ function callPaymentFromComponent(data, component) {
       data: JSON.stringify(data),
     },
     success(response) {
-      helpers.createShowConfirmationForm(window.showConfirmationAction);
-      helpers.setOrderFormData(response);
       handlePaypalResponse(response, component);
     },
   });
@@ -43,6 +41,10 @@ function makeExpressPaymentDetailsCall(data) {
     data: JSON.stringify({ data }),
     contentType: 'application/json; charset=utf-8',
     async: false,
+    success(response) {
+      helpers.createShowConfirmationForm(window.showConfirmationAction);
+      helpers.setOrderFormData(response);
+    },
   });
 }
 
@@ -79,6 +81,9 @@ async function mountPaypalComponent() {
       },
       onAdditionalDetails: (state) => {
         makeExpressPaymentDetailsCall(state.data);
+        document.querySelector('#additionalDetailsHidden').value =
+          JSON.stringify(state.data);
+        document.querySelector('#showConfirmationForm').submit();
       },
     };
 

src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/expressPayments/paypal/makeExpressPaymentDetailsCall.js

@@ -2,7 +2,6 @@ const URLUtils = require('dw/web/URLUtils');
 const OrderMgr = require('dw/order/OrderMgr');
 const Transaction = require('dw/system/Transaction');
 const BasketMgr = require('dw/order/BasketMgr');
-const AdyenHelper = require('*/cartridge/adyen/utils/adyenHelper');
 const adyenCheckout = require('*/cartridge/adyen/scripts/payments/adyenCheckout');
 const AdyenLogs = require('*/cartridge/adyen/logs/adyenCustomLogs');
 const COHelpers = require('*/cartridge/scripts/checkout/checkoutHelpers');
@@ -60,25 +59,26 @@ function makeExpressPaymentDetailsCall(req, res, next) {
     const request = JSON.parse(req.body);
     const currentBasket = BasketMgr.getCurrentBasket();
 
-    const paymentsDetailsResponse = adyenCheckout.doPaymentsDetailsCall(
-      request.data,
-    );
+    const response = adyenCheckout.doPaymentsDetailsCall(request.data);
 
     setBillingAndShippingAddress(currentBasket);
-    const order = OrderMgr.createOrder(currentBasket);
+    const order = OrderMgr.createOrder(
+      currentBasket,
+      session.privacy.paypalExpressOrderNo,
+    );
     const fraudDetectionStatus = { status: 'success' };
     const placeOrderResult = COHelpers.placeOrder(order, fraudDetectionStatus);
     if (placeOrderResult.error) {
       AdyenLogs.error_log('Failed to place the PayPal express order');
     }
 
-    const response = AdyenHelper.createAdyenCheckoutResponse(
-      paymentsDetailsResponse,
-    );
-
     response.orderNo = order.orderNo;
     response.orderToken = order.orderToken;
-    res.json(response);
+    // Storing the paypal express response to make use of show confirmation logic
+    Transaction.wrap(() => {
+      order.custom.Adyen_paypalExpressResponse = JSON.stringify(response);
+    });
+    res.json({ orderNo: response.orderNo, orderToken: response.orderToken });
     return next();
   } catch (e) {
     AdyenLogs.error_log(

src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenCheckout.js

@@ -155,9 +155,9 @@ function createPaymentRequest(args) {
 
     paymentRequest = AdyenHelper.add3DS2Data(paymentRequest);
     const paymentMethodType = paymentRequest.paymentMethod.type;
-    const isPayPalExpress =
-      paymentRequest.paymentMethod.type === 'paypal' &&
-      paymentRequest.paymentMethod.subtype === 'express';
+    const isPayPalExpress = AdyenHelper.isPayPalExpress(
+      paymentRequest.paymentMethod,
+    );
 
     // Add Risk data
     if (AdyenConfigs.getAdyenBasketFieldsEnabled()) {

src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/showConfirmation/handlePaymentFromComponent.js

@@ -49,11 +49,14 @@ function handleAuthorisedPayment(
 ) {
   // custom fraudDetection
   const fraudDetectionStatus = { status: 'success' };
+  const isPayPalExpress = order.custom.Adyen_paypalExpressResponse;
 
-  // Places the order
-  const placeOrderResult = COHelpers.placeOrder(order, fraudDetectionStatus);
-  if (placeOrderResult.error) {
-    return handlePaymentError(order, adyenPaymentInstrument, { res, next });
+  // Places the order, for PayPal express the order is placed from makeExpressPaymentDetailsCall.js
+  if (!isPayPalExpress) {
+    const placeOrderResult = COHelpers.placeOrder(order, fraudDetectionStatus);
+    if (placeOrderResult.error) {
+      return handlePaymentError(order, adyenPaymentInstrument, { res, next });
+    }
   }
 
   Transaction.wrap(() => {
@@ -101,6 +104,7 @@ function handlePaymentResult(result, order, adyenPaymentInstrument, options) {
   Transaction.wrap(() => {
     order.custom.Adyen_pspReference = result.pspReference;
     order.custom.Adyen_eventCode = result.resultCode;
+    order.custom.Adyen_paypalExpressResponse = null;
   });
   return handlePaymentError(order, adyenPaymentInstrument, options);
 }
@@ -135,15 +139,25 @@ function handlePayment(stateData, order, options) {
       return handlePaymentError(order, adyenPaymentInstrument, options);
     }
   }
-
-  const detailsCall = hasStateData
-    ? handlePaymentsDetailsCall(stateData, adyenPaymentInstrument)
-    : null;
+  const paymentData = JSON.parse(
+    adyenPaymentInstrument.custom.adyenPaymentData,
+  );
+  const isPayPalExpress = AdyenHelper.isPayPalExpress(
+    paymentData.paymentMethod,
+  );
+  const detailsCall =
+    hasStateData && !isPayPalExpress
+      ? handlePaymentsDetailsCall(stateData, adyenPaymentInstrument)
+      : null;
+  if (isPayPalExpress) {
+    finalResult = JSON.parse(order.custom.Adyen_paypalExpressResponse);
+  } else {
+    finalResult = finalResult || detailsCall?.result;
+  }
 
   Transaction.wrap(() => {
     adyenPaymentInstrument.custom.adyenPaymentData = null;
   });
-  finalResult = finalResult || detailsCall?.result;
 
   return handlePaymentResult(
     finalResult,

src/cartridges/int_adyen_SFRA/cartridge/adyen/utils/adyenHelper.js

@@ -32,6 +32,7 @@ const collections = require('*/cartridge/scripts/util/collections');
 const ShippingMgr = require('dw/order/ShippingMgr');
 const ShippingMethodModel = require('*/cartridge/models/shipping/shippingMethod');
 const PaymentInstrument = require('dw/order/PaymentInstrument');
+const OrderMgr = require('dw/order/OrderMgr');
 const StringUtils = require('dw/util/StringUtils');
 //script includes
 const AdyenLogs = require('*/cartridge/adyen/logs/adyenCustomLogs');
@@ -339,6 +340,13 @@ let adyenHelperObj = {
     return false;
   },
 
+  isPayPalExpress(paymentMethod){
+	if (paymentMethod.type === 'paypal' && paymentMethod.subtype === 'express'){
+		return true;
+	}
+	return false;
+  },
+
   // Get stored card token of customer saved card based on matched cardUUID
   getCardToken(cardUUID, customer) {
     let token = '';
@@ -504,6 +512,13 @@ let adyenHelperObj = {
       orderToken = order.getOrderToken();
     }
 
+	// creates order number to be utilized for PayPal express
+	if (adyenHelperObj.isPayPalExpress(stateData.paymentMethod)){
+		const paypalExpressOrderNo = OrderMgr.createOrderNo();
+		session.privacy.paypalExpressOrderNo = paypalExpressOrderNo;
+		reference = paypalExpressOrderNo;
+	}
+
     let signature = '';
     //Create signature to verify returnUrl if there is an order
     if (order && order.getUUID()) {