Added Wallet/Express pay type field (#3)

Co-authored-by: Jonathan Dart <jonathan.dart@boldcommerce.com>
bold-commerce · Nov 20, 2023 · 6b0bac7 · 6b0bac7
1 parent 7cb7d08
commit 6b0bac7
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 5 deletions.
diff --git a/src/braintree/apple/braintreeOnPaymentAuthorizedApple.ts b/src/braintree/apple/braintreeOnPaymentAuthorizedApple.ts
@@ -87,7 +87,8 @@ export async function braintreeOnPaymentAuthorizedApple(event: ApplePayPaymentAu
             token: nonce,
             gateway_public_id: gatewayPublicId,
             currency: currencyCode,
-            amount: totalAmountDue
+            amount: totalAmountDue,
+            wallet_pay_type: 'applepay',
         };
 
         const paymentResult = await addPayment(payment, API_RETRY);

diff --git a/src/braintree/google/braintreeOnPaymentAuthorizedGoogle.ts b/src/braintree/google/braintreeOnPaymentAuthorizedGoogle.ts
@@ -82,7 +82,8 @@ export async function braintreeOnPaymentAuthorizedGoogle(paymentData: PaymentDat
         gateway_public_id: gatewayPublicId,
         currency: currencyCode,
         amount: totalAmountDue,
-        display_string: description
+        display_string: description,
+        wallet_pay_type: 'paywithgoogle',
     };
     const paymentResult = await addPayment(payment, API_RETRY);
     if (!paymentResult.success) {

diff --git a/src/paypal/paypalOnApprove.ts b/src/paypal/paypalOnApprove.ts
@@ -88,7 +88,8 @@ export async function paypalOnApprove(data: OnApproveData, actions: OnApproveAct
             nonce: `${id}:${payer.payer_id}`, // TODO: Temporarily required - It is not in the API documentation, but required for Paypal Express
             gateway_public_id: getPaypalGatewayPublicId(),
             currency: currencyCode,
-            amount: totals.totalAmountDue
+            amount: totals.totalAmountDue,
+            wallet_pay_type: 'paypal',
         } as IAddPaymentRequest;
         const paymentResult = await addPayment(payment, API_RETRY);
         if(!paymentResult.success){

diff --git a/src/paypal/ppcp_apple/ppcpOnPaymentAuthorizedApple.ts b/src/paypal/ppcp_apple/ppcpOnPaymentAuthorizedApple.ts
@@ -89,6 +89,7 @@ export async function ppcpOnPaymentAuthorizedApple(event: ApplePayPaymentAuthori
             gateway_public_id: gatewayPublicId,
             currency: currencyCode,
             amount: totalAmountDue,
+            wallet_pay_type: 'applepay',
             extra_payment_data: {
                 brand: token.paymentMethod.network,
                 last_digits: displayNameLast,

diff --git a/src/paypal/ppcp_buttons/ppcpOnApprove.ts b/src/paypal/ppcp_buttons/ppcpOnApprove.ts
@@ -54,6 +54,7 @@ export async function ppcpOnApprove(data: OnApproveData, actions: OnApproveActio
                 gateway_public_id: getPaypalGatewayPublicId(),
                 currency: currencyCode,
                 amount: totals.totalAmountDue,
+                wallet_pay_type: 'paypal',
                 extra_payment_data: {
                     orderId: data.orderID,
                     facilitatorAccessToken: data.facilitatorAccessToken,

diff --git a/src/stripe/addStripePayment.ts b/src/stripe/addStripePayment.ts
@@ -37,11 +37,13 @@ export async function addStripePayment(event: IStripePaymentEvent, stripeGateway
                     const billingAddress = formatStripeBillingAddress(card, event.payerName, event.payerPhone);
                     await setBillingAddress(billingAddress, API_RETRY).then(async (billingResult) => {
                         if (billingResult.success) {
+                            const walletPayType = window.ApplePaySession && ApplePaySession.canMakePayments() ? 'applepay' : 'paywithgoogle';
                             const payment: IAddPaymentRequest = {
                                 token: token.id,
                                 gateway_public_id: stripeGatewayId,
                                 currency: card.currency,
-                                amount: totalAmountDue
+                                amount: totalAmountDue,
+                                wallet_pay_type: walletPayType,
                             };
                             await addPayment(payment, API_RETRY).then(async (paymentResult) => {
                                 if (paymentResult.success) {

diff --git a/tests/braintree/apple/braintreeOnPaymentAuthorizedApple.test.ts b/tests/braintree/apple/braintreeOnPaymentAuthorizedApple.test.ts
@@ -194,7 +194,8 @@ describe('testing braintreeOnPaymentAuthorizedApple function', () => {
             token: nonce,
             gateway_public_id: credentials.public_id,
             currency: currencyMock.iso_code,
-            amount: applicationStateMock.order_total
+            amount: applicationStateMock.order_total,
+            wallet_pay_type: 'applepay',
         };
 
         await braintreeOnPaymentAuthorizedApple(eventParam as ApplePayPaymentAuthorizedEvent);

diff --git a/tests/paypal/paypalOnApprove.test.ts b/tests/paypal/paypalOnApprove.test.ts
@@ -140,6 +140,7 @@ const paypalOrderResponseMock: OrderResponseBody = {
 const paymentRequest = {
     token: 'test_id:test_payer_id',
     nonce: 'test_id:test_payer_id',
+    wallet_pay_type: 'paypal',
     gateway_public_id: 'abc123',
     currency: 'USD',
     amount: 10000,

diff --git a/tests/paypal/ppcp_apple/ppcpOnPaymentAuthorizedApple.test.ts b/tests/paypal/ppcp_apple/ppcpOnPaymentAuthorizedApple.test.ts
@@ -178,6 +178,7 @@ describe('testing ppcpOnPaymentAuthorizedApple function', () => {
             gateway_public_id: credentials.public_id,
             currency: currencyMock.iso_code,
             amount: applicationStateMock.order_total,
+            wallet_pay_type: 'applepay',
             extra_payment_data: {
                 brand: eventParam.payment.token.paymentMethod.network,
                 last_digits: '1111',

diff --git a/tests/paypal/ppcp_buttons/ppcpOnApprove.test.ts b/tests/paypal/ppcp_buttons/ppcpOnApprove.test.ts
@@ -154,6 +154,7 @@ const paypalOrderResponseMock: OrderResponseBody = {
 } as unknown as OrderResponseBody;
 const paymentRequest = {
     token: onApproveDataMock.orderID,
+    wallet_pay_type: 'paypal',
     gateway_public_id: 'abc123',
     currency: 'USD',
     amount: 10000,

diff --git a/tests/stripe/addStripePayment.test.ts b/tests/stripe/addStripePayment.test.ts
@@ -39,6 +39,8 @@ const processOrderMock = mocked(processOrder, true);
 const getTotalsMock = mocked(getTotals, true);
 const getOrderInitialDataMock = mocked(getOrderInitialData, true);
 const callGuestCustomerEndpointMock = mocked(callGuestCustomerEndpoint, true);
+const canMakePaymentsMock = jest.fn();
+const applePaySession = {canMakePayments: canMakePaymentsMock};
 
 describe('testing stripe payment function', () => {
 
@@ -117,6 +119,7 @@ describe('testing stripe payment function', () => {
         formatStripeBillingAddressMock.mockReturnValue(appState.addresses.billing);
         getTotalsMock.mockReturnValue(totals);
         getOrderInitialDataMock.mockReturnValue(orderInitialDataMock);
+        window.ApplePaySession = applePaySession;
 
     });
 
@@ -126,6 +129,7 @@ describe('testing stripe payment function', () => {
         setBillingAddressMock.mockReturnValueOnce(Promise.resolve(setBilling));
         addPaymentMock.mockReturnValueOnce(Promise.resolve(addPayment));
         processOrderMock.mockReturnValueOnce(Promise.resolve(processOrder));
+        canMakePaymentsMock.mockReturnValueOnce(false);
 
         await addStripePayment(eventMock, 'test-id');
         expect(completeMock).toBeCalled();
@@ -141,6 +145,7 @@ describe('testing stripe payment function', () => {
         setBillingAddressMock.mockReturnValueOnce(Promise.resolve(successApi));
         addPaymentMock.mockReturnValueOnce(Promise.resolve(successApi));
         processOrderMock.mockReturnValueOnce(Promise.resolve(successApi));
+        canMakePaymentsMock.mockReturnValueOnce(true);
         await addStripePayment(localEventMock, 'test-id');
         expect(completeMock).toBeCalled();
         expect(completeMock).toHaveBeenCalledWith('success');