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

feat(services/RecipesService): update AddNotFulfilledProductsToShoppingList for recipes_ignore_stock_on_add_to_cart_checkbox option

Browse Source 
close https://github.com/grocy/grocy/issues/686
This commit is contained in:
9Lukas5 2026-01-25 15:53:47 +01:00
parent bf242043a4
commit 6e166b2b74
No known key found for this signature in database
GPG Key ID: 3203216F282460B6
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
services/RecipesService.php
View File

@ -15,6 +15,7 @@ class RecipesService extends BaseService
{ {
$recipe = $this->getDataBase()->recipes($recipeId); $recipe = $this->getDataBase()->recipes($recipeId);
$recipePositions = $this->GetRecipesPosResolved(); $recipePositions = $this->GetRecipesPosResolved();
$ignoreStock = boolval($this->getUsersService()->GetUserSetting(GROCY_USER_ID, 'recipes_ignore_stock_on_add_to_cart_checkbox'));
if ($excludedProductIds == null) if ($excludedProductIds == null)
{ {
@ -26,13 +27,26 @@ class RecipesService extends BaseService
if ($recipePosition->recipe_id == $recipeId && !in_array($recipePosition->product_id, $excludedProductIds)) if ($recipePosition->recipe_id == $recipeId && !in_array($recipePosition->product_id, $excludedProductIds))
{ {
$product = $this->getDataBase()->products($recipePosition->product_id); $product = $this->getDataBase()->products($recipePosition->product_id);
$toOrderAmount = round(($recipePosition->missing_amount - $recipePosition->amount_on_shopping_list), 2);
$quId = $product->qu_id_purchase;
if ($recipe->not_check_shoppinglist == 1) // Determine order amount
{ // First, define the base amount, depending on if the full recipe amount or just the missing amount shall be used
$toOrderAmount = round($recipePosition->missing_amount, 2); if ($ignoreStock) {
$toOrderAmount = $recipePosition->recipe_amount;
} }
else {
$toOrderAmount = $recipePosition->missing_amount;
}
// Then, decide if on top of the base amount, the shopping cart shall be considered as well
if ($recipe->not_check_shoppinglist == 0)
{
$toOrderAmount = round($toOrderAmount - $recipePosition->amount_on_shopping_list, 2);
}
else {
$toOrderAmount = round($toOrderAmount, 2);
}
$quId = $product->qu_id_purchase;
// When the recipe ingredient option "Only check if any amount is in stock" is enabled, // When the recipe ingredient option "Only check if any amount is in stock" is enabled,
// any QU can be used and the amount is not based on qu_stock then // any QU can be used and the amount is not based on qu_stock then