diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6326546de..3ac871d20 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -103,6 +103,7 @@ stages: indexDeployVariables: __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__) __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__) + __VUE_APP_SOLARWINDS_MONITORING_SCRIPT__: $(__VUE_APP_SOLARWINDS_MONITORING_SCRIPT__) - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps parameters: awsCliContainer: awscli @@ -162,6 +163,7 @@ stages: indexDeployVariables: __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__) __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__) + __VUE_APP_SOLARWINDS_MONITORING_SCRIPT__: $(__VUE_APP_SOLARWINDS_MONITORING_SCRIPT__) - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps parameters: awsCliContainer: awscli @@ -221,6 +223,7 @@ stages: indexDeployVariables: __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__) __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__) + __VUE_APP_SOLARWINDS_MONITORING_SCRIPT__: $(__VUE_APP_SOLARWINDS_MONITORING_SCRIPT__) - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps parameters: awsCliContainer: awscli @@ -280,6 +283,7 @@ stages: indexDeployVariables: __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__) __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__) + __VUE_APP_SOLARWINDS_MONITORING_SCRIPT__: $(__VUE_APP_SOLARWINDS_MONITORING_SCRIPT__) - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps parameters: awsCliContainer: awscli diff --git a/public/index.html b/public/index.html index abba76b43..15cf004a2 100644 --- a/public/index.html +++ b/public/index.html @@ -26,5 +26,7 @@
+ + <%= process.env.VUE_APP_SOLARWINDS_MONITORING_SCRIPT %> diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 2dcafb154..4c2fb90df 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -96,7 +96,8 @@ {{ @@ -195,7 +196,7 @@ export default { }, data() { return { - isExpanded: true, // set default to true so cart is open on page load. This may be temporary. + isExpanded: this.shouldHideRecalibration, currencyFormatter: new Intl.NumberFormat("en-US", { style: "currency", currency: "USD", @@ -1014,7 +1015,7 @@ export default { return this.getCmsContent("SalesTaxTextWidget", "Text"); }, amountDueText() { - return this.getCmsContent("AmountDueTextWidget", "Text"); + return this.getCmsContent("OrderDetailsTextWidget", "Text"); }, amountPaidText() { return this.getCmsContent("AmountPaidTextWidget", "Text"); diff --git a/src/fmg-components/promo-modal-question/promo-modal-question.vue b/src/fmg-components/promo-modal-question/promo-modal-question.vue index 9f102fd52..97788a4b9 100644 --- a/src/fmg-components/promo-modal-question/promo-modal-question.vue +++ b/src/fmg-components/promo-modal-question/promo-modal-question.vue @@ -50,7 +50,10 @@ cmsWidgetName="AlertInshopPromoWidget" alertClass="alert-danger" v-bind:isDismissible="false" /> -
+
Promo code {{ promoCode }} applied @@ -357,7 +360,7 @@ export default {