diff -r 0c719ea7e680 -r 99a7f2a6976e www/includes/db_product.php --- a/www/includes/db_product.php Sat Jun 15 19:41:44 2019 +0200 +++ b/www/includes/db_product.php Thu Jun 20 13:55:12 2019 +0200 @@ -127,14 +127,19 @@ $sql .= "', package_date=NULL"; else $sql .= "', package_date='" . $_POST['package_date'] ."'"; - $sql .= ", bottle_amount='" . $_POST['bottle_amount']; + $sql .= ", package_volume='" . $_POST['package_volume']; + $sql .= "', package_infuse_amount='" . $_POST['package_infuse_amount']; + $sql .= "', package_infuse_abv='" . $_POST['package_infuse_abv']; + $sql .= "', package_infuse_notes='" . mysqli_real_escape_string($connect, $_POST['package_infuse_notes']); + $sql .= "', package_abv='" . $_POST['package_abv']; + $sql .= "', bottle_amount='" . $_POST['bottle_amount']; $sql .= "', bottle_carbonation='" . $_POST['bottle_carbonation']; - //$sql .= "', bottle_priming_sugar='" . $_POST['bottle_priming_sugar']; + $sql .= "', bottle_priming_water='" . $_POST['bottle_priming_water']; $sql .= "', bottle_priming_amount='" . $_POST['bottle_priming_amount']; $sql .= "', bottle_carbonation_temp='" . $_POST['bottle_carbonation_temp']; $sql .= "', keg_amount='" . $_POST['keg_amount']; $sql .= "', keg_carbonation='" . $_POST['keg_carbonation']; - //$sql .= "', keg_priming_sugar='" . $_POST['keg_priming_sugar']; + $sql .= "', keg_priming_water='" . $_POST['keg_priming_water']; $sql .= "', keg_priming_amount='" . $_POST['keg_priming_amount']; $sql .= "', keg_carbonation_temp='" . $_POST['keg_carbonation_temp']; $sql .= "', keg_forced_carb='" . $_POST['keg_forced_carb']; @@ -711,14 +716,19 @@ $brew .= ',"secondary_end_date":"' . $row['secondary_end_date']; $brew .= '","tertiary_temp":' . floatval($row['tertiary_temp']); $brew .= ',"package_date":"' . $row['package_date']; - $brew .= '","bottle_amount":' . floatval($row['bottle_amount']); + $brew .= '","package_volume":' . floatval($row['package_volume']); + $brew .= ',"package_infuse_amount":' . floatval($row['package_infuse_amount']); + $brew .= ',"package_infuse_abv":' . floatval($row['package_infuse_abv']); + $brew .= ',"package_infuse_notes":"' . $row['package_infuse_notes']; + $brew .= '","package_abv":' . floatval($row['package_abv']); + $brew .= ',"bottle_amount":' . floatval($row['bottle_amount']); $brew .= ',"bottle_carbonation":' . floatval($row['bottle_carbonation']); - //$brew .= ',"bottle_priming_sugar":' . $row['bottle_priming_sugar']; + $brew .= ',"bottle_priming_water":' . $row['bottle_priming_water']; $brew .= ',"bottle_priming_amount":' . floatval($row['bottle_priming_amount']); $brew .= ',"bottle_carbonation_temp":' . floatval($row['bottle_carbonation_temp']); $brew .= ',"keg_amount":' . floatval($row['keg_amount']); $brew .= ',"keg_carbonation":' . floatval($row['keg_carbonation']); - //$brew .= ',"keg_priming_sugar":' . $row['keg_priming_sugar']; + $brew .= ',"keg_priming_water":' . $row['keg_priming_water']; $brew .= ',"keg_priming_amount":' . floatval($row['keg_priming_amount']); $brew .= ',"keg_carbonation_temp":' . floatval($row['keg_carbonation_temp']); $brew .= ',"keg_forced_carb":' . floatval($row['keg_forced_carb']);