github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-07 05:16:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added quantity conversion

Browse Source
This commit is contained in:
Marc Ole Bulling 2021-01-15 13:59:45 +01:00
parent a8142fed05
commit 983ab48945
No known key found for this signature in database
GPG Key ID: C126AFC2A47B06FF
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
services/StockService.php
View File

@ -941,33 +941,48 @@ class StockService extends BaseService
* @return string[] Returns an array in the format "[amount] [name of product]" * @return string[] Returns an array in the format "[amount] [name of product]"
* @throws \Exception * @throws \Exception
*/ */
public function GetShoppinglistInPrintableStrings($listId = 1): array { public function GetShoppinglistInPrintableStrings($listId = 1): array
if (!$this->ShoppingListExists($listId)) { {
if (!$this->ShoppingListExists($listId))
{
throw new \Exception('Shopping list does not exist'); throw new \Exception('Shopping list does not exist');
} }
$result = array(); $result = array();
$rowsShoppingListProducts = $this->getDatabase()->uihelper_shopping_list()->where('shopping_list_id = :1', $listId)->fetchAll(); $rowsShoppingListProducts = $this->getDatabase()->uihelper_shopping_list()->where('shopping_list_id = :1', $listId)->fetchAll();
foreach ($rowsShoppingListProducts as $row) { foreach ($rowsShoppingListProducts as $row) {
$note = ""; $product = $this->getDatabase()->products()->where('id = :1', $row->product_id)->fetch();
if (GROCY_TPRINTER_PRINT_NOTES) { $conversion = $this->getDatabase()->quantity_unit_conversions_resolved()->where('product_id = :1 AND from_qu_id = :2 AND to_qu_id = :3', $product->id, $product->qu_id_stock, $row->qu_id)->fetch();
if (isset($row["note"])) { $factor = 1.0;
$note = ' (' . $row["note"] . ')'; if ($conversion != null) {
$factor = floatval($conversion->factor);
}
$amount = round($row->amount * $factor);
$note = "";
if (GROCY_TPRINTER_PRINT_NOTES)
{
if ($row->note != "") {
$note = ' (' . $row->note . ')';
} }
} }
if (GROCY_TPRINTER_PRINT_QUANTITY_NAME) { if (GROCY_TPRINTER_PRINT_QUANTITY_NAME)
$quantityname = $row["qu_name"]; {
if ($row["amount"] > 1) { $quantityname = $row->qu_name;
$quantityname = $row["qu_name_plural"]; if ($amount > 1)
{
$quantityname = $row->qu_name_plural;
} }
array_push($result, $row["amount"] . ' ' . $quantityname . ' ' . $row["product_name"] . $note); array_push($result, $amount . ' ' . $quantityname . ' ' . $row->product_name . $note);
} else { }
array_push($result, $row["amount"] . ' ' . $row["product_name"] . $note); else
{
array_push($result, $amount . ' ' . $row->product_name . $note);
} }
} }
return $result; return $result;
} }
public function TransferProduct(int $productId, float $amount, int $locationIdFrom, int $locationIdTo, $specificStockEntryId = 'default', &$transactionId = null) public function TransferProduct(int $productId, float $amount, int $locationIdFrom, int $locationIdTo, $specificStockEntryId = 'default', &$transactionId = null)
{ {
if (!$this->ProductExists($productId)) if (!$this->ProductExists($productId))