Fixed: After applying filters on the Open & Completed pages, the filters are not hiding in the empty state (hotwax#936)

Author: R-Sourabh

src/views/Completed.vue

@@ -18,30 +18,29 @@
 
     <ion-content ref="contentRef" :scroll-events="true" @ionScroll="enableScrolling()" id="view-size-selector">
       <ion-searchbar class="searchbar" :value="completedOrders.query.queryString" :placeholder="translate('Search orders')" @keyup.enter="updateQueryString($event.target.value)" />
+      <div class="filters">
+        <ion-item lines="none" v-for="carrierPartyId in carrierPartyIds" :key="carrierPartyId.val">
+          <ion-checkbox label-placement="end" :checked="completedOrders.query.selectedCarrierPartyIds.includes(carrierPartyId.val)" @ionChange="updateSelectedCarrierPartyIds(carrierPartyId.val)">
+            <ion-label>
+              {{ getPartyName(carrierPartyId.val.split('/')[0]) }}
+              <p>{{ carrierPartyId.groups }} {{ carrierPartyId.groups === 1 ? translate('package') : translate("packages") }}</p>
+            </ion-label>
+          </ion-checkbox>
+          <!-- TODO: make the print icon functional -->
+          <!-- <ion-icon :icon="printOutline" /> -->
+        </ion-item>
+
+        <ion-item lines="none" v-for="shipmentMethod in shipmentMethods" :key="shipmentMethod.val">
+          <ion-checkbox label-placement="end" :checked="completedOrders.query.selectedShipmentMethods.includes(shipmentMethod.val)" @ionChange="updateSelectedShipmentMethods(shipmentMethod.val)">
+            <ion-label>
+              {{ getShipmentMethodDesc(shipmentMethod.val) }}
+              <p>{{ shipmentMethod.groups }} {{ shipmentMethod.groups > 1 ? translate('orders') : translate('order') }}, {{ shipmentMethod.itemCount }} {{ shipmentMethod.itemCount > 1 ? translate('items') : translate('item') }}</p>
+            </ion-label>
+          </ion-checkbox>
+        </ion-item>
+      </div>
 
       <div v-if="completedOrders.total">
-
-        <div class="filters">
-          <ion-item lines="none" v-for="carrierPartyId in carrierPartyIds" :key="carrierPartyId.val">
-            <ion-checkbox label-placement="end" :checked="completedOrders.query.selectedCarrierPartyIds.includes(carrierPartyId.val)" @ionChange="updateSelectedCarrierPartyIds(carrierPartyId.val)">
-              <ion-label>
-                {{ getPartyName(carrierPartyId.val.split('/')[0]) }}
-                <p>{{ carrierPartyId.groups }} {{ carrierPartyId.groups === 1 ? translate('package') : translate("packages") }}</p>
-              </ion-label>
-            </ion-checkbox>
-            <!-- TODO: make the print icon functional -->
-            <!-- <ion-icon :icon="printOutline" /> -->
-          </ion-item>
-
-          <ion-item lines="none" v-for="shipmentMethod in shipmentMethods" :key="shipmentMethod.val">
-            <ion-checkbox label-placement="end" :checked="completedOrders.query.selectedShipmentMethods.includes(shipmentMethod.val)" @ionChange="updateSelectedShipmentMethods(shipmentMethod.val)">
-              <ion-label>
-                {{ getShipmentMethodDesc(shipmentMethod.val) }}
-                <p>{{ shipmentMethod.groups }} {{ shipmentMethod.groups > 1 ? translate('orders') : translate('order') }}, {{ shipmentMethod.itemCount }} {{ shipmentMethod.itemCount > 1 ? translate('items') : translate('item') }}</p>
-              </ion-label>
-            </ion-checkbox>
-          </ion-item>
-        </div>
         <div class="results">
           <ion-button :disabled="isShipNowDisabled || !hasAnyPackedShipment() || hasAnyMissingInfo() || (hasAnyShipmentTrackingInfoMissing() && !hasPermission(Actions.APP_FORCE_SHIP_ORDER))" expand="block" class="bulk-action desktop-only" fill="outline" size="large" @click="bulkShipOrders()">{{ translate("Ship") }}</ion-button>
           <ion-card class="order" v-for="(order, index) in completedOrdersList" :key="index">

src/views/OpenOrders.vue

@@ -24,17 +24,17 @@
 
     <ion-content ref="contentRef" :scroll-events="true" @ionScroll="enableScrolling()" id="view-size-selector">
       <ion-searchbar class="searchbar" :value="openOrders.query.queryString" :placeholder="translate('Search orders')" @keyup.enter="updateQueryString($event.target.value)"/>
+      <div class="filters">
+        <ion-item lines="none" v-for="method in shipmentMethods" :key="method.val">
+          <ion-checkbox label-placement="end" @ionChange="updateSelectedShipmentMethods(method.val)">
+            <ion-label>
+              {{ getShipmentMethodDesc(method.val) }}
+              <p>{{ method.ordersCount }} {{ translate("orders") }}, {{ method.count }} {{ translate("items") }}</p>
+            </ion-label>
+          </ion-checkbox>
+        </ion-item>
+      </div>
       <div v-if="openOrders.total">
-        <div class="filters">
-          <ion-item lines="none" v-for="method in shipmentMethods" :key="method.val">
-            <ion-checkbox label-placement="end" @ionChange="updateSelectedShipmentMethods(method.val)">
-              <ion-label>
-                {{ getShipmentMethodDesc(method.val) }}
-                <p>{{ method.ordersCount }} {{ translate("orders") }}, {{ method.count }} {{ translate("items") }}</p>
-              </ion-label>
-            </ion-checkbox>
-          </ion-item>
-        </div>
 
         <div class="results">
           <ion-button class="bulk-action desktop-only" size="large" @click="assignPickers">{{ translate("Print Picklist") }}</ion-button>