Mercurial > bms / file diff

--- a/www/import/from_brouwhulp.php	Sat Dec 08 15:20:03 2018 +0100
+++ b/www/import/from_brouwhulp.php	Sat Dec 08 17:11:38 2018 +0100
@@ -685,9 +685,13 @@
 		$comma = TRUE;
 		$yeasts .= '{"y_name":"' . mysqli_real_escape_string($db, $yeast->NAME) . '"';
 		$yeasts .= ',"y_amount":' . floatval($yeast->AMOUNT);
-		if ($yeast->COST)
-			$yeasts .= ',"y_cost":' . floatval($yeast->COST);
-		else
+		if ($yeast->COST) {
+			if (($yeast->FORM == "Liquid") && ($yeast->AMOUNT == "0.0588")) {	// Packs
+				$yeasts .= ',"y_cost":' . floatval($yeast->COST) / 58.8;
+			} else {
+				$yeasts .= ',"y_cost":' . floatval($yeast->COST);
+			}
+		} else
 			$yeasts .= ',"y_cost":0';
 		$yeasts .= ',"y_laboratory":"' . mysqli_real_escape_string($db, $yeast->LABORATORY) . '"';
 		$yeasts .= ',"y_product_id":"' . mysqli_real_escape_string($db, $yeast->PRODUCT_ID) . '"';