comparison: www/includes/db_recipes.php
www/includes/db_recipes.php
- changeset 332
- f0ca77097236
- parent 233
- 14a84d42031d
- child 350
- c314277905e6
equal
deleted
inserted
replaced
| 331:8d7fad771dde | 332:f0ca77097236 |
|---|---|
| 215 $yeast .= ',"y_min_temperature":' . $item['y_min_temperature']; | 215 $yeast .= ',"y_min_temperature":' . $item['y_min_temperature']; |
| 216 $yeast .= ',"y_max_temperature":' . $item['y_max_temperature']; | 216 $yeast .= ',"y_max_temperature":' . $item['y_max_temperature']; |
| 217 $yeast .= ',"y_flocculation":' . $item['y_flocculation']; | 217 $yeast .= ',"y_flocculation":' . $item['y_flocculation']; |
| 218 $yeast .= ',"y_attenuation":' . $item['y_attenuation']; | 218 $yeast .= ',"y_attenuation":' . $item['y_attenuation']; |
| 219 $yeast .= ',"y_cells":' . $item['y_cells']; | 219 $yeast .= ',"y_cells":' . $item['y_cells']; |
| 220 $yeast .= ',"y_tolerance":' . $item['y_tolerance']; | |
| 220 $yeast .= ',"y_inventory":' . $item['y_inventory']; | 221 $yeast .= ',"y_inventory":' . $item['y_inventory']; |
| 221 $yeast .= ',"y_use":' . $item['y_use']; | 222 $yeast .= ',"y_use":' . $item['y_use']; |
| 222 $yeast .= ',"y_cost":' . $item['y_cost'] . '}'; | 223 $yeast .= ',"y_cost":' . $item['y_cost'] . '}'; |
| 223 //syslog(LOG_NOTICE, $yeast); | 224 //syslog(LOG_NOTICE, $yeast); |
| 224 $yeasts .= $yeast; | 225 $yeasts .= $yeast; |
| 426 | 427 |
| 427 $yeasts = json_decode($row['json_yeasts'], true); | 428 $yeasts = json_decode($row['json_yeasts'], true); |
| 428 for ($i = 0; $i < count($yeasts); $i++) { | 429 for ($i = 0; $i < count($yeasts); $i++) { |
| 429 $yeasts[$i]['y_inventory'] = 0; // Not in stock | 430 $yeasts[$i]['y_inventory'] = 0; // Not in stock |
| 430 $yeasts[$i]['y_avail'] = 0; // Ingredient not in db | 431 $yeasts[$i]['y_avail'] = 0; // Ingredient not in db |
| 431 $sql2 = "SELECT inventory FROM inventory_yeasts "; | 432 $sql2 = "SELECT inventory,tolerance FROM inventory_yeasts "; |
| 432 $sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_name'])."' AND"; | 433 $sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_name'])."' AND"; |
| 433 $sql2 .= " form='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_form'])."' AND"; | 434 $sql2 .= " form='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_form'])."' AND"; |
| 434 $sql2 .= " laboratory='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_laboratory'])."' AND"; | 435 $sql2 .= " laboratory='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_laboratory'])."' AND"; |
| 435 $sql2 .= " product_id='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_product_id'])."'"; | 436 $sql2 .= " product_id='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_product_id'])."'"; |
| 436 if ($result2 = mysqli_query($connect, $sql2)) { | 437 if ($result2 = mysqli_query($connect, $sql2)) { |
| 437 if ($obj = mysqli_fetch_object($result2)) { | 438 if ($obj = mysqli_fetch_object($result2)) { |
| 438 $yeasts[$i]['y_inventory'] = floatval($obj->inventory); | 439 $yeasts[$i]['y_inventory'] = floatval($obj->inventory); |
| 439 $yeasts[$i]['y_avail'] = 1; | 440 $yeasts[$i]['y_avail'] = 1; |
| 441 if ($yeasts[$i]['y_tolerance'] == 0) { | |
| 442 $yeasts[$i]['y_tolerance'] = floatval($obj->tolerance); // Upgrade alcohol tolerance | |
| 443 } | |
| 440 } | 444 } |
| 441 mysqli_free_result($result2); | 445 mysqli_free_result($result2); |
| 442 } | 446 } |
| 443 } | 447 } |
| 444 $recipes .= ',"yeasts":' . json_encode($yeasts, JSON_UNESCAPED_UNICODE); | 448 $recipes .= ',"yeasts":' . json_encode($yeasts, JSON_UNESCAPED_UNICODE); |
