CSR-240 | Fixing merge conflicts

This commit is contained in:
Scott Kiener 2022-05-06 08:11:48 -04:00
parent 434811ccf7
commit 31defe304e

View file

@ -14,76 +14,78 @@
:displayGenericVehicleImage="false" :displayGenericVehicleImage="false"
/> />
<funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" /> <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
<div class="row my-2"> <div class="fade-on-route-transition sub-container make-tall">
<div class="col"> <div class="row my-2">
<textboxQuestion <div class="col">
cmsWidgetName="LicensePlateNumber" <textboxQuestion
v-model="licensePlate" cmsWidgetName="LicensePlateNumber"
isRequired v-model="licensePlate"
inputId="license_plate" isRequired
validationRules="license-plate-required" inputId="license_plate"
/> validationRules="license-plate-required"
/>
</div>
</div> </div>
</div> <div class="row my-2">
<div class="row my-2"> <div class="col">
<div class="col"> <textboxQuestion
<textboxQuestion cmsWidgetName="RegistrationZip"
cmsWidgetName="RegistrationZip" v-model="registrationZip"
v-model="registrationZip" inputId="zip"
inputId="zip" mask="#####"
mask="#####" validationRules="zip-required"
validationRules="zip-required" />
/> </div>
</div> </div>
</div> <div class="row my-2">
<div class="row my-2"> <div class="col">
<div class="col"> <textboxQuestion
<textboxQuestion cmsWidgetName="EmailAddress"
cmsWidgetName="EmailAddress" v-model="email"
v-model="email" inputId="email"
inputId="email" validationRules="email-address-required|email-address-format"
validationRules="email-address-required|email-address-format" />
/> </div>
</div> </div>
</div> <alert
<alert class="my-3"
class="my-3" :manualHeadline="NoServiceZipHeader"
:manualHeadline="NoServiceZipHeader" :manualCopy="NoServiceZipBody"
:manualCopy="NoServiceZipBody" v-if="!isRegistrationZipServicable && isVinValid && !isCarIdDifferent"
v-if="!isRegistrationZipServicable && isVinValid && !isCarIdDifferent" alertClass="alert-danger"
alertClass="alert-danger" />
/> <div class="row my-2">
<div class="row my-2"> <div class="col">
<div class="col"> <textboxQuestion
<textboxQuestion v-if="!isRegistrationZipServicable"
v-if="!isRegistrationZipServicable" cmsWidgetName="ServiceZip"
cmsWidgetName="ServiceZip" v-model="serviceZip"
v-model="serviceZip" inputId="serviceZip"
inputId="serviceZip" validationRules="zip-required"
validationRules="zip-required" />
/> </div>
</div> </div>
<alert
class="my-3"
cmsWidgetName="NoMatchAlertWidget"
v-if="!isVinValid"
alertClass="alert-danger"
/>
<alert
class="my-3"
:manualHeadline="MatchedDifferentVehicleAlertHeader"
:manualCopy="MatchedDifferentVehicleAlertBody"
v-if="isCarIdDifferent"
alertClass="alert-warning"
/>
<funnelFooter
ref="funnelFooter"
cmsWidgetName="FunnelFooterWidget"
:isForwardActionDisabled="!meta.valid"
@back-clicked="backButtonAction"
@ForwardClicked="forwardButtonAction"
/>
</div> </div>
<alert
class="my-3"
cmsWidgetName="NoMatchAlertWidget"
v-if="!isVinValid"
alertClass="alert-danger"
/>
<alert
class="my-3"
:manualHeadline="MatchedDifferentVehicleAlertHeader"
:manualCopy="MatchedDifferentVehicleAlertBody"
v-if="isCarIdDifferent"
alertClass="alert-warning"
/>
<funnelFooter
ref="funnelFooter"
cmsWidgetName="FunnelFooterWidget"
:isForwardActionDisabled="!meta.valid"
@back-clicked="backButtonAction"
@ForwardClicked="forwardButtonAction"
/>
</div> </div>
</Form> </Form>
</template> </template>