diff --git a/.gitignore b/.gitignore
index 9e8bc37..5b9358c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@ data/config.php
data/users.db
/vendor/
.idea
+/.devDocker/
+/.run/Dev Docker.run.xml
+/data/logs/
diff --git a/api/index.php b/api/index.php
index e1e9e48..3be9d7c 100644
--- a/api/index.php
+++ b/api/index.php
@@ -37,7 +37,6 @@
$api->checkIfAuthorized();
$api->execute($requestedUrl);
-
class BBuddyApi {
private $routes = array();
@@ -115,7 +114,6 @@ function addRoute(ApiRoute $route): void {
}
private function initRoutes(): void {
-
$this->addRoute(new ApiRoute("/action/scan", function () {
$barcode = "";
if (isset($_GET["text"]))
@@ -124,22 +122,24 @@ private function initRoutes(): void {
$barcode = $_GET["add"];
if (isset($_POST["barcode"]))
$barcode = $_POST["barcode"];
- if ($barcode == "")
+ if ($barcode == "") {
return self::createResultArray(null, "No barcode supplied", 400);
- else {
+ } else {
$bestBefore = null;
$price = null;
if (isset($_POST["bestBeforeInDays"]) && $_POST["bestBeforeInDays"] != null) {
- if (is_numeric($_POST["bestBeforeInDays"]))
+ if (is_numeric($_POST["bestBeforeInDays"])) {
$bestBefore = $_POST["bestBeforeInDays"];
- else
+ } else {
return self::createResultArray(null, "Invalid parameter bestBeforeInDays: needs to be type int", 400);
+ }
}
if (isset($_POST["price"]) && $_POST["price"] != null) {
- if (is_numeric($_POST["price"]))
+ if (is_numeric($_POST["price"])) {
$price = $_POST["price"];
- else
+ } else {
return self::createResultArray(null, "Invalid parameter price: needs to be type float", 400);
+ }
}
$result = processNewBarcode(sanitizeString($barcode), $bestBefore, $price);
return self::createResultArray(array("result" => sanitizeString($result)));
@@ -159,10 +159,10 @@ private function initRoutes(): void {
else if (isset($_POST["state"]))
$state = $_POST["state"];
- //Also check if value is a valid range (STATE_CONSUME the lowest and STATE_CONSUME_ALL the highest value)
- if (!is_numeric($state) || $state < STATE_CONSUME || $state > STATE_CONSUME_ALL)
+ //Also check if value is a valid range (STATE_CONSUME the lowest and STATE_TXFR the highest value)
+ if (!is_numeric($state) || $state < STATE_CONSUME || $state > STATE_TXFR) {
return self::createResultArray(null, "Invalid state provided", 400);
- else {
+ } else {
DatabaseConnection::getInstance()->setTransactionState(intval($state));
return self::createResultArray();
}
@@ -178,7 +178,8 @@ private function initRoutes(): void {
"BARCODE_GS" => $config["BARCODE_GS"],
"BARCODE_Q" => $config["BARCODE_Q"],
"BARCODE_AS" => $config["BARCODE_AS"],
- "BARCODE_CA" => $config["BARCODE_CA"]
+ "BARCODE_CA" => $config["BARCODE_CA"],
+ "BARCODE_TXFR" => $config["BARCODE_TXFR"],
));
}));
diff --git a/barcodes.php b/barcodes.php
new file mode 100644
index 0000000..5f6e40b
--- /dev/null
+++ b/barcodes.php
@@ -0,0 +1,136 @@
+checkIfAuthenticated(true, true);
+
+// Get mode and validate it
+$mode = MODE_ACTION;
+if (isset($_GET)) {
+ if (isset($_GET["mode"])) {
+ $mode = $_GET["mode"];
+ }
+}
+if (!in_array($mode, [MODE_ACTION ,MODE_QUANTITY, MODE_LOCATION])) {
+ die("Invalid mode");
+}
+
+// Generate the page
+$webUi = new WebUiGenerator(MENU_GENERIC);
+
+$webUi->addBaseHeader(
+ null,
+ false,
+ true,
+ "\n");
+
+switch ($mode) {
+ case MODE_ACTION:
+ getHtmlActionTable($webUi);
+ break;
+ case MODE_QUANTITY:
+ getHtmlQuantityTable($webUi);
+ break;
+ case MODE_LOCATION:
+ getHtmlLocationTable($webUi);
+ break;
+}
+
+$webUi->printHtml();
+
+function getHtmlActionTable(WebUiGenerator $webUi): void
+{
+ $config = BBConfig::getInstance();
+
+ $actions = [
+ 1 => ['barcode' => $config['BARCODE_C'], 'name' => 'Consume'],
+ 2 => ['barcode' => $config['BARCODE_CS'], 'name' => 'Consume (spoiled)'],
+ 3 => ['barcode' => $config['BARCODE_CA'], 'name' => 'Consume All'],
+ 4 => ['barcode' => $config['BARCODE_P'], 'name' => 'Purchase'],
+ 5 => ['barcode' => $config['BARCODE_O'], 'name' => 'Open'],
+ 6 => ['barcode' => $config['BARCODE_GS'], 'name' => 'Inventory'],
+ 7 => ['barcode' => $config['BARCODE_AS'], 'name' => 'Add to Shopping List'],
+ ];
+
+
+ // Generate the HTML
+ $html = new UiEditor(true, null, "barcodes");
+ $html->addHtml("");
+
+ foreach ($actions as $key => $action) {
+ $html->addDiv("
![\"$key\"]()
", null, "flex-settings-child");
+
+ }
+
+ $html->addHtml('
");
+
+ for ($i = $startQty; $i <= $endQty; $i++) {
+ $html->addDiv("
![\"$i\"]()
", null, "flex-settings-child");
+ }
+
+ $html->addHtml('