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-15 22:59:42 +03:00
parent 9c76a521c5
commit e2c04fab5d
3 changed files with 213 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -486,7 +486,15 @@ function resolvePhotoDim3(item, secondColorDisplay = '') {
}
function resolvePhotoDim1ID(item) {
const candidates = [item?.ItemDim1Code, item?.itemDim1Code, item?.ITEMDIM1CODE, item?.Beden]
const candidates = [
item?.PhotoDim1ID,
item?.photoDim1ID,
item?.Dim1ID,
item?.dim1ID,
item?.ColorID,
item?.colorID,
item?.RenkID
]
for (const value of candidates) {
const s = String(value || '').trim()
if (/^\d+$/.test(s)) return s
@@ -495,7 +503,15 @@ function resolvePhotoDim1ID(item) {
}
function resolvePhotoDim3ID(item) {
const candidates = [item?.ItemDim3Code, item?.itemDim3Code, item?.ITEMDIM3CODE, item?.Renk2]
const candidates = [
item?.PhotoDim3ID,
item?.photoDim3ID,
item?.Dim3ID,
item?.dim3ID,
item?.SecondColorID,
item?.secondColorID,
item?.Renk2ID
]
for (const value of candidates) {
const s = String(value || '').trim()
if (/^\d+$/.test(s)) return s

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

@@ -479,7 +479,15 @@ function resolvePhotoDim3(item, secondColorDisplay = '') {
}
function resolvePhotoDim1ID(item) {
const candidates = [item?.ItemDim1Code, item?.itemDim1Code, item?.ITEMDIM1CODE, item?.Beden]
const candidates = [
item?.PhotoDim1ID,
item?.photoDim1ID,
item?.Dim1ID,
item?.dim1ID,
item?.ColorID,
item?.colorID,
item?.RenkID
]
for (const value of candidates) {
const s = String(value || '').trim()
if (/^\d+$/.test(s)) return s
@@ -488,7 +496,15 @@ function resolvePhotoDim1ID(item) {
}
function resolvePhotoDim3ID(item) {
const candidates = [item?.ItemDim3Code, item?.itemDim3Code, item?.ITEMDIM3CODE, item?.Renk2]
const candidates = [
item?.PhotoDim3ID,
item?.photoDim3ID,
item?.Dim3ID,
item?.dim3ID,
item?.SecondColorID,
item?.secondColorID,
item?.Renk2ID
]
for (const value of candidates) {
const s = String(value || '').trim()
if (/^\d+$/.test(s)) return s