Changelog and small changes for #557)

changelog/56_UNRELEASED_2020-xx-xx.md

@@ -17,6 +17,7 @@
 - Fixed that the recipe "fullscreen card" was not correctly displayed
 - Fixed that nested recipes showed all ingredients of the nested recipes twice
 - Fixed that when displaying or consuming a recipe from the meal plan the serving amount was maybe wrong (was the one from the recipe instead the one from the meal plan entry) (thanks @kriddles)
+- Fixed that the stock fulfillment counts on the recipe card were maybe wrong if that recipe was also added to the meal plan (thanks @kriddles)
 
 ### Meal plan improvements
 - Improved that all add-dialogs can be submitted by using `ENTER` and that the next input is automatically selected after selecting a recipe/product

controllers/RecipesController.php

@@ -22,14 +22,7 @@ class RecipesController extends BaseController
 
 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		if (isset($request->getQueryParams()['include-internal']))
-		{
-			$recipes = $this->Database->recipes()->orderBy('name');
-		}
-		else
-		{
-			$recipes = $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name');
-		}
+		$recipes = $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name');
 		$recipesResolved = $this->RecipesService->GetRecipesResolved();
 
 		$selectedRecipe = null;

migrations/0098.sql

@@ -1,4 +1,3 @@
-
 DROP VIEW recipes_pos_resolved;
 CREATE VIEW recipes_pos_resolved
 AS