diff -r 8d7fad771dde -r f0ca77097236 www/includes/db_product.php --- a/www/includes/db_product.php Wed Mar 13 20:17:15 2019 +0100 +++ b/www/includes/db_product.php Wed Mar 13 21:31:04 2019 +0100 @@ -348,6 +348,7 @@ $yeast .= ',"y_flocculation":' . $item['y_flocculation']; $yeast .= ',"y_attenuation":' . $item['y_attenuation']; $yeast .= ',"y_cells":' . $item['y_cells']; + $yeast .= ',"y_tolerance":' . $item['y_tolerance']; $yeast .= ',"y_inventory":' . $item['y_inventory']; $yeast .= ',"y_use":' . $item['y_use']; $yeast .= ',"y_cost":' . $item['y_cost'] . '}'; @@ -783,7 +784,7 @@ for ($i = 0; $i < count($yeasts); $i++) { $yeasts[$i]['y_inventory'] = 0; // Not in stock $yeasts[$i]['y_avail'] = 0; // Ingredient not in db - $sql2 = "SELECT inventory FROM inventory_yeasts "; + $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"; $sql2 .= " laboratory='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_laboratory'])."' AND"; @@ -792,6 +793,9 @@ if ($obj = mysqli_fetch_object($result2)) { $yeasts[$i]['y_inventory'] = floatval($obj->inventory); $yeasts[$i]['y_avail'] = 1; + if ($yeasts[$i]['y_tolerance'] == 0) { + $yeasts[$i]['y_tolerance'] = floatval($obj->tolerance); // Upgrade alcohol tolerance + } } mysqli_free_result($result2); }