M_Kececi/bssapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
M_Kececi
2026-03-13 14:26:51 +03:00
parent 4a45fa82d9
commit fd7400ee69
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ui/src/pages/ProductStockByAttributes.vue
View File

@@ -480,7 +480,6 @@ function extractSecondColor(item) {
return ( return (
normalizeSecondColorValue(item?.Renk2) || normalizeSecondColorValue(item?.Renk2) ||
normalizeSecondColorValue(item?.ItemDim3Code) || normalizeSecondColorValue(item?.ItemDim3Code) ||
normalizeSecondColorValue(item?.Yaka) ||
'' ''
) )
} }
@@ -536,21 +535,12 @@ function resolveProductImageUrl(item) {
const uploadsPath = normalizeUploadsPath(item.storage_path || item.storage || '') const uploadsPath = normalizeUploadsPath(item.storage_path || item.storage || '')
let publicUrl = '' let publicUrl = ''
const thumbFolder = (typeof window !== 'undefined' && window.devicePixelRatio > 1.5)
? 't600'
: 't300'
if (uploadsPath) { if (uploadsPath) {
// Thumbnail tercih et publicUrl = 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
}
} else { } else {
const fileName = String(item.file_name || item.FileName || '').trim() const fileName = String(item.file_name || item.FileName || '').trim()
if (fileName) { if (fileName) {
// b2b benzeri yapi: /uploads/image/t300|t600/<uuid>.jpg publicUrl = `/uploads/image/${fileName}`
publicUrl = `/uploads/image/${thumbFolder}/${fileName}`
} }
} }

10
ui/src/pages/ProductStockQuery.vue
View File

@@ -473,7 +473,6 @@ function extractSecondColor(item) {
return ( return (
normalizeSecondColorValue(item?.Renk2) || normalizeSecondColorValue(item?.Renk2) ||
normalizeSecondColorValue(item?.ItemDim3Code) || normalizeSecondColorValue(item?.ItemDim3Code) ||
normalizeSecondColorValue(item?.Yaka) ||
'' ''
) )
} }
@@ -525,16 +524,11 @@ function resolveProductImageUrl(item) {
const uploadsPath = normalizeUploadsPath(item.storage_path || item.storage || '') const uploadsPath = normalizeUploadsPath(item.storage_path || item.storage || '')
let publicUrl = '' let publicUrl = ''
const thumbFolder = (typeof window !== 'undefined' && window.devicePixelRatio > 1.5) ? 't600' : 't300'
if (uploadsPath) { if (uploadsPath) {
if (uploadsPath.includes('/uploads/image/') && !uploadsPath.includes('/uploads/image/t300/') && !uploadsPath.includes('/uploads/image/t600/')) { publicUrl = uploadsPath
publicUrl = uploadsPath.replace('/uploads/image/', `/uploads/image/${thumbFolder}/`)
} else {
publicUrl = uploadsPath
}
} else { } else {
const fileName = String(item.file_name || item.FileName || '').trim() 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 } return { contentUrl, publicUrl }