From 41fafc3f24f73caba021fd91b3a3756ef5a1bc90 Mon Sep 17 00:00:00 2001
From: Michaela Brydon <Michaela.Brydon@safelite.com>
Date: Tue, 19 Mar 2024 14:31:58 -0400
Subject: [PATCH 1/7] Adding format amount to methods

---
 src/iss-components/cart-dropdown/cart-dropdown.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/iss-components/cart-dropdown/cart-dropdown.vue b/src/iss-components/cart-dropdown/cart-dropdown.vue
index eef1058a..9c4fe1a4 100644
--- a/src/iss-components/cart-dropdown/cart-dropdown.vue
+++ b/src/iss-components/cart-dropdown/cart-dropdown.vue
@@ -233,7 +233,8 @@ export default {
             }
 
             return cartItem;
-        }
+        },
+        formatAmountInDollars
     }
 };
 </script>

From f95be2467dc8b85ac91f4b17fd7db15fa910cfa7 Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Wed, 20 Mar 2024 14:05:38 -0400
Subject: [PATCH 2/7] change X to * in default case

---
 src/layouts/vin-lookup/vin-lookup.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 9a4bbaa2..3cea2d69 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -144,7 +144,7 @@ export default {
                 const lastSixChars = this.vin.substring(11, this.vin.length);
                 return `!X!X!X!X!X!X!X!X!X!X!X${lastSixChars}`;
             }
-            return 'XXXXXXXXXXXXXXXXX';
+            return '*****************';
         },
         carIdIsValid() {
             return this.hasValidCarId();

From 24496fe9b2927b70bbc6d9e3b93e60990833e512 Mon Sep 17 00:00:00 2001
From: Johan Gunawan <johan.gunawan@safelite.com>
Date: Wed, 20 Mar 2024 14:34:18 -0400
Subject: [PATCH 3/7] SSR-1116. Order Confirmation page: Add UI element for
 email confirmation. (#595)

---
 .../order-confirmation/order-confirmation.vue     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/layouts/order-confirmation/order-confirmation.vue b/src/layouts/order-confirmation/order-confirmation.vue
index 7ee31d95..ace6c02f 100644
--- a/src/layouts/order-confirmation/order-confirmation.vue
+++ b/src/layouts/order-confirmation/order-confirmation.vue
@@ -47,6 +47,9 @@
                             v-html="appointmentWordingText2">
                         </div>
                     </div>
+                    <div
+                        class="email-confirmation-text"
+                        v-html="confirmationEmailText" />
                     <siteFooter
                         v-if="carrierUrl"
                         ref="siteFooter"
@@ -118,6 +121,11 @@ export default {
         carrierUrl() {
             return this.mainStore.issConfig.successReturnURL;
         },
+        confirmationEmailText() {
+            return this.getCmsContent('EmailConfirmationWordingWidget', 'BodyText')
+                ?.replaceAll('&lt;', '<')
+                ?.replaceAll('&gt;', '>');
+        },
         orderConfirmationHeaderText() {
             return this.getCmsContent('OrderConfirmationContent', 'HeaderText');
         },
@@ -338,4 +346,11 @@ $page-side-padding: 1.5rem;
         color: $black;
     }
 }
+
+.email-confirmation-text {
+    :deep(a) {
+        font-weight: $font-weight-bold;
+        text-decoration: none;
+    }
+}
 </style>

From 3ec3552aac25238419f4e2a81067aca03d120069 Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Thu, 21 Mar 2024 12:20:30 -0400
Subject: [PATCH 4/7] replace concept-funnel with iss-nextgen

---
 src/layouts/payment-page/payment-page.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/payment-page/payment-page.vue b/src/layouts/payment-page/payment-page.vue
index 3c0c8913..d8d2f907 100644
--- a/src/layouts/payment-page/payment-page.vue
+++ b/src/layouts/payment-page/payment-page.vue
@@ -514,11 +514,11 @@ export default {
     computed: {
         payInAdvanceResponseUrl() {
             const { protocol, host } = window.location;
-            return `${protocol}//${host}/?issPage=${issPageValues.PAYMENT_RETURN}&src=concept-funnel`;
+            return `${protocol}//${host}/?issPage=${issPageValues.PAYMENT_RETURN}&src=iss-nextgen`;
         },
         payInAdvanceCancelUrl() {
             const { protocol, host } = window.location;
-            return `${protocol}//${host}/?issPage=${issPageValues.PAYMENT_METHOD}&src=concept-funnel`;
+            return `${protocol}//${host}/?issPage=${issPageValues.PAYMENT_METHOD}&src=iss-nextgen`;
         },
         dynamicCSSUrl() {
             const { protocol, hostname, port } = window.location;

From 7c5dd4fbf0f65ea5714dc622286d674135c60633 Mon Sep 17 00:00:00 2001
From: Johan Gunawan <johan.gunawan@safelite.com>
Date: Thu, 21 Mar 2024 14:51:55 -0400
Subject: [PATCH 5/7] SSR-1117. Order Confirmation page: Add Customer Portal
 integration (#598)

---
 azure-pipelines.yml                           | 19 +++++++++++--------
 src/constants/application-config.js           |  1 +
 .../order-confirmation/order-confirmation.vue |  3 +++
 src/store/index.js                            |  2 ++
 vue.config.js                                 |  1 +
 vue.release.config.js                         |  3 ++-
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8843c001..0ae142d5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -84,6 +84,7 @@ stages:
                     appDeployVariables:
                       __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__)
                       __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__)
+                      __VUE_APP_CUSTOMER_PORTAL_URL__: $(__VUE_APP_CUSTOMER_PORTAL_URL__)
                       __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__)
                       __VUE_APP_SAFELITE_HOP__: $(__VUE_APP_SAFELITE_HOP__)
                     indexDeployVariables:
@@ -91,13 +92,13 @@ stages:
                       __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__)
                       __VUE_APP_GOOGLE_MAPS_API_SCRIPT__: $(__VUE_APP_GOOGLE_MAPS_API_SCRIPT__)
                 - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
-                  parameters: 
+                  parameters:
                     awsCliContainer: awscli
                     distributionId: $(cfDistributionId)
                     paths: /*
                     awsProfile: $(devDeploymentProfile)
 
-    # Test Build/Deploy                      
+    # Test Build/Deploy
     - stage: Test
       condition: eq(variables['Build.SourceBranch'], variables['test-branch'] )
       variables:
@@ -133,8 +134,9 @@ stages:
                           deployFolder: ""
                           region: us-east-2
                       appDeployVariables:
-                        __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__)                          
+                        __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__)
                         __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__)
+                        __VUE_APP_CUSTOMER_PORTAL_URL__: $(__VUE_APP_CUSTOMER_PORTAL_URL__)
                         __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__)
                         __VUE_APP_SAFELITE_HOP__: $(__VUE_APP_SAFELITE_HOP__)
                       indexDeployVariables:
@@ -142,12 +144,12 @@ stages:
                         __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__)
                         __VUE_APP_GOOGLE_MAPS_API_SCRIPT__: $(__VUE_APP_GOOGLE_MAPS_API_SCRIPT__)
                   - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
-                    parameters: 
+                    parameters:
                       awsCliContainer: awscli
                       distributionId: $(cfDistributionId)
                       paths: /*
                       awsProfile: $(sysDeploymentProfile)
-                
+
     # QA Build/Deploy
     - stage: QA
       condition: eq(variables['Build.SourceBranch'], variables['qa-branch'] )
@@ -186,6 +188,7 @@ stages:
                       appDeployVariables:
                         __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__)
                         __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__)
+                        __VUE_APP_CUSTOMER_PORTAL_URL__: $(__VUE_APP_CUSTOMER_PORTAL_URL__)
                         __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__)
                         __VUE_APP_SAFELITE_HOP__: $(__VUE_APP_SAFELITE_HOP__)
                       indexDeployVariables:
@@ -193,7 +196,7 @@ stages:
                         __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__)
                         __VUE_APP_GOOGLE_MAPS_API_SCRIPT__: $(__VUE_APP_GOOGLE_MAPS_API_SCRIPT__)
                   - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
-                    parameters: 
+                    parameters:
                       awsCliContainer: awscli
                       distributionId: $(cfDistributionId)
                       paths: /*
@@ -237,6 +240,7 @@ stages:
                       appDeployVariables:
                         __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__)
                         __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__)
+                        __VUE_APP_CUSTOMER_PORTAL_URL__: $(__VUE_APP_CUSTOMER_PORTAL_URL__)
                         __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__)
                         __VUE_APP_SAFELITE_HOP__: $(__VUE_APP_SAFELITE_HOP__)
                       indexDeployVariables:
@@ -244,7 +248,7 @@ stages:
                         __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__)
                         __VUE_APP_GOOGLE_MAPS_API_SCRIPT__: $(__VUE_APP_GOOGLE_MAPS_API_SCRIPT__)
                   - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
-                    parameters: 
+                    parameters:
                       awsCliContainer: awscli
                       distributionId: $(cfDistributionId)
                       paths: /*
@@ -255,4 +259,3 @@ stages:
             userName: SafeliteAzureDevops
             userEmail: githubazuredevops@safelite.com
 
-                
\ No newline at end of file
diff --git a/src/constants/application-config.js b/src/constants/application-config.js
index 7230f485..1d1ee4a1 100644
--- a/src/constants/application-config.js
+++ b/src/constants/application-config.js
@@ -6,6 +6,7 @@
 const applicationConfig = Object.freeze({
     CURRENT_ENVIRONMENT: process.env.VUE_APP_CURRENT_ENVIRONMENT, // "Localhost", "Dev", "QA", and "Prod"
     CONSUMER_CF_DISTRO: process.env.VUE_APP_CONSUMER_CF_DISTRO,
+    CUSTOMER_PORTAL_URL: process.env.VUE_APP_CUSTOMER_PORTAL_URL,
     ANALYTICS_SESSION_TIMEOUT_MINUTES: 30,
     SAVED_SESSION_TIMEOUT_DAYS: 45,
     COOKIE_PATH: '/',
diff --git a/src/layouts/order-confirmation/order-confirmation.vue b/src/layouts/order-confirmation/order-confirmation.vue
index ace6c02f..8fcf3c54 100644
--- a/src/layouts/order-confirmation/order-confirmation.vue
+++ b/src/layouts/order-confirmation/order-confirmation.vue
@@ -81,6 +81,7 @@ import { get12HourTimeFormat,
     getDisplayTextForDurationLength } from '@/helpers/date-helper.js';
 import { toTitleCase } from '@/helpers/text-helper.js';
 import { AppointmentTypeStrings } from '@/constants/schedule-constants';
+import applicationConfig from '@/constants/application-config';
 
 export default {
     name: 'order-confirmation',
@@ -123,6 +124,8 @@ export default {
         },
         confirmationEmailText() {
             return this.getCmsContent('EmailConfirmationWordingWidget', 'BodyText')
+                ?.replaceAll('{custom:CUSTOMER_PORTAL_URL}', applicationConfig.CUSTOMER_PORTAL_URL)
+                ?.replaceAll('{custom:CUSTOMER_PORTAL_LOGIN_TOKEN}', this.submittedOrder.customerPortalLoginToken)
                 ?.replaceAll('&lt;', '<')
                 ?.replaceAll('&gt;', '>');
         },
diff --git a/src/store/index.js b/src/store/index.js
index 5b9e2bd9..437ef866 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -197,6 +197,7 @@ const getDefaultState = () => ({
         referralSequenceNumber: null,
         eon: null,
         workOrderNumber: null,
+        customerPortalLoginToken: null,
         originalDeductible: null,
         currentDeductible: null,
         carrierPhoneNumber: null,
@@ -1142,6 +1143,7 @@ export const useMainStore = defineStore({
             this.order.referralCorrelationId = response.referralCorrelationId;
             this.order.eon = response.eon;
             this.order.workOrderNumber = response.workOrderNumber;
+            this.order.customerPortalLoginToken = response.customerPortalLoginToken;
             this.applicationUser.savedSessionId = response.savedSessionId;
             this.applicationUser.crmCustomerId = response.crmCustomerId.toString();
         },
diff --git a/vue.config.js b/vue.config.js
index 0a7711e6..e2c3176a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,6 +1,7 @@
 /* eslint-disable max-len */
 process.env.VUE_APP_CONSUMER_CF_DISTRO = 'https://digitalapi.dev.safelite.io';
 process.env.VUE_APP_CURRENT_ENVIRONMENT = 'Localhost';
+process.env.VUE_APP_CUSTOMER_PORTAL_URL = 'https://myaccountdev.safelite.com/';
 process.env.VUE_APP_GOOGLE_PLACES_API_KEY = 'AIzaSyCuLhQcDdZTTb4JzpUFms1OCch2dk5lHF0';
 process.env.VUE_APP_SAFELITE_HOP = 'https://iss-hop-sys.glassclaim.com/fmgCheckoutEmbedded.aspx';
 
diff --git a/vue.release.config.js b/vue.release.config.js
index 2cfed6dd..6e8ad2b7 100644
--- a/vue.release.config.js
+++ b/vue.release.config.js
@@ -1,5 +1,6 @@
 process.env.VUE_APP_CONSUMER_CF_DISTRO = "__VUE_APP_CONSUMER_CF_DISTRO__";
 process.env.VUE_APP_CURRENT_ENVIRONMENT = "__VUE_APP_CURRENT_ENVIRONMENT__";
+process.env.VUE_APP_CUSTOMER_PORTAL_URL = '__VUE_APP_CUSTOMER_PORTAL_URL__';
 process.env.VUE_APP_GOOGLE_PLACES_API_KEY = "__VUE_APP_GOOGLE_PLACES_API_KEY__";
 process.env.VUE_APP_SAFELITE_HOP = "__VUE_APP_SAFELITE_HOP__";
 
@@ -24,7 +25,7 @@ module.exports = {
         `,
       },
     },
-  },  
+  },
   configureWebpack: {
     devtool: 'source-map'
   },

From d1ce437b9111e53a2e529004b2a5329c8d342f01 Mon Sep 17 00:00:00 2001
From: Josh Dassinger <Joshua.Dassinger@safelite.com>
Date: Fri, 22 Mar 2024 07:59:56 -0500
Subject: [PATCH 6/7] SSR-1134 Only show fees for NoComp and ITAC

---
 .../cart-dropdown/cart-dropdown.spec.js       | 52 +++++--------------
 .../cart-dropdown/cart-dropdown.vue           | 10 ++--
 .../service-location/service-location.vue     |  5 +-
 src/mixins/base-mixin.js                      |  2 +-
 src/store/index.js                            | 16 +++++-
 5 files changed, 37 insertions(+), 48 deletions(-)

diff --git a/src/iss-components/cart-dropdown/cart-dropdown.spec.js b/src/iss-components/cart-dropdown/cart-dropdown.spec.js
index fc09a48e..5d125a0b 100644
--- a/src/iss-components/cart-dropdown/cart-dropdown.spec.js
+++ b/src/iss-components/cart-dropdown/cart-dropdown.spec.js
@@ -42,13 +42,7 @@ function getMountedComponent(mainInitialState = {}, initialData = {}, propsData
 describe('cart-dropdown component', () => {
     test('initial data rendered as expected', () => {
         // Arrange
-        const { wrapper } = getMountedComponent({
-            order: {
-                lineItems: {
-                    supportingItems: []
-                }
-            }
-        });
+        const { wrapper } = getMountedComponent({});
 
         // Assert
         expect(wrapper.vm.$data).toMatchSnapshot();
@@ -239,13 +233,9 @@ describe('cart-dropdown component', () => {
                 // Arrange
                 const storeData = {
                     order: {
-                        payment: {
-                            insuranceCoverage: {
-                                coverageStatus: coverageStatuses.NO_COMP
-                            }
-                        },
                         policy: {
-                            isITAC: isItac
+                            isITAC: isItac,
+                            noCoverage: true,
                         }
                     }
                 };
@@ -285,13 +275,9 @@ describe('cart-dropdown component', () => {
                 // Arrange
                 const storeData = {
                     order: {
-                        payment: {
-                            insuranceCoverage: {
-                                coverageStatus: coverageStatuses.PENDING
-                            }
-                        },
                         policy: {
-                            isITAC: false
+                            isITAC: false,
+                            noCoverage: false
                         }
                     }
                 };
@@ -309,13 +295,9 @@ describe('cart-dropdown component', () => {
                 // Arrange
                 const storeData = {
                     order: {
-                        payment: {
-                            insuranceCoverage: {
-                                coverageStatus: coverageStatuses.NO_COMP
-                            }
-                        },
                         policy: {
-                            isITAC: false
+                            isITAC: false,
+                            noCoverage: true,
                         },
                         currentDeductible: null
                     }
@@ -378,13 +360,9 @@ describe('cart-dropdown component', () => {
                 // Arrange
                 const storeData = {
                     order: {
-                        payment: {
-                            insuranceCoverage: {
-                                coverageStatus: coverageStatuses.VERIFIED
-                            }
-                        },
                         policy: {
-                            isITAC: false
+                            isITAC: false,
+                            noCoverage: false
                         },
                         currentDeductible: null
                     }
@@ -526,13 +504,9 @@ describe('cart-dropdown component', () => {
                 // Arrange
                 const storeData = {
                     order: {
-                        payment: {
-                            insuranceCoverage: {
-                                coverageStatus: coverageStatuses.NO_COMP
-                            }
-                        },
                         policy: {
-                            isITAC: false
+                            isITAC: false,
+                            noCoverage: true
                         },
                         currentDeductible: 321
                     }
@@ -579,7 +553,7 @@ describe('cart-dropdown component', () => {
             test('Shows recycle fee when preset in supported items', () => {
                 // Arrange
                 const reference = '#recycle-fee-item';
-                const {wrapper} = getMountedComponent({
+                const { wrapper } = getMountedComponent({
                     order: {
                         lineItems: {
                             supportingItems: [{
@@ -599,7 +573,7 @@ describe('cart-dropdown component', () => {
             test('Hides recycle fee when not in supported items', () => {
                 // Arrange
                 const reference = '#recycle-fee-item';
-                const {wrapper} = getMountedComponent({
+                const { wrapper } = getMountedComponent({
                     order: {
                         lineItems: {
                             supportingItems: []
diff --git a/src/iss-components/cart-dropdown/cart-dropdown.vue b/src/iss-components/cart-dropdown/cart-dropdown.vue
index 9c4fe1a4..c4dab0dd 100644
--- a/src/iss-components/cart-dropdown/cart-dropdown.vue
+++ b/src/iss-components/cart-dropdown/cart-dropdown.vue
@@ -45,9 +45,9 @@
                 <div class="non-packaged-cart-item">
                     <div
                         id="mobile-fee"
-                        class="cart-item">
+                        class="cart-item"
+                        v-if="mobileFeeCartItem">
                         <div
-                            v-if="mobileFeeCartItem"
                             id="mobile-fee-item"
                             class="d-flex justify-content-between align-items-center">
                             <span id="mobile-fee-label">{{ mobileFeeCartItem.name }}</span>
@@ -57,9 +57,9 @@
 
                     <div
                         id="recycle-fee"
-                        class="cart-item cart-gray">
+                        class="cart-item cart-gray"
+                        v-if="recycleFeeCartItem">
                         <div
-                            v-if="recycleFeeCartItem"
                             id="recycle-fee-item"
                             class="d-flex justify-content-between align-items-center">
                             <span id="recycle-fee-label">
@@ -199,7 +199,7 @@ export default {
         recycleFeeCartItem() {
             return this.getCartItem(
                 this.getCmsContent(this.widget.recycleFee, widgetFields.TEXT_BLOCK_WIDGET.TEXT),
-                this.mainStore.order.lineItems.supportingItems.find((lineItem) => lineItem.partType === partTypeStrings.REPLACE_FEE)
+                this.mainStore.order.lineItems.supportingItems?.find((lineItem) => lineItem.partType === partTypeStrings.REPLACE_FEE)
             );
         },
         mobileFeeCartItem() {
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 2f503879..8d1cfa12 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -343,7 +343,10 @@ export default {
             let provider = this.selectedProvider;
             this.mainStore.updateMobileFee(null);
             if (this.isMobileLocationDisplayed) {
-                this.mainStore.updateMobileFee(this.mobileFeePart);
+                if (this.mainStore.isNoComp || this.mainStore.isITAC) {
+                    this.mainStore.updateMobileFee(this.mobileFeePart);
+                }
+
                 provider = {
                     providerNumber: this.mobileProviderNumber,
                     address: {
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 3816d5c2..53f316ee 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -67,7 +67,7 @@ export default {
             });
         },
         getAmountDue(lineItems) {
-            if (!useMainStore().isNoComp && !useMainStore().policy.isITAC) {
+            if (!useMainStore().isNoComp && !useMainStore().isITAC) {
                 return useMainStore().order.currentDeductible;
             }
 
diff --git a/src/store/index.js b/src/store/index.js
index 437ef866..44e95212 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -21,6 +21,7 @@ import {
     noCoverageForSelectedVehicle,
     repairWaivedForSelectedVehicle
 } from '@/helpers/policy-vehicle-helper';
+import partTypeStrings from '@/constants/part-type-strings';
 
 const storeId = 'main';
 
@@ -260,7 +261,8 @@ export const useMainStore = defineStore({
         isClaimRegistrationRequired: (state) => state.issConfig.isClaimRegistrationRequired,
         isClaimAlreadyRegistered: (state) => state.order.payment.insuranceCoverage.claimNumber !== null,
         isBailout: (state) => state.applicationUser.pageData[issPageValues.BAILOUT_PAGE] != null,
-        isNoComp: (state) => state.order.payment.insuranceCoverage.coverageStatus === coverageStatuses.NO_COMP,
+        isNoComp: (state) => !!state.order.policy.noCoverage,
+        isITAC: (state) => !!state.order.policy.isITAC,
         isVerifiedCoverageStatus: (state) => state.order.payment.insuranceCoverage.coverageStatus === coverageStatuses.VERIFIED,
         eventBusItem: (state) => (eventCategory, eventSubCategory) => {
             const matchedEvent = state.applicationUser.eventBus.find(({ category, subCategory }) => category === eventCategory && subCategory === eventSubCategory);
@@ -1533,7 +1535,17 @@ export const useMainStore = defineStore({
         },
 
         updateSupportingItems(partsData) {
-            this.order.lineItems.supportingItems = partsData;
+            if (partsData == null) {
+                this.order.lineItems.supportingItems = partsData;
+                return;
+            }
+
+            let parts = partsData;
+            if (!this.isNoComp && !this.isITAC) {
+                parts = parts.filter((i) => i.partNumber !== partTypeStrings.RECYCLE_FEE);
+            }
+
+            this.order.lineItems.supportingItems = parts;
         },
 
         updateVaps(partsData) {

From cf2aeb6f52e563046f16f02e61ed2f6e41b4086b Mon Sep 17 00:00:00 2001
From: Josh Dassinger <Joshua.Dassinger@safelite.com>
Date: Fri, 22 Mar 2024 09:08:39 -0500
Subject: [PATCH 7/7] SSR-1134 Assign null when given null or undefined value

---
 src/store/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/index.js b/src/store/index.js
index 44e95212..5add699d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1536,7 +1536,7 @@ export const useMainStore = defineStore({
 
         updateSupportingItems(partsData) {
             if (partsData == null) {
-                this.order.lineItems.supportingItems = partsData;
+                this.order.lineItems.supportingItems = null;
                 return;
             }