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/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 368b30d3..d71b7830 100644 --- a/src/iss-components/cart-dropdown/cart-dropdown.vue +++ b/src/iss-components/cart-dropdown/cart-dropdown.vue @@ -340,7 +340,6 @@ export default { ? VERIFYING_COVERAGE : formatAmountInDollars(amount); }, - formatAmountInDollars, getCartItem(label, lineItems) { let cartItem = null; @@ -368,7 +367,8 @@ export default { const vapsTypeName = vapsItemDescriptions.find((entry) => entry.Name === vapsType); return vapsTypeName.Text; - } + }, + formatAmountInDollars } }; diff --git a/src/layouts/order-confirmation/order-confirmation.vue b/src/layouts/order-confirmation/order-confirmation.vue index 7ee31d95..8fcf3c54 100644 --- a/src/layouts/order-confirmation/order-confirmation.vue +++ b/src/layouts/order-confirmation/order-confirmation.vue @@ -47,6 +47,9 @@ v-html="appointmentWordingText2"> +