Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-06-19 12:21:43 +03:00
parent ad8d459491
commit c8c37b4e69
3 changed files with 21 additions and 19 deletions

View File

@@ -562,7 +562,7 @@ DO UPDATE SET dim_id = EXCLUDED.dim_id, updated_at = EXCLUDED.updated_at
}
// Resolve to PG dim ids. For this installation we align with mmitem_dim key:
// - dim1 = color
// - dim3 = itemdim3 (optional)
// - dim3 = ItemDim2Code/yaka (optional)
// Size (ItemDim1Code) is not part of the key here.
d1 := int64(0)
if id, ok := resolveDimvalFromToken(pgTx, "dimval1", colorCode); ok {
@@ -579,7 +579,7 @@ DO UPDATE SET dim_id = EXCLUDED.dim_id, updated_at = EXCLUDED.updated_at
continue
}
var d3 sql.NullInt64
// dim3 corresponds to mmitem_dim.val3 (ItemDim3Code).
// dim3 corresponds to mmitem_dim.val3.
if id, ok := resolveDimvalFromToken(pgTx, "dimval1", dim3Code); ok {
d3 = sql.NullInt64{Int64: id, Valid: true}
resolvedDim3++