Merge branch 'develop' into defect/CSR-1497

This commit is contained in:
Scott Kiener 2023-07-12 11:13:22 -04:00
commit fed637678a
3 changed files with 5 additions and 4 deletions

View file

@ -72,9 +72,9 @@ https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Com
</div>
</fieldset>
</div>
<div class="row form-test-error mt-1">
<div class="row form-test-error">
<error-message
class="small"
class="small mt-1"
:name="formatString(groupName)"
v-if="!suppressError"></error-message>
</div>

View file

@ -64,9 +64,9 @@
</template>
</template>
</div>
<div v-show="errorMessage" class="row my-1 form-test-error">
<div v-show="errorMessage" class="row form-test-error">
<span
class="d-inline-flex small mt-0"
class="d-inline-flex small my-1"
role="alert"
:class="[centerErrorMessage ? 'center-error-message' : '']"
>{{ errorMessage }}</span

View file

@ -2189,6 +2189,7 @@ async function resetScheduleIfUnavailable(context, order) {
// If you put any kind of time stamp on the date string with dashes, then it IS parsed as local time.
var aptDate = new Date(order.schedule.date + "T00:00:00");
var curDate = new Date();
curDate.setHours(0, 0, 0, 0);
// if appointment date is in the past, clear schedule
if (aptDate.getTime() < curDate.getTime()) {