From 4bde0dffa734f0588db077708cb5a098d40c9a97 Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 23 Oct 2024 09:17:14 +0200 Subject: [PATCH 1/4] fix: fixed item packaging type field showing repetitive values --- .../components/CustomerSummaryTable.vue | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue index f6013dea9..ff1474fb9 100644 --- a/src/pages/Customer/components/CustomerSummaryTable.vue +++ b/src/pages/Customer/components/CustomerSummaryTable.vue @@ -101,7 +101,7 @@ const columns = computed(() => [ align: 'left', name: 'itemPackingTypeFk', label: t('ticketSale.packaging'), - format: (row) => getItemPackagingType(row), + format: (row) => getItemPackagingType(row.ticketSales), }, { align: 'right', @@ -151,13 +151,18 @@ const setShippedColor = (date) => { if (difference < 0) return 'success'; }; -const getItemPackagingType = (row) => { - const packagingType = row?.ticketSales - .map((sale) => sale.item?.itemPackingTypeFk || '-') - .filter((value) => value !== '-') - .join(', '); +const getItemPackagingType = (ticketSales) => { + if (!ticketSales || ticketSales.length === 0) return '-'; - return dashIfEmpty(packagingType); + const packagingTypes = ticketSales + .map((sale) => sale.item?.itemPackingTypeFk) + .filter((type) => type !== undefined && type !== null); + + const uniquePackagingTypes = [...new Set(packagingTypes)]; + + return dashIfEmpty( + uniquePackagingTypes.length > 0 ? uniquePackagingTypes.join(', ') : '-' + ); }; From 70dcadc57d58831ae7149be462536f22e00469cd Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Thu, 24 Oct 2024 11:52:13 +0000 Subject: [PATCH 2/4] Actualizar src/components/CreateNewPostcodeForm.vue --- src/components/CreateNewPostcodeForm.vue | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue index 030ca1388..afd3fc025 100644 --- a/src/components/CreateNewPostcodeForm.vue +++ b/src/components/CreateNewPostcodeForm.vue @@ -108,11 +108,11 @@ watch( watch( () => postcodeFormData.provinceFk, - async (newProvinceFk) => { + async (newProvinceFk, oldValueFk) => { if (Array.isArray(newProvinceFk)) { newProvinceFk = newProvinceFk[0]; } - if (newProvinceFk !== postcodeFormData.provinceFk) { + if (newProvinceFk !== oldValueFk) { await townsFetchDataRef.value.fetch({ where: { provinceFk: newProvinceFk }, }); @@ -147,13 +147,7 @@ async function handleCountries(data) { auto-load url="Towns/location" /> - + Date: Thu, 24 Oct 2024 12:39:49 +0000 Subject: [PATCH 3/4] perf: remove limit --- src/components/CreateNewPostcodeForm.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue index afd3fc025..03cba8ac7 100644 --- a/src/components/CreateNewPostcodeForm.vue +++ b/src/components/CreateNewPostcodeForm.vue @@ -214,7 +214,6 @@ async function handleCountries(data) { /> Date: Fri, 25 Oct 2024 09:41:28 +0200 Subject: [PATCH 4/4] perf: optimize get packing type function --- .../components/CustomerSummaryTable.vue | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue index ff1474fb9..e9bb36be7 100644 --- a/src/pages/Customer/components/CustomerSummaryTable.vue +++ b/src/pages/Customer/components/CustomerSummaryTable.vue @@ -152,17 +152,20 @@ const setShippedColor = (date) => { }; const getItemPackagingType = (ticketSales) => { - if (!ticketSales || ticketSales.length === 0) return '-'; + if (!ticketSales?.length) return '-'; - const packagingTypes = ticketSales - .map((sale) => sale.item?.itemPackingTypeFk) - .filter((type) => type !== undefined && type !== null); + const packagingTypes = ticketSales.reduce((types, sale) => { + const { itemPackingTypeFk } = sale.item; + if ( + !types.includes(itemPackingTypeFk) && + (itemPackingTypeFk === 'H' || itemPackingTypeFk === 'V') + ) { + types.push(itemPackingTypeFk); + } + return types; + }, []); - const uniquePackagingTypes = [...new Set(packagingTypes)]; - - return dashIfEmpty( - uniquePackagingTypes.length > 0 ? uniquePackagingTypes.join(', ') : '-' - ); + return dashIfEmpty(packagingTypes.join(', ') || '-'); };