kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +00:00
Code Issues Projects Releases Wiki Activity

Allow partially in stock recipes to be consumed (closes #386)

Browse Source
This commit is contained in:
Bernd Bestel
2025-01-18 10:23:31 +01:00
parent f9c7c67dc7
commit 23d7b6ad3c
6 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/RecipesService.php
View File

@@ -78,12 +78,6 @@ class RecipesService extends BaseService
throw new \Exception('Recipe does not exist');
}
$recipeResolved = $this->getDatabase()->recipes_resolved()->where('recipe_id', $recipeId)->fetch();
if ($recipeResolved->need_fulfilled == 0)
{
throw new \Exception('Recipe need is not fulfilled, consuming not possible');
}
$transactionId = uniqid();
$recipePositions = $this->getDatabase()->recipes_pos_resolved()->where('recipe_id', $recipeId)->fetchAll();
@@ -92,9 +86,15 @@ class RecipesService extends BaseService
{
foreach ($recipePositions as $recipePosition)
{
if ($recipePosition->only_check_single_unit_in_stock == 0)
if ($recipePosition->only_check_single_unit_in_stock == 0 && $recipePosition->stock_amount > 0)
{
$this->getStockService()->ConsumeProduct($recipePosition->product_id, $recipePosition->recipe_amount, false, StockService::TRANSACTION_TYPE_CONSUME, 'default', $recipeId, null, $transactionId, true, true);
$amount = $recipePosition->recipe_amount;
if ($recipePosition->stock_amount > 0 && $recipePosition->stock_amount < $recipePosition->recipe_amount)
{
$amount = $recipePosition->stock_amount;
}
$this->getStockService()->ConsumeProduct($recipePosition->product_id, $amount, false, StockService::TRANSACTION_TYPE_CONSUME, 'default', $recipeId, null, $transactionId, true, true);
}
}
}