From 96ac6183c0142d26d581b89429d0f4770421a872 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Thu, 19 Jun 2025 12:43:06 -0400 Subject: [PATCH] CASH-341 CASH-341 new branch with PR to try to get around weird pretttier pipeline blocker --- src/fmg-components/cart/cart.vue | 3 +-- src/layouts/schedule/schedule.vue | 8 +++++++- src/styles/ux-variables.scss | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index ef3e0300c..643bc7ed4 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -1311,8 +1311,7 @@ export default { .amount-due, .amount-paid, .donation-amount { - font-family: - UrbanistSemibold, AvertaSemibold; //Okay to remove AvertaSemibold after 2025.06.19 merge/release + font-family: UrbanistSemibold, AvertaSemibold; //Okay to remove AvertaSemibold after 2025.06.19 merge/release color: $black; } .sub-total { diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 975003197..b21442dd2 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -544,7 +544,13 @@ export default { if (this.displayWaitList) { var gaLabel = ""; - const status = this.waitListRequested ? "checked" : "unchecked"; + let status = this.waitListRequested ? "checked" : "unchecked"; + if ( + this.waitListRequested === null && + this.$store.state.order.customer.waitListRequested === true + ) { + status = "checked"; + } const type = store.getters.isMobileAppointment ? "mobile" : "inshop"; gaLabel = `${status}_${type}`; diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss index 9acab9499..ac47bfb62 100644 --- a/src/styles/ux-variables.scss +++ b/src/styles/ux-variables.scss @@ -121,8 +121,8 @@ $body-color: $gray-600; //Fonts $font-family-sans-serif: AvertaRegular, Arial, Helvetica, sans-serif; -$font-family-monospace: - SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; +$font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", + monospace; // stylelint-enable value-keyword-case $font-family-base: $font-family-sans-serif; $font-family-code: $font-family-monospace;