diff --git a/src/views/Orders.vue b/src/views/Orders.vue
index 25608770..0945a434 100644
--- a/src/views/Orders.vue
+++ b/src/views/Orders.vue
@@ -158,7 +158,7 @@
@@ -352,6 +352,11 @@ export default defineComponent({
}
},
async loadMoreProducts (event: any) {
+ // Added this check here as if added on infinite-scroll component the Loading content does not get displayed
+ if (!(this.isScrollingEnabled && (this.segmentSelected === 'open' ? this.isOpenOrdersScrollable : this.segmentSelected === 'packed' ? this.isPackedOrdersScrollable : this.isCompletedOrdersScrollable))) {
+ await event.target.complete();
+ return;
+ }
if (this.segmentSelected === 'open') {
this.getPickupOrders(
undefined,
diff --git a/src/views/ShipToStoreOrders.vue b/src/views/ShipToStoreOrders.vue
index d3e6371e..4e8e84f5 100644
--- a/src/views/ShipToStoreOrders.vue
+++ b/src/views/ShipToStoreOrders.vue
@@ -91,7 +91,7 @@
@@ -227,6 +227,10 @@ export default defineComponent({
}
},
async loadMoreOrders (event: any) {
+ // Added this check here as if added on infinite-scroll component the Loading content does not gets displayed
+ if (!(this.isScrollingEnabled && (this.segmentSelected === 'incoming' ? this.isIncomingOrdersScrollable : this.segmentSelected === 'readyForPickup' ? this.isReadyForPickupOrdersScrollable : this.isCompletedOrdersScrollable))) {
+ await event.target.complete();
+ }
if (this.segmentSelected === 'incoming') {
this.getIncomingOrders(
undefined,