comparison: www/includes/db_recipes.php
www/includes/db_recipes.php
- changeset 221
- a8aabb63fbcc
- parent 220
- 14e349ff2a10
- child 222
- 78946739b3a6
equal
deleted
inserted
replaced
| 220:14e349ff2a10 | 221:a8aabb63fbcc |
|---|---|
| 326 $recipes .= ',"w2_ph":' . $row['w2_ph']; | 326 $recipes .= ',"w2_ph":' . $row['w2_ph']; |
| 327 $recipes .= ',"w2_cost":' . $row['w2_cost']; | 327 $recipes .= ',"w2_cost":' . $row['w2_cost']; |
| 328 $recipes .= ',"wa_acid_name":' . $row['wa_acid_name']; | 328 $recipes .= ',"wa_acid_name":' . $row['wa_acid_name']; |
| 329 $recipes .= ',"wa_acid_perc":' . $row['wa_acid_perc']; | 329 $recipes .= ',"wa_acid_perc":' . $row['wa_acid_perc']; |
| 330 $recipes .= ',"wa_base_name":' . $row['wa_base_name']; | 330 $recipes .= ',"wa_base_name":' . $row['wa_base_name']; |
| 331 $recipes .= ',"fermentables":' . $row['json_fermentables']; | 331 if (isset($_GET['record'])) { |
| 332 $recipes .= ',"hops":' . $row['json_hops']; | 332 // Append stock information. |
| 333 $recipes .= ',"miscs":' . $row['json_miscs']; | 333 $fermentables = json_decode($row['json_fermentables'], true); |
| 334 $recipes .= ',"yeasts":' . $row['json_yeasts']; | 334 for ($i = 0; $i < count($fermentables); $i++) { |
| 335 $fermentables[$i]['f_inventory'] = 0; // Not in stock | |
| 336 $fermentables[$i]['f_avail'] = 0; // Ingredient not in db | |
| 337 $sql2 = "SELECT inventory FROM inventory_fermentables "; | |
| 338 $sql2 .= "WHERE name='".$fermentables[$i]['f_name']."' AND supplier='".$fermentables[$i]['f_supplier']."'"; | |
| 339 if ($result2 = mysqli_query($connect, $sql2)) { | |
| 340 if ($obj = mysqli_fetch_object($result2)) { | |
| 341 $fermentables[$i]['f_inventory'] = $obj->inventory; | |
| 342 $fermentables[$i]['f_avail'] = 1; | |
| 343 } | |
| 344 mysqli_free_result($result2); | |
| 345 } | |
| 346 } | |
| 347 syslog(LOG_NOTICE, json_encode($fermentables, JSON_UNESCAPED_UNICODE)); | |
| 348 $recipes .= ',"fermentables":' . json_encode($fermentables, JSON_UNESCAPED_UNICODE); | |
| 349 $recipes .= ',"hops":' . $row['json_hops']; | |
| 350 $recipes .= ',"miscs":' . $row['json_miscs']; | |
| 351 $recipes .= ',"yeasts":' . $row['json_yeasts']; | |
| 352 } else { | |
| 353 // Just leave it. | |
| 354 $recipes .= ',"fermentables":' . $row['json_fermentables']; | |
| 355 $recipes .= ',"hops":' . $row['json_hops']; | |
| 356 $recipes .= ',"miscs":' . $row['json_miscs']; | |
| 357 $recipes .= ',"yeasts":' . $row['json_yeasts']; | |
| 358 } | |
| 335 $recipes .= ',"mashs":' . $row['json_mashs']; | 359 $recipes .= ',"mashs":' . $row['json_mashs']; |
| 336 $recipes .= '}'; | 360 $recipes .= '}'; |
| 337 } | 361 } |
| 338 $recipes .= ']'; | 362 $recipes .= ']'; |
| 339 header("Content-type: application/json"); | 363 header("Content-type: application/json"); |
