From e48a05c9aafc099120dd859f16a6f9e496807b6e Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 12 Dec 2023 12:15:09 -0500
Subject: [PATCH] Revert "Merge pull request #1622 from
 Safelite/feature/CSR-1851"

This reverts commit 3bddf0b509a6268531b34de55b789d1028fec1ff, reversing
changes made to 1eb6d9663970dec0fd93c4ed0bfa735fc877eb64.
---
 src/helpers/promotions-helper.js              |  3 ---
 src/layouts/payment-method/payment-method.vue | 27 -------------------
 2 files changed, 30 deletions(-)

diff --git a/src/helpers/promotions-helper.js b/src/helpers/promotions-helper.js
index a592a6d9d..3968248d6 100644
--- a/src/helpers/promotions-helper.js
+++ b/src/helpers/promotions-helper.js
@@ -112,7 +112,6 @@ export async function revalidatePromosAndValidateQueryStringPromo(
             pageNameToLog,
             false
         );
-
         const revalidationErrorPromoCodes = revalidatePromoResponse.errors.map((x) => x.promoCode);
         baseMixin.methods.dispatchStoreAction(
             storeActions.SAVE_ACTIVE_AND_OR_INACTIVE_PROMOS,
@@ -123,7 +122,6 @@ export async function revalidatePromosAndValidateQueryStringPromo(
             false
         );
     }
-
     if (hasNewPromo) {
         validatePromoResponse = await baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.VALIDATE_ORDER_PROMO_AND_SAVE_SERVER_DATA,
@@ -134,7 +132,6 @@ export async function revalidatePromosAndValidateQueryStringPromo(
             pageNameToLog,
             false
         );
-
         if (validatePromoResponse.errorCode == null) {
             // Save promo to store
             const activePromos = store.getters.order.lineItems.promos ?? [];
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 5311c2728..39541db02 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -112,7 +112,6 @@ import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 import { AppointmentTypeStrings } from "@/constants/schedule-constants";
-import { partTypeStrings } from "@/constants/part-type-strings";
 import { mapTaxedLineItemsToStoreFormat } from "../../store";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
@@ -381,32 +380,6 @@ export default {
                 );
             }
 
-            // Because we don't yet have a robust solution for part interchange ...
-            // if there are front wiper line items in the revalidate response, we need to delete any existing front wiper line items from the store
-            // and replace them with those that come back from revalidation.
-            const revalidateResponseHasFrontWiperLineItems =
-                revalidatePromoResponse.promoLineItems.find(
-                    (lineItem) => lineItem.partType == partTypeStrings.FRONT_WIPER
-                )?.length > 0;
-
-            if (revalidateResponseHasFrontWiperLineItems) {
-                const frontWiperLineItemsInStore = this.lineItems.vaps.find(
-                    (lineItem) => lineItem.partType == partTypeStrings.FRONT_WIPER
-                );
-                if (frontWiperLineItemsInStore.length > 0) {
-                    this.lineItems.vaps = this.lineItems.vaps.find(
-                        (lineItem) => lineItem.partType != partTypeStrings.FRONT_WIPER
-                    );
-                }
-            }
-
-            const vapsToAddToCart = getVapsThatNeedToBeAddedToSatisfyPromos(
-                revalidatePromoResponse.promoLineItems,
-                this.availableVaps,
-                this.lineItems
-            );
-            this.lineItems.vaps.push(...vapsToAddToCart);
-
             this.lineItems.promos = revalidatePromoResponse.promoLineItems;
             this.inactivePromos = revalidatePromoResponse.errors.map((x) =>
                 getPromoCodeWithoutBundleIdentifier(x.promoCode)