Mercurial > bms / changeset

--- a/www/includes/db_inventory_equipments.php	Thu Aug 27 16:40:51 2020 +0200
+++ b/www/includes/db_inventory_equipments.php	Sat Sep 12 12:15:24 2020 +0200
@@ -51,13 +51,13 @@
 	$result = mysqli_query($connect, $sql);
 	if (! $result) {
 		syslog(LOG_NOTICE, "db_inventory_equipment: ".$sql." result: ".mysqli_error($connect));
-	} else {
-		if (isset($_POST['update'])) {
-			syslog(LOG_NOTICE, "db_inventory_equipment: updated record ".$_POST['record']);
-		} else {
-			$lastid = mysqli_insert_id($connect);
-			syslog(LOG_NOTICE, "db_inventory_equipment: inserted record ".$lastid);
-		}
+	//} else {
+	//	if (isset($_POST['update'])) {
+	//		syslog(LOG_NOTICE, "db_inventory_equipment: updated record ".$_POST['record']);
+	//	} else {
+	//		$lastid = mysqli_insert_id($connect);
+	//		syslog(LOG_NOTICE, "db_inventory_equipment: inserted record ".$lastid);
+	//	}
 	}
 	echo $result;
 

--- a/www/includes/db_inventory_fermentables.php	Thu Aug 27 16:40:51 2020 +0200
+++ b/www/includes/db_inventory_fermentables.php	Sat Sep 12 12:15:24 2020 +0200
@@ -62,13 +62,13 @@
 	$result = mysqli_query($connect, $sql);
 	if (! $result) {
 		syslog(LOG_NOTICE, "db_inventory_fermentables: ".$sql." result: ".mysqli_error($connect));
-	} else {
-		if (isset($_POST['update'])) {
-			syslog(LOG_NOTICE, "db_inventory_fermentables: updated record ".$_POST['record']);
-		} else {
-			$lastid = mysqli_insert_id($connect);
-			syslog(LOG_NOTICE, "db_inventory_fermentables: inserted record ".$lastid);
-		}
+	//} else {
+	//	if (isset($_POST['update'])) {
+	//		syslog(LOG_NOTICE, "db_inventory_fermentables: updated record ".$_POST['record']);
+	//	} else {
+	//		$lastid = mysqli_insert_id($connect);
+	//		syslog(LOG_NOTICE, "db_inventory_fermentables: inserted record ".$lastid);
+	//	}
 	}
 	echo $result;
 

--- a/www/includes/db_inventory_hops.php	Thu Aug 27 16:40:51 2020 +0200
+++ b/www/includes/db_inventory_hops.php	Sat Sep 12 12:15:24 2020 +0200
@@ -56,13 +56,13 @@
 	$result = mysqli_query($connect, $sql);
 	if (! $result) {
 		syslog(LOG_NOTICE, "db_inventory_hops: ".$sql." result: ".mysqli_error($connect));
-	} else {
-		if (isset($_POST['update'])) {
-			syslog(LOG_NOTICE, "db_inventory_hops: updated record ".$_POST['record']);
-		} else {
-			$lastid = mysqli_insert_id($connect);
-			syslog(LOG_NOTICE, "db_inventory_hops: inserted record ".$lastid);
-		}
+	//} else {
+	//	if (isset($_POST['update'])) {
+	//		syslog(LOG_NOTICE, "db_inventory_hops: updated record ".$_POST['record']);
+	//	} else {
+	//		$lastid = mysqli_insert_id($connect);
+	//		syslog(LOG_NOTICE, "db_inventory_hops: inserted record ".$lastid);
+	//	}
 	}
 	echo $result;
 

--- a/www/includes/db_inventory_miscs.php	Thu Aug 27 16:40:51 2020 +0200
+++ b/www/includes/db_inventory_miscs.php	Sat Sep 12 12:15:24 2020 +0200
@@ -49,13 +49,13 @@
 	$result = mysqli_query($connect, $sql);
 	if (! $result) {
 		syslog(LOG_NOTICE, "db_inventory_miscs: ".$sql." result: ".mysqli_error($connect));
-	} else {
-		if (isset($_POST['update'])) {
-			syslog(LOG_NOTICE, "db_inventory_miscs: updated record ".$_POST['record']);
-		} else {
-			$lastid = mysqli_insert_id($connect);
-			syslog(LOG_NOTICE, "db_inventory_miscs: inserted record ".$lastid);
-		}
+	//} else {
+	//	if (isset($_POST['update'])) {
+	//		syslog(LOG_NOTICE, "db_inventory_miscs: updated record ".$_POST['record']);
+	//	} else {
+	//		$lastid = mysqli_insert_id($connect);
+	//		syslog(LOG_NOTICE, "db_inventory_miscs: inserted record ".$lastid);
+	//	}
 	}
 	echo $result;
 

--- a/www/includes/db_inventory_suppliers.php	Thu Aug 27 16:40:51 2020 +0200
+++ b/www/includes/db_inventory_suppliers.php	Sat Sep 12 12:15:24 2020 +0200
@@ -27,8 +27,8 @@
 	$result = mysqli_query($connect, $sql);
 	if (! $result) {
 		syslog(LOG_NOTICE, "db_inventory_suppliers: ".$sql." result: ".mysqli_error($connect));
-	} else {
-		syslog(LOG_NOTICE, "db_inventory_suppliers: inserted ".$_POST['name']);
+	//} else {
+	//	syslog(LOG_NOTICE, "db_inventory_suppliers: inserted ".$_POST['name']);
 	}
 	echo $result;
 
@@ -47,8 +47,8 @@
 	$result = mysqli_query($connect, $sql);
 	if (! $result) {
 		syslog(LOG_NOTICE, "db_inventory_suppliers: ".$sql." result: ".mysqli_error($connect));
-	} else {
-		syslog(LOG_NOTICE, "db_inventory_suppliers: updated record ".$_POST['record']);
+	//} else {
+	//	syslog(LOG_NOTICE, "db_inventory_suppliers: updated record ".$_POST['record']);
 	}
 	echo $result;
 

--- a/www/includes/db_inventory_water.php	Thu Aug 27 16:40:51 2020 +0200
+++ b/www/includes/db_inventory_water.php	Sat Sep 12 12:15:24 2020 +0200
@@ -43,13 +43,13 @@
 	$result = mysqli_query($connect, $sql);
 	if (! $result) {
 		syslog(LOG_NOTICE, "db_inventory_waters: ".$sql." result: ".mysqli_error($connect));
-	} else {
-		if (isset($_POST['update'])) {
-			syslog(LOG_NOTICE, "db_inventory_waters: updated record ".$_POST['record']);
-		} else {
-			$lastid = mysqli_insert_id($connect);
-			syslog(LOG_NOTICE, "db_inventory_waters: inserted record ".$lastid);
-		}
+	//} else {
+	//	if (isset($_POST['update'])) {
+	//		syslog(LOG_NOTICE, "db_inventory_waters: updated record ".$_POST['record']);
+	//	} else {
+	//		$lastid = mysqli_insert_id($connect);
+	//		syslog(LOG_NOTICE, "db_inventory_waters: inserted record ".$lastid);
+	//	}
 	}
 	echo $result;
 

--- a/www/includes/db_inventory_yeasts.php	Thu Aug 27 16:40:51 2020 +0200
+++ b/www/includes/db_inventory_yeasts.php	Sat Sep 12 12:15:24 2020 +0200
@@ -63,13 +63,13 @@
 	$result = mysqli_query($connect, $sql);
 	if (! $result) {
 		syslog(LOG_NOTICE, "db_inventory_yeasts: ".$sql." result: ".mysqli_error($connect));
-	} else {
-		if (isset($_POST['update'])) {
-			syslog(LOG_NOTICE, "db_inventory_yeasts: updated record ".$_POST['record']);
-		} else {
-			$lastid = mysqli_insert_id($connect);
-			syslog(LOG_NOTICE, "db_inventory_yeasts: inserted record ".$lastid);
-		}
+	//} else {
+	//	if (isset($_POST['update'])) {
+	//		syslog(LOG_NOTICE, "db_inventory_yeasts: updated record ".$_POST['record']);
+	//	} else {
+	//		$lastid = mysqli_insert_id($connect);
+	//		syslog(LOG_NOTICE, "db_inventory_yeasts: inserted record ".$lastid);
+	//	}
 	}
 	echo $result;
 

--- a/www/includes/db_product.php	Thu Aug 27 16:40:51 2020 +0200
+++ b/www/includes/db_product.php	Sat Sep 12 12:15:24 2020 +0200
@@ -1172,6 +1172,16 @@
     }
     syslog(LOG_NOTICE, "inventory_reduce() stage: ".$stage." inventory_reduced: ".$inventory_reduced);
 
+    /* Nothing to reduce yet, but just set the $inventory_reduced */
+    if (($stage >= 1) && ($inventory_reduced < 1)) {
+        $inventory_reduced = 1;
+        $savethis = 1;
+    }
+    if (($stage >= 2) && ($inventory_reduced < 2)) {
+	$inventory_reduced = 2;
+	$savethis = 1;
+    }
+
     /*
      * If the brew is done, reduce the used ingredients.
      */
@@ -1396,6 +1406,11 @@
 	$savethis = 1;
     }
 
+    if (($stage >= 8) && ($inventory_reduced < $stage)) {
+        $inventory_reduced = $stage;
+        $savethis = 1;
+    }
+
     /*
      * Save only if something was reduced.
      */