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

Merge pull request #2486 from Safelite/feature/Digital/CASH-597

Browse source 
CASH-597
This commit is contained in:
hiteshkumar87 2025-05-06 14:46:53 +05:30 committed by GitHub
commit 8ef5eb89b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/layouts/service-location/service-location.vue
View file

@ -111,7 +111,8 @@
:selectedAppointmentType="selectedAppointmentType" :selectedAppointmentType="selectedAppointmentType"
:shopProviderData="shopProviderData" :shopProviderData="shopProviderData"
:isDisplayed="isShopQuestionDisplayed" :isDisplayed="isShopQuestionDisplayed"
cmsWidgetName="ShopQuestionWidget" /> cmsWidgetName="ShopQuestionWidget"
:isInshopOnly="isInshopOnly" />
<contentGroupModal ref="RecalModal" cmsWidgetName="RecalModal" /> <contentGroupModal ref="RecalModal" cmsWidgetName="RecalModal" />
@ -413,6 +414,11 @@ export default {
isNoComp() { isNoComp() {
return store.getters.order.policy.isNoComp; return store.getters.order.policy.isNoComp;
}, },
isInshopOnly() {
return (
this.isServiceableInshop && !this.isServiceableMobile && !this.isServiceableDropoff
);
},
}, },
methods: { methods: {
arePagePrerequisitesValid() { arePagePrerequisitesValid() {

10
src/layouts/service-location/shop-question/shop-question.vue
View file

@ -77,6 +77,7 @@ export default {
cmsWidgetName: String, cmsWidgetName: String,
validationRules: String, validationRules: String,
isDisplayed: Boolean, isDisplayed: Boolean,
isInshopOnly: Boolean,
}, },
computed: { computed: {
questionText() { questionText() {
@ -233,10 +234,13 @@ export default {
// nothing to do with this component. We could mitigate this by showing / hiding this component with v-if but that messes // nothing to do with this component. We could mitigate this by showing / hiding this component with v-if but that messes
// up the component initialization on page load. // up the component initialization on page load.
async handler() { async handler() {
this.resetAnswers(); //We do not need to run this handler in case of Inshop only else it will ended running twice function getNextShopsFromList and will cause pagination
if (!this.isInshopOnly) {
this.resetAnswers();
await nextTick(); await nextTick();
this.getNextShopsFromList(); this.getNextShopsFromList();
}
}, },
}, },
shopProviders: { shopProviders: {