comparison: www/includes/db_product.php
www/includes/db_product.php
- changeset 332
- f0ca77097236
- parent 326
- bf5fa5277c9f
- child 359
- 98354ef399cd
equal
deleted
inserted
replaced
| 331:8d7fad771dde | 332:f0ca77097236 |
|---|---|
| 346 $yeast .= ',"y_min_temperature":' . $item['y_min_temperature']; | 346 $yeast .= ',"y_min_temperature":' . $item['y_min_temperature']; |
| 347 $yeast .= ',"y_max_temperature":' . $item['y_max_temperature']; | 347 $yeast .= ',"y_max_temperature":' . $item['y_max_temperature']; |
| 348 $yeast .= ',"y_flocculation":' . $item['y_flocculation']; | 348 $yeast .= ',"y_flocculation":' . $item['y_flocculation']; |
| 349 $yeast .= ',"y_attenuation":' . $item['y_attenuation']; | 349 $yeast .= ',"y_attenuation":' . $item['y_attenuation']; |
| 350 $yeast .= ',"y_cells":' . $item['y_cells']; | 350 $yeast .= ',"y_cells":' . $item['y_cells']; |
| 351 $yeast .= ',"y_tolerance":' . $item['y_tolerance']; | |
| 351 $yeast .= ',"y_inventory":' . $item['y_inventory']; | 352 $yeast .= ',"y_inventory":' . $item['y_inventory']; |
| 352 $yeast .= ',"y_use":' . $item['y_use']; | 353 $yeast .= ',"y_use":' . $item['y_use']; |
| 353 $yeast .= ',"y_cost":' . $item['y_cost'] . '}'; | 354 $yeast .= ',"y_cost":' . $item['y_cost'] . '}'; |
| 354 //syslog(LOG_NOTICE, $yeast); | 355 //syslog(LOG_NOTICE, $yeast); |
| 355 $yeasts .= $yeast; | 356 $yeasts .= $yeast; |
| 781 | 782 |
| 782 $yeasts = json_decode($row['json_yeasts'], true); | 783 $yeasts = json_decode($row['json_yeasts'], true); |
| 783 for ($i = 0; $i < count($yeasts); $i++) { | 784 for ($i = 0; $i < count($yeasts); $i++) { |
| 784 $yeasts[$i]['y_inventory'] = 0; // Not in stock | 785 $yeasts[$i]['y_inventory'] = 0; // Not in stock |
| 785 $yeasts[$i]['y_avail'] = 0; // Ingredient not in db | 786 $yeasts[$i]['y_avail'] = 0; // Ingredient not in db |
| 786 $sql2 = "SELECT inventory FROM inventory_yeasts "; | 787 $sql2 = "SELECT inventory,tolerance FROM inventory_yeasts "; |
| 787 $sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_name'])."' AND"; | 788 $sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_name'])."' AND"; |
| 788 $sql2 .= " form='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_form'])."' AND"; | 789 $sql2 .= " form='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_form'])."' AND"; |
| 789 $sql2 .= " laboratory='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_laboratory'])."' AND"; | 790 $sql2 .= " laboratory='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_laboratory'])."' AND"; |
| 790 $sql2 .= " product_id='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_product_id'])."'"; | 791 $sql2 .= " product_id='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_product_id'])."'"; |
| 791 if ($result2 = mysqli_query($connect, $sql2)) { | 792 if ($result2 = mysqli_query($connect, $sql2)) { |
| 792 if ($obj = mysqli_fetch_object($result2)) { | 793 if ($obj = mysqli_fetch_object($result2)) { |
| 793 $yeasts[$i]['y_inventory'] = floatval($obj->inventory); | 794 $yeasts[$i]['y_inventory'] = floatval($obj->inventory); |
| 794 $yeasts[$i]['y_avail'] = 1; | 795 $yeasts[$i]['y_avail'] = 1; |
| 796 if ($yeasts[$i]['y_tolerance'] == 0) { | |
| 797 $yeasts[$i]['y_tolerance'] = floatval($obj->tolerance); // Upgrade alcohol tolerance | |
| 798 } | |
| 795 } | 799 } |
| 796 mysqli_free_result($result2); | 800 mysqli_free_result($result2); |
| 797 } | 801 } |
| 798 } | 802 } |
| 799 $brew .= ',"yeasts":' . json_encode($yeasts, JSON_UNESCAPED_UNICODE); | 803 $brew .= ',"yeasts":' . json_encode($yeasts, JSON_UNESCAPED_UNICODE); |
