Mercurial > bms / file diff

--- a/www/includes/db_product.php	Sat May 11 23:13:40 2019 +0200
+++ b/www/includes/db_product.php	Sun May 12 15:16:35 2019 +0200
@@ -688,29 +688,29 @@
 		$brew .= ',"sparge_acid_type":' . $row['sparge_acid_type'];
 		$brew .= ',"sparge_acid_perc":' . floatval($row['sparge_acid_perc']);
 		$brew .= ',"sparge_acid_amount":' . floatval($row['sparge_acid_amount']);
-		$brew .= ',"mash_ph":' . $row['mash_ph'];
-		$brew .= ',"mash_name":"' . $row['mash_name'];
+		$brew .= ',"mash_ph":' . floatval($row['mash_ph']);
+		$brew .= ',"mash_name":"' . str_replace($escapers, $replacements, $row['mash_name']);
 		$brew .= '","calc_acid":' . $row['calc_acid'];
 		$brew .= ',"w1_name":"' . str_replace($escapers, $replacements, $row['w1_name']);
-		$brew .= '","w1_amount":' . $row['w1_amount'];
-		$brew .= ',"w1_calcium":' . $row['w1_calcium'];
-		$brew .= ',"w1_sulfate":' . $row['w1_sulfate'];
-		$brew .= ',"w1_chloride":' . $row['w1_chloride'];
-		$brew .= ',"w1_sodium":' . $row['w1_sodium'];
-		$brew .= ',"w1_magnesium":' . $row['w1_magnesium'];
-		$brew .= ',"w1_total_alkalinity":' . $row['w1_total_alkalinity'];
-		$brew .= ',"w1_ph":' . $row['w1_ph'];
-		$brew .= ',"w1_cost":' . $row['w1_cost'];
+		$brew .= '","w1_amount":' . floatval($row['w1_amount']);
+		$brew .= ',"w1_calcium":' . floatval($row['w1_calcium']);
+		$brew .= ',"w1_sulfate":' . floatval($row['w1_sulfate']);
+		$brew .= ',"w1_chloride":' . floatval($row['w1_chloride']);
+		$brew .= ',"w1_sodium":' . floatval($row['w1_sodium']);
+		$brew .= ',"w1_magnesium":' . floatval($row['w1_magnesium']);
+		$brew .= ',"w1_total_alkalinity":' . floatval($row['w1_total_alkalinity']);
+		$brew .= ',"w1_ph":' . floatval($row['w1_ph']);
+		$brew .= ',"w1_cost":' . floatval($row['w1_cost']);
 		$brew .= ',"w2_name":"' . str_replace($escapers, $replacements, $row['w2_name']);
-		$brew .= '","w2_amount":' . $row['w2_amount'];
-		$brew .= ',"w2_calcium":' . $row['w2_calcium'];
-		$brew .= ',"w2_sulfate":' . $row['w2_sulfate'];
-		$brew .= ',"w2_chloride":' . $row['w2_chloride'];
-		$brew .= ',"w2_sodium":' . $row['w2_sodium'];
-		$brew .= ',"w2_magnesium":' . $row['w2_magnesium'];
-		$brew .= ',"w2_total_alkalinity":' . $row['w2_total_alkalinity'];
-		$brew .= ',"w2_ph":' . $row['w2_ph'];
-		$brew .= ',"w2_cost":' . $row['w2_cost'];
+		$brew .= '","w2_amount":' . floatval($row['w2_amount']);
+		$brew .= ',"w2_calcium":' . floatval($row['w2_calcium']);
+		$brew .= ',"w2_sulfate":' . floatval($row['w2_sulfate']);
+		$brew .= ',"w2_chloride":' . floatval($row['w2_chloride']);
+		$brew .= ',"w2_sodium":' . floatval($row['w2_sodium']);
+		$brew .= ',"w2_magnesium":' . floatval($row['w2_magnesium']);
+		$brew .= ',"w2_total_alkalinity":' . floatval($row['w2_total_alkalinity']);
+		$brew .= ',"w2_ph":' . floatval($row['w2_ph']);
+		$brew .= ',"w2_cost":' . floatval($row['w2_cost']);
 		$brew .= ',"wa_acid_name":' . $row['wa_acid_name'];
 		$brew .= ',"wa_acid_perc":' . $row['wa_acid_perc'];
 		$brew .= ',"wa_base_name":' . $row['wa_base_name'];
@@ -784,6 +784,8 @@
 			for ($i = 0; $i < count($yeasts); $i++) {
 				$yeasts[$i]['y_inventory'] = 0;   // Not in stock
 				$yeasts[$i]['y_avail'] = 0;       // Ingredient not in db
+				if (! isset($yeasts[$i]['y_tolerance']))
+                                        $yeasts[$i]['y_tolerance'] = 0;
 				$sql2 = "SELECT inventory,tolerance FROM inventory_yeasts ";
 				$sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_name'])."' AND";
 				$sql2 .= " form='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_form'])."' AND";