kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-17 19:16:37 +00:00
Code Issues Projects Releases Wiki Activity

Implemented that included recipes can have a serving amount (closes #163 and references #127)

Browse Source
This commit is contained in:
Bernd Bestel
2019-03-05 23:45:04 +01:00
parent 45db9ff90c
commit 2d8ad24887
7 changed files with 174 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/RecipesService.php
View File

@@ -14,15 +14,15 @@ class RecipesService extends BaseService
protected $StockService;
public function GetRecipesFulfillment()
public function GetRecipesPosResolved()
{
$sql = 'SELECT * from recipes_fulfillment';
$sql = 'SELECT * FROM recipes_pos_resolved';
return $this->DatabaseService->ExecuteDbQuery($sql)->fetchAll(\PDO::FETCH_OBJ);
}
public function GetRecipesSumFulfillment()
public function GetRecipesResolved()
{
$sql = 'SELECT * from recipes_fulfillment_sum';
$sql = 'SELECT * FROM recipes_resolved';
return $this->DatabaseService->ExecuteDbQuery($sql)->fetchAll(\PDO::FETCH_OBJ);
}
@@ -30,7 +30,7 @@ class RecipesService extends BaseService
{
$recipe = $this->Database->recipes($recipeId);
$recipePositions = $this->GetRecipesFulfillment();
$recipePositions = $this->GetRecipesPosResolved();
foreach ($recipePositions as $recipePosition)
{
if($recipePosition->recipe_id == $recipeId && !in_array($recipePosition->product_id, $excludedProductIds))