From fd7400ee6950ad05e17aa96d837e3f556994bed4 Mon Sep 17 00:00:00 2001 From: M_Kececi Date: Fri, 13 Mar 2026 14:26:51 +0300 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ui/src/pages/ProductStockByAttributes.vue | 14 ++------------ ui/src/pages/ProductStockQuery.vue | 10 ++-------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/ui/src/pages/ProductStockByAttributes.vue b/ui/src/pages/ProductStockByAttributes.vue index a63f9e4..78b7303 100644 --- a/ui/src/pages/ProductStockByAttributes.vue +++ b/ui/src/pages/ProductStockByAttributes.vue @@ -480,7 +480,6 @@ function extractSecondColor(item) { return ( normalizeSecondColorValue(item?.Renk2) || normalizeSecondColorValue(item?.ItemDim3Code) || - normalizeSecondColorValue(item?.Yaka) || '' ) } @@ -536,21 +535,12 @@ function resolveProductImageUrl(item) { const uploadsPath = normalizeUploadsPath(item.storage_path || item.storage || '') let publicUrl = '' - const thumbFolder = (typeof window !== 'undefined' && window.devicePixelRatio > 1.5) - ? 't600' - : 't300' if (uploadsPath) { - // Thumbnail tercih et - if (uploadsPath.includes('/uploads/image/') && !uploadsPath.includes('/uploads/image/t300/') && !uploadsPath.includes('/uploads/image/t600/')) { - publicUrl = uploadsPath.replace('/uploads/image/', `/uploads/image/${thumbFolder}/`) - } else { - publicUrl = uploadsPath - } + publicUrl = uploadsPath } else { const fileName = String(item.file_name || item.FileName || '').trim() if (fileName) { - // b2b benzeri yapi: /uploads/image/t300|t600/.jpg - publicUrl = `/uploads/image/${thumbFolder}/${fileName}` + publicUrl = `/uploads/image/${fileName}` } } diff --git a/ui/src/pages/ProductStockQuery.vue b/ui/src/pages/ProductStockQuery.vue index edc1325..fdecdd2 100644 --- a/ui/src/pages/ProductStockQuery.vue +++ b/ui/src/pages/ProductStockQuery.vue @@ -473,7 +473,6 @@ function extractSecondColor(item) { return ( normalizeSecondColorValue(item?.Renk2) || normalizeSecondColorValue(item?.ItemDim3Code) || - normalizeSecondColorValue(item?.Yaka) || '' ) } @@ -525,16 +524,11 @@ function resolveProductImageUrl(item) { const uploadsPath = normalizeUploadsPath(item.storage_path || item.storage || '') let publicUrl = '' - const thumbFolder = (typeof window !== 'undefined' && window.devicePixelRatio > 1.5) ? 't600' : 't300' if (uploadsPath) { - if (uploadsPath.includes('/uploads/image/') && !uploadsPath.includes('/uploads/image/t300/') && !uploadsPath.includes('/uploads/image/t600/')) { - publicUrl = uploadsPath.replace('/uploads/image/', `/uploads/image/${thumbFolder}/`) - } else { - publicUrl = uploadsPath - } + publicUrl = uploadsPath } else { const fileName = String(item.file_name || item.FileName || '').trim() - if (fileName) publicUrl = `/uploads/image/${thumbFolder}/${fileName}` + if (fileName) publicUrl = `/uploads/image/${fileName}` } return { contentUrl, publicUrl }