morgane/EverShelf
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix: price calc conf+weight label → convert g to packs, not qty×price (v1.7.22)

Browse Source 
When unit='conf' and we know the package weight (default_quantity + package_unit)
and the AI price label contains a weight (e.g. 'pacco 500g'), convert:
  total_grams = qty × defQty
  packs = ceil(total_grams / label_grams)
  cost = packs × price_per_unit

Examples:
  Noci 7 conf×170g at €3.20/pacco 500g → 3 packs × €3.20 = €9.60 (was €22.40)
  Fragole 3 conf×250g at €3.29/conf 500g → 2 packs × €3.29 = €6.58 (was €9.87)
  Ceci 2 conf×250g at €2.00/pacco 500g → 1 pack × €2.00 = €2.00 (was €4.00)
This commit is contained in:
dadaloop82
2026-05-17 15:07:13 +00:00
parent a690d2e7cf
commit 92048c9eba
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/index.php
+26
View File
@@ -8434,6 +8434,32 @@ function _calcEstimatedTotal(float $pricePerUnit, string $priceUnitLabel, float
}
}
// ── conf/pz with known package weight vs weight-labeled AI price ──────────
// E.g. unit='conf', defQty=170g, AI priced 'pacco 500g' @ €3.20
// → need ceil(7×170 / 500) = 3 packs × €3.20 = €9.60, not 7×€3.20 = €22.40
if (in_array(strtolower($unit), ['conf', 'pz']) && $defQty > 0 && !empty($pkgUnit)) {
$pkgL = strtolower($pkgUnit);
$isWt = in_array($pkgL, ['g', 'kg']);
$isVol = in_array($pkgL, ['ml', 'l', 'lt']);
if (($isWt || $isVol) &&
preg_match('/\b(\d+(?:[.,]\d+)?)\s*(g|kg|ml|l|lt)\b/i', $priceUnitLabel, $m)) {
$rawVal = (float) str_replace(',', '.', $m[1]);
$rawUnit = strtolower($m[2]);
$labelIsWt = in_array($rawUnit, ['g', 'kg']);
$labelIsVol = in_array($rawUnit, ['ml', 'l', 'lt']);
if (($isWt && $labelIsWt) || ($isVol && $labelIsVol)) {
// Convert to base units (g or ml)
$defBase = $pkgL === 'kg' ? $defQty * 1000.0 : $defQty;
$labelBase = match($rawUnit) { 'kg','l','lt' => $rawVal * 1000.0, default => $rawVal };
if ($labelBase > 0) {
$totalBase = $qty * $defBase;
$packs = (int) max(1, ceil($totalBase / $labelBase));
return round($pricePerUnit * $packs, 2);
}
}
}
}
$buyQty = max(1.0, $qty);
return round($pricePerUnit * $buyQty, 2);
}