From 3efcdfc6d6f3dc2e57d7c649853dc3de75a6a776 Mon Sep 17 00:00:00 2001 From: k2maan Date: Thu, 3 Aug 2023 10:38:42 +0530 Subject: [PATCH 1/4] 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 @@
- - + +
- + - +
- - - - - - - - - - - - - - - - - - - - {{ $t("Eligible") }} - {{ poSummary.eligible ? $t("Yes") : $t("No") }} - - - {{ $t("Category") }} - {{ poSummary.categoryId === preOrderCategoryId ? $t('Pre-order') : poSummary.categoryId === backorderCategoryId ? $t('Back-order') : $t('None') }} - - - - {{ $t("Shopify listing") }} - {{ poSummary.listingCountStatusMessage }} - - - - {{ $t("Promise date") }} - {{ poSummary.promiseDate }} - - - {{ $t("Timeline") }} - - - - - -

{{ poSummary.header }}

-

{{ poSummary.body }}

-
-
+ +
+ + {{ $t("Eligible") }} + + + + {{ $t("Category") }} + + + + {{ $t("Shopify listing") }} + + + + {{ $t("Timeline") }} + + + + + + + + + + + + +
+
+ + {{ $t("Eligible") }} + {{ poSummary.eligible ? $t("Yes") : $t("No") }} + + + {{ $t("Category") }} + {{ poSummary.categoryId === preOrderCategoryId ? $t('Pre-order') : poSummary.categoryId === backorderCategoryId ? $t('Back-order') : $t('None') }} + + + + {{ $t("Shopify listing") }} + {{ poSummary.listingCountStatusMessage }} + + + + {{ $t("Promise date") }} + {{ poSummary.promiseDate }} + + + {{ $t("Timeline") }} + + + + + +

{{ poSummary.header }}

+

{{ poSummary.body }}

+
+
+
@@ -214,166 +227,162 @@ - - - - - - - - - - - - - - - - - - - - - +

{{ $t("Online ATP calculation") }}

- - {{ $t("Online ATP") }} - {{ (atpCalcDetails.onlineAtp >= 0) ? atpCalcDetails.onlineAtp : '-' }} - - - {{ $t("Quantity on hand") }} - {{ (atpCalcDetails.totalQOH >= 0) ? atpCalcDetails.totalQOH : '-' }} - - - {{ $t("Excluded ATP") }} - {{ (atpCalcDetails.excludedAtp || atpCalcDetails.excludedAtp === 0) ? atpCalcDetails.excludedAtp : '-' }} - - - {{ $t("Reserve inventory") }} - - - - {{ $t("Hold pre-order physical inventory") }} - - +
+ + + + + + + + + + + + + + + +
+
+ + {{ $t("Online ATP") }} + {{ (atpCalcDetails.onlineAtp >= 0) ? atpCalcDetails.onlineAtp : '-' }} + + + {{ $t("Quantity on hand") }} + {{ (atpCalcDetails.totalQOH >= 0) ? atpCalcDetails.totalQOH : '-' }} + + + {{ $t("Excluded ATP") }} + {{ (atpCalcDetails.excludedAtp || atpCalcDetails.excludedAtp === 0) ? atpCalcDetails.excludedAtp : '-' }} + + + {{ $t("Reserve inventory") }} + + + + {{ $t("Hold pre-order physical inventory") }} + + +

- - - - - - - - - - - - - - - - - - +

{{ $t('Category and brokering jobs') }}

- -
- {{ $t("No jobs found") }} + || !Object.keys(getCtgryAndBrkrngJob('JOB_BKR_ORD')).length + || !Object.keys(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE')).length"> + + + + + + + + + + + + + + +
-
- - -

{{ $t('Pre-sell computation') }}

-

{{ getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').lastRunTime) }}

-
- -

{{ getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').runTime ? timeTillJob(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').runTime) : $t('disabled')}}

-
-
+ +
+ {{ $t("No jobs found") }} +
+ +
+ + +

{{ $t('Pre-sell computation') }}

+

{{ getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').lastRunTime) }}

+
+ +

{{ getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').runTime ? timeTillJob(getCtgryAndBrkrngJob('JOB_REL_PREODR_CAT').runTime) : $t('disabled')}}

+
+
- - -

{{ $t('Order brokering') }}

-

{{ getCtgryAndBrkrngJob('JOB_BKR_ORD').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_BKR_ORD').lastRunTime) }}

-
- -

{{ getCtgryAndBrkrngJob('JOB_BKR_ORD').runTime ? timeTillJob(getCtgryAndBrkrngJob('JOB_BKR_ORD').runTime) : $t('disabled')}}

-
-
+ + +

{{ $t('Order brokering') }}

+

{{ getCtgryAndBrkrngJob('JOB_BKR_ORD').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_BKR_ORD').lastRunTime) }}

+
+ +

{{ getCtgryAndBrkrngJob('JOB_BKR_ORD').runTime ? timeTillJob(getCtgryAndBrkrngJob('JOB_BKR_ORD').runTime) : $t('disabled')}}

+
+
- - -

{{ $t('Auto releasing') }}

-

{{ getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').lastRunTime) }}

-
- -

{{ getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').runTime ? timeTillJob(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').runTime) : $t('disabled')}}

-
-
+ + +

{{ $t('Auto releasing') }}

+

{{ getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').lastRunTime && timeTillJob(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').lastRunTime) }}

+
+ +

{{ getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').runTime ? timeTillJob(getCtgryAndBrkrngJob('JOB_RLS_ORD_DTE').runTime) : $t('disabled')}}

+
+
+
- - - - - - - - - - - - - - - - - - +

{{ $t('Shop listing status') }}

- - {{ $t('No shop listings found') }} - - - -
{{ listData.name }}
- -

{{ listData.listingTimeAndStatus }}

-
- -
{{ $t(listData.listingStatus) }}
-
- -
{{ $t("No listing data") }}
-
- -
{{ $t("Not linked") }}
-
-
+
+ + + + + + + + + +
+
+ + {{ $t('No shop listings found') }} + + + +
{{ listData.name }}
+ +

{{ listData.listingTimeAndStatus }}

+
+ +
{{ $t(listData.listingStatus) }}
+
+ +
{{ $t("No listing data") }}
+
+ +
{{ $t("Not linked") }}
+
+
+
From 14adbeabe56d529c481722ba2b19709d4972252b Mon Sep 17 00:00:00 2001 From: k2maan Date: Thu, 3 Aug 2023 10:54:42 +0530 Subject: [PATCH 2/4] 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({