From ab565fccec4f55c618b0babd0f9f8beae5820af6 Mon Sep 17 00:00:00 2001
From: Alex Humphries <Alex.Humphries@safelite.com>
Date: Tue, 17 Mar 2026 13:15:51 -0400
Subject: [PATCH] INSR-7995: Address some inconsistencies

---
 src/helpers/adyen-helper.js                           | 11 ++++++-----
 src/layouts/payment-method/payment-method.vue         |  5 +++--
 src/layouts/payment-page-adyen/payment-page-adyen.vue |  8 ++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/helpers/adyen-helper.js b/src/helpers/adyen-helper.js
index 76ad22ad..d1b5b571 100644
--- a/src/helpers/adyen-helper.js
+++ b/src/helpers/adyen-helper.js
@@ -94,17 +94,18 @@ export function mapIssToAdyenPaymentMethod(issMethod) {
 }
 
 export function generateCcToken(adyenSessionInfo) {
-    const order = useMainStore().order;
-    const locationInfo = getLocationInfo(order);
+    const zipCode = useMainStore().order.customer.address.zipCode
+                ?? useMainStore().order.serviceLocation.zipCode
+                ?? useMainStore().order.serviceLocation.provider.address.zipCode
 
     const ccToken = {
         subscriptionId: adyenSessionInfo?.storedToken,
         expMonth: adyenSessionInfo?.cardExpiryMonth,
         expYear: adyenSessionInfo?.cardExpiryYear,
         cardType: adyenSessionInfo?.cardType,
-        billToPostalCode: locationInfo.zipCode, // TODO - real data?
-        billToFirstName: order.customer.firstName, // TODO - real data?
-        billToLastName: order.customer.lastName, // TODO - real data?
+        billToPostalCode: zipCode,
+        billToFirstName: useMainStore().contactInfo.firstName,
+        billToLastName: useMainStore().contactInfo.lastName,
         referenceNumber: adyenSessionInfo?.workOrderNumber,
         authCode: adyenSessionInfo?.authCode,
         transactionId: adyenSessionInfo?.transactionReference,
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 0c3d0c7d..67c09971 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -240,8 +240,9 @@ export default {
             return !isEnabled || useMainStore().isUnverified || (useMainStore().isDeductible && isDeductibleTotalEqualToZero);
         },
         isAdyenEnabled() {
-            const adyenEnabled = this.getSettingValue(experimentSettings.ISS_ENABLE_ADYEN_V1);
-            return adyenEnabled === 'true';
+            return true;
+            // const adyenEnabled = this.getSettingValue(experimentSettings.ISS_ENABLE_ADYEN_V1);
+            // return adyenEnabled === 'true';
         },
         paymentMethodWidgetName() {
             let showApplePay = false;
diff --git a/src/layouts/payment-page-adyen/payment-page-adyen.vue b/src/layouts/payment-page-adyen/payment-page-adyen.vue
index 6a2db11d..91462f51 100644
--- a/src/layouts/payment-page-adyen/payment-page-adyen.vue
+++ b/src/layouts/payment-page-adyen/payment-page-adyen.vue
@@ -510,12 +510,12 @@ export default {
                 expMonth: adyenResponse?.cardExpiryMonth,
                 expYear: adyenResponse?.cardExpiryYear,
                 cardType: adyenResponse?.cardType,
-                billToPostalCode: this.zipCode, // TODO
-                billToFirstName: this.mainStore.contactInfo.firstName, // TODO
-                billToLastName: this.mainStore.contactInfo.lastName, // TODO
+                billToPostalCode: this.zipCode,
+                billToFirstName: this.mainStore.contactInfo.firstName,
+                billToLastName: this.mainStore.contactInfo.lastName,
                 referenceNumber: adyenResponse?.workOrderNumber,
                 authCode: adyenResponse?.authCode,
-                transactionId: adyenResponse?.transactionReference, // TODO
+                transactionId: adyenResponse?.transactionReference,
                 transReferenceNumber: adyenResponse?.transactionReference,
                 lastFour: adyenResponse?.last4DigitsOfCard,
             };