Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Add/Consume all buttons #127

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add Add/Consume all buttons #127

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b02a32
Create add and consume all buttons on unknown barcodes card.
PhilippCh Apr 4, 2021
585eda4
Add modify all buttons to known barcodes card.
PhilippCh Apr 4, 2021
83bc8d8
Only add products with selected grocy ids.
PhilippCh Apr 6, 2021
c8630b8
Fix psalm.
PhilippCh Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 93 additions & 46 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,63 +210,89 @@ function processButtons() {
die();
}

if (isset($_POST["button_add"]) || isset($_POST["button_consume"])) {
if (isset($_POST["button_consume"])) {
$isConsume = true;
$id = $_POST["button_consume"];
} else {
$isConsume = false;
$id = $_POST["button_add"];
if (isset($_POST["button_add_all"]) || isset($_POST["button_consume_all"])) {
$isConsume = isset($_POST["button_consume_all"]);
$selectValues = array_filter($_POST, function(int $value, string $key) {
return strpos($key, 'select_') !== false && $value !== 0;
}, ARRAY_FILTER_USE_BOTH);

foreach ($selectValues as $key => $value) {
preg_match('/select_(\d*)/', $key, $matches);

if (count($matches) !== 2) {
continue;
}

$id = $matches[1];
$gidSelected = $value;

addOrConsume($isConsume, $id, $gidSelected, $db);
}

//Hide POST, so we can refresh
header("Location: " . $CONFIG->getPhpSelfWithBaseUrl());
die();
}

if (isset($_POST["button_add"]) || isset($_POST["button_consume"])) {
$isConsume = isset($_POST["button_consume"]);
$id = $isConsume ? $_POST["button_consume"] : $_POST["button_add"];

checkIfNumeric($id);
$gidSelected = $_POST["select_" . $id];
if ($gidSelected != 0) {
$row = $db->getBarcodeById($id);
if ($row !== false) {
$barcode = sanitizeString($row["barcode"], true);
$amount = $row["amount"];
checkIfNumeric($amount);
if (isset($_POST["tags"])) {
foreach ($_POST["tags"][$id] as $tag) {
TagManager::add(sanitizeString($tag), $gidSelected);
}

addOrConsume($isConsume, $id, $gidSelected, $db);

//Hide POST, so we can refresh
header("Location: " . $CONFIG->getPhpSelfWithBaseUrl());
die();
}
}

function addOrConsume($isConsume, $id, $gidSelected, $db) {
if ($gidSelected != 0) {
$row = $db->getBarcodeById($id);
if ($row !== false) {
$barcode = sanitizeString($row["barcode"], true);
$amount = $row["amount"];
checkIfNumeric($amount);
if (isset($_POST["tags"])) {
foreach ($_POST["tags"][$id] as $tag) {
TagManager::add(sanitizeString($tag), $gidSelected);
}
$product = API::getProductInfo(sanitizeString($gidSelected));
API::addBarcode($gidSelected, $barcode);
$log = new LogOutput("Associated barcode $barcode with " . $product->name, EVENT_TYPE_ASSOCIATE_PRODUCT);
}
$product = API::getProductInfo(sanitizeString($gidSelected));
API::addBarcode($gidSelected, $barcode);
$log = new LogOutput("Associated barcode $barcode with " . $product->name, EVENT_TYPE_ASSOCIATE_PRODUCT);
$log->setVerbose()->dontSendWebsocket()->createLog();
$db->deleteBarcode($id);
QuantityManager::syncBarcodeToGrocy($barcode);
if ($product->isTare) {
if (!$db->isUnknownBarcodeAlreadyStored($barcode))
$db->insertActionRequiredBarcode($barcode, $row["bestBeforeInDays"], $row["price"]);
$log = new LogOutput("Action required: Enter weight for " . $product->name, EVENT_TYPE_ACTION_REQUIRED, $barcode);
$log->setVerbose()->dontSendWebsocket()->createLog();
$db->deleteBarcode($id);
QuantityManager::syncBarcodeToGrocy($barcode);
if ($product->isTare) {
if (!$db->isUnknownBarcodeAlreadyStored($barcode))
$db->insertActionRequiredBarcode($barcode, $row["bestBeforeInDays"], $row["price"]);
$log = new LogOutput("Action required: Enter weight for " . $product->name, EVENT_TYPE_ACTION_REQUIRED, $barcode);
} else {
if ($isConsume) {
if ($product->stockAmount < $amount)
$amount = $product->stockAmount;
if ($amount > 0) {
API::consumeProduct($gidSelected, $amount);
$log = new LogOutput("Consuming $amount " . $product->unit . " of " . $product->name, EVENT_TYPE_ADD_KNOWN_BARCODE);
} else {
$log = new LogOutput("None in stock, not consuming: " . $product->name, EVENT_TYPE_ADD_KNOWN_BARCODE);
}
$log->setVerbose()->dontSendWebsocket()->createLog();
} else {
if ($isConsume) {
if ($product->stockAmount < $amount)
$amount = $product->stockAmount;
if ($amount > 0) {
API::consumeProduct($gidSelected, $amount);
$log = new LogOutput("Consuming $amount " . $product->unit . " of " . $product->name, EVENT_TYPE_ADD_KNOWN_BARCODE);
} else {
$log = new LogOutput("None in stock, not consuming: " . $product->name, EVENT_TYPE_ADD_KNOWN_BARCODE);
}
$log->setVerbose()->dontSendWebsocket()->createLog();
} else {
$additionalLog = "";
if (!API::purchaseProduct($gidSelected, $amount, $row["bestBeforeInDays"], $row["price"])) {
$additionalLog = " [WARNING]: No default best before date set!";
}
$log = new LogOutput("Adding $amount " . $product->unit . " of " . $product->name . $additionalLog, EVENT_TYPE_ADD_KNOWN_BARCODE);
$log->setVerbose()->dontSendWebsocket()->createLog();
$additionalLog = "";
if (!API::purchaseProduct($gidSelected, $amount, $row["bestBeforeInDays"], $row["price"])) {
$additionalLog = " [WARNING]: No default best before date set!";
}
$log = new LogOutput("Adding $amount " . $product->unit . " of " . $product->name . $additionalLog, EVENT_TYPE_ADD_KNOWN_BARCODE);
$log->setVerbose()->dontSendWebsocket()->createLog();
}
}
}
//Hide POST, so we can refresh
header("Location: " . $CONFIG->getPhpSelfWithBaseUrl());
die();
}
}

Expand Down Expand Up @@ -346,6 +372,8 @@ function getHtmlMainMenuTableKnown(array $barcodes): string {
if ($containsFederationName)
array_splice($arrayTableEntries, 1, 0, array("Federation"));

addModifyAllButtons($html);

$table = new TableGenerator($arrayTableEntries);
foreach ($barcodes['known'] as $item) {
$isDisabled = "disabled";
Expand Down Expand Up @@ -418,6 +446,7 @@ function getHtmlMainMenuTableUnknown(array $barcodes): string {
$html->addHtml("No unknown barcodes yet.");
return $html->getHtml();
} else {
addModifyAllButtons($html);
$table = new TableGenerator(array(
"Barcode",
"Look up",
Expand Down Expand Up @@ -466,6 +495,24 @@ function getHtmlMainMenuTableUnknown(array $barcodes): string {
}


function addModifyAllButtons($html) {
$html->addHtml('<div class="mdl-cell">');
$html->addHtml($html->buildButton("button_add_all", "Add all")
->setSubmit()
->setRaised()
->setIsAccent()
->setId('button_add_all')
->generate(true));
$html->addHtml($html->buildButton("button_consume_all", "Consume all")
->setSubmit()
->setRaised()
->setIsAccent()
->setId('button_consume_all')
->generate(true));
$html->addHtml('</div>');
}


/**
* Outputs stored logs to the textarea
* @return string
Expand Down