jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge Conflict

Browse source 
CASH-341 to 2025.07.17
This commit is contained in:
Johnny shultz 2025-07-11 14:36:25 -04:00
parent 621adb09ad
commit cdede63bec
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/fmg-components/cart/cart.vue
View file

@ -1309,8 +1309,10 @@ export default {
.sub-total, .sub-total,
.sales-tax, .sales-tax,
.amount-due, .amount-due,
.amount-paid { .amount-paid,
font-weight: 500; .donation-amount {
font-family:
UrbanistSemibold, AvertaSemibold; /* Okay to remove AvertaSemibold after 2025.06.19 merge/release */
color: $black; color: $black;
} }
.sub-total { .sub-total {

15
src/layouts/schedule/schedule.vue
View file

@ -542,10 +542,17 @@ export default {
forwardButtonAction() { forwardButtonAction() {
this.updateSupportingItems(); this.updateSupportingItems();
if (this.waitListRequested) { if (this.displayWaitList) {
var gaLabel = store.getters.isMobileAppointment let gaLabel = "";
? "checked_mobile" let status = this.waitListRequested ? "checked" : "unchecked";
: "checked_inshop"; if (
this.waitListRequested === null &&
this.$store.state.order.customer.waitListRequested === true
) {
status = "checked";
}
const type = store.getters.isMobileAppointment ? "mobile" : "inshop";
gaLabel = `${status}_${type}`;
const currentDate = new Date(); const currentDate = new Date();
const dateString = this.selectableDatesData.days[0].date; const dateString = this.selectableDatesData.days[0].date;

2
src/styles/common-typography-styles.scss
View file

@ -133,4 +133,4 @@ caption,
url("@/assets/fonts/Urbanist-BoldItalic.woff2") format("woff"); url("@/assets/fonts/Urbanist-BoldItalic.woff2") format("woff");
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }

4
src/styles/ux-variables.scss
View file

@ -121,8 +121,8 @@ $body-color: $gray-600;
//Fonts //Fonts
$font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif; $font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif;
$font-family-monospace: UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", $font-family-monospace:
monospace; UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
// stylelint-enable value-keyword-case // stylelint-enable value-keyword-case
$font-family-base: $font-family-sans-serif; $font-family-base: $font-family-sans-serif;
$font-family-code: $font-family-monospace; $font-family-code: $font-family-monospace;