From 3efcdfc6d6f3dc2e57d7c649853dc3de75a6a776 Mon Sep 17 00:00:00 2001
From: k2maan <ketuman333@gmail.com>
Date: Thu, 3 Aug 2023 10:38:42 +0530
Subject: [PATCH 01/27] Updated: removed skeleton text from static labeles
 (#139)

---
 src/views/catalog-product-details.vue | 373 +++++++++++++-------------
 1 file changed, 191 insertions(+), 182 deletions(-)

diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index 7c7cbf5f..74291f0e 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -47,75 +47,88 @@
         </div>
         <div class="product-info" v-else>
           <div class="ion-padding">
-            <ion-skeleton-text animated style="width: 40%; height: 80%;" />
-            <ion-skeleton-text animated style="width: 60%;" />
+            <ion-skeleton-text animated style="width: 60%; height: 80%;" />
+            <ion-skeleton-text animated style="width: 40%; height: 40%;" />
           </div>
 
           <div class="product-features">
             <ion-list>
               <ion-skeleton-text class="ion-margin" animated style="width: 30%" />
               <ion-item lines="none">
-                <ion-skeleton-text animated style="width: 70%;" />
+                <ion-skeleton-text animated style="width: 60%;" />
               </ion-item>
             </ion-list>
 
             <ion-list>
               <ion-skeleton-text class="ion-margin" animated style="width: 30%" />
               <ion-item lines="none">
-                <ion-skeleton-text animated style="width: 70%;" />
+                <ion-skeleton-text animated style="width: 60%;" />
               </ion-item>
             </ion-list>
           </div>
         </div>
 
         <div>
-          <ion-card v-if="!poSummary.listingCountStatusMessage">
-            <ion-item>
-              <ion-skeleton-text animated style="height: 60%; width: 90%;" />
-            </ion-item>
-            <ion-item>
-              <ion-skeleton-text animated style="height: 40%; width: 70%;" />
-            </ion-item>
-            <ion-item>
-              <ion-skeleton-text animated style="height: 40%; width: 60%;" />
-            </ion-item>
-            <ion-item>
-              <ion-skeleton-text animated style="height: 40%; width: 70%;" />
-            </ion-item>
-            <ion-item>
-              <ion-skeleton-text animated style="height: 40%; width: 60%;" />
-            </ion-item>
-          </ion-card>
-          <ion-card v-else>
-            <ion-item>
-              <ion-label class="ion-text-wrap">{{ $t("Eligible") }}</ion-label>
-              <ion-label slot="end">{{ poSummary.eligible ? $t("Yes") : $t("No") }}</ion-label>
-            </ion-item>
-            <ion-item>
-              <ion-label class="ion-text-wrap">{{ $t("Category") }}</ion-label>
-              <ion-label slot="end">{{ poSummary.categoryId === preOrderCategoryId ? $t('Pre-order') : poSummary.categoryId === backorderCategoryId ? $t('Back-order') : $t('None') }}</ion-label>
-              <ion-icon slot="end" :icon="isCategoryValid() ? checkmarkCircleOutline : alertCircleOutline" :color="isCategoryValid() ? 'success' : 'warning'" />
-            </ion-item>
-            <ion-item>
-              <ion-label class="ion-text-wrap">{{ $t("Shopify listing") }}</ion-label>
-              <ion-label slot="end">{{ poSummary.listingCountStatusMessage }}</ion-label>
-              <ion-icon slot="end" :icon="isShopifyListingValid() ? checkmarkCircleOutline : alertCircleOutline" :color="isShopifyListingValid() ? 'success' : 'warning'" />
-            </ion-item>
-            <ion-item v-if="poSummary.promiseDate">
-              <ion-label class="ion-text-wrap">{{ $t("Promise date") }}</ion-label>
-              <ion-label slot="end">{{ poSummary.promiseDate }}</ion-label>
-            </ion-item>
-            <ion-item-divider color="light">
-              <ion-label color="medium">{{ $t("Timeline") }}</ion-label>
-            </ion-item-divider>
-            <!-- internationalized while preparaion -->
-            <ion-item v-if="poSummary.header || poSummary.body">
-              <ion-icon slot="start" :icon="shirtOutline"></ion-icon>
-              <ion-label class="ion-text-wrap">
-                <h2 v-if="poSummary.header">{{ poSummary.header }}</h2>
-                <p v-if="poSummary.body">{{ poSummary.body }}</p>
-              </ion-label>
-            </ion-item>
+          <ion-card>
+            <div v-if="!poSummary.listingCountStatusMessage">
+              <ion-item>
+                <ion-label class="ion-text-wrap">{{ $t("Eligible") }}</ion-label>
+                <ion-skeleton-text slot="end" animated style="height: 50%; width: 20%;" />
+              </ion-item>
+              <ion-item>
+                <ion-label class="ion-text-wrap">{{ $t("Category") }}</ion-label>
+                <ion-skeleton-text slot="end" animated style="height: 50%; width: 40%;" />
+              </ion-item>
+              <ion-item>
+                <ion-label class="ion-text-wrap">{{ $t("Shopify listing") }}</ion-label>
+                <ion-skeleton-text slot="end" animated style="height: 50%; width: 50%;" />
+              </ion-item>
+              <ion-item-divider color="light">
+                <ion-label color="medium">{{ $t("Timeline") }}</ion-label>
+              </ion-item-divider>
+              <ion-item>
+                <ion-icon slot="start" :icon="shirtOutline" />
+                <ion-label>
+                  <ion-item lines="none">
+                    <ion-skeleton-text animated style="width: 90%; height: 40%;" />
+                  </ion-item>
+                  <ion-item lines="none">
+                    <ion-skeleton-text animated style="width: 100%; height: 60%;" />
+                  </ion-item>
+                </ion-label> 
+              </ion-item>
+            </div>
+            <div v-else>
+              <ion-item>
+                <ion-label class="ion-text-wrap">{{ $t("Eligible") }}</ion-label>
+                <ion-label slot="end">{{ poSummary.eligible ? $t("Yes") : $t("No") }}</ion-label>
+              </ion-item>
+              <ion-item>
+                <ion-label class="ion-text-wrap">{{ $t("Category") }}</ion-label>
+                <ion-label slot="end">{{ poSummary.categoryId === preOrderCategoryId ? $t('Pre-order') : poSummary.categoryId === backorderCategoryId ? $t('Back-order') : $t('None') }}</ion-label>
+                <ion-icon slot="end" :icon="isCategoryValid() ? checkmarkCircleOutline : alertCircleOutline" :color="isCategoryValid() ? 'success' : 'warning'" />
+              </ion-item>
+              <ion-item>
+                <ion-label class="ion-text-wrap">{{ $t("Shopify listing") }}</ion-label>
+                <ion-label slot="end">{{ poSummary.listingCountStatusMessage }}</ion-label>
+                <ion-icon slot="end" :icon="isShopifyListingValid() ? checkmarkCircleOutline : alertCircleOutline" :color="isShopifyListingValid() ? 'success' : 'warning'" />
+              </ion-item>
+              <ion-item v-if="poSummary.promiseDate">
+                <ion-label class="ion-text-wrap">{{ $t("Promise date") }}</ion-label>
+                <ion-label slot="end">{{ poSummary.promiseDate }}</ion-label>
+              </ion-item>
+              <ion-item-divider color="light">
+                <ion-label color="medium">{{ $t("Timeline") }}</ion-label>
+              </ion-item-divider>
+              <!-- internationalized while preparaion -->
+              <ion-item v-if="poSummary.header || poSummary.body">
+                <ion-icon slot="start" :icon="shirtOutline" />
+                <ion-label class="ion-text-wrap">
+                  <h2 v-if="poSummary.header">{{ poSummary.header }}</h2>
+                  <p v-if="poSummary.body">{{ poSummary.body }}</p>
+                </ion-label>
+              </ion-item>
+            </div>
           </ion-card>
         </div>
       </div>
@@ -214,166 +227,162 @@
           </ion-item>
         </ion-card>
 
-        <ion-card v-if="!Object.keys(inventoryConfig).length">
-          <ion-item>
-            <ion-skeleton-text animated style="height: 40%; width: 70%;" />
-          </ion-item>
-          <ion-item>
-            <ion-skeleton-text animated style="height: 30%; width: 40%;" /> 
-          </ion-item>
-          <ion-item>
-            <ion-skeleton-text animated style="height: 30%; width: 50%;" /> 
-          </ion-item>
-          <ion-item>
-            <ion-skeleton-text animated style="height: 30%; width: 40%;" /> 
-          </ion-item>
-          <ion-item>
-            <ion-skeleton-text animated style="height: 30%; width: 50%;" /> 
-          </ion-item>
-          <ion-item>
-            <ion-skeleton-text animated style="height: 30%; width: 40%;" /> 
-          </ion-item>
-        </ion-card>
-        <ion-card v-else>
+        <ion-card>
           <ion-card-header>
             <ion-card-title>
               <h3>{{ $t("Online ATP calculation") }}</h3>
             </ion-card-title>
           </ion-card-header>
-          <ion-item>
-            <ion-label>{{ $t("Online ATP") }}</ion-label>
-            <ion-label slot="end">{{ (atpCalcDetails.onlineAtp >= 0) ? atpCalcDetails.onlineAtp : '-' }}</ion-label>
-          </ion-item>
-          <ion-item>
-            <ion-label>{{ $t("Quantity on hand") }}</ion-label>
-            <ion-label slot="end">{{ (atpCalcDetails.totalQOH >= 0) ? atpCalcDetails.totalQOH : '-' }}</ion-label>
-          </ion-item>
-          <ion-item>
-            <ion-label>{{ $t("Excluded ATP") }}</ion-label>
-            <ion-label slot="end">{{ (atpCalcDetails.excludedAtp || atpCalcDetails.excludedAtp === 0) ? atpCalcDetails.excludedAtp : '-' }}</ion-label>
-          </ion-item>
-          <ion-item>
-            <ion-label>{{ $t("Reserve inventory") }}</ion-label>
-            <ion-toggle slot="end" :disabled="!inventoryConfig.reserveInvStatus" :checked="inventoryConfig.reserveInvStatus === 'Y'" @ionChange="updateReserveInvConfig($event.detail.checked)"/>
-          </ion-item>
-          <ion-item>
-            <ion-label>{{ $t("Hold pre-order physical inventory") }}</ion-label>
-            <ion-toggle slot="end" :disabled="!inventoryConfig.preOrdPhyInvHoldStatus" :checked="inventoryConfig.preOrdPhyInvHoldStatus != 'false'" @ionChange="updatePreOrdPhyInvHoldConfig($event.detail.checked)"/>
-          </ion-item>
+          <div v-if="!Object.keys(inventoryConfig).length">
+            <ion-item>
+              <ion-skeleton-text animated style="height: 30%; width: 40%;" /> 
+            </ion-item>
+            <ion-item>
+              <ion-skeleton-text animated style="height: 30%; width: 50%;" /> 
+            </ion-item>
+            <ion-item>
+              <ion-skeleton-text animated style="height: 30%; width: 40%;" /> 
+            </ion-item>
+            <ion-item>
+              <ion-skeleton-text animated style="height: 30%; width: 50%;" /> 
+            </ion-item>
+            <ion-item>
+              <ion-skeleton-text animated style="height: 30%; width: 40%;" /> 
+            </ion-item>
+          </div>
+          <div v-else>
+            <ion-item>
+              <ion-label>{{ $t("Online ATP") }}</ion-label>
+              <ion-label slot="end">{{ (atpCalcDetails.onlineAtp >= 0) ? atpCalcDetails.onlineAtp : '-' }}</ion-label>
+            </ion-item>
+            <ion-item>
+              <ion-label>{{ $t("Quantity on hand") }}</ion-label>
+              <ion-label slot="end">{{ (atpCalcDetails.totalQOH >= 0) ? atpCalcDetails.totalQOH : '-' }}</ion-label>
+            </ion-item>
+            <ion-item>
+              <ion-label>{{ $t("Excluded ATP") }}</ion-label>
+              <ion-label slot="end">{{ (atpCalcDetails.excludedAtp || atpCalcDetails.excludedAtp === 0) ? atpCalcDetails.excludedAtp : '-' }}</ion-label>
+            </ion-item>
+            <ion-item>
+              <ion-label>{{ $t("Reserve inventory") }}</ion-label>
+              <ion-toggle slot="end" :disabled="!inventoryConfig.reserveInvStatus" :checked="inventoryConfig.reserveInvStatus === 'Y'" @ionChange="updateReserveInvConfig($event.detail.checked)"/>
+            </ion-item>
+            <ion-item>
+              <ion-label>{{ $t("Hold pre-order physical inventory") }}</ion-label>
+              <ion-toggle slot="end" :disabled="!inventoryConfig.preOrdPhyInvHoldStatus" :checked="inventoryConfig.preOrdPhyInvHoldStatus != 'false'" @ionChange="updatePreOrdPhyInvHoldConfig($event.detail.checked)"/>
+            </ion-item>
+          </div>
         </ion-card>
       </section>
 
       <hr />
 
       <section>
-        <ion-card v-if="!Object.keys(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT')).length
-          || !Object.keys(getCtgryAndBrkrngJob('JOB_BKR_ORD')).length
-          || !Object.keys(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE')).length">
-          <ion-item>
-            <ion-skeleton-text animated style="height: 40%; width: 70%;" />
-          </ion-item>
-          <ion-item>
-            <ion-skeleton-text animated style="height: 30%; width: 40%;" /> 
-          </ion-item>
-          <ion-item>
-            <ion-skeleton-text animated style="height: 30%; width: 50%;" /> 
-          </ion-item>
-          <ion-item>
-            <ion-skeleton-text animated style="height: 30%; width: 40%;" /> 
-          </ion-item>
-          <ion-item>
-            <ion-skeleton-text animated style="height: 30%; width: 50%;" /> 
-          </ion-item>
-        </ion-card>
-        <ion-card v-else>
+        <ion-card>
           <ion-card-header>
             <ion-card-title>
               <h3>{{ $t('Category and brokering jobs') }}</h3>
             </ion-card-title>
           </ion-card-header>
-
-          <!-- in case jobs are not available -->
           <div v-if="!Object.keys(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT')).length
-            && !Object.keys(getCtgryAndBrkrngJob('JOB_BKR_ORD')).length 
-            && !Object.keys(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE')).length">
-            <ion-item>{{ $t("No jobs found") }}</ion-item>
+          || !Object.keys(getCtgryAndBrkrngJob('JOB_BKR_ORD')).length
+          || !Object.keys(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE')).length">
+            <ion-item>
+              <ion-skeleton-text animated style="height: 40%; width: 70%;" />
+            </ion-item>
+            <ion-item>
+              <ion-skeleton-text animated style="height: 30%; width: 40%;" /> 
+            </ion-item>
+            <ion-item>
+              <ion-skeleton-text animated style="height: 30%; width: 50%;" /> 
+            </ion-item>
+            <ion-item>
+              <ion-skeleton-text animated style="height: 30%; width: 40%;" /> 
+            </ion-item>
+            <ion-item>
+              <ion-skeleton-text animated style="height: 30%; width: 50%;" /> 
+            </ion-item>
           </div>
-
           <div v-else>
-            <ion-item detail button @click="openJobActionsPopover($event, getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT'), 'Pre-sell computation')">
-              <ion-label class="ion-text-wrap">
-                <h3>{{ $t('Pre-sell computation') }}</h3>
-                <p>{{ getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').lastRunTime) }}</p>
-              </ion-label>
-              <ion-label slot="end">
-                <p>{{ getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').runTime ? timeTillJob(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').runTime) : $t('disabled')}}</p>
-              </ion-label>
-            </ion-item>
+            <!-- in case jobs are not available -->
+            <div v-if="!Object.keys(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT')).length
+              && !Object.keys(getCtgryAndBrkrngJob('JOB_BKR_ORD')).length 
+              && !Object.keys(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE')).length">
+              <ion-item>{{ $t("No jobs found") }}</ion-item>
+            </div>
+
+            <div v-else>
+              <ion-item detail button @click="openJobActionsPopover($event, getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT'), 'Pre-sell computation')">
+                <ion-label class="ion-text-wrap">
+                  <h3>{{ $t('Pre-sell computation') }}</h3>
+                  <p>{{ getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').lastRunTime) }}</p>
+                </ion-label>
+                <ion-label slot="end">
+                  <p>{{ getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').runTime ? timeTillJob(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').runTime) : $t('disabled')}}</p>
+                </ion-label>
+              </ion-item>
 
-            <ion-item detail button @click="openJobActionsPopover($event, getCtgryAndBrkrngJob('JOB_BKR_ORD'), 'Order brokering')">
-              <ion-label class="ion-text-wrap">
-                <h3>{{ $t('Order brokering') }}</h3>
-                <p>{{ getCtgryAndBrkrngJob('JOB_BKR_ORD').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_BKR_ORD').lastRunTime) }}</p>
-              </ion-label>
-              <ion-label slot="end">
-                <p>{{ getCtgryAndBrkrngJob('JOB_BKR_ORD').runTime ? timeTillJob(getCtgryAndBrkrngJob('JOB_BKR_ORD').runTime) : $t('disabled')}}</p>
-              </ion-label>
-            </ion-item>
+              <ion-item detail button @click="openJobActionsPopover($event, getCtgryAndBrkrngJob('JOB_BKR_ORD'), 'Order brokering')">
+                <ion-label class="ion-text-wrap">
+                  <h3>{{ $t('Order brokering') }}</h3>
+                  <p>{{ getCtgryAndBrkrngJob('JOB_BKR_ORD').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_BKR_ORD').lastRunTime) }}</p>
+                </ion-label>
+                <ion-label slot="end">
+                  <p>{{ getCtgryAndBrkrngJob('JOB_BKR_ORD').runTime ? timeTillJob(getCtgryAndBrkrngJob('JOB_BKR_ORD').runTime) : $t('disabled')}}</p>
+                </ion-label>
+              </ion-item>
 
-            <ion-item detail button @click="openJobActionsPopover($event, getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE'), 'Auto releasing')">
-              <ion-label class="ion-text-wrap">
-                <h3>{{ $t('Auto releasing') }}</h3>
-                <p>{{ getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').lastRunTime) }}</p>
-              </ion-label>
-              <ion-label slot="end">
-                <p>{{ getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').runTime ? timeTillJob(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').runTime) : $t('disabled')}}</p>
-              </ion-label>
-            </ion-item>
+              <ion-item detail button @click="openJobActionsPopover($event, getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE'), 'Auto releasing')">
+                <ion-label class="ion-text-wrap">
+                  <h3>{{ $t('Auto releasing') }}</h3>
+                  <p>{{ getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').lastRunTime) }}</p>
+                </ion-label>
+                <ion-label slot="end">
+                  <p>{{ getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').runTime ? timeTillJob(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').runTime) : $t('disabled')}}</p>
+                </ion-label>
+              </ion-item>
+            </div>
           </div>
         </ion-card>
 
-        <ion-card v-if="!poSummary.listingCountStatusMessage">
-          <ion-item>
-            <ion-skeleton-text animated style="height: 40%; width: 60%;" />
-          </ion-item>
-          <ion-item>
-            <ion-skeleton-text animated style="height: 30%; width: 40%;" /> 
-          </ion-item>
-          <ion-item>
-            <ion-skeleton-text animated style="height: 30%; width: 50%;" /> 
-          </ion-item>
-          <ion-item>
-            <ion-skeleton-text animated style="height: 30%; width: 40%;" /> 
-          </ion-item>
-          <ion-item>
-            <ion-skeleton-text animated style="height: 30%; width: 50%;" /> 
-          </ion-item>
-        </ion-card>
-        <ion-card v-else>
+        <ion-card>
           <ion-card-header>
             <ion-card-title>
               <h3>{{ $t('Shop listing status') }}</h3>
             </ion-card-title>
           </ion-card-header>
-          <ion-item v-if="!Object.keys(shopListings).length">
-            {{ $t('No shop listings found') }}
-          </ion-item>
-          <ion-item v-else v-for="(listData, index) in shopListings" :key="index">
-            <ion-label class="ion-text-wrap">
-              <h5>{{ listData.name }}</h5>
-              <!-- internationalized while preparation -->
-              <p>{{ listData.listingTimeAndStatus }}</p>
-            </ion-label>
-            <ion-label v-if="listData.shopifyShopProductId && listData.status" :color="listData.containsError ? 'danger' : (listData.status === 'inactive' ? 'warning' : 'success')" slot="end">
-              <h5>{{ $t(listData.listingStatus) }}</h5>
-            </ion-label>
-            <ion-label v-else-if="listData.shopifyShopProductId" color="medium" slot="end">
-              <h5>{{ $t("No listing data") }}</h5>
-            </ion-label>
-            <ion-label v-else color="medium" slot="end">
-              <h5>{{ $t("Not linked") }}</h5>
-            </ion-label>
-          </ion-item>
+          <div v-if="!poSummary.listingCountStatusMessage">
+            <ion-item>
+              <ion-skeleton-text animated style="height: 40%; width: 60%;" />
+            </ion-item>
+            <ion-item>
+              <ion-skeleton-text animated style="height: 30%; width: 40%;" /> 
+            </ion-item>
+            <ion-item>
+              <ion-skeleton-text animated style="height: 30%; width: 50%;" /> 
+            </ion-item>
+          </div>
+          <div v-else>
+            <ion-item v-if="!Object.keys(shopListings).length">
+              {{ $t('No shop listings found') }}
+            </ion-item>
+            <ion-item v-else v-for="(listData, index) in shopListings" :key="index">
+              <ion-label class="ion-text-wrap">
+                <h5>{{ listData.name }}</h5>
+                <!-- internationalized while preparation -->
+                <p>{{ listData.listingTimeAndStatus }}</p>
+              </ion-label>
+              <ion-label v-if="listData.shopifyShopProductId && listData.status" :color="listData.containsError ? 'danger' : (listData.status === 'inactive' ? 'warning' : 'success')" slot="end">
+                <h5>{{ $t(listData.listingStatus) }}</h5>
+              </ion-label>
+              <ion-label v-else-if="listData.shopifyShopProductId" color="medium" slot="end">
+                <h5>{{ $t("No listing data") }}</h5>
+              </ion-label>
+              <ion-label v-else color="medium" slot="end">
+                <h5>{{ $t("Not linked") }}</h5>
+              </ion-label>
+            </ion-item>
+          </div>
         </ion-card>
       </section>
     </ion-content>

From 14adbeabe56d529c481722ba2b19709d4972252b Mon Sep 17 00:00:00 2001
From: k2maan <ketuman333@gmail.com>
Date: Thu, 3 Aug 2023 10:54:42 +0530
Subject: [PATCH 02/27] Improved: increased card size to stop text from
 squishing (#139)

---
 src/views/catalog-product-details.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index 74291f0e..adbfe9f0 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -1095,7 +1095,7 @@ export default defineComponent({
 <style scoped>
 .header {
   display: grid;
-  grid-template-columns: 200px 1fr 375px;
+  grid-template-columns: 200px 1fr 400px;
   grid-gap: 16px;
   padding: 16px 16px 48px;
 }

From 148b619310c4d2a200e2c6770c4f8e850cf7ac20 Mon Sep 17 00:00:00 2001
From: Sanskar Soni <sonisanskar223@gmail.com>
Date: Thu, 10 Aug 2023 14:29:33 +0530
Subject: [PATCH 03/27] Implemented: job's time difference from next scheduled
 time in the Product Detail Page in timeline section

---
 src/i18n/locales/en.json              | 3 ++-
 src/views/catalog-product-details.vue | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 664a4f17..1b831031 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -163,7 +163,8 @@
     "Release preorder to a warehouse": "Release preorder to a warehouse",
     "Release preorders to a warehouse": "Release preorders to a warehouse",
     "Release to a warehouse": "Release to a warehouse",
-    "Removing from in": "Removing from {categoryName} in {removeTime}",
+    "Removing from": "Removing from {categoryName} {removeTime}",
+    "Removed from": "Removed from {categoryName} {removeTime}",
     "Removed from category": "Removed from category",
     "Removed from category on because there is no active PO but still listed on stores": "Removed from {category} category on {changeDatetime} because there is no active PO but still listed on {listedCount} stores",
     "Reserve inventory": "Reserve inventory",
diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index 7c7cbf5f..643a9c45 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -874,7 +874,11 @@ export default defineComponent({
         if (Object.keys(presellingJob).length === 0 || !presellingJob.runTime) {
           this.poSummary.header = this.$t("Pre-sell processing disabled");
         } else {
-          this.poSummary.header = this.$t("Removing from in", { categoryName, addingTime: this.timeTillJob(presellingJob.runTime) });
+          if(this.timeTillJob(presellingJob.runTime)?.includes('in')){
+            this.poSummary.header = this.$t("Removing from", { categoryName, removeTime: this.timeTillJob(presellingJob.runTime) });
+          }else{
+            this.poSummary.header = this.$t("Removed from", { categoryName, removeTime: this.timeTillJob(presellingJob.runTime) });
+          }
         }
         if (this.atpCalcDetails.onlineAtp > 0) {
           this.poSummary.body = this.$t("This product will be removed from because it is in stock", { categoryName });

From 8f354a61d8e1bea9989a6fd1aaca4615d3dfcfa2 Mon Sep 17 00:00:00 2001
From: Sanskar Soni <sonisanskar223@gmail.com>
Date: Thu, 10 Aug 2023 18:59:51 +0530
Subject: [PATCH 04/27] Implemented: new function to check if time passed or
 not and using it to check whether presellingJob runtime has passed or not

---
 src/views/catalog-product-details.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index 643a9c45..8eedc4e8 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -874,7 +874,7 @@ export default defineComponent({
         if (Object.keys(presellingJob).length === 0 || !presellingJob.runTime) {
           this.poSummary.header = this.$t("Pre-sell processing disabled");
         } else {
-          if(this.timeTillJob(presellingJob.runTime)?.includes('in')){
+          if(!this.isTimePassed(presellingJob.runTime)){
             this.poSummary.header = this.$t("Removing from", { categoryName, removeTime: this.timeTillJob(presellingJob.runTime) });
           }else{
             this.poSummary.header = this.$t("Removed from", { categoryName, removeTime: this.timeTillJob(presellingJob.runTime) });
@@ -1071,6 +1071,9 @@ export default defineComponent({
         externalId = externalIdentificationSplit[2] ? externalIdentificationSplit[2] : '';
       }
       return externalId;
+    },
+    isTimePassed(time: number){
+      return time - (new Date().getTime()) >= 0 ? false : true;
     }
   },
   setup() {

From fa40b908caeee947e5c001954c5b95c320f6eb21 Mon Sep 17 00:00:00 2001
From: Sanskar Soni <sonisanskar223@gmail.com>
Date: Mon, 14 Aug 2023 14:49:51 +0530
Subject: [PATCH 05/27] Implemented: used luxon datetime to see if time passed
 or not (#192)

---
 src/views/catalog-product-details.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index 8eedc4e8..e5cf096a 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -1073,7 +1073,8 @@ export default defineComponent({
       return externalId;
     },
     isTimePassed(time: number){
-      return time - (new Date().getTime()) >= 0 ? false : true;
+      const timeDiff: any = DateTime.fromMillis(time).diff(DateTime.local());
+      return timeDiff.values.milliseconds > 0 ? false : true;
     }
   },
   setup() {

From 439010d18bf18b9ca07f73462a0d51792b74039c Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 14 Aug 2023 19:14:55 +0530
Subject: [PATCH 06/27] Fixed: Implement Page Selection Persistence for
 Preorder App  with Side Navigation (#122)

---
 src/components/Menu.vue | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 231cd6a7..b9652358 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -11,7 +11,6 @@
             <ion-menu-toggle auto-hide="false" v-for="(p, i) in appPages" :key="i">
               <ion-item
                 button
-                @click="selectedIndex = i"
                 router-direction="root"
                 :router-link="p.url"
                 class="hydrated"
@@ -39,11 +38,12 @@ import {
   IonMenu,
   IonMenuToggle,
 } from "@ionic/vue";
-import { defineComponent, ref } from "vue";
+import { computed, defineComponent} from "vue"
 import { mapGetters } from "vuex";
 
 import { albums ,shirt, pricetags, settings } from "ionicons/icons";
 import { useStore } from "@/store";
+import { useRouter } from "vue-router";
 
 export default defineComponent({
   name: "Menu",
@@ -59,30 +59,14 @@ export default defineComponent({
     IonMenu,
     IonMenuToggle,
   },
-  created() {
-    // When open any specific page it should show that page selected
-    // TODO Find a better way
-    this.selectedIndex = this.appPages.findIndex((page) => {
-      return page.url === this.$router.currentRoute.value.path;
-    })
-  },
   computed: {
     ...mapGetters({
       isUserAuthenticated: 'user/isUserAuthenticated'
     })
   },
-  watch:{
-    $route (to) {
-      // When logout and login it should point to Oth index
-      // TODO Find a better way
-      if (to.path === '/login') {
-        this.selectedIndex = 0;
-      }
-    },
-  }, 
   setup() {
     const store = useStore();
-    const selectedIndex = ref(0);
+    const router = useRouter();
     const appPages = [
       {
         title: "Orders",
@@ -107,8 +91,15 @@ export default defineComponent({
         url: "/settings",
         iosIcon: settings,
         mdIcon: settings,
-      },
-    ];
+      }
+    ] as any;
+
+    const selectedIndex = computed(() => {
+      const path = router.currentRoute.value.path
+      return appPages.findIndex((screen : any) => screen.url === path || screen.childRoutes?.includes(path))
+    })
+
+
     return {
       selectedIndex,
       appPages,
@@ -118,7 +109,7 @@ export default defineComponent({
       settings,
       store
     };
-  },
+  }
 });
 </script>
 <style scoped>

From 16013e3b750c8a28b0bdd07a0fda08144c349607 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Thu, 17 Aug 2023 11:48:43 +0530
Subject: [PATCH 07/27] Fixed: issue of menu not being enabled for dynamic
 childRoutes(#122)

---
 src/components/Menu.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index b9652358..1fa777df 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -77,12 +77,14 @@ export default defineComponent({
       {
         title: "Products",
         url: "/products",
+        childRoutes: ["/product-details/"],
         iosIcon: shirt,
         mdIcon: shirt,
       },
       {
         title: "Catalog",
         url: "/catalog",
+        childRoutes: ["/catalog-product-details/"],
         iosIcon: albums,
         mdIcon: albums,
       },
@@ -92,11 +94,11 @@ export default defineComponent({
         iosIcon: settings,
         mdIcon: settings,
       }
-    ] as any;
+    ];
 
     const selectedIndex = computed(() => {
       const path = router.currentRoute.value.path
-      return appPages.findIndex((screen : any) => screen.url === path || screen.childRoutes?.includes(path))
+      return appPages.findIndex((screen) => screen.url === path || screen.childRoutes?.includes(path) || screen.childRoutes?.some((route)=> path.includes(route)))
     })
 
 

From c72d54ba3a1c4949f7e3a58783a8a9c8f56a7292 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 18 Aug 2023 11:14:00 +0530
Subject: [PATCH 08/27] Improved: renamed the catalog's product detail page
 title(#187)

---
 src/i18n/locales/en.json              | 2 +-
 src/views/catalog-product-details.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index f0c62369..c42bd376 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -144,7 +144,7 @@
     "preorder items will be released to the warehouse you have selected.": "{count} preorder items will be released to the warehouse you have selected.",
     "preorders will be cancelled. This action cannot be undone.": "{count} preorders will be cancelled. This action cannot be undone.",
     "Products": "Products",
-    "Product details": "Product details",
+    "Product summary page": "Product summary page",
     "Product cannot be pre-sold because it does not have active purchase orders": "Product cannot be pre-sold because it does not have active purchase orders",
     "Product has been accepting from against PO #": "Product has been accepting {category}s from {fromDate} against PO #${POID}",
     "Product is eligible for but not added to the category": "Product is eligible for {category}s but not added to the {category} category",
diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index 5ccad313..0b658c59 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -5,7 +5,7 @@
         <ion-buttons slot="start">
           <ion-back-button default-href="/catalog"></ion-back-button>
         </ion-buttons>
-        <ion-title>{{ $t("Product details") }}</ion-title>
+        <ion-title>{{ $t("Product summary page") }}</ion-title>
       </ion-toolbar>
     </ion-header>
     <ion-content>

From 87037ffc86988da639e5d65ae6ea23e587cad3e6 Mon Sep 17 00:00:00 2001
From: Sanskar Soni <sonisanskar223@gmail.com>
Date: Fri, 18 Aug 2023 12:52:58 +0530
Subject: [PATCH 09/27] Improved: code format

---
 src/views/catalog-product-details.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index 3f978c8d..bb66e27f 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -881,9 +881,9 @@ export default defineComponent({
         if (Object.keys(presellingJob).length === 0 || !presellingJob.runTime) {
           this.poSummary.header = this.$t("Pre-sell processing disabled");
         } else {
-          if(!this.isTimePassed(presellingJob.runTime)){
+          if (!this.isTimePassed(presellingJob.runTime)) {
             this.poSummary.header = this.$t("Removing from", { categoryName, removeTime: this.timeTillJob(presellingJob.runTime) });
-          }else{
+          } else {
             this.poSummary.header = this.$t("Removed from", { categoryName, removeTime: this.timeTillJob(presellingJob.runTime) });
           }
         }
@@ -1079,7 +1079,7 @@ export default defineComponent({
       }
       return externalId;
     },
-    isTimePassed(time: number){
+    isTimePassed(time: number) {
       const timeDiff: any = DateTime.fromMillis(time).diff(DateTime.local());
       return timeDiff.values.milliseconds > 0 ? false : true;
     },

From f3ccdfdfb14a5ad836db9d19bd3b4ad3da8af164 Mon Sep 17 00:00:00 2001
From: Sanskar Soni <sonisanskar223@gmail.com>
Date: Fri, 18 Aug 2023 16:28:23 +0530
Subject: [PATCH 10/27] Improved: isTimePassed function

---
 src/views/catalog-product-details.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index bb66e27f..653b3323 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -1081,7 +1081,7 @@ export default defineComponent({
     },
     isTimePassed(time: number) {
       const timeDiff: any = DateTime.fromMillis(time).diff(DateTime.local());
-      return timeDiff.values.milliseconds > 0 ? false : true;
+      return timeDiff.values.milliseconds <= 0;
     },
     async copyAuditMsg() {
       const { Clipboard } = Plugins;

From f738b9a890fe69e99d7b16d2ea53d16e9bf786a7 Mon Sep 17 00:00:00 2001
From: k2maan <ketuman333@gmail.com>
Date: Mon, 21 Aug 2023 14:43:00 +0530
Subject: [PATCH 11/27] Fixed: category and brokering jobs card loading if job
 data for any job is missing (#199)

---
 src/views/catalog-product-details.vue | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index 5ccad313..a1c86491 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -269,9 +269,7 @@
       <hr />
 
       <section>
-        <ion-card v-if="!Object.keys(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT')).length
-          || !Object.keys(getCtgryAndBrkrngJob('JOB_BKR_ORD')).length
-          || !Object.keys(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE')).length">
+        <ion-card v-if="!isCtgryAndBrkrngJobsLoaded">
           <ion-item>
             <ion-skeleton-text animated style="height: 40%; width: 70%;" />
           </ion-item>
@@ -303,7 +301,7 @@
           </div>
 
           <div v-else>
-            <ion-item detail button @click="openJobActionsPopover($event, getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT'), 'Pre-sell computation')">
+            <ion-item v-if="Object.keys(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT')).length" detail button @click="openJobActionsPopover($event, getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT'), 'Pre-sell computation')">
               <ion-label class="ion-text-wrap">
                 <h3>{{ $t('Pre-sell computation') }}</h3>
                 <p>{{ getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').lastRunTime) }}</p>
@@ -313,7 +311,7 @@
               </ion-label>
             </ion-item>
 
-            <ion-item detail button @click="openJobActionsPopover($event, getCtgryAndBrkrngJob('JOB_BKR_ORD'), 'Order brokering')">
+            <ion-item v-if="Object.keys(getCtgryAndBrkrngJob('JOB_BKR_ORD')).length " detail button @click="openJobActionsPopover($event, getCtgryAndBrkrngJob('JOB_BKR_ORD'), 'Order brokering')">
               <ion-label class="ion-text-wrap">
                 <h3>{{ $t('Order brokering') }}</h3>
                 <p>{{ getCtgryAndBrkrngJob('JOB_BKR_ORD').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_BKR_ORD').lastRunTime) }}</p>
@@ -323,7 +321,7 @@
               </ion-label>
             </ion-item>
 
-            <ion-item detail button @click="openJobActionsPopover($event, getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE'), 'Auto releasing')">
+            <ion-item v-if="Object.keys(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE')).length" detail button @click="openJobActionsPopover($event, getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE'), 'Auto releasing')">
               <ion-label class="ion-text-wrap">
                 <h3>{{ $t('Auto releasing') }}</h3>
                 <p>{{ getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').lastRunTime) }}</p>
@@ -474,7 +472,8 @@ export default defineComponent({
       configsByStores: [] as any,
       listingJobRunTime: 0,
       backorderCategoryId: '',
-      preOrderCategoryId: ''
+      preOrderCategoryId: '',
+      isCtgryAndBrkrngJobsLoaded: false
     }
   },
   computed: {
@@ -577,7 +576,9 @@ export default defineComponent({
     },
     async getCtgryAndBrkrngJobs() {
       const systemJobEnumIds = JSON.parse(process.env.VUE_APP_CTGRY_AND_BRKRNG_JOB)
-      await this.store.dispatch('job/fetchCtgryAndBrkrngJobs', { systemJobEnumIds })
+      this.store.dispatch('job/fetchCtgryAndBrkrngJobs', { systemJobEnumIds }).then(() => {
+        this.isCtgryAndBrkrngJobsLoaded = true
+      })
     },
     async openJobActionsPopover(event: Event, job: any, jobTitle: string) {
       job.jobTitle = jobTitle
@@ -840,7 +841,6 @@ export default defineComponent({
     async preparePoSummary() {
       this.poSummary.eligible = this.poAndAtpDetails.totalPoAtp > 0 && this.atpCalcDetails.onlineAtp === 0;
 
-
       const productCategories = this.currentVariant.productCategories;
       const hasPreOrderCategory = productCategories?.includes(this.preOrderCategoryId);
       const hasBackorderCategory = productCategories?.includes(this.backorderCategoryId);
@@ -959,7 +959,6 @@ export default defineComponent({
       }
     },
     async prepareShopListings() {
-
       // TODO Use ShopifyShopProduct to check if product is associated
       this.shopListings = []
       try {

From 21b09990da500da57774cbd68b6ae20af05994ed Mon Sep 17 00:00:00 2001
From: Sanskar Soni <sonisanskar223@gmail.com>
Date: Mon, 21 Aug 2023 14:58:53 +0530
Subject: [PATCH 12/27] Implemented: change func. name from isTimePassed to
 isPastTime and simplified if else logic (#192)

---
 src/views/catalog-product-details.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index 653b3323..5f2f435d 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -881,11 +881,8 @@ export default defineComponent({
         if (Object.keys(presellingJob).length === 0 || !presellingJob.runTime) {
           this.poSummary.header = this.$t("Pre-sell processing disabled");
         } else {
-          if (!this.isTimePassed(presellingJob.runTime)) {
-            this.poSummary.header = this.$t("Removing from", { categoryName, removeTime: this.timeTillJob(presellingJob.runTime) });
-          } else {
-            this.poSummary.header = this.$t("Removed from", { categoryName, removeTime: this.timeTillJob(presellingJob.runTime) });
-          }
+          const headerMessage = this.isPastTime(presellingJob.runTime) ? "Removed from" : "Removing from";
+          this.poSummary.header = this.$t(headerMessage, { categoryName, removeTime: this.timeTillJob(presellingJob.runTime) });
         }
         if (this.atpCalcDetails.onlineAtp > 0) {
           this.poSummary.body = this.$t("This product will be removed from because it is in stock", { categoryName });
@@ -1079,7 +1076,7 @@ export default defineComponent({
       }
       return externalId;
     },
-    isTimePassed(time: number) {
+    isPastTime(time: number) {
       const timeDiff: any = DateTime.fromMillis(time).diff(DateTime.local());
       return timeDiff.values.milliseconds <= 0;
     },

From 0c640f4d2e9a9198eb8b549ec0e89627c40de7bc Mon Sep 17 00:00:00 2001
From: k2maan <ketuman333@gmail.com>
Date: Wed, 23 Aug 2023 15:58:47 +0530
Subject: [PATCH 13/27] Fixed: inconsistent shopfiy shop ordering through
 manually sorting the shopListings on the UI (#200)

---
 src/views/catalog-product-details.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index 5ccad313..f074ace3 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -361,7 +361,7 @@
           <ion-item v-if="!Object.keys(shopListings).length">
             {{ $t('No shop listings found') }}
           </ion-item>
-          <ion-item v-else v-for="(listData, index) in shopListings" :key="index">
+          <ion-item v-else v-for="(listData, index) in getSortedShopListings(shopListings)" :key="index">
             <ion-label class="ion-text-wrap">
               <h5>{{ listData.name }}</h5>
               <!-- internationalized while preparation -->
@@ -992,7 +992,7 @@ export default defineComponent({
           return shopifyConfigsAndProductIds
         }, {})
 
-        await Promise.allSettled(Object.keys(configs).sort().map(async (shopId: any) => {
+        await Promise.allSettled(Object.keys(configs).map(async (shopId: any) => {
           const configAndIdData = shopifyConfigsAndProductIds[shopId];
           let listData = {
             ...configs[shopId], // adding shopify shop information to be available for showing name
@@ -1085,6 +1085,9 @@ export default defineComponent({
         showToast(this.$t("Copied to clipboard"));
       })
     },
+    getSortedShopListings(shopListings: any) {
+      return shopListings.sort((a: any, b: any) => a.name.localeCompare(b.name))
+    }
   },
   setup() {
     const store = useStore();

From 02a1f211db6dd028f0a7a6f96fbe0be803e90967 Mon Sep 17 00:00:00 2001
From: k2maan <ketuman333@gmail.com>
Date: Wed, 23 Aug 2023 18:47:57 +0530
Subject: [PATCH 14/27] Improved: structure for summary section (#139)

---
 src/views/catalog-product-details.vue | 118 +++++++++++++-------------
 1 file changed, 58 insertions(+), 60 deletions(-)

diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index aaf9c1cf..6f42c061 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -69,66 +69,64 @@
         </div>
 
         <div>
-          <ion-card>
-            <div v-if="!poSummary.listingCountStatusMessage">
-              <ion-item>
-                <ion-label class="ion-text-wrap">{{ $t("Eligible") }}</ion-label>
-                <ion-skeleton-text slot="end" animated style="height: 50%; width: 20%;" />
-              </ion-item>
-              <ion-item>
-                <ion-label class="ion-text-wrap">{{ $t("Category") }}</ion-label>
-                <ion-skeleton-text slot="end" animated style="height: 50%; width: 40%;" />
-              </ion-item>
-              <ion-item>
-                <ion-label class="ion-text-wrap">{{ $t("Shopify listing") }}</ion-label>
-                <ion-skeleton-text slot="end" animated style="height: 50%; width: 50%;" />
-              </ion-item>
-              <ion-item-divider color="light">
-                <ion-label color="medium">{{ $t("Timeline") }}</ion-label>
-              </ion-item-divider>
-              <ion-item>
-                <ion-icon slot="start" :icon="shirtOutline" />
-                <ion-label>
-                  <ion-item lines="none">
-                    <ion-skeleton-text animated style="width: 90%; height: 40%;" />
-                  </ion-item>
-                  <ion-item lines="none">
-                    <ion-skeleton-text animated style="width: 100%; height: 60%;" />
-                  </ion-item>
-                </ion-label> 
-              </ion-item>
-            </div>
-            <div v-else>
-              <ion-item>
-                <ion-label class="ion-text-wrap">{{ $t("Eligible") }}</ion-label>
-                <ion-label slot="end">{{ poSummary.eligible ? $t("Yes") : $t("No") }}</ion-label>
-              </ion-item>
-              <ion-item>
-                <ion-label class="ion-text-wrap">{{ $t("Category") }}</ion-label>
-                <ion-label slot="end">{{ poSummary.categoryId === preOrderCategoryId ? $t('Pre-order') : poSummary.categoryId === backorderCategoryId ? $t('Back-order') : $t('None') }}</ion-label>
-                <ion-icon slot="end" :icon="isCategoryValid() ? checkmarkCircleOutline : alertCircleOutline" :color="isCategoryValid() ? 'success' : 'warning'" />
-              </ion-item>
-              <ion-item>
-                <ion-label class="ion-text-wrap">{{ $t("Shopify listing") }}</ion-label>
-                <ion-label slot="end">{{ poSummary.listingCountStatusMessage }}</ion-label>
-                <ion-icon slot="end" :icon="isShopifyListingValid() ? checkmarkCircleOutline : alertCircleOutline" :color="isShopifyListingValid() ? 'success' : 'warning'" />
-              </ion-item>
-              <ion-item v-if="poSummary.promiseDate">
-                <ion-label class="ion-text-wrap">{{ $t("Promise date") }}</ion-label>
-                <ion-label slot="end">{{ poSummary.promiseDate }}</ion-label>
-              </ion-item>
-              <ion-item-divider color="light">
-                <ion-label color="medium">{{ $t("Timeline") }}</ion-label>
-              </ion-item-divider>
-              <!-- internationalized while preparaion -->
-              <ion-item v-if="poSummary.header || poSummary.body">
-                <ion-icon slot="start" :icon="shirtOutline" />
-                <ion-label class="ion-text-wrap">
-                  <h2 v-if="poSummary.header">{{ poSummary.header }}</h2>
-                  <p v-if="poSummary.body">{{ poSummary.body }}</p>
-                </ion-label>
-              </ion-item>
-            </div>
+          <ion-card v-if="!poSummary.listingCountStatusMessage">
+            <ion-item>
+              <ion-label class="ion-text-wrap">{{ $t("Eligible") }}</ion-label>
+              <ion-skeleton-text slot="end" animated style="height: 50%; width: 20%;" />
+            </ion-item>
+            <ion-item>
+              <ion-label class="ion-text-wrap">{{ $t("Category") }}</ion-label>
+              <ion-skeleton-text slot="end" animated style="height: 50%; width: 40%;" />
+            </ion-item>
+            <ion-item>
+              <ion-label class="ion-text-wrap">{{ $t("Shopify listing") }}</ion-label>
+              <ion-skeleton-text slot="end" animated style="height: 50%; width: 50%;" />
+            </ion-item>
+            <ion-item-divider color="light">
+              <ion-label color="medium">{{ $t("Timeline") }}</ion-label>
+            </ion-item-divider>
+            <ion-item>
+              <ion-icon slot="start" :icon="shirtOutline" />
+              <ion-label>
+                <ion-item lines="none">
+                  <ion-skeleton-text animated style="width: 90%; height: 40%;" />
+                </ion-item>
+                <ion-item lines="none">
+                  <ion-skeleton-text animated style="width: 100%; height: 60%;" />
+                </ion-item>
+              </ion-label> 
+            </ion-item>
+          </ion-card>
+          <ion-card v-else>
+            <ion-item>
+              <ion-label class="ion-text-wrap">{{ $t("Eligible") }}</ion-label>
+              <ion-label slot="end">{{ poSummary.eligible ? $t("Yes") : $t("No") }}</ion-label>
+            </ion-item>
+            <ion-item>
+              <ion-label class="ion-text-wrap">{{ $t("Category") }}</ion-label>
+              <ion-label slot="end">{{ poSummary.categoryId === preOrderCategoryId ? $t('Pre-order') : poSummary.categoryId === backorderCategoryId ? $t('Back-order') : $t('None') }}</ion-label>
+              <ion-icon slot="end" :icon="isCategoryValid() ? checkmarkCircleOutline : alertCircleOutline" :color="isCategoryValid() ? 'success' : 'warning'" />
+            </ion-item>
+            <ion-item>
+              <ion-label class="ion-text-wrap">{{ $t("Shopify listing") }}</ion-label>
+              <ion-label slot="end">{{ poSummary.listingCountStatusMessage }}</ion-label>
+              <ion-icon slot="end" :icon="isShopifyListingValid() ? checkmarkCircleOutline : alertCircleOutline" :color="isShopifyListingValid() ? 'success' : 'warning'" />
+            </ion-item>
+            <ion-item v-if="poSummary.promiseDate">
+              <ion-label class="ion-text-wrap">{{ $t("Promise date") }}</ion-label>
+              <ion-label slot="end">{{ poSummary.promiseDate }}</ion-label>
+            </ion-item>
+            <ion-item-divider color="light">
+              <ion-label color="medium">{{ $t("Timeline") }}</ion-label>
+            </ion-item-divider>
+            <!-- internationalized while preparaion -->
+            <ion-item v-if="poSummary.header || poSummary.body">
+              <ion-icon slot="start" :icon="shirtOutline" />
+              <ion-label class="ion-text-wrap">
+                <h2 v-if="poSummary.header">{{ poSummary.header }}</h2>
+                <p v-if="poSummary.body">{{ poSummary.body }}</p>
+              </ion-label>
+            </ion-item>
           </ion-card>
         </div>
       </div>

From e5cd5cde606821d91e6c6096de610caaed0be410 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Thu, 24 Aug 2023 18:39:29 +0530
Subject: [PATCH 15/27] Fixed: re-entered the 'Product Details' entry in the
 en.json as it is used by product details page(#187)

---
 src/i18n/locales/en.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index c42bd376..14a500d3 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -144,6 +144,7 @@
     "preorder items will be released to the warehouse you have selected.": "{count} preorder items will be released to the warehouse you have selected.",
     "preorders will be cancelled. This action cannot be undone.": "{count} preorders will be cancelled. This action cannot be undone.",
     "Products": "Products",
+    "Product details": "Product details",
     "Product summary page": "Product summary page",
     "Product cannot be pre-sold because it does not have active purchase orders": "Product cannot be pre-sold because it does not have active purchase orders",
     "Product has been accepting from against PO #": "Product has been accepting {category}s from {fromDate} against PO #${POID}",

From 889cd7d7d23162a48af03fdca9cd45b137937c73 Mon Sep 17 00:00:00 2001
From: k2maan <ketuman333@gmail.com>
Date: Thu, 24 Aug 2023 18:46:52 +0530
Subject: [PATCH 16/27] Improved: used manual return based sorting instead of
 localeCompare due to performance issues (#200)

---
 src/views/catalog-product-details.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index f074ace3..4aae4371 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -1086,7 +1086,13 @@ export default defineComponent({
       })
     },
     getSortedShopListings(shopListings: any) {
-      return shopListings.sort((a: any, b: any) => a.name.localeCompare(b.name))
+      // using return based sorting instead of localeCompare
+      // as localeCompare is slower
+      return shopListings.sort((a: any, b: any) => {
+        if (a.name < b.name) return -1;
+        if (a.name > b.name) return 1;
+        return 0;
+      })
     }
   },
   setup() {

From ca82820063c222c7cb40040f8692edd107090795 Mon Sep 17 00:00:00 2001
From: k2maan <ketuman333@gmail.com>
Date: Fri, 25 Aug 2023 15:02:10 +0530
Subject: [PATCH 17/27] Improved: used conditonal operator instead of manual
 iffing (#200)

---
 src/views/catalog-product-details.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index 4aae4371..6100059f 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -1088,11 +1088,7 @@ export default defineComponent({
     getSortedShopListings(shopListings: any) {
       // using return based sorting instead of localeCompare
       // as localeCompare is slower
-      return shopListings.sort((a: any, b: any) => {
-        if (a.name < b.name) return -1;
-        if (a.name > b.name) return 1;
-        return 0;
-      })
+      return shopListings.sort((a: any, b: any) => a.name < b.name ? -1 : 1)
     }
   },
   setup() {

From 3c35cb147cd4a1e9a28aba9d31ef25a865f65640 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 1 Sep 2023 12:23:29 +0530
Subject: [PATCH 18/27] Improved: Loader on the product summary page is not
 required hence removed it. (#208)

---
 src/store/modules/product/actions.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/store/modules/product/actions.ts b/src/store/modules/product/actions.ts
index 7036cb5d..bc703add 100644
--- a/src/store/modules/product/actions.ts
+++ b/src/store/modules/product/actions.ts
@@ -226,8 +226,6 @@ const actions: ActionTree<ProductState, RootState> = {
       return product
     }
 
-    emitter.emit("presentLoader")
-
     let resp;
     let productFilterCondition: any = `docType: PRODUCT AND groupId: ${payload.productId}`;
     if (!isProductCached) productFilterCondition = `docType: PRODUCT AND (productId: ${payload.productId} OR groupId: ${payload.productId})`

From 6fefdf251d6496aae626418d280c2de6524e3545 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 1 Sep 2023 12:54:52 +0530
Subject: [PATCH 19/27] Improved: Dismiss Loader is not required in Product
 Summary Page, hence remove it. (#208)

---
 src/store/modules/product/actions.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/store/modules/product/actions.ts b/src/store/modules/product/actions.ts
index bc703add..56220083 100644
--- a/src/store/modules/product/actions.ts
+++ b/src/store/modules/product/actions.ts
@@ -258,7 +258,6 @@ const actions: ActionTree<ProductState, RootState> = {
       console.error(error)
       showToast(translate("Something went wrong"));
     }
-    emitter.emit("dismissLoader");
     return product
   },
   /**

From 58b2f7d15eb562c0738b530f4d6efa2a2f5ca33e Mon Sep 17 00:00:00 2001
From: k2maan <ketuman333@gmail.com>
Date: Mon, 4 Sep 2023 14:51:11 +0530
Subject: [PATCH 20/27] Improved: height/thickness for skeleton text loaders
 (#139)

---
 src/views/catalog-product-details.vue | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index 6f42c061..f1269640 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -72,15 +72,15 @@
           <ion-card v-if="!poSummary.listingCountStatusMessage">
             <ion-item>
               <ion-label class="ion-text-wrap">{{ $t("Eligible") }}</ion-label>
-              <ion-skeleton-text slot="end" animated style="height: 50%; width: 20%;" />
+              <ion-skeleton-text slot="end" animated style="height: 30%; width: 20%;" />
             </ion-item>
             <ion-item>
               <ion-label class="ion-text-wrap">{{ $t("Category") }}</ion-label>
-              <ion-skeleton-text slot="end" animated style="height: 50%; width: 40%;" />
+              <ion-skeleton-text slot="end" animated style="height: 30%; width: 40%;" />
             </ion-item>
             <ion-item>
               <ion-label class="ion-text-wrap">{{ $t("Shopify listing") }}</ion-label>
-              <ion-skeleton-text slot="end" animated style="height: 50%; width: 50%;" />
+              <ion-skeleton-text slot="end" animated style="height: 30%; width: 50%;" />
             </ion-item>
             <ion-item-divider color="light">
               <ion-label color="medium">{{ $t("Timeline") }}</ion-label>
@@ -89,7 +89,7 @@
               <ion-icon slot="start" :icon="shirtOutline" />
               <ion-label>
                 <ion-item lines="none">
-                  <ion-skeleton-text animated style="width: 90%; height: 40%;" />
+                  <ion-skeleton-text animated style="width: 90%; height: 30%;" />
                 </ion-item>
                 <ion-item lines="none">
                   <ion-skeleton-text animated style="width: 100%; height: 60%;" />
@@ -133,15 +133,9 @@
 
       <hr />
 
-      <div v-if="!Object.keys(poAndAtpDetails).length">
-        <ion-item lines="none">
-          <ion-skeleton-text animated style="width: 50%; height: 50%;" />
-        </ion-item>
-      </div>
-
       <section>
         <ion-card v-if="!Object.keys(poAndAtpDetails).length">
-          <ion-item>
+          <ion-item lines="none">
             <ion-skeleton-text animated style="height: 40%; width: 70%;" />
           </ion-item>
           <ion-item>
@@ -206,7 +200,6 @@
             <ion-label slot="end">{{ (poAndAtpDetails.totalPoAtp >= 0) ? poAndAtpDetails.totalPoAtp : '-' }}</ion-label>
           </ion-item>
         </ion-card>
-
         <ion-card v-else>
           <ion-card-header>
             <ion-card-title>

From 8b5a6e7d5e545b28401ffd0c077089ef4a710b80 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Tue, 5 Sep 2023 14:39:47 +0530
Subject: [PATCH 21/27] Improved: changed the product summary page title (#187)

---
 src/i18n/locales/en.json              | 2 +-
 src/views/catalog-product-details.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 14a500d3..d3a8740e 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -145,7 +145,7 @@
     "preorders will be cancelled. This action cannot be undone.": "{count} preorders will be cancelled. This action cannot be undone.",
     "Products": "Products",
     "Product details": "Product details",
-    "Product summary page": "Product summary page",
+    "Product summary": "Product summary",
     "Product cannot be pre-sold because it does not have active purchase orders": "Product cannot be pre-sold because it does not have active purchase orders",
     "Product has been accepting from against PO #": "Product has been accepting {category}s from {fromDate} against PO #${POID}",
     "Product is eligible for but not added to the category": "Product is eligible for {category}s but not added to the {category} category",
diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index 0b658c59..893d920f 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -5,7 +5,7 @@
         <ion-buttons slot="start">
           <ion-back-button default-href="/catalog"></ion-back-button>
         </ion-buttons>
-        <ion-title>{{ $t("Product summary page") }}</ion-title>
+        <ion-title>{{ $t("Product summary") }}</ion-title>
       </ion-toolbar>
     </ion-header>
     <ion-content>

From 1d3b1e052951e00922bf1a72de5756e72b2ecd3a Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Wed, 6 Sep 2023 14:21:25 +0530
Subject: [PATCH 22/27] Fixed: eliminated 'in' word duplication in timeline
 message on product summary page (#211)

---
 src/i18n/locales/en.json              | 2 +-
 src/views/catalog-product-details.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index f0c62369..edb8de7b 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -4,7 +4,7 @@
     "Active jobs": "Active jobs",
     "Active purchase order": "Active purchase order",
     "Added to pre-order category on, against PO but not listed on all stores" : "Added to pre-order category on {fromDate}, against PO #{POID} but not listed on all stores",
-    "Adding to in": "Adding to {categoryName} in {addingTime}",
+    "Adding to": "Adding to {categoryName} {addingTime}",
     "All": "All",
     "App": "App",
     "Are you sure you want to update the promise date for these orders?": "Are you sure you want to update the promise date for these orders?",
diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index 5ccad313..29611aad 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -872,7 +872,7 @@ export default defineComponent({
         if (Object.keys(presellingJob).length === 0 || !presellingJob.runTime) {
           this.poSummary.header = this.$t("Pre-sell processing disabled");
         } else {
-          this.poSummary.header = this.$t("Adding to in", { categoryName, addingTime: this.timeTillJob(presellingJob.runTime) });
+          this.poSummary.header = this.$t("Adding to", { categoryName, addingTime: this.timeTillJob(presellingJob.runTime) });
         }
         this.poSummary.body = this.$t("This product will begin pre-selling because it is out of stock and purchase order is available.", { poId: this.poAndAtpDetails.activePo.orderExternalId ? this.poAndAtpDetails.activePo.orderExternalId : this.poAndAtpDetails.activePo.orderId });
       } else if (!this.poSummary.eligible && hasCategory) {

From 9ca207d5f06e1c2fb4d0b7a444f6b4f1c64aa0b4 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Wed, 6 Sep 2023 15:32:37 +0530
Subject: [PATCH 23/27] Fixed: shopify listing to display status when listing
 is done directly or by third party(#198)

---
 src/views/catalog-product-details.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index 0239f56c..c81b40f2 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -988,6 +988,7 @@ export default defineComponent({
         const shopifyConfigsAndProductIds = this.configsByStores.reduce((shopifyConfigsAndProductIds: any, config: any) => {
           const shopifyShop = shopifyConfigsAndProductIds[config.shopId] || {}
           !shopifyShop.variantProductId && (shopifyShop.variantProductId = this.getProductIdentificationId(this.currentVariant.goodIdentifications, 'ShopifyShopProduct/' + config.shopId))
+          !shopifyShop.hcVariantProductId && (shopifyShop.hcVariantProductId = this.currentVariant.productId)
           shopifyConfigsAndProductIds[config.shopId] = shopifyShop;
           configs[config.shopId] = config;
           return shopifyConfigsAndProductIds
@@ -998,7 +999,7 @@ export default defineComponent({
           let listData = {
             ...configs[shopId], // adding shopify shop information to be available for showing name
           } as any
-          if (!configAndIdData.variantProductId) {
+          if (!configAndIdData.variantProductId && !configAndIdData.hcVariantProductId) {
             this.shopListings = [...this.shopListings, listData]
             // TODO Find a better way
             return Promise.resolve(this.shopListings)
@@ -1012,7 +1013,7 @@ export default defineComponent({
               } as any,
               "filter": `docType: BULKOPERATION
                   AND operation: 'SHOP_PREORDER_SYNC'
-                  AND data_productVariantUpdate_productVariant_id: "gid://shopify/ProductVariant/${configAndIdData.variantProductId}"
+                  AND data_productVariantUpdate_productVariant_id: ("gid://shopify/ProductVariant/${configAndIdData.variantProductId}" OR "gid://hotwax/ProductVariant/id/${configAndIdData.hcVariantProductId}")
                   AND data_productVariantUpdate_productVariant_metafields_edges_node_namespace: "HC_PREORDER"`,
               "query": "*:*",
             },

From 79e7caa957e791f77c48fd6c64d26c7f41b3ec97 Mon Sep 17 00:00:00 2001
From: k2maan <ketuman333@gmail.com>
Date: Wed, 6 Sep 2023 16:54:04 +0530
Subject: [PATCH 24/27] Fixed: incorrect sizing sequence order by adding
 missing support for point value sizes in apparel sorter (#216)

---
 src/apparel-sorter/index.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/apparel-sorter/index.ts b/src/apparel-sorter/index.ts
index a03a89c4..8f8bf9a3 100644
--- a/src/apparel-sorter/index.ts
+++ b/src/apparel-sorter/index.ts
@@ -139,6 +139,16 @@ export function sortSizes(sizes: any) {
   if (!sizes) {
     return [];
   }
+
+  const hasFloatNumSizes = sizes.some((size: string) => {
+    const sizeAsInt = +size
+    return (!Number.isNaN(sizeAsInt) && !Number.isInteger(sizeAsInt))
+  })
+
+  if (hasFloatNumSizes) {
+    sizes.sort((a: string, b: string) => (+a) - (+b))
+  }
+
   return sizes
     .map(matchSizesWithRegexes)
     .sort(sortSizesByIndex)

From 70af610c485cc87266d5421df64bb73fc658aa72 Mon Sep 17 00:00:00 2001
From: k2maan <ketuman333@gmail.com>
Date: Wed, 6 Sep 2023 17:47:19 +0530
Subject: [PATCH 25/27] Improved: code to fetch catalog products and job data
 by enalbing async handling (#216)

---
 src/views/catalog.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/catalog.vue b/src/views/catalog.vue
index 156db534..9b1e9392 100644
--- a/src/views/catalog.vue
+++ b/src/views/catalog.vue
@@ -165,9 +165,9 @@ export default defineComponent({
       isCatalogScrollable: 'product/isCatalogScrollable'
     })
   },
-  mounted() {
-    this.getCatalogProducts()
-    this.preparePreordBckordComputationJob()
+  async ionViewWillEnter() {
+    await this.getCatalogProducts()
+    await this.preparePreordBckordComputationJob()
   },
   methods: {
     async getCatalogProducts(vSize?: any, vIndex?: any) {

From a0b7ff51ca9e666b1dd51dfc02887605a1d7524a Mon Sep 17 00:00:00 2001
From: k2maan <ketuman333@gmail.com>
Date: Wed, 6 Sep 2023 17:48:05 +0530
Subject: [PATCH 26/27] Fixed: showed current quantity instead of total ATP in
 timeline body (#216)

---
 src/views/catalog-product-details.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/catalog-product-details.vue b/src/views/catalog-product-details.vue
index f4086636..1f92fa56 100644
--- a/src/views/catalog-product-details.vue
+++ b/src/views/catalog-product-details.vue
@@ -853,7 +853,7 @@ export default defineComponent({
         } else {
           this.poSummary.header = this.$t("Added to", { categoryName });
         }
-        this.poSummary.body = this.$t("When this product entered there was no sellable inventory and was available in", { categoryName, poItemATP: this.poAndAtpDetails.totalPoAtp , poId: this.poAndAtpDetails.activePo.orderExternalId ? this.poAndAtpDetails.activePo.orderExternalId : this.poAndAtpDetails.activePo.orderId  });
+        this.poSummary.body = this.$t("When this product entered there was no sellable inventory and was available in", { categoryName, poItemATP: this.poAndAtpDetails.activePo.quantity , poId: this.poAndAtpDetails.activePo.orderExternalId ? this.poAndAtpDetails.activePo.orderExternalId : this.poAndAtpDetails.activePo.orderId  });
       } else if (!this.poSummary.eligible && !hasCategory) {
         const presellingJob = this.getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT');
         if (Object.keys(presellingJob).length === 0 || !presellingJob.runTime) {

From 38e4509d2c7f09e381c26cfc17928ec253e0a4f6 Mon Sep 17 00:00:00 2001
From: k2maan <ketuman333@gmail.com>
Date: Wed, 6 Sep 2023 18:28:26 +0530
Subject: [PATCH 27/27] Improved: added missing return statement (#216)

---
 src/apparel-sorter/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apparel-sorter/index.ts b/src/apparel-sorter/index.ts
index 8f8bf9a3..4a84ce68 100644
--- a/src/apparel-sorter/index.ts
+++ b/src/apparel-sorter/index.ts
@@ -146,7 +146,7 @@ export function sortSizes(sizes: any) {
   })
 
   if (hasFloatNumSizes) {
-    sizes.sort((a: string, b: string) => (+a) - (+b))
+    return sizes.sort((a: string, b: string) => (+a) - (+b))
   }
 
   return sizes