Mercurial > bms / changeset

--- a/README.design	Thu Jun 13 21:28:17 2019 +0200
+++ b/README.design	Fri Jun 14 15:57:57 2019 +0200
@@ -31,8 +31,8 @@
 x Hiervoor een script maken om deze suikers als fermentable in het recept te zetten
   met  'added = 4'. 
 x Toevoegen added = 5, voor kegs.
-  In products vervallen de velden bottle_priming_sugar, bottle_priming_amount,
-  keg_priming_sugar en keg_priming_amount. Deze waardes komen uit fermentables.
+x In products vervallen de velden bottle_priming_sugar en keg_priming_sugar.
+x Deze waardes komen uit fermentables.
 x Let op, de amount waardes zijn g/l dus omrekenen.
 x Ook aanpassen de recept suikerstort, de added 4 of 5 niet meenemen.
 

--- a/www/includes/db_product.php	Thu Jun 13 21:28:17 2019 +0200
+++ b/www/includes/db_product.php	Fri Jun 14 15:57:57 2019 +0200
@@ -29,11 +29,9 @@
 	// Basic settings
 	if (isset($_POST['uuid'])) {
 		$sql .= "uuid='" . $_POST['uuid'];
-		syslog(LOG_NOTICE, 'Keep uuid ');
 	} else {
 		$uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid'));
 		$sql .= "uuid='" . $uuid;
-		syslog(LOG_NOTICE, 'New uuid ');
 	}
 	$sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']);
 	$sql .= "', code='" . mysqli_real_escape_string($connect, $_POST['code']);
@@ -131,12 +129,12 @@
 		$sql .= "', package_date='" . $_POST['package_date'] ."'";
 	$sql .=  ", bottle_amount='" . $_POST['bottle_amount'];
 	$sql .= "', bottle_carbonation='" . $_POST['bottle_carbonation'];
-	$sql .= "', bottle_priming_sugar='" . $_POST['bottle_priming_sugar'];
+	//$sql .= "', bottle_priming_sugar='" . $_POST['bottle_priming_sugar'];
 	$sql .= "', bottle_priming_amount='" . $_POST['bottle_priming_amount'];
 	$sql .= "', bottle_carbonation_temp='" . $_POST['bottle_carbonation_temp'];
 	$sql .= "', keg_amount='" . $_POST['keg_amount'];
 	$sql .= "', keg_carbonation='" . $_POST['keg_carbonation'];
-	$sql .= "', keg_priming_sugar='" . $_POST['keg_priming_sugar'];
+	//$sql .= "', keg_priming_sugar='" . $_POST['keg_priming_sugar'];
 	$sql .= "', keg_priming_amount='" . $_POST['keg_priming_amount'];
 	$sql .= "', keg_carbonation_temp='" . $_POST['keg_carbonation_temp'];
 	$sql .= "', keg_forced_carb='" . $_POST['keg_forced_carb'];
@@ -715,12 +713,12 @@
 		$brew .= ',"package_date":"' . $row['package_date'];
 		$brew .= '","bottle_amount":' . floatval($row['bottle_amount']);
 		$brew .= ',"bottle_carbonation":' . floatval($row['bottle_carbonation']);
-		$brew .= ',"bottle_priming_sugar":' . $row['bottle_priming_sugar'];
+		//$brew .= ',"bottle_priming_sugar":' . $row['bottle_priming_sugar'];
 		$brew .= ',"bottle_priming_amount":' . floatval($row['bottle_priming_amount']);
 		$brew .= ',"bottle_carbonation_temp":' . floatval($row['bottle_carbonation_temp']);
 		$brew .= ',"keg_amount":' . floatval($row['keg_amount']);
 		$brew .= ',"keg_carbonation":' . floatval($row['keg_carbonation']);
-		$brew .= ',"keg_priming_sugar":' . $row['keg_priming_sugar'];
+		//$brew .= ',"keg_priming_sugar":' . $row['keg_priming_sugar'];
 		$brew .= ',"keg_priming_amount":' . floatval($row['keg_priming_amount']);
 		$brew .= ',"keg_carbonation_temp":' . floatval($row['keg_carbonation_temp']);
 		$brew .= ',"keg_forced_carb":' . floatval($row['keg_forced_carb']);
@@ -1065,6 +1063,9 @@
     $savethis = 0;
     $stage = $_POST['stage'];
     $inventory_reduced = $_POST['inventory_reduced'];
+    if ($stage == $inventory_reduced) {
+	return;
+    }
     syslog(LOG_NOTICE, "inventory_reduce() stage: ".$stage." inventory_reduced: ".$inventory_reduced);
 
     /*

--- a/www/js/prod_edit.js	Thu Jun 13 21:28:17 2019 +0200
+++ b/www/js/prod_edit.js	Fri Jun 14 15:57:57 2019 +0200
@@ -2865,12 +2865,12 @@
 			{ name: 'package_date', type: 'string' },
 			{ name: 'bottle_amount', type: 'float' },
 			{ name: 'bottle_carbonation', type: 'float' },
-			{ name: 'bottle_priming_sugar', type: 'int' },
+			//{ name: 'bottle_priming_sugar', type: 'int' },
 			{ name: 'bottle_priming_amount', type: 'float' },
 			{ name: 'bottle_carbonation_temp', type: 'float' },
 			{ name: 'keg_amount', type: 'float' },
 			{ name: 'keg_carbonation', type: 'float' },
-			{ name: 'keg_priming_sugar', type: 'int' },
+			//{ name: 'keg_priming_sugar', type: 'int' },
 			{ name: 'keg_priming_amount', type: 'float' },
 			{ name: 'keg_carbonation_temp', type: 'float' },
 			{ name: 'keg_forced_carb', type: 'int' },