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-06-19 14:21:50 +03:00
parent 13c9df1e96
commit 10f90cbaf3
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
svc/routes/product_pricing_save.go
View File

@@ -678,13 +678,17 @@ WHERE mmitem_id = $1
if !v1.Valid || v1.Int64 <= 0 { if !v1.Valid || v1.Int64 <= 0 {
continue continue
} }
// Variant key in this installation: (val1=color, val3=itemdim3_if_any). Ignore val2 (size). // Variant key in this installation: (val1=color, val3=ItemDim2Code/yaka_if_any). Ignore val2 (size).
d1 := v1.Int64 d1 := v1.Int64
_ = mmdimID
_ = v2 _ = v2
var d3 sql.NullInt64 var d3 sql.NullInt64
if v3.Valid && v3.Int64 > 0 { if mmdimID.Valid && mmdimID.Int64 == 3 {
if !v3.Valid || v3.Int64 <= 1000 {
continue
}
}
if v3.Valid && v3.Int64 > 1000 {
d3 = sql.NullInt64{Int64: v3.Int64, Valid: true} d3 = sql.NullInt64{Int64: v3.Int64, Valid: true}
} }

8
svc/routes/wholesale_campaigns.go
View File

@@ -815,11 +815,15 @@ WHERE mmitem_id = ANY($1::bigint[])
} }
// Variant key in this installation: (val1=color, val3=ItemDim2Code/yaka_if_any). Ignore val2 (size). // Variant key in this installation: (val1=color, val3=ItemDim2Code/yaka_if_any). Ignore val2 (size).
d1 := v1.Int64 d1 := v1.Int64
_ = mmdimID
_ = v2 _ = v2
addCandidate(itemDim1Candidates, itemID, d1) addCandidate(itemDim1Candidates, itemID, d1)
d3k := int64(0) d3k := int64(0)
if v3.Valid && v3.Int64 > 0 { if mmdimID.Valid && mmdimID.Int64 == 3 {
if !v3.Valid || v3.Int64 <= 1000 {
continue
}
}
if v3.Valid && v3.Int64 > 1000 {
d3k = v3.Int64 d3k = v3.Int64
addCandidate(itemDim3Candidates, itemID, d3k) addCandidate(itemDim3Candidates, itemID, d3k)
} }