diff -r 3e29755638b6 -r d4f4762e59b3 www/import/from_brouwhulp.php --- a/www/import/from_brouwhulp.php Thu Sep 06 21:05:44 2018 +0200 +++ b/www/import/from_brouwhulp.php Tue Sep 18 23:16:14 2018 +0200 @@ -531,6 +531,8 @@ $fermentables .= ','; $comma = TRUE; $fermentables .= '{"f_name":"' . mysqli_real_escape_string($db, $fermentable->NAME) . '"'; + $fermentables .= ',"f_origin":"' . mysqli_real_escape_string($db, $fermentable->ORIGIN) . '"'; + $fermentables .= ',"f_supplier":"' . mysqli_real_escape_string($db, $fermentable->SUPPLIER) . '"'; $fermentables .= ',"f_amount":' . floatval($fermentable->AMOUNT); $fermentables .= ',"f_cost":' . floatval($fermentable->COST); $fermentables .= ',"f_type":"' . mysqli_real_escape_string($db, $fermentable->TYPE) . '"'; @@ -561,6 +563,8 @@ if ($fermentable->ADDED) { $fermentables .= ',"f_added":"' . mysqli_real_escape_string($db, $fermentable->ADDED) . '"'; } + ($fermentable->ADD_AFTER_BOIL== "TRUE") ? $fermentables .= ',"f_add_after_boil":true' : $fermentables .= ',"f_add_after_boil":false'; + ($fermentable->RECOMMEND_MASH== "TRUE") ? $fermentables .= ',"f_recommend_mash":true' : $fermentables .= ',"f_recommend_mash":false'; if ($fermentable->DISSOLVED_PROTEIN) { $fermentables .= ',"f_dissolved_protein":' . floatval($fermentable->DISSOLVED_PROTEIN); }