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 23:30:14 +03:00
parent fee3b13122
commit 10c173d41d
3 changed files with 135 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
ui/src/pages/ProductPricing.vue
View File

@@ -1756,7 +1756,12 @@ function parseNumber (val) {
} else if (lastComma >= 0) {
normalized = text.replace(/\./g, '').replace(',', '.')
} else {
normalized = text.replace(/,/g, '')
const parts = text.split('.')
const lastPart = parts[parts.length - 1] || ''
const looksLikeThousands = lastDot >= 0 && parts.length > 1 && lastPart.length === 3 && parts.slice(0, -1).every((p, i) => (
i === 0 ? p.length >= 1 && p.length <= 3 : p.length === 3
))
normalized = looksLikeThousands ? text.replace(/\./g, '') : text.replace(/,/g, '')
}
const n = Number(normalized)
@@ -2323,26 +2328,26 @@ async function saveSelectedRows () {
const payload = {
items: list.map((r) => ({
product_code: String(r?.productCode || '').trim(),
base_price_usd: Number(r?.basePriceUsd ?? 0),
base_price_try: Number(r?.basePriceTry ?? 0),
usd1: Number(r?.usd1 ?? 0),
usd2: Number(r?.usd2 ?? 0),
usd3: Number(r?.usd3 ?? 0),
usd4: Number(r?.usd4 ?? 0),
usd5: Number(r?.usd5 ?? 0),
usd6: Number(r?.usd6 ?? 0),
eur1: Number(r?.eur1 ?? 0),
eur2: Number(r?.eur2 ?? 0),
eur3: Number(r?.eur3 ?? 0),
eur4: Number(r?.eur4 ?? 0),
eur5: Number(r?.eur5 ?? 0),
eur6: Number(r?.eur6 ?? 0),
try1: Number(r?.try1 ?? 0),
try2: Number(r?.try2 ?? 0),
try3: Number(r?.try3 ?? 0),
try4: Number(r?.try4 ?? 0),
try5: Number(r?.try5 ?? 0),
try6: Number(r?.try6 ?? 0)
base_price_usd: parseNumber(r?.basePriceUsd),
base_price_try: parseNumber(r?.basePriceTry),
usd1: parseNumber(r?.usd1),
usd2: parseNumber(r?.usd2),
usd3: parseNumber(r?.usd3),
usd4: parseNumber(r?.usd4),
usd5: parseNumber(r?.usd5),
usd6: parseNumber(r?.usd6),
eur1: parseNumber(r?.eur1),
eur2: parseNumber(r?.eur2),
eur3: parseNumber(r?.eur3),
eur4: parseNumber(r?.eur4),
eur5: parseNumber(r?.eur5),
eur6: parseNumber(r?.eur6),
try1: parseNumber(r?.try1),
try2: parseNumber(r?.try2),
try3: parseNumber(r?.try3),
try4: parseNumber(r?.try4),
try5: parseNumber(r?.try5),
try6: parseNumber(r?.try6)
}))
}