Merge pull request #2835 from Safelite/feature/CASH-1348-ProdMerge
CASH-1348 - Fixed merging issues for inShopProviders property
This commit is contained in:
commit
2b2e78a7b2
2 changed files with 5 additions and 2 deletions
|
|
@ -291,7 +291,7 @@ export default {
|
||||||
this.$store.getters.order.vehicle.carId,
|
this.$store.getters.order.vehicle.carId,
|
||||||
"service-location"
|
"service-location"
|
||||||
);
|
);
|
||||||
if (!closestShops || closestShops.providers?.length === 0) {
|
if (!closestShops || closestShops.inShopProviders?.length === 0) {
|
||||||
this.isLoading = false;
|
this.isLoading = false;
|
||||||
this.displayNoServiceAlert = true;
|
this.displayNoServiceAlert = true;
|
||||||
return null;
|
return null;
|
||||||
|
|
|
||||||
|
|
@ -496,7 +496,10 @@ export default {
|
||||||
{ zip: this.serviceZipCode, carId: this.carId },
|
{ zip: this.serviceZipCode, carId: this.carId },
|
||||||
"vehicle"
|
"vehicle"
|
||||||
);
|
);
|
||||||
if (!closestShops?.data?.providers || closestShops.data.providers.length === 0) {
|
if (
|
||||||
|
!closestShops?.data?.inShopProviders ||
|
||||||
|
closestShops.data.inShopProviders.length === 0
|
||||||
|
) {
|
||||||
this.displayNoServiceAlert = true;
|
this.displayNoServiceAlert = true;
|
||||||
if (store.getters.externalParameterState?.isExternalParameter) {
|
if (store.getters.externalParameterState?.isExternalParameter) {
|
||||||
return baseMixin.methods.ResetExternalParamsAndHideModal();
|
return baseMixin.methods.ResetExternalParamsAndHideModal();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue