updated to original master

.devtools/transifex_download.bat

@@ -1,4 +1,4 @@
 pushd ..
-tx pull --all --minimum-perc=90
+tx pull --all --minimum-perc=80
 tx pull --language en_GB
 popd

.devtools/update_dependencies.bat

@@ -1,4 +1,4 @@
 pushd ..
 call composer update
-yarn upgrade
+yarn upgrade --latest
 popd

README.md

@@ -23,7 +23,7 @@ Just unpack the [latest release](https://releases.grocy.info/latest) on your PHP
 
 Alternatively clone this repository and install Composer and Yarn dependencies manually.
 
-If you use nginx as your webserver, please include `try_files $uri /index.php;` in your location block.
+If you use nginx as your webserver, please include `try_files $uri /index.php$is_args$query_string;` in your location block.
 
 If, however, your webserver does not support URL rewriting, set `DISABLE_URL_REWRITING` in `data/config.php` (`Setting('DISABLE_URL_REWRITING', true);`).
 
@@ -45,18 +45,20 @@ You can easily help translating grocy at https://www.transifex.com/grocy/grocy,
 
 The [pre-release demo](https://demo-prerelease.grocy.info) is available for any translation which is at least 80 % complete and will pull the translations from Transifex 10 minutes past every hour, so you can have a kind of instant preview of your contributed translations. Thank you!
 
+Also any translation which reached a completion level of 80 % will be included in releases.
+
 ## Things worth to know
 
 ### REST API & data model documentation
 See the integrated Swagger UI instance on [/api](https://demo.grocy.info/api).
 
 ### Barcode readers & camera scanning
-Some fields also allow to select a value by scanning a barcode. It works best when your barcode reader prefixes every barcode with a letter which is normally not part of a item name (I use a `$`) and sends a `TAB` after a scan.
+Some fields (with a barcode icon above) also allow to select a value by scanning a barcode. It works best when your barcode reader prefixes every barcode with a letter which is normally not part of a item name (I use a `$`) and sends a `TAB` after a scan.
 
 Additionally it's also possible to use your device camera to scan a barcode by using the camera button on the right side of the corresponding field (powered by [QuaggaJS](https://github.com/serratus/quaggaJS), totally offline / client-side camera stream processing, please note due to browser security restrictions, this only works when serving grocy via a secure connection (`https://`)). Quick video demo: https://www.youtube.com/watch?v=Y5YH6IJFnfc
 
 ### Input shorthands for date fields
-For (productivity) reasons all date (and time) input fields use the ISO-8601 format regardless of localization.
+For (productivity) reasons all date (and time) input (and display) fields use the ISO-8601 format regardless of localization.
 The following shorthands are available:
 - `MMDD` gets expanded to the given day on the current year, if > today, or to the given day next year, if < today, in proper notation
   - Example: `0517` will be converted to `2018-05-17`
@@ -90,7 +92,7 @@ If you don't use certain feature sets of grocy (for example if you don't need "C
 - When the file `data/custom_css.html` exists, the contents of the file will be added just before `</head>` (end of head) on every page
 
 ### Demo mode
-When the file `data/demo.txt` exists, the application will work in a demo mode which means authentication is disabled and some demo data will be generated during the database schema migration.
+When the `MODE` setting is set to `dev`, `demo` or `prerelease`, the application will work in a demo mode which means authentication is disabled and some demo data will be generated during the database schema migration.
 
 ### Embedded mode
 When the file `embedded.txt` exists, it must contain a valid and writable path which will be used as the data directory instead of `data` and authentication will be disabled (used in [grocy-desktop](https://github.com/grocy/grocy-desktop)).

app.php

@@ -1,10 +1,13 @@
 <?php
 
-use \Psr\Http\Message\ServerRequestInterface as Request;
-use \Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Container\ContainerInterface as Container;
+use Slim\Factory\AppFactory;
+use Selective\BasePath\BasePathMiddleware;
 
-use \Grocy\Helpers\UrlManager;
-use \Grocy\Controllers\LoginController;
+use Grocy\Helpers\UrlManager;
+use Grocy\Controllers\LoginController;
 
 // Definitions for embedded mode
 if (file_exists(__DIR__ . '/embedded.txt'))
@@ -19,20 +22,6 @@ else
 	define('GROCY_DATAPATH', __DIR__ . '/data');
 }
 
-// Definitions for demo mode
-if (file_exists(GROCY_DATAPATH . '/demo.txt'))
-{
-	define('GROCY_IS_DEMO_INSTALL', true);
-	if (!defined('GROCY_USER_ID'))
-	{
-		define('GROCY_USER_ID', 1);
-	}
-}
-else
-{
-	define('GROCY_IS_DEMO_INSTALL', false);
-}
-
 // Load composer dependencies
 require_once __DIR__ . '/vendor/autoload.php';
 
@@ -40,6 +29,12 @@ require_once __DIR__ . '/vendor/autoload.php';
 require_once GROCY_DATAPATH . '/config.php';
 require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
 
+// Definitions for dev/demo/prerelease mode
+if (GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease')
+{
+	define('GROCY_USER_ID', 1);
+}
+
 // Definitions for disabled authentication mode
 if (GROCY_DISABLE_AUTH === true)
 {
@@ -50,31 +45,33 @@ if (GROCY_DISABLE_AUTH === true)
 }
 
 // Setup base application
-$appContainer = new \Slim\Container([
-	'settings' => [
-		'displayErrorDetails' => true,
-		'determineRouteBeforeAppMiddleware' => true
-	],
-	'view' => function($container)
-	{
-		return new \Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
-	},
-	'LoginControllerInstance' => function($container)
-	{
-		return new LoginController($container, 'grocy_session');
-	},
-	'UrlManager' => function($container)
-	{
-		return new UrlManager(GROCY_BASE_URL);
-	},
-	'ApiKeyHeaderName' => function($container)
-	{
-		return 'GROCY-API-KEY';
-	}
-]);
-$app = new \Slim\App($appContainer);
+AppFactory::setContainer(new DI\Container());
+$app = AppFactory::create();
+
+$container = $app->getContainer();
+$container->set('view', function(Container $container)
+{
+	return new Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
+});
+$container->set('LoginControllerInstance', function(Container $container)
+{
+	return new LoginController($container, 'grocy_session');
+});
+$container->set('UrlManager', function(Container $container)
+{
+	return new UrlManager(GROCY_BASE_URL);
+});
+$container->set('ApiKeyHeaderName', function(Container $container)
+{
+	return 'GROCY-API-KEY';
+});
 
 // Load routes from separate file
 require_once __DIR__ . '/routes.php';
 
+// Add default middleware
+$app->addRoutingMiddleware();
+$app->add(new BasePathMiddleware($app));
+$app->addErrorMiddleware(true, false, false);
+
 $app->run();

changelog/55_2.6.0_2020-01-31.md

@@ -0,0 +1,85 @@
+### New feature: Transfer products between locations and edit stock entries
+- New menu entry in the sidebar to transfer products (or as a shortcut in the more/context menu per line on the stock overview page)
+- New button "Stock entries" in the header of the stock overview page (or as a shortcut in the more/context menu per line) to show the detail stock entries behind each product
+  - From there you can also edit the stock entries
+- (A huge THANK YOU goes to @kriddles for the work on this feature)
+
+### New feature: Scan mode
+- Just scan one product after another, no manual input required and audio feedback is provided
+- New switch-button on the purchase and consume page
+- When enabled
+  - The amount will always be filled with `1` after changing/scanning a product
+  - If all fields could be automatically populated (means for purchase the product has a default best before date set), the transaction is automatically submitted
+    - If not, a warning is displayed and you can fill in the missing information
+  - Audio feedback is provided after scanning and on success/error of the transaction
+- => Quick video demo: https://www.youtube.com/watch?v=83dm9iD718k
+
+### New feature: Self produced products
+- To a recipe a product can be attached
+  - This products needs a "Default best before date"
+- On using "Consume all ingredients needed by this recipe" and when it has a product attached, one unit of that product (per serving in purchase quantity unit) will be added to stock (with the proper price based on the recipe ingredients)
+- (Thanks @kriddles for the intial work on this)
+
+### New feature: Freeze/Thaw products
+- New product options "Default best before days after freezing/thawing" to set how the best before date should be changed on freezing/thawing
+- New location option "Is freezer" to indicate if the location is a freezer
+- => When moving a product from/to a freezer location, the best before date is changed accordingly
+- There is also a new sub feature flag `FEATURE_FLAG_STOCK_PRODUCT_FREEZING` to disable this if you don't need it (defaults to `true`)
+
+### Stock improvements/fixes
+- The productcard gets now also refreshed after a transaction was posted (purchase/consume/etc.) (thanks @kriddles)
+- The product field calories (kcal) now also allows decimal numbers
+- On the inventory page, "New amount" is now prefilled with the current stock amount of the selected product
+- Fixed that entering partial amounts was not possible on the inventory page (only applies if the product option "Allow partial units in stock" is enabled)
+- Fixed that on purchase a wrong minimum amount was enforced for products with enabled tare weight handling in combination with different purchase/stock quantity units
+- Fixed that the productcard did not load correctly when `FEATURE_FLAG_STOCK_LOCATION_TRACKING` was set to `false` (thanks @kriddles)
+- Fixed that the "Add as barcode to existing product" workflow did not work twice when not switching the page inbetween
+
+### Shopping list improvements/fixes
+- Added a compact view to have a better shopping list for shopping trips (new button "Compact view" in the header, additionally this is automatically enabled on mobile devices / when screen width is < 768 px)
+- It's now possible to filter for only undone (not striked through) items (new option in the "Filter by status" dropdown)
+- Fixed that when `FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS` was set to `false`, the shopping list appeared empty after some actions
+
+### Recipe improvements
+- When consuming a recipe and if an ingredient is not in stock, but that product has any subproduct which is in stock, this gets now consumed (before consuming was not possible in that case)
+- When adding or editing a recipe ingredient, a dialog is now used instead of switching between pages (thanks @kriddles)
+
+### Meal plan improvements/fixes
+- It's now possible to add notes per day (in the dropdown of the add button in the header of each day column)
+- It's now possible to products directly (also in the dropdown of the add button in the header of each day column, maybe useful in combination with the new "Self produced products" feature)
+- Added that the calories per serving are now also shown
+- Added that the total costs and calories per day are displayed in the header of each day column
+- Added a new `config.php` setting `MEAL_PLAN_FIRST_DAY_OF_WEEK` which can be used to start the meal plan on a different day (defaults to `CALENDAR_FIRST_DAY_OF_WEEK`, so no changed behavior when not configured)
+- Fixed that when `FEATURE_FLAG_STOCK_PRICE_TRACKING` was set to `false`, prices were still shown (thanks @kriddles)
+- Fixed that the week costs were missing for the weeks 1 - 9 of a year
+
+### Calendar improvements
+- Improved that meal plan events in the iCal calendar export now contain a link to the appropriate meal plan week in the body of the event (thanks @kriddles)
+
+### Task fixes
+- Fixed that a due date was required when editing an existing task
+
+### API improvements/fixes
+- The endpoint `/stock` now includes also the product object itself (new field/property `product`) (thanks @gsacre)
+- The endpoint `/stock/products/{productId}/entries` can now include stock entries of child products (if the given product is a parent product and in addition to the ones of the given product) - new query parameter `include_sub_products` (defaults to `false` so no changed behavior when not supplied)
+- New endpoints for the new stock transfer & stock entry edit capabilities
+- Fixed that the route `/stock/barcodes/external-lookup/{barcode}` did not work, because the `barcode` argument was expected as a route argument but the route was missing it (thanks @Mikhail5555 and @beetle442002)
+- Fixed the response type description of the `/stock/volatile` endpoint
+
+### General & other improvements/fixes
+- It's now possible to keep the screen on always or when a "fullscreen-card" (e. g. used for recipes) is displayed
+  - New user options in the display settings menu in the top right corner (defaults to disabled)
+- Slightly optimized table loading & search performance (thanks @lwis)
+- Added that the currently active sidebar menu item is always in view
+- Reordered the sidebar menu items a little bit, grouped them by borders and made them a little smaller to waste less space
+- Changed/removed some animations (and replaced jQuery UI by [Animate.css](https://daneden.github.io/animate.css/)) to improve responsiveness
+- Fixed that also the first column (where in most tables only buttons/menus are displayed) in tables was searched when using the general search field
+- Fixed that the meal plan menu entry (sidebar) was not visible when the calendar was disabled (`FEATURE_FLAG_CALENDAR`) (thanks @lwis)
+- For integration: If a `GET` parameter `closeAfterCreation` is passed to the product edit page, the window will be closed on save (due to Browser restrictions, this only works when the window was opened from JavaScript) (thanks @Forceu)
+- Fixed that the `update.sh` file had wrong line endings (DOS instead of Unix)
+- Internal change: Demo mode is now handled via the setting `MODE` instead of checking the existence of the file `data/demo.txt`
+- There is now a RSS feed for the changelog, subscribe to get notified about new releases: https://grocy.info/changelog/feed
+- New translations: (thanks all the translators)
+  - Hungarian (demo available at https://hu.demo.grocy.info)
+  - Portuguese (Brazil) (demo available at https://pt-br.demo.grocy.info)
+  - Slovak (demo available at https://sk.demo.grocy.info)

changelog/55_UNRELEASED_2019-xx-xx.md

@@ -1,26 +0,0 @@
-### New feature: Transfer products between locations and edit stock entries
-- New menu entry in the sidebar to transfer products (or as a shortcut in the more/context menu per line on the stock overview page)
-- New menu entry in the more/context menu of stock overview page lines to show the detail stock entries behind the corresponding product
-  - From there you can also edit the stock entries
-- A huge THANK YOU goes to @kriddles for the work on this feature
-
-## Recipe improvements
-- When adding or editing a recipe ingredient, a dialog is now used instead of switching between pages (thanks @kriddles)
-
-### Meal plan fixes
-- Fixed that when `FEATURE_FLAG_STOCK_PRICE_TRACKING` was set to `false`, prices were still shown (thanks @kriddles)
-
-### Calendar improvements
-- Improved that meal plan events in the iCal calendar export now contain a link to the appropriate meal plan week in the body of the event (thanks @kriddles)
-
-### API improvements/fixes
-- Fixed that the route `/stock/barcodes/external-lookup/{barcode}` did not work, because the `barcode` argument was expected as a route argument but the route was missing it (thanks @Mikhail5555 and @beetle442002)
-- New endpoints for the stock transfer & stock entry edit capabilities mentioned above
-
-### General & other improvements/fixes
-- Fixed that the meal plan menu entry (sidebar) was not visible when the calendar was disabled (`FEATURE_FLAG_CALENDAR`) (thanks @lwis)
-- Slightly optimized table loading & search performance (thanks @lwis)
-- For integration: If a `GET` parameter `closeAfterCreation` is passed to the product edit page, the window will be closed on save (due to Browser restrictions, this only works when the window was opened from JavaScript) (thanks @Forceu)
-- The `update.sh` file had wrong line endings (DOS instead of Unix)
-- New translations: (thanks all the translators)
-  - Portuguese (Brazil) (demo available at https://pt-br.demo.grocy.info)

changelog/56_UNRELEASED_2020-xx-xx.md

@@ -0,0 +1,36 @@
+### Stock fixes
+- Fixed purchase/consume/inventory problems when `FEATURE_FLAG_STOCK_LOCATION_TRACKING` was set to `false`
+
+### Shopping list improvements/fixes
+- Added an option to hide the month-calendar (in the shopping list settings / top right corner settings menu) (defaults to disabled, so please enable this option if you still want to have the month-calendar on the shopping list)
+- Optimized the new compact view (there was a little too much white space at the sides of the page)
+- Added an option to not switch to the new compact view on mobile devices automatically (in the shopping list settings / top right corner settings menu) (defaults to `false`, so no changed behavior when not configured) (thanks @Forceu)
+- Fixed that the "Shopping list to stock workflow" did not work when `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` was set to `false`
+
+### Recipe improvements/fixes
+- Optimized the ordering of the inputs on the recipe ingredient edit page (moved "Only check if a single unit is in stock" before the amount)
+- Variable ingredient amounts are now marked accordingly on the renedered recipe
+- After selecting a recipe on mobile devices, the page now automatically scrolls to the recipe card
+- Added the recipes base servings to be displayed on the recipe card and properly named the servings column in the recipes list/table (thanks @kriddles)
+- Added that recipe ingredients can now also be displayed grouped by the products product group (additionally to the ingredient group, new option in the recipes settings / top right corner settings menu) (defaults to `false`, so no changed behavior when not configured) (thanks @kriddles)
+- Fixed that when editing a recipe ingredient which had "Only check if a single unit is in stock" set, not any quantity unit could be picked and the amount stayed empty
+- Fixed that when reloading the "new recipe"-page (or when it gets auto-reloaded due to "Auto reload on external changes" is enabled), for each reload a new recipe was created
+- 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
+- Added an edit button to all types of meal plan entries
+- When adding a recipe, the serving amount is now prefilled with the one of the selected recipe (thanks @kriddles)
+- Fixed that the meal plan not used the full height on mobile devices
+
+### Calendar fixes
+- Fixed to only include events when the corresponding feature flag is enabled (e. g. don't show expiring products when `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` is set to `false`) (thanks @kriddles)
+- Fixed that the calendar not used the full height on mobile devices
+
+### General & other improvements/fixes
+- Optimized the top navbar height and overall spacing to waste less space
+- Replaced the scan-mode-switch-button by a native button because it's less disturbing
+- Fixed that the "contextual time ago" of date/time pickers was not displayed

composer.json

@@ -1,14 +1,18 @@
 {
 	"require": {
 		"php": ">=7.2",
-		"slim/slim": "^3.12.2",
-		"morris/lessql": "^0.4.1",
+		"slim/slim": "^4.0",
+		"slim/psr7": "^1.0",
+		"slim/http": "^1.0",
+		"php-di/php-di": "^6.0",
 		"rubellum/slim-blade-view": "^0.1.1",
-		"tuupola/cors-middleware": "^1.0.0",
-		"eluceo/ical": "^0.15.1",
-		"erusev/parsedown": "^1.7.3",
-		"gettext/gettext": "^4.6.3",
-		"gumlet/php-image-resize": "^1.9.2"
+		"tuupola/cors-middleware": "^1.1",
+		"selective/basepath": "^0.2.0",
+		"morris/lessql": "^0.4.1",
+		"gettext/gettext": "^4.8",
+		"eluceo/ical": "^0.16.0",
+		"erusev/parsedown": "^1.7",
+		"gumlet/php-image-resize": "^1.9"
 	},
 	"autoload": {
 		"psr-4": {

config-dist.php

@@ -15,7 +15,8 @@
 
 
 # Either "production", "dev", "demo" or "prerelease"
-# ("demo" and "prerelease" is reserved to be used only on the offical demo instances)
+# When not "production", authentication will be disabled and
+# demo data will be populated during database migrations
 Setting('MODE', 'production');
 
 # Either "en" or "de" or the directory name of
@@ -32,7 +33,7 @@ Setting('CALENDAR_SHOW_WEEK_OF_YEAR', true);
 
 # To keep it simple: grocy does not handle any currency conversions,
 # this here is used to format all money values,
-# so doesn't matter really matter, but should be the
+# so doesn't really matter, but should be the
 # ISO 4217 code of the currency ("USD", "EUR", "GBP", etc.)
 Setting('CURRENCY', 'USD');
 
@@ -61,6 +62,11 @@ Setting('DISABLE_AUTH', false);
 # Set this to true if you want to disable the ability to scan a barcode via the device camera (Browser API)
 Setting('DISABLE_BROWSER_BARCODE_CAMERA_SCANNING', false);
 
+# Set this if you want to have a different start day for the weekly meal plan view,
+# leave empty to use CALENDAR_FIRST_DAY_OF_WEEK (see above)
+# Needs to be a number where Sunday = 0, Monday = 1 and so forth
+Setting('MEAL_PLAN_FIRST_DAY_OF_WEEK', '');
+
 
 # Default user settings
 # These settings can be changed per user, here the defaults
@@ -74,6 +80,10 @@ DefaultUserSetting('auto_night_mode_time_range_to', "07:00"); // Format HH:mm
 DefaultUserSetting('auto_night_mode_time_range_goes_over_midnight', true); // If the time range above goes over midnight
 DefaultUserSetting('currently_inside_night_mode_range', false); // If we're currently inside of night mode time range (this is not user configurable, but stored as a user setting because it's evaluated client side to be able to use the client time instead of the maybe different server time)
 
+# Keep screen on settings
+DefaultUserSetting('keep_screen_on', false); // Keep the screen always on
+DefaultUserSetting('keep_screen_on_when_fullscreen_card', false); // Keep the screen on when a "fullscreen-card" is displayed
+
 # Stock settings
 DefaultUserSetting('product_presets_location_id', -1); // Default location id for new products (-1 means no location is preset)
 DefaultUserSetting('product_presets_product_group_id', -1); // Default product group id for new products (-1 means no product group is preset)
@@ -81,6 +91,16 @@ DefaultUserSetting('product_presets_qu_id', -1); // Default quantity unit id for
 DefaultUserSetting('stock_expring_soon_days', 5);
 DefaultUserSetting('stock_default_purchase_amount', 0);
 DefaultUserSetting('stock_default_consume_amount', 1);
+DefaultUserSetting('scan_mode_consume_enabled', false);
+DefaultUserSetting('scan_mode_purchase_enabled', false);
+
+# Shopping list settings
+DefaultUserSetting('shopping_list_to_stock_workflow_auto_submit_when_prefilled', false); // Automatically do the booking using the last price and the amount of the shopping list item, if the product has "Default best before days" set
+DefaultUserSetting('shopping_list_show_calendar', false);
+DefaultUserSetting('shopping_list_disable_auto_compact_view_on_mobile', false);
+
+# Recipe settings
+DefaultUserSetting('recipe_ingredients_group_by_product_group', false); // Group recipe ingredients by their product group
 
 # Chores settings
 DefaultUserSetting('chores_due_soon_days', 5);
@@ -98,11 +118,6 @@ DefaultUserSetting('auto_reload_on_db_change', true);
 # Show a clock in the header next to the logo or not
 DefaultUserSetting('show_clock_in_header', false);
 
-# Shopping list to stock workflow:
-# Automatically do the booking using the last price and the amount
-# of the shopping list item, if the product has "Default best before days" set
-DefaultUserSetting('shopping_list_to_stock_workflow_auto_submit_when_prefilled', false);
-
 
 # Feature flags
 # grocy was initially about "stock management for your household", many other things
@@ -124,6 +139,7 @@ Setting('FEATURE_FLAG_STOCK_PRICE_TRACKING', true);
 Setting('FEATURE_FLAG_STOCK_LOCATION_TRACKING', true);
 Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING', true);
 Setting('FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING', true);
+Setting('FEATURE_FLAG_STOCK_PRODUCT_FREEZING', true);
 Setting('FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS', true);
 Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true);
 

controllers/BaseApiController.php

@@ -5,7 +5,7 @@ namespace Grocy\Controllers;
 class BaseApiController extends BaseController
 {
 
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
@@ -21,20 +21,36 @@ class BaseApiController extends BaseController
 		return $this->OpenApiSpec;
 	}
 
-	protected function ApiResponse($data)
+	protected function ApiResponse(\Psr\Http\Message\ResponseInterface $response, $data)
 	{
-		return json_encode($data);
+		$response->getBody()->write(json_encode($data));
+		return $response;
 	}
 
-	protected function EmptyApiResponse($response, $status = 204)
+	protected function EmptyApiResponse(\Psr\Http\Message\ResponseInterface $response, $status = 204)
 	{
 		return $response->withStatus($status);
 	}
 
-	protected function GenericErrorResponse($response, $errorMessage, $status = 400)
+	protected function GenericErrorResponse(\Psr\Http\Message\ResponseInterface $response, $errorMessage, $status = 400)
 	{
 		return $response->withStatus($status)->withJson(array(
 			'error_message' => $errorMessage
 		));
 	}
+
+	protected function getApiKeyService()
+	{
+		return ApiKeyService::getInstance();
+	}
+
+	protected function getChoresService()
+	{
+		return ChoresService::getInstance();
+	}
+
+	protected function getFilesService()
+	{
+		return FilesService::getInstance();
+	}
 }

controllers/BaseController.php

@@ -10,7 +10,7 @@ use \Grocy\Services\UserfieldsService;
 
 class BaseController
 {
-	public function __construct(\Slim\Container $container) {
+	public function __construct(\DI\Container $container) {
 
 		$this->AppContainer = $container;
 	}
@@ -36,11 +36,11 @@ class BaseController
 
 		$container->view->set('U', function($relativePath, $isResource = false) use($container)
 		{
-			return $container->UrlManager->ConstructUrl($relativePath, $isResource);
+			return $container->get('UrlManager')->ConstructUrl($relativePath, $isResource);
 		});
 
 		$embedded = false;
-		if (isset($container->request->getQueryParams()['embedded']))
+		if (isset($_GET['embedded']))
 		{
 			$embedded = true;
 		}
@@ -56,7 +56,7 @@ class BaseController
 		}
 		$container->view->set('featureFlags', $constants);
 
-		$this->AppContainer = $container;
+        $this->AppContainer = $container;
 
 		return $this->AppContainer->view->render($response, $page, $data);
 	}
@@ -106,6 +106,41 @@ class BaseController
 		return ApplicationService::getInstance();
 	}
 
+	protected function getBatteriesService()
+	{
+		return BatteriesService::getInstance();
+	}
+
+	protected function getCalendarService()
+	{
+		return CalendarService::getInstance();
+	}
+
+    private function getSessionService()
+	{
+		return SessionService::getInstance();
+	}
+
+	protected function getRecipesService()
+	{
+		return RecipesService::getInstance();
+	}
+
+	protected function getStockService()
+	{
+		return StockService::getInstance();
+	}
+
+    protected function getTasksService()
+	{
+		return TasksService::getInstance();
+	}
+
+    protected function getUsersService()
+	{
+		return UsersService::getInstance();
+	}
+
 	private $userfieldsService = null;
 
 	protected function getUserfieldsService()
@@ -127,6 +162,6 @@ class BaseController
 		}
 		return $this->usersService;
 	}
-
+	
 	protected $AppContainer;
 }

controllers/BatteriesApiController.php

@@ -6,23 +6,12 @@ use \Grocy\Services\BatteriesService;
 
 class BatteriesApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	protected $BatteriesService = null;
-
-    protected function getBatteriesService()
-    {
-        if($this->BatteriesService == null)
-        {
-            $this->BatteriesService = BatteriesService::getInstance();
-        }
-        return $this->BatteriesService;
-    }
-
-	public function TrackChargeCycle(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TrackChargeCycle(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -35,7 +24,7 @@ class BatteriesApiController extends BaseApiController
 			}
 
 			$chargeCycleId = $this->getBatteriesService()->TrackChargeCycle($args['batteryId'], $trackedTime);
-			return $this->ApiResponse($this->getDatabase()->battery_charge_cycles($chargeCycleId));
+			return $this->ApiResponse($response, $this->getDatabase()->battery_charge_cycles($chargeCycleId));
 		}
 		catch (\Exception $ex)
 		{
@@ -43,11 +32,11 @@ class BatteriesApiController extends BaseApiController
 		}
 	}
 
-	public function BatteryDetails(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function BatteryDetails(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			return $this->ApiResponse($this->getBatteriesService()->GetBatteryDetails($args['batteryId']));
+			return $this->ApiResponse($response, $this->getBatteriesService()->GetBatteryDetails($args['batteryId']));
 		}
 		catch (\Exception $ex)
 		{
@@ -55,16 +44,16 @@ class BatteriesApiController extends BaseApiController
 		}
 	}
 
-	public function Current(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Current(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->ApiResponse($this->getBatteriesService()->GetCurrent());
+		return $this->ApiResponse($response, $this->getBatteriesService()->GetCurrent());
 	}
 
-	public function UndoChargeCycle(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UndoChargeCycle(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			$this->ApiResponse($this->getBatteriesService()->UndoChargeCycle($args['chargeCycleId']));
+			$this->ApiResponse($response, $this->getBatteriesService()->UndoChargeCycle($args['chargeCycleId']));
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)

controllers/BatteriesController.php

@@ -6,23 +6,12 @@ use \Grocy\Services\BatteriesService;
 
 class BatteriesController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	protected $BatteriesService = null;
-
-	protected function getBatteriesService()
-	{
-		if($this->BatteriesService == null)
-		{
-			$this->BatteriesService = BatteriesService::getInstance();
-		}
-		return $this->BatteriesService;
-	}
-
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$usersService = $this->getUsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['batteries_due_soon_days'];
@@ -36,14 +25,14 @@ class BatteriesController extends BaseController
 		]);
 	}
 
-	public function TrackChargeCycle(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TrackChargeCycle(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'batterytracking', [
 			'batteries' =>  $this->getDatabase()->batteries()->orderBy('name')
 		]);
 	}
 
-	public function BatteriesList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function BatteriesList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'batteries', [
 			'batteries' => $this->getDatabase()->batteries()->orderBy('name'),
@@ -52,7 +41,7 @@ class BatteriesController extends BaseController
 		]);
 	}
 
-	public function BatteryEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function BatteryEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['batteryId'] == 'new')
 		{
@@ -71,7 +60,7 @@ class BatteriesController extends BaseController
 		}
 	}
 
-	public function Journal(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Journal(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'batteriesjournal', [
 			'chargeCycles' => $this->getDatabase()->battery_charge_cycles()->orderBy('tracked_time', 'DESC'),
@@ -79,7 +68,7 @@ class BatteriesController extends BaseController
 		]);
 	}
 
-	public function BatteriesSettings(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function BatteriesSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'batteriessettings');
 	}

controllers/CalendarApiController.php

@@ -7,34 +7,12 @@ use \Grocy\Services\ApiKeyService;
 
 class CalendarApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	protected $CalendarService = null;
-
-	protected function getCalendarService()
-	{
-		if($this->CalendarService == null)
-		{
-			$this->CalendarService = CalendarService::getInstance();
-		}
-		return $this->CalendarService;
-	}
-
-	protected $ApiKeyService = null;
-
-	protected function getApiKeyService()
-	{
-		if($this->ApiKeyService == null)
-		{
-			$this->ApiKeyService = ApiKeyService::getInstance();
-		}
-		return $this->ApiKeyService;
-	}
-
-	public function Ical(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Ical(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -72,12 +50,12 @@ class CalendarApiController extends BaseApiController
 		}
 	}
 
-	public function IcalSharingLink(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function IcalSharingLink(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			return $this->ApiResponse(array(
-				'url' => $this->AppContainer->UrlManager->ConstructUrl('/api/calendar/ical?secret=' . $this->getApiKeyService()->GetOrCreateApiKey(ApiKeyService::API_KEY_TYPE_SPECIAL_PURPOSE_CALENDAR_ICAL))
+			return $this->ApiResponse($response, array(
+				'url' => $this->AppContainer->get('UrlManager')->ConstructUrl('/api/calendar/ical?secret=' . $this->getApiKeyService()->GetOrCreateApiKey(ApiKeyService::API_KEY_TYPE_SPECIAL_PURPOSE_CALENDAR_ICAL))
 			));
 		}
 		catch (\Exception $ex)

controllers/CalendarController.php

@@ -6,23 +6,12 @@ use \Grocy\Services\CalendarService;
 
 class CalendarController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	protected $CalendarService = null;
-
-	protected function getCalendarService()
-	{
-		if($this->CalendarService == null)
-		{
-			$this->CalendarService = CalendarService::getInstance();
-		}
-		return $this->CalendarService;
-	}
-
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'calendar', [
 			'fullcalendarEventSources' => $this->getCalendarService()->GetEvents()

controllers/ChoresApiController.php

@@ -6,23 +6,12 @@ use \Grocy\Services\ChoresService;
 
 class ChoresApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	protected $ChoresService = null;
-
-	protected function getChoresService()
-	{
-		if($this->ChoresService == null)
-		{
-			$this->ChoresService = ChoresService::getInstance();
-		}
-		return $this->ChoresService;
-	}
-
-	public function TrackChoreExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TrackChoreExecution(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -41,7 +30,7 @@ class ChoresApiController extends BaseApiController
 			}
 
 			$choreExecutionId = $this->getChoresService()->TrackChore($args['choreId'], $trackedTime, $doneBy);
-			return $this->ApiResponse($this->getDatabase()->chores_log($choreExecutionId));
+			return $this->ApiResponse($response, $this->getDatabase()->chores_log($choreExecutionId));
 		}
 		catch (\Exception $ex)
 		{
@@ -49,11 +38,11 @@ class ChoresApiController extends BaseApiController
 		}
 	}
 
-	public function ChoreDetails(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ChoreDetails(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			return $this->ApiResponse($this->getChoresService()->GetChoreDetails($args['choreId']));
+			return $this->ApiResponse($response, $this->getChoresService()->GetChoreDetails($args['choreId']));
 		}
 		catch (\Exception $ex)
 		{
@@ -61,16 +50,16 @@ class ChoresApiController extends BaseApiController
 		}
 	}
 
-	public function Current(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Current(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->ApiResponse($this->getChoresService()->GetCurrent());
+		return $this->ApiResponse($response, $this->getChoresService()->GetCurrent());
 	}
 
-	public function UndoChoreExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UndoChoreExecution(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			$this->ApiResponse($this->getChoresService()->UndoChoreExecution($args['executionId']));
+			$this->ApiResponse($response, $this->getChoresService()->UndoChoreExecution($args['executionId']));
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
@@ -79,7 +68,7 @@ class ChoresApiController extends BaseApiController
 		}
 	}
 
-	public function CalculateNextExecutionAssignments(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function CalculateNextExecutionAssignments(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{

controllers/ChoresController.php

@@ -6,23 +6,12 @@ use \Grocy\Services\ChoresService;
 
 class ChoresController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	protected $ChoresService = null;
-
-	protected function getChoresService()
-	{
-		if($this->ChoresService == null)
-		{
-			$this->ChoresService = ChoresService::getInstance();
-		}
-		return $this->ChoresService;
-	}
-
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$usersService = $this->getUsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['chores_due_soon_days'];
@@ -37,7 +26,7 @@ class ChoresController extends BaseController
 		]);
 	}
 
-	public function TrackChoreExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TrackChoreExecution(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'choretracking', [
 			'chores' => $this->getDatabase()->chores()->orderBy('name'),
@@ -45,7 +34,7 @@ class ChoresController extends BaseController
 		]);
 	}
 
-	public function ChoresList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ChoresList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'chores', [
 			'chores' => $this->getDatabase()->chores()->orderBy('name'),
@@ -54,7 +43,7 @@ class ChoresController extends BaseController
 		]);
 	}
 
-	public function Journal(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Journal(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'choresjournal', [
 			'choresLog' => $this->getDatabase()->chores_log()->orderBy('tracked_time', 'DESC'),
@@ -63,7 +52,7 @@ class ChoresController extends BaseController
 		]);
 	}
 
-	public function ChoreEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ChoreEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$usersService = getUsersService();
 		$users = $usersService->GetUsersAsDto();
@@ -93,7 +82,7 @@ class ChoresController extends BaseController
 		}
 	}
 
-	public function ChoresSettings(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ChoresSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'choressettings');
 	}

controllers/EquipmentController.php

@@ -4,14 +4,14 @@ namespace Grocy\Controllers;
 
 class EquipmentController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
 	protected $UserfieldsService;
 
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'equipment', [
 			'equipment' => $this->getDatabase()->equipment()->orderBy('name'),
@@ -20,7 +20,7 @@ class EquipmentController extends BaseController
 		]);
 	}
 
-	public function EditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function EditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['equipmentId'] == 'new')
 		{

controllers/FilesApiController.php

@@ -6,23 +6,12 @@ use \Grocy\Services\FilesService;
 
 class FilesApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	protected $FilesService = null;
-
-	protected function getFilesService()
-	{
-		if($this->FilesService == null)
-		{
-			$this->FilesService = FilesService::getInstance();
-		}
-		return $this->FilesService;
-	}
-
-	public function UploadFile(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UploadFile(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -46,7 +35,7 @@ class FilesApiController extends BaseApiController
 		}
 	}
 
-	public function ServeFile(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ServeFile(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -104,7 +93,7 @@ class FilesApiController extends BaseApiController
 		}
 	}
 
-	public function DeleteFile(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function DeleteFile(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -117,7 +106,7 @@ class FilesApiController extends BaseApiController
 				throw new \Exception('Invalid filename');
 			}
 
-			$filePath = $this->getFilesService->GetFilePath($args['group'], $fileName);
+			$filePath = $this->getFilesService()->GetFilePath($args['group'], $fileName);
 			if (file_exists($filePath))
 			{
 				unlink($filePath);

controllers/GenericEntityApiController.php

@@ -4,16 +4,16 @@ namespace Grocy\Controllers;
 
 class GenericEntityApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	public function GetObjects(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetObjects(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($this->IsValidEntity($args['entity']) && !$this->IsEntityWithPreventedListing($args['entity']))
 		{
-			return $this->ApiResponse($this->getDatabase()->{$args['entity']}());
+			return $this->ApiResponse($response, $this->getDatabase()->{$args['entity']}());
 		}
 		else
 		{
@@ -21,11 +21,11 @@ class GenericEntityApiController extends BaseApiController
 		}
 	}
 
-	public function GetObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($this->IsValidEntity($args['entity']) && !$this->IsEntityWithPreventedListing($args['entity']))
 		{
-			return $this->ApiResponse($this->getDatabase()->{$args['entity']}($args['objectId']));
+			return $this->ApiResponse($response, $this->getDatabase()->{$args['entity']}($args['objectId']));
 		}
 		else
 		{
@@ -33,7 +33,7 @@ class GenericEntityApiController extends BaseApiController
 		}
 	}
 
-	public function AddObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function AddObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($this->IsValidEntity($args['entity']))
 		{
@@ -49,7 +49,7 @@ class GenericEntityApiController extends BaseApiController
 				$newRow = $this->getDatabase()->{$args['entity']}()->createRow($requestBody);
 				$newRow->save();
 				$success = $newRow->isClean();
-				return $this->ApiResponse(array(
+				return $this->ApiResponse($response, array(
 					'created_object_id' => $this->getDatabase()->lastInsertId()
 				));
 			}
@@ -64,7 +64,7 @@ class GenericEntityApiController extends BaseApiController
 		}
 	}
 
-	public function EditObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function EditObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($this->IsValidEntity($args['entity']))
 		{
@@ -93,7 +93,7 @@ class GenericEntityApiController extends BaseApiController
 		}
 	}
 
-	public function DeleteObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function DeleteObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($this->IsValidEntity($args['entity']))
 		{
@@ -108,13 +108,13 @@ class GenericEntityApiController extends BaseApiController
 		}
 	}
 
-	public function SearchObjects(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function SearchObjects(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($this->IsValidEntity($args['entity']) && !$this->IsEntityWithPreventedListing($args['entity']))
 		{
 			try
 			{
-				return $this->ApiResponse($this->getDatabase()->{$args['entity']}()->where('name LIKE ?', '%' . $args['searchString'] . '%'));
+				return $this->ApiResponse($response, $this->getDatabase()->{$args['entity']}()->where('name LIKE ?', '%' . $args['searchString'] . '%'));
 			}
 			catch (\PDOException $ex)
 			{
@@ -127,11 +127,11 @@ class GenericEntityApiController extends BaseApiController
 		}
 	}
 
-	public function GetUserfields(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetUserfields(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			return $this->ApiResponse($this->getUserfieldsService()->GetValues($args['entity'], $args['objectId']));
+			return $this->ApiResponse($response, $this->getUserfieldsService()->GetValues($args['entity'], $args['objectId']));
 		}
 		catch (\Exception $ex)
 		{
@@ -139,7 +139,7 @@ class GenericEntityApiController extends BaseApiController
 		}
 	}
 
-	public function SetUserfields(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function SetUserfields(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -166,6 +166,6 @@ class GenericEntityApiController extends BaseApiController
 
 	private function IsEntityWithPreventedListing($entity)
 	{
-		return in_array($entity, $this->getOpenApiSpec()->components->internalSchemas->ExposedEntitiesPreventListing->enum);
+		return !in_array($entity, $this->getOpenApiSpec()->components->internalSchemas->ExposedEntityButNoListing->enum);
 	}
 }

controllers/GenericEntityController.php

@@ -4,12 +4,12 @@ namespace Grocy\Controllers;
 
 class GenericEntityController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	public function UserfieldsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UserfieldsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'userfields', [
 			'userfields' => $this->getUserfieldsService()->GetAllFields(),
@@ -17,14 +17,14 @@ class GenericEntityController extends BaseController
 		]);
 	}
 
-	public function UserentitiesList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UserentitiesList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'userentities', [
 			'userentities' => $this->getDatabase()->userentities()->orderBy('name')
 		]);
 	}
 
-	public function UserobjectsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UserobjectsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$userentity = $this->getDatabase()->userentities()->where('name = :1', $args['userentityName'])->fetch();
 
@@ -36,7 +36,7 @@ class GenericEntityController extends BaseController
 		]);
 	}
 
-	public function UserfieldEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UserfieldEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['userfieldId'] == 'new')
 		{
@@ -57,7 +57,7 @@ class GenericEntityController extends BaseController
 		}
 	}
 
-	public function UserentityEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UserentityEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['userentityId'] == 'new')
 		{
@@ -74,7 +74,7 @@ class GenericEntityController extends BaseController
 		}
 	}
 
-	public function UserobjectEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UserobjectEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$userentity = $this->getDatabase()->userentities()->where('name = :1', $args['userentityName'])->fetch();
 

controllers/LoginController.php

@@ -8,25 +8,14 @@ use \Grocy\Services\DemoDataGeneratorService;
 
 class LoginController extends BaseController
 {
-	public function __construct(\Slim\Container $container, string $sessionCookieName)
+	public function __construct(\DI\Container $container, string $sessionCookieName)
 	{
 		parent::__construct($container);
 		$this->SessionCookieName = $sessionCookieName;
 	}
-
-	protected $SessionService = null;
 	protected $SessionCookieName;
 
-    private function getSessionService()
-	{
-		if($this->SessionsService == null)
-		{
-			$this->SessionService = SessionService::getInstance();
-		}
-		return $this->SessionService;
-	}
-
-	public function ProcessLogin(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProcessLogin(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$postParams = $request->getParsedBody();
 		if (isset($postParams['username']) && isset($postParams['password']))
@@ -47,28 +36,28 @@ class LoginController extends BaseController
 					));
 				}
 
-				return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/'));
+				return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl('/'));
 			}
 			else
 			{
-				return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/login?invalid=true'));
+				return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl('/login?invalid=true'));
 			}
 		}
 		else
 		{
-			return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/login?invalid=true'));
+			return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl('/login?invalid=true'));
 		}
 	}
 
-	public function LoginPage(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function LoginPage(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'login');
 	}
 
-	public function Logout(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Logout(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$this->getSessionService()->RemoveSession($_COOKIE[$this->SessionCookieName]);
-		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/'));
+		return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl('/'));
 	}
 
 	public function GetSessionCookieName()

controllers/OpenApiController.php

@@ -7,40 +7,29 @@ use \Grocy\Services\ApiKeyService;
 
 class OpenApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	protected $ApiKeyService = null;
-
-	protected function getApiKeyService()
-	{
-		if($this->ApiKeyService == null)
-		{
-			$this->ApiKeyService = ApiKeyService::getInstance();
-		}
-		return $this->ApiKeyService;
-	}
-
-	public function DocumentationUi(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function DocumentationUi(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->render($response, 'openapiui');
 	}
 
-	public function DocumentationSpec(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function DocumentationSpec(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$applicationService = $this->getApplicationService;
 
 		$versionInfo = $applicationService->GetInstalledVersion();
 		$this->getOpenApiSpec()->info->version = $versionInfo->Version;
-		$this->getOpenApiSpec()->info->description = str_replace('PlaceHolderManageApiKeysUrl', $this->AppContainer->UrlManager->ConstructUrl('/manageapikeys'), $this->getOpenApiSpec()->info->description);
-		$this->getOpenApiSpec()->servers[0]->url = $this->AppContainer->UrlManager->ConstructUrl('/api');
+		$this->getOpenApiSpec()->info->description = str_replace('PlaceHolderManageApiKeysUrl', $this->AppContainer->get('UrlManager')->ConstructUrl('/manageapikeys'), $this->getOpenApiSpec()->info->description);
+		$this->getOpenApiSpec()->servers[0]->url = $this->AppContainer->get('UrlManager')->ConstructUrl('/api');
 
-		return $this->ApiResponse($this->getOpenApiSpec());
+		return $this->ApiResponse($response, $this->getOpenApiSpec());
 	}
 
-	public function ApiKeysList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ApiKeysList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'manageapikeys', [
 			'apiKeys' => $this->getDatabase()->api_keys(),
@@ -48,10 +37,10 @@ class OpenApiController extends BaseApiController
 		]);
 	}
 
-	public function CreateNewApiKey(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function CreateNewApiKey(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$newApiKey = $this->getApiKeyService()->CreateApiKey();
 		$newApiKeyId = $this->getApiKeyService()->GetApiKeyId($newApiKey);
-		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl("/manageapikeys?CreatedApiKeyId=$newApiKeyId"));
+		return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl("/manageapikeys?CreatedApiKeyId=$newApiKeyId"));
 	}
 }

controllers/RecipesApiController.php

@@ -6,23 +6,12 @@ use \Grocy\Services\RecipesService;
 
 class RecipesApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	protected $RecipesService = null;
-
-	protected function getRecipesService()
-	{
-		if($this->RecipesService == null)
-		{
-			$this->RecipesService = RecipesService::getInstance();
-		}
-		return $this->RecipesService;
-	}
-
-	public function AddNotFulfilledProductsToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function AddNotFulfilledProductsToShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 		$excludedProductIds = null;
@@ -36,7 +25,7 @@ class RecipesApiController extends BaseApiController
 		return $this->EmptyApiResponse($response);
 	}
 
-	public function ConsumeRecipe(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ConsumeRecipe(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -49,13 +38,13 @@ class RecipesApiController extends BaseApiController
 		}
 	}
 
-	public function GetRecipeFulfillment(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetRecipeFulfillment(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
 			if(!isset($args['recipeId']))
 			{
-				return $this->ApiResponse($this->getRecipesService()->GetRecipesResolved());
+				return $this->ApiResponse($response, $this->getRecipesService()->GetRecipesResolved());
 			}
 
 			$recipeResolved = FindObjectInArrayByPropertyValue($this->getRecipesService()->GetRecipesResolved(), 'recipe_id', $args['recipeId']);
@@ -65,7 +54,7 @@ class RecipesApiController extends BaseApiController
 			}
 			else
 			{
-				return $this->ApiResponse($recipeResolved);
+				return $this->ApiResponse($response, $recipeResolved);
 			}
 		}
 		catch (\Exception $ex)

controllers/RecipesController.php

@@ -3,36 +3,19 @@
 namespace Grocy\Controllers;
 
 use \Grocy\Services\RecipesService;
+use \Grocy\Services\StockService;
 use \Grocy\Services\UserfieldsService;
 
 class RecipesController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	protected $RecipesService = null;
-
-	protected function getRecipesService()
+	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		if($this->RecipesService == null)
-		{
-			$this->RecipesService = RecipesService::getInstance();
-		}
-		return $this->RecipesService;
-	}
-
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		if (isset($request->getQueryParams()['include-internal']))
-		{
-			$recipes = $this->getDatabase()->recipes()->orderBy('name');
-		}
-		else
-		{
-			$recipes = $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name');
-		}
+		$recipes = $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name');
 		$recipesResolved = $this->getRecipesService()->GetRecipesResolved();
 
 		$selectedRecipe = null;
@@ -40,20 +23,20 @@ class RecipesController extends BaseController
 		if (isset($request->getQueryParams()['recipe']))
 		{
 			$selectedRecipe = $this->getDatabase()->recipes($request->getQueryParams()['recipe']);
-			$selectedRecipePositionsResolved = $this->getDatabase()->recipes_pos_resolved()->where('recipe_id', $request->getQueryParams()['recipe'])->orderBy('ingredient_group');
+			$selectedRecipePositionsResolved = $this->getDatabase()->recipes_pos_resolved()->where('recipe_id = :1 AND is_nested_recipe_pos = 0', $request->getQueryParams()['recipe'])->orderBy('ingredient_group', 'ASC', 'product_group', 'ASC');
 		}
 		else
 		{
 			foreach ($recipes as $recipe)
 			{
 				$selectedRecipe = $recipe;
-				$selectedRecipePositionsResolved = $this->getDatabase()->recipes_pos_resolved()->where('recipe_id', $recipe->id)->orderBy('ingredient_group');
+				$selectedRecipePositionsResolved = $this->getDatabase()->recipes_pos_resolved()->where('recipe_id = :1 AND is_nested_recipe_pos = 0', $recipe->id)->orderBy('ingredient_group', 'ASC', 'product_group', 'ASC');
 				break;
 			}
 		}
 
 		$selectedRecipeSubRecipes = $this->getDatabase()->recipes()->where('id IN (SELECT includes_recipe_id FROM recipes_nestings_resolved WHERE recipe_id = :1 AND includes_recipe_id != :1)', $selectedRecipe->id)->orderBy('name')->fetchAll();
-		$selectedRecipeSubRecipesPositions = $this->getDatabase()->recipes_pos_resolved()->where('recipe_id = :1', $selectedRecipe->id)->orderBy('ingredient_group')->fetchAll();
+		$selectedRecipeSubRecipesPositions = $this->getDatabase()->recipes_pos_resolved()->where('recipe_id = :1', $selectedRecipe->id)->orderBy('ingredient_group', 'ASC', 'product_group', 'ASC')->fetchAll();
 
 		$includedRecipeIdsAbsolute = array();
 		$includedRecipeIdsAbsolute[] = $selectedRecipe->id;
@@ -65,7 +48,7 @@ class RecipesController extends BaseController
 		return $this->renderPage($response, 'recipes', [
 			'recipes' => $recipes,
 			'recipesResolved' => $recipesResolved,
-			'recipePositionsResolved' => $this->getDatabase()->recipes_pos_resolved(),
+			'recipePositionsResolved' => $this->getDatabase()->recipes_pos_resolved()->where('recipe_type', RecipesService::RECIPE_TYPE_NORMAL),
 			'selectedRecipe' => $selectedRecipe,
 			'selectedRecipePositionsResolved' => $selectedRecipePositionsResolved,
 			'products' => $this->getDatabase()->products(),
@@ -81,7 +64,7 @@ class RecipesController extends BaseController
 		]);
 	}
 
-	public function RecipeEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function RecipeEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$recipeId = $args['recipeId'];
 		if ($recipeId  == 'new')
@@ -98,7 +81,7 @@ class RecipesController extends BaseController
 			'recipe' =>  $this->getDatabase()->recipes($recipeId),
 			'recipePositions' =>  $this->getDatabase()->recipes_pos()->where('recipe_id', $recipeId),
 			'mode' => 'edit',
-			'products' => $this->getDatabase()->products(),
+			'products' => $this->getDatabase()->products()->orderBy('name'),,
 			'quantityunits' => $this->getDatabase()->quantity_units(),
 			'recipePositionsResolved' => $this->getRecipesService()->GetRecipesPosResolved(),
 			'recipesResolved' => $this->getRecipesService()->GetRecipesResolved(),
@@ -109,7 +92,7 @@ class RecipesController extends BaseController
 		]);
 	}
 
-	public function RecipePosEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function RecipePosEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['recipePosId'] == 'new')
 		{
@@ -135,10 +118,15 @@ class RecipesController extends BaseController
 		}
 	}
 
-	public function MealPlan(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function RecipesSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($response, 'recipessettings');
+	}
+
+	public function MealPlan(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$recipes = $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->fetchAll();
-
+		
 		$events = array();
 		foreach($this->getDatabase()->meal_plan() as $mealPlanEntry)
 		{
@@ -149,13 +137,21 @@ class RecipesController extends BaseController
 				$title = $recipe->name;
 			}
 
+			$productDetails = null;
+			if ($mealPlanEntry['product_id'] !== null)
+			{
+				$productDetails = $this->getStockService()->GetProductDetails($mealPlanEntry['product_id']);
+			}
+
 			$events[] = array(
 				'id' => $mealPlanEntry['id'],
 				'title' => $title,
 				'start' => $mealPlanEntry['day'],
 				'date_format' => 'date',
 				'recipe' => json_encode($recipe),
-				'mealPlanEntry' => json_encode($mealPlanEntry)
+				'mealPlanEntry' => json_encode($mealPlanEntry),
+				'type' => $mealPlanEntry['type'],
+				'productDetails' => json_encode($productDetails)
 			);
 		}
 
@@ -163,7 +159,10 @@ class RecipesController extends BaseController
 			'fullcalendarEventSources' => $events,
 			'recipes' => $recipes,
 			'internalRecipes' => $this->getDatabase()->recipes()->whereNot('type', RecipesService::RECIPE_TYPE_NORMAL)->fetchAll(),
-			'recipesResolved' => $this->getRecipesService()->GetRecipesResolved()
+			'recipesResolved' => $this->getRecipesService()->GetRecipesResolved(),
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+			'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved()
 		]);
 	}
 }

controllers/StockApiController.php

@@ -6,27 +6,16 @@ use \Grocy\Services\StockService;
 
 class StockApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	protected $StockService = null;
-
-	protected function getStockService()
-	{
-		if($this->StockService == null)
-		{
-			$this->StockService = StockService::getInstance();
-		}
-		return $this->StockService;
-	}
-
-	public function ProductDetails(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProductDetails(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			return $this->ApiResponse($this->getStockService()->GetProductDetails($args['productId']));
+			return $this->ApiResponse($response, $this->getStockService()->GetProductDetails($args['productId']));
 		}
 		catch (\Exception $ex)
 		{
@@ -34,12 +23,12 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function ProductDetailsByBarcode(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProductDetailsByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
 			$productId = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
-			return $this->ApiResponse($this->getStockService()->GetProductDetails($productId));
+			return $this->ApiResponse($response, $this->getStockService()->GetProductDetails($productId));
 		}
 		catch (\Exception $ex)
 		{
@@ -47,11 +36,11 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function ProductPriceHistory(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProductPriceHistory(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			return $this->ApiResponse($this->getStockService()->GetProductPriceHistory($args['productId']));
+			return $this->ApiResponse($response, $this->getStockService()->GetProductPriceHistory($args['productId']));
 		}
 		catch (\Exception $ex)
 		{
@@ -59,7 +48,7 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function AddProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function AddProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -100,7 +89,7 @@ class StockApiController extends BaseApiController
 			}
 
 			$bookingId = $this->getStockService()->AddProduct($args['productId'], $requestBody['amount'], $bestBeforeDate, $transactionType, date('Y-m-d'), $price, $locationId);
-			return $this->ApiResponse($this->getDatabase()->stock_log($bookingId));
+			return $this->ApiResponse($response $this->getDatabase()->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
 		{
@@ -108,7 +97,7 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function AddProductByBarcode(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function AddProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -121,7 +110,7 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function EditStock(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function EditStockEntry(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -132,11 +121,6 @@ class StockApiController extends BaseApiController
 				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
 			}
 
-			if (!array_key_exists('stock_row_id', $requestBody))
-			{
-				throw new \Exception('A stock row id is required');
-			}
-
 			if (!array_key_exists('amount', $requestBody))
 			{
 				throw new \Exception('An amount is required');
@@ -160,8 +144,8 @@ class StockApiController extends BaseApiController
 				$locationId = $requestBody['location_id'];
 			}
 
-			$bookingId = $this->StockService->EditStock($requestBody['stock_row_id'], $requestBody['amount'], $bestBeforeDate, $locationId, $price);
-			return $this->ApiResponse($this->Database->stock_log($bookingId));
+			$bookingId = $this->getStockService()->EditStockEntry($args['entryId'], $requestBody['amount'], $bestBeforeDate, $locationId, $price, $requestBody['open'], $requestBody['purchased_date']);
+			return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
 		{
@@ -169,7 +153,7 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function TransferProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TransferProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -201,8 +185,8 @@ class StockApiController extends BaseApiController
 				$specificStockEntryId = $requestBody['stock_entry_id'];
 			}
 
-			$bookingId = $this->StockService->TransferProduct($args['productId'], $requestBody['amount'], $requestBody['location_id_from'], $requestBody['location_id_to'], $specificStockEntryId);
-			return $this->ApiResponse($this->Database->stock_log($bookingId));
+			$bookingId = $this->getStockService()->TransferProduct($args['productId'], $requestBody['amount'], $requestBody['location_id_from'], $requestBody['location_id_to'], $specificStockEntryId);
+			return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
 		{
@@ -210,11 +194,11 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function TransferProductByBarcode(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TransferProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			$args['productId'] = $this->StockService->GetProductIdFromBarcode($args['barcode']);
+			$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
 			return $this->TransferProduct($request, $response, $args);
 		}
 		catch (\Exception $ex)
@@ -223,7 +207,7 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function ConsumeProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ConsumeProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -272,7 +256,7 @@ class StockApiController extends BaseApiController
 			}
 
 			$bookingId = $this->getStockService()->ConsumeProduct($args['productId'], $requestBody['amount'], $spoiled, $transactionType, $specificStockEntryId, $recipeId, $locationId);
-			return $this->ApiResponse($this->getDatabase()->stock_log($bookingId));
+			return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
 		{
@@ -281,7 +265,7 @@ class StockApiController extends BaseApiController
 		return $result;
 	}
 
-	public function ConsumeProductByBarcode(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ConsumeProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -294,7 +278,7 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function InventoryProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function InventoryProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -329,7 +313,7 @@ class StockApiController extends BaseApiController
 			}
 
 			$bookingId = $this->getStockService()->InventoryProduct($args['productId'], $requestBody['new_amount'], $bestBeforeDate, $locationId, $price);
-			return $this->ApiResponse($this->getDatabase()->stock_log($bookingId));
+			return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
 		{
@@ -337,7 +321,7 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function InventoryProductByBarcode(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function InventoryProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -350,7 +334,7 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function OpenProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function OpenProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -373,7 +357,7 @@ class StockApiController extends BaseApiController
 			}
 
 			$bookingId = $this->getStockService()->OpenProduct($args['productId'], $requestBody['amount'], $specificStockEntryId);
-			return $this->ApiResponse($this->getDatabase()->stock_log($bookingId));
+			return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
 		{
@@ -381,7 +365,7 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function OpenProductByBarcode(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function OpenProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -394,12 +378,12 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function CurrentStock(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function CurrentStock(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->ApiResponse($this->getStockService()->GetCurrentStock());
+		return $this->ApiResponse($response, $this->getStockService()->GetCurrentStock());
 	}
 
-	public function CurrentVolatilStock(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function CurrentVolatileStock(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$nextXDays = 5;
 		if (isset($request->getQueryParams()['expiring_days']) && !empty($request->getQueryParams()['expiring_days']) && is_numeric($request->getQueryParams()['expiring_days']))
@@ -410,14 +394,14 @@ class StockApiController extends BaseApiController
 		$expiringProducts = $this->getStockService()->GetExpiringProducts($nextXDays, true);
 		$expiredProducts = $this->getStockService()->GetExpiringProducts(-1);
 		$missingProducts = $this->getStockService()->GetMissingProducts();
-		return $this->ApiResponse(array(
+		return $this->ApiResponse($response, array(
 			 'expiring_products' => $expiringProducts,
 			 'expired_products' => $expiredProducts,
 			 'missing_products' => $missingProducts
 		));
 	}
 
-	public function AddMissingProductsToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function AddMissingProductsToShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -438,7 +422,7 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function ClearShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ClearShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -460,7 +444,7 @@ class StockApiController extends BaseApiController
 	}
 
 
-	public function AddProductToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function AddProductToShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -501,7 +485,7 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function RemoveProductFromShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function RemoveProductFromShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -537,7 +521,7 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function ExternalBarcodeLookup(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ExternalBarcodeLookup(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -547,7 +531,7 @@ class StockApiController extends BaseApiController
 				$addFoundProduct = true;
 			}
 			
-			return $this->ApiResponse($this->getStockService()->ExternalBarcodeLookup($args['barcode'], $addFoundProduct));
+			return $this->ApiResponse($response, $this->getStockService()->ExternalBarcodeLookup($args['barcode'], $addFoundProduct));
 		}
 		catch (\Exception $ex)
 		{
@@ -555,11 +539,11 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function UndoBooking(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UndoBooking(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			$this->ApiResponse($this->StockService->UndoBooking($args['bookingId']));
+			$this->ApiResponse($response, $this->StockService->UndoBooking($args['bookingId']));
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
@@ -568,11 +552,11 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function UndoTransaction(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UndoTransaction(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			$this->ApiResponse($this->StockService->UndoTransaction($args['transactionId']));
+			$this->ApiResponse($response, $this->StockService->UndoTransaction($args['transactionId']));
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
@@ -581,17 +565,28 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function ProductStockEntries(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProductStockEntries(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->ApiResponse($this->getStockService()->GetProductStockEntries($args['productId']));
+		$allowSubproductSubstitution = false;
+		if (isset($request->getQueryParams()['include_sub_products']) && filter_var($request->getQueryParams()['include_sub_products'], FILTER_VALIDATE_BOOLEAN))
+		{
+			$allowSubproductSubstitution = true;
+		}
+
+		return $this->ApiResponse($response, $this->StockService->GetProductStockEntries($args['productId'], false, $allowSubproductSubstitution));
 	}
 
-	public function ProductStockLocations(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProductStockLocations(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->ApiResponse($this->StockService->GetProductStockLocations($args['productId']));
+		return $this->ApiResponse($response, $this->getStockService()->GetProductStockEntries($args['productId']));
 	}
 
-	public function StockBooking(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function StockEntry(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->ApiResponse($response, $this->StockService->GetStockEntry($args['entryId']));
+	}
+
+	public function StockBooking(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -602,7 +597,7 @@ class StockApiController extends BaseApiController
 				throw new \Exception('Stock booking does not exist');
 			}
 			
-			return $this->ApiResponse($stockLogRow);
+			return $this->ApiResponse($response, $stockLogRow);
 		}
 		catch (\Exception $ex)
 		{
@@ -610,18 +605,18 @@ class StockApiController extends BaseApiController
 		}
 	}
 
-	public function StockTransactions(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function StockTransactions(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			$transactionRows = $this->Database->stock_log()->where('transaction_id = :1', $args['transactionId'])->fetchAll();
+			$transactionRows = $this->getDatabase()->stock_log()->where('transaction_id = :1', $args['transactionId'])->fetchAll();
 
 			if (count($transactionRows) === 0)
 			{
 				throw new \Exception('No transaction was found by the given transaction id');
 			}
 			
-			return $this->ApiResponse($transactionRows);
+			return $this->ApiResponse($response, $transactionRows);
 		}
 		catch (\Exception $ex)
 		{

controllers/StockController.php

@@ -8,23 +8,17 @@ use \Grocy\Services\UserfieldsService;
 class StockController extends BaseController
 {
 
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	protected $StockService = null;
-
     protected function getStockService()
 	{
-		if($this->StockService == null)
-		{
-			$this->StockService = StockService::getInstance();
-		}
-		return $this->StockService;
+		return StockService::getInstance();
 	}
 
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$usersService = $this->getUsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expring_soon_days'];
@@ -43,26 +37,24 @@ class StockController extends BaseController
 		]);
 	}
 
-	public function Detail(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Stockentries(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$usersService = new UsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expring_soon_days'];
 
-		return $this->AppContainer->view->render($response, 'stockdetail', [
-			'products' => $this->Database->products()->orderBy('name'),
-			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
-			'locations' => $this->Database->locations()->orderBy('name'),
-			'currentStockDetail' => $this->Database->stock()->orderBy('product_id'),
-			'currentStockLocations' => $this->StockService->GetCurrentStockLocations(),
-			'missingProducts' => $this->StockService->GetMissingProducts(),
+		return $this->AppContainer->view($response, 'stockentries', [
+			'products' => $this->getDatabase(()->products()->orderBy('name'),
+			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name'),
+			'stockEntries' => $this->getDatabase()->stock()->orderBy('product_id'),
+			'currentStockLocations' => $this->getStockService()->GetCurrentStockLocations(),
 			'nextXDays' => $nextXDays,
-			'productGroups' => $this->Database->product_groups()->orderBy('name'),
-			'userfields' => $this->UserfieldsService->GetFields('products'),
-			'userfieldValues' => $this->UserfieldsService->GetAllValues('products')
+			'userfields' => $this->getUserfieldsService()->GetFields('products'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('products')
 		]);
 	}
 
-	public function Purchase(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Purchase(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'purchase', [
 			'products' => $this->getDatabase()->products()->orderBy('name'),
@@ -70,7 +62,7 @@ class StockController extends BaseController
 		]);
 	}
 
-	public function Consume(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Consume(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'consume', [
 			'products' => $this->getDatabase()->products()->orderBy('name'),
@@ -79,7 +71,7 @@ class StockController extends BaseController
 		]);
 	}
 
-	public function Transfer(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Transfer(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'transfer', [
 			'products' => $this->getDatabase()->products()->orderBy('name'),
@@ -88,7 +80,7 @@ class StockController extends BaseController
 		]);
 	}
 
-	public function Inventory(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Inventory(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'inventory', [
 			'products' => $this->getDatabase()->products()->orderBy('name'),
@@ -96,15 +88,16 @@ class StockController extends BaseController
 		]);
 	}
 
-	public function StockEdit(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function StockEntryEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'stockedit', [
-			'products' => $this->Database->products()->orderBy('name'),
-			'locations' => $this->Database->locations()->orderBy('name')
+		return $this->AppContainer->view->render($response, 'stockentryform', [
+			'stockEntry' => $this->getDatabase()->stock()->where('id', $args['entryId'])->fetch(),
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name')
 		]);
 	}
 
-	public function ShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$listId = 1;
 		if (isset($request->getQueryParams()['list']))
@@ -125,7 +118,7 @@ class StockController extends BaseController
 		]);
 	}
 
-	public function ProductsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProductsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'products', [
 			'products' => $this->getDatabase()->products()->orderBy('name'),
@@ -137,7 +130,7 @@ class StockController extends BaseController
 		]);
 	}
 
-	public function StockSettings(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function StockSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'stocksettings', [
 			'locations' => $this->getDatabase()->locations()->orderBy('name'),
@@ -146,7 +139,7 @@ class StockController extends BaseController
 		]);
 	}
 
-	public function LocationsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function LocationsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'locations', [
 			'locations' => $this->getDatabase()->locations()->orderBy('name'),
@@ -155,7 +148,7 @@ class StockController extends BaseController
 		]);
 	}
 
-	public function ProductGroupsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProductGroupsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'productgroups', [
 			'productGroups' => $this->getDatabase()->product_groups()->orderBy('name'),
@@ -165,7 +158,7 @@ class StockController extends BaseController
 		]);
 	}
 
-	public function QuantityUnitsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function QuantityUnitsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'quantityunits', [
 			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
@@ -174,7 +167,7 @@ class StockController extends BaseController
 		]);
 	}
 
-	public function ProductEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProductEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['productId'] == 'new')
 		{
@@ -206,7 +199,7 @@ class StockController extends BaseController
 		}
 	}
 
-	public function LocationEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function LocationEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['locationId'] == 'new')
 		{
@@ -225,7 +218,7 @@ class StockController extends BaseController
 		}
 	}
 
-	public function ProductGroupEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ProductGroupEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['productGroupId'] == 'new')
 		{
@@ -244,7 +237,7 @@ class StockController extends BaseController
 		}
 	}
 
-	public function QuantityUnitEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function QuantityUnitEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['quantityunitId'] == 'new')
 		{
@@ -271,7 +264,7 @@ class StockController extends BaseController
 		}
 	}
 
-	public function ShoppingListItemEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ShoppingListItemEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['itemId'] == 'new')
 		{
@@ -292,7 +285,7 @@ class StockController extends BaseController
 		}
 	}
 
-	public function ShoppingListEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ShoppingListEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['listId'] == 'new')
 		{
@@ -309,7 +302,12 @@ class StockController extends BaseController
 		}
 	}
 
-	public function Journal(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ShoppingListSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->View->render($response, 'shoppinglistsettings');
+	}
+
+	public function Journal(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'stockjournal', [
 			'stockLog' => $this->getDatabase()->stock_log()->orderBy('row_created_timestamp', 'DESC'),
@@ -319,7 +317,7 @@ class StockController extends BaseController
 		]);
 	}
 
-	public function LocationContentSheet(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function LocationContentSheet(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'locationcontentsheet', [
 			'products' => $this->getDatabase()->products()->orderBy('name'),
@@ -329,7 +327,7 @@ class StockController extends BaseController
 		]);
 	}
 
-	public function QuantityUnitConversionEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function QuantityUnitConversionEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$product = null;
 		if (isset($request->getQueryParams()['product']))
@@ -366,7 +364,7 @@ class StockController extends BaseController
 		}
 	}
 
-	public function QuantityUnitPluralFormTesting(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function QuantityUnitPluralFormTesting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'quantityunitpluraltesting', [
 			'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name')

controllers/SystemApiController.php

@@ -4,20 +4,19 @@ namespace Grocy\Controllers;
 
 class SystemApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	public function GetDbChangedTime(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetDbChangedTime(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-        $response = $this->ApiResponse(array(
+        return $this->ApiResponse($response, array(
             'changed_time' => $this->getDatabaseService()->GetDbChangedTime()
         ));
-        return $response;
 	}
 
-	public function LogMissingLocalization(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function LogMissingLocalization(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if (GROCY_MODE === 'dev')
 		{
@@ -35,8 +34,8 @@ class SystemApiController extends BaseApiController
 		}
 	}
 
-	public function GetSystemInfo(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetSystemInfo(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->ApiResponse($this->getApplicationService()->GetSystemInfo());
+		return $this->ApiResponse($response, $this->getApplicationService()->GetSystemInfo());
 	}
 }

controllers/SystemController.php

@@ -8,24 +8,24 @@ use \Grocy\Services\DemoDataGeneratorService;
 class SystemController extends BaseController
 {
 
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	public function Root(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Root(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		// Schema migration is done here
 		$databaseMigrationService = DatabaseMigrationService::getInstance();
 		$databaseMigrationService->MigrateDatabase();
 
-		if (GROCY_IS_DEMO_INSTALL)
+		if (GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease')
 		{
 			$demoDataGeneratorService = DemoDataGeneratorService::getInstance();
 			$demoDataGeneratorService->PopulateDemoData();
 		}
 
-		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl($this->GetEntryPageRelative()));
+		return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl($this->GetEntryPageRelative()));
 	}
 
 	/**
@@ -91,7 +91,7 @@ class SystemController extends BaseController
 		return '/about';
 	}
 
-	public function About(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function About(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'about', [
 			'system_info' => $this->getApplicationService()->GetSystemInfo(),
@@ -99,7 +99,7 @@ class SystemController extends BaseController
 		]);
 	}
 
-	public function BarcodeScannerTesting(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function BarcodeScannerTesting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'barcodescannertesting');
 	}

controllers/TasksApiController.php

@@ -6,28 +6,17 @@ use \Grocy\Services\TasksService;
 
 class TasksApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	protected $TasksService = null;
-
-    protected function getTasksService()
+	public function Current(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		if($this->TasksService == null)
-		{
-			$this->TasksService = TasksService::getInstance();
-		}
-		return $this->TasksService;
+		return $this->ApiResponse($response, $this->getTasksService()->GetCurrent());
 	}
 
-	public function Current(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		return $this->ApiResponse($this->getTasksService()->GetCurrent());
-	}
-
-	public function MarkTaskAsCompleted(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function MarkTaskAsCompleted(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -48,7 +37,7 @@ class TasksApiController extends BaseApiController
 		}
 	}
 
-	public function UndoTask(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UndoTask(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{

controllers/TasksController.php

@@ -6,23 +6,12 @@ use \Grocy\Services\TasksService;
 
 class TasksController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	protected $TasksService = null;
-
-    protected function getTasksService()
-	{
-		if($this->TasksService == null)
-		{
-			$this->TasksService = TasksService::getInstance();
-		}
-		return $this->TasksService;
-	}
-
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if (isset($request->getQueryParams()['include_done']))
 		{
@@ -46,7 +35,7 @@ class TasksController extends BaseController
 		]);
 	}
 
-	public function TaskEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TaskEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['taskId'] == 'new')
 		{
@@ -69,7 +58,7 @@ class TasksController extends BaseController
 		}
 	}
 
-	public function TaskCategoriesList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TaskCategoriesList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'taskcategories', [
 			'taskCategories' => $this->getDatabase()->task_categories()->orderBy('name'),
@@ -78,7 +67,7 @@ class TasksController extends BaseController
 		]);
 	}
 
-	public function TaskCategoryEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TaskCategoryEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['categoryId'] == 'new')
 		{
@@ -97,7 +86,7 @@ class TasksController extends BaseController
 		}
 	}
 
-	public function TasksSettings(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TasksSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'taskssettings');
 	}

controllers/UsersApiController.php

@@ -6,27 +6,16 @@ use \Grocy\Services\UsersService;
 
 class UsersApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
 
-	protected $UsersService = null;
-
-    protected function getUsersService()
-	{
-		if($this->UsersService == null)
-		{
-			$this->UsersService = UsersService::getInstance();
-		}
-		return $this->UsersService;
-	}
-
-	public function GetUsers(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetUsers(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
-			return $this->ApiResponse($this->getUsersService()->GetUsersAsDto());
+			return $this->ApiResponse($response, $this->getUsersService()->GetUsersAsDto());
 		}
 		catch (\Exception $ex)
 		{
@@ -34,7 +23,7 @@ class UsersApiController extends BaseApiController
 		}
 	}
 
-	public function CreateUser(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function CreateUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -54,7 +43,7 @@ class UsersApiController extends BaseApiController
 		}
 	}
 
-	public function DeleteUser(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function DeleteUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -67,7 +56,7 @@ class UsersApiController extends BaseApiController
 		}
 	}
 
-	public function EditUser(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function EditUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
 
@@ -82,12 +71,12 @@ class UsersApiController extends BaseApiController
 		}
 	}
 
-	public function GetUserSetting(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function GetUserSetting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
 			$value = $this->getUsersService()->GetUserSetting(GROCY_USER_ID, $args['settingKey']);
-			return $this->ApiResponse(array('value' => $value));
+			return $this->ApiResponse($response, array('value' => $value));
 		}
 		catch (\Exception $ex)
 		{
@@ -95,7 +84,7 @@ class UsersApiController extends BaseApiController
 		}
 	}
 
-	public function SetUserSetting(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function SetUserSetting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{

controllers/UsersController.php

@@ -4,14 +4,14 @@ namespace Grocy\Controllers;
 
 class UsersController extends BaseController
 {
-	public function UsersList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UsersList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'users', [
 			'users' => $this->getDatabase()->users()->orderBy('username')
 		]);
 	}
 
-	public function UserEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function UserEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['userId'] == 'new')
 		{

data_store/config.php

@@ -0,0 +1,132 @@
+<?php
+
+# Settings can also be overwritten in two ways
+#
+# First priority
+# A .txt file with the same name as the setting in /data/settingoverrides
+# the content of the file is used as the setting value
+#
+# Second priority
+# An environment variable with the same name as the setting and prefix "GROCY_"
+# so for example "GROCY_BASE_URL"
+#
+# Third priority
+# The settings defined here below
+
+
+# Either "production", "dev", "demo" or "prerelease"
+# ("demo" and "prerelease" is reserved to be used only on the offical demo instances)
+Setting('MODE', 'production');
+
+# Either "en" or "de" or the directory name of
+# one of the other available localization folders in the "/localization" directory
+Setting('CULTURE', 'en');
+
+# This is used to define the first day of a week for calendar views in the frontend,
+# leave empty to use the locale default
+# Needs to be a number where Sunday = 0, Monday = 1 and so forth
+Setting('CALENDAR_FIRST_DAY_OF_WEEK', '');
+
+# If calendars should show week numbers
+Setting('CALENDAR_SHOW_WEEK_OF_YEAR', true);
+
+# To keep it simple: grocy does not handle any currency conversions,
+# this here is used to format all money values,
+# so doesn't matter really matter, but should be the
+# ISO 4217 code of the currency ("USD", "EUR", "GBP", etc.)
+Setting('CURRENCY', 'USD');
+
+# The base url of your installation,
+# should be just "/" when running directly under the root of a (sub)domain
+# or for example "https://example.com/grocy" when using a subdirectory
+Setting('BASE_URL', '/');
+
+# The plugin to use for external barcode lookups,
+# must be the filename without .php extension and must be located in /data/plugins,
+# see /data/plugins/DemoBarcodeLookupPlugin.php for an example implementation
+Setting('STOCK_BARCODE_LOOKUP_PLUGIN', 'DemoBarcodeLookupPlugin');
+
+# If, however, your webserver does not support URL rewriting, set this to true
+Setting('DISABLE_URL_REWRITING', false);
+
+# Specify an custom homepage if desired - by default the homepage will be set to the stock overview,
+# this needs to be one of the following values:
+# stock, shoppinglist, recipes, chores, tasks, batteries, equipment, calendar, mealplan
+Setting('ENTRY_PAGE', 'stock');
+
+# Set this to true if you want to disable authentication / the login screen,
+# places where user context is needed will then use the default (first existing) user
+Setting('DISABLE_AUTH', false);
+
+# Set this to true if you want to disable the ability to scan a barcode via the device camera (Browser API)
+Setting('DISABLE_BROWSER_BARCODE_CAMERA_SCANNING', false);
+
+
+# Default user settings
+# These settings can be changed per user, here the defaults
+# are defined which are used when the user has not changed the setting so far
+
+# Night mode related
+DefaultUserSetting('night_mode_enabled', false); // If night mode is enabled always
+DefaultUserSetting('auto_night_mode_enabled', false); // If night mode is enabled automatically when inside a given time range (see the two settings below)
+DefaultUserSetting('auto_night_mode_time_range_from', "20:00"); // Format HH:mm
+DefaultUserSetting('auto_night_mode_time_range_to', "07:00"); // Format HH:mm
+DefaultUserSetting('auto_night_mode_time_range_goes_over_midnight', true); // If the time range above goes over midnight
+DefaultUserSetting('currently_inside_night_mode_range', false); // If we're currently inside of night mode time range (this is not user configurable, but stored as a user setting because it's evaluated client side to be able to use the client time instead of the maybe different server time)
+
+# Stock settings
+DefaultUserSetting('product_presets_location_id', -1); // Default location id for new products (-1 means no location is preset)
+DefaultUserSetting('product_presets_product_group_id', -1); // Default product group id for new products (-1 means no product group is preset)
+DefaultUserSetting('product_presets_qu_id', -1); // Default quantity unit id for new products (-1 means no quantity unit is preset)
+DefaultUserSetting('stock_expring_soon_days', 5);
+DefaultUserSetting('stock_default_purchase_amount', 0);
+DefaultUserSetting('stock_default_consume_amount', 1);
+
+# Chores settings
+DefaultUserSetting('chores_due_soon_days', 5);
+
+# Batteries settings
+DefaultUserSetting('batteries_due_soon_days', 5);
+
+# Tasks settings
+DefaultUserSetting('tasks_due_soon_days', 5);
+
+# If the page should be automatically reloaded when there was
+# an external change
+DefaultUserSetting('auto_reload_on_db_change', true);
+
+# Show a clock in the header next to the logo or not
+DefaultUserSetting('show_clock_in_header', false);
+
+# Shopping list to stock workflow:
+# Automatically do the booking using the last price and the amount
+# of the shopping list item, if the product has "Default best before days" set
+DefaultUserSetting('shopping_list_to_stock_workflow_auto_submit_when_prefilled', false);
+
+
+# Feature flags
+# grocy was initially about "stock management for your household", many other things
+# came and still come by, because they are useful - here you can disable the parts
+# which you don't need to have a less cluttered UI
+# (set the setting to "false" to disable the corresponding part, which should be self explanatory)
+Setting('FEATURE_FLAG_STOCK', true);
+Setting('FEATURE_FLAG_SHOPPINGLIST', true);
+Setting('FEATURE_FLAG_RECIPES', true);
+Setting('FEATURE_FLAG_CHORES', true);
+Setting('FEATURE_FLAG_TASKS', true);
+Setting('FEATURE_FLAG_BATTERIES', true);
+Setting('FEATURE_FLAG_EQUIPMENT', true);
+Setting('FEATURE_FLAG_CALENDAR', true);
+
+
+# Sub feature flags
+Setting('FEATURE_FLAG_STOCK_PRICE_TRACKING', true);
+Setting('FEATURE_FLAG_STOCK_LOCATION_TRACKING', true);
+Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING', true);
+Setting('FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING', true);
+Setting('FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS', true);
+Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true);
+
+
+# Feature settings
+Setting('FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT', true); // When set to false, opened products will not be considered for minimum stock amounts

data_store/viewcache/19cac18e2e279ce0ab04f1126e1b8846e2af3068.php

@@ -0,0 +1,230 @@
+<?php $__env->startSection('title', $__t('Shopping list')); ?>
+<?php $__env->startSection('activeNav', 'shoppinglist'); ?>
+<?php $__env->startSection('viewJsName', 'shoppinglist'); ?>
+
+<?php $__env->startPush('pageScripts'); ?>
+	<script src="<?php echo e($U('/node_modules/jquery-ui-dist/jquery-ui.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/datatables.net-rowgroup/js/dataTables.rowGroup.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/datatables.net-rowgroup-bs4/js/rowGroup.bootstrap4.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/viewjs/purchase.js?v=', true)); ?><?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<?php $__env->startPush('pageStyles'); ?>
+	<link href="<?php echo e($U('/node_modules/datatables.net-rowgroup-bs4/css/rowGroup.bootstrap4.min.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+<?php $__env->stopPush(); ?>
+
+<?php $__env->startSection('content'); ?>
+<?php if(GROCY_FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS): ?>
+<div class="row border-bottom pb-2 mb-2 d-print-none">
+	<div class="col-xs-12 col-md-4">
+		<label for="selected-shopping-list"><?php echo e($__t('Selected shopping list')); ?></label>
+		<select class="form-control" id="selected-shopping-list">
+			<?php $__currentLoopData = $shoppingLists; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $shoppingList): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+			<option <?php if($shoppingList->id == $selectedShoppingListId): ?> selected="selected" <?php endif; ?> value="<?php echo e($shoppingList->id); ?>"><?php echo e($shoppingList->name); ?></option>
+			<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+		</select>
+	</div>
+	<div class="col-xs-12 col-md-8">
+		<label for="selected-shopping-list">&nbsp;</label><br>
+		<a class="btn btn-outline-dark responsive-button" href="<?php echo e($U('/shoppinglist/new')); ?>">
+			<i class="fas fa-plus"></i> <?php echo e($__t('New shopping list')); ?>
+
+		</a>
+		<a id="delete-selected-shopping-list" class="btn btn-outline-danger responsive-button <?php if($selectedShoppingListId == 1): ?> disabled <?php endif; ?>" href="#">
+			<i class="fas fa-trash"></i> <?php echo e($__t('Delete shopping list')); ?>
+
+		</a>
+		<a id="print-shopping-list-button" class="btn btn-outline-dark responsive-button" href="#">
+			<i class="fas fa-print"></i> <?php echo e($__t('Print')); ?>
+
+		</a>
+		<!--<div class="dropdown d-inline-block">
+			<button class="btn btn-outline-dark responsive-button dropdown-toggle" data-toggle="dropdown"><i class="fas fa-file-export"></i> <?php echo e($__t('Output')); ?></button>
+			<div class="dropdown-menu">
+				<a id="print-shopping-list-button" class="dropdown-item" href="#"><i class="fas fa-print"></i> <?php echo e($__t('Print')); ?></a>
+			</div>
+		</div>-->
+	</div>
+</div>
+<?php endif; ?>
+
+<div class="row d-print-none">
+	<div class="col">
+		<h1>
+			<?php echo $__env->yieldContent('title'); ?>
+			<a class="btn btn-outline-dark responsive-button" href="<?php echo e($U('/shoppinglistitem/new?list=' . $selectedShoppingListId)); ?>">
+				<i class="fas fa-plus"></i> <?php echo e($__t('Add item')); ?>
+
+			</a>
+			<a id="clear-shopping-list" class="btn btn-outline-danger responsive-button <?php if($listItems->count() == 0): ?> disabled <?php endif; ?>" href="#">
+				<i class="fas fa-trash"></i> <?php echo e($__t('Clear list')); ?>
+
+			</a>
+			<a id="add-products-below-min-stock-amount" class="btn btn-outline-primary responsive-button" href="#">
+				<i class="fas fa-cart-plus"></i> <?php echo e($__t('Add products that are below defined min. stock amount')); ?>
+
+			</a>
+			<a id="add-all-items-to-stock-button" class="btn btn-outline-primary responsive-button" href="#">
+				<i class="fas fa-box"></i> <?php echo e($__t('Add all list items to stock')); ?>
+
+			</a>
+		</h1>
+		<p data-status-filter="belowminstockamount" class="btn btn-lg btn-info status-filter-button responsive-button"><?php echo e($__n(count($missingProducts), '%s product is below defined min. stock amount', '%s products are below defined min. stock amount')); ?></p>
+	</div>
+</div>
+
+<div class="row mt-3 d-print-none">
+	<div class="col-xs-12 col-md-4">
+		<label for="search"><?php echo e($__t('Search')); ?></label> <i class="fas fa-search"></i>
+		<input type="text" class="form-control" id="search">
+	</div>
+	<div class="col-xs-12 col-md-4">
+		<label for="status-filter"><?php echo e($__t('Filter by status')); ?></label> <i class="fas fa-filter"></i>
+		<select class="form-control" id="status-filter">
+			<option class="bg-white" value="all"><?php echo e($__t('All')); ?></option>
+			<option class="bg-info" value="belowminstockamount"><?php echo e($__t('Below min. stock amount')); ?></option>
+		</select>
+	</div>
+</div>
+
+<div class="row d-print-none">
+	<div class="col-xs-12 col-md-8 pb-3">
+		<table id="shoppinglist-table" class="table table-sm table-striped dt-responsive">
+			<thead>
+				<tr>
+					<th class="border-right"></th>
+					<th><?php echo e($__t('Product')); ?> / <em><?php echo e($__t('Note')); ?></em></th>
+					<th><?php echo e($__t('Amount')); ?></th>
+					<th class="d-none">Hiden product group</th>
+					<th class="d-none">Hidden status</th>
+
+					<?php echo $__env->make('components.userfields_thead', array(
+						'userfields' => $userfields
+					), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+
+				</tr>
+			</thead>
+			<tbody class="d-none">
+				<?php $__currentLoopData = $listItems; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $listItem): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+				<tr id="shoppinglistitem-<?php echo e($listItem->id); ?>-row" class="<?php if(FindObjectInArrayByPropertyValue($missingProducts, 'id', $listItem->product_id) !== null): ?> table-info <?php endif; ?> <?php if($listItem->done == 1): ?> text-muted text-strike-through <?php endif; ?>">
+					<td class="fit-content border-right">
+						<a class="btn btn-success btn-sm order-listitem-button" href="#"
+							data-item-id="<?php echo e($listItem->id); ?>"
+							data-item-done="<?php echo e($listItem->done); ?>">
+							<i class="fas fa-check"></i>
+						</a>
+						<a class="btn btn-sm btn-info" href="<?php echo e($U('/shoppinglistitem/') . $listItem->id . '?list=' . $selectedShoppingListId); ?>">
+							<i class="fas fa-edit"></i>
+						</a>
+						<a class="btn btn-sm btn-danger shoppinglist-delete-button" href="#" data-shoppinglist-id="<?php echo e($listItem->id); ?>">
+							<i class="fas fa-trash"></i>
+						</a>
+						<a class="btn btn-sm btn-primary <?php if(empty($listItem->product_id)): ?> disabled <?php else: ?> shopping-list-stock-add-workflow-list-item-button <?php endif; ?>" href="<?php echo e($U('/purchase?embedded&flow=shoppinglistitemtostock&product=')); ?><?php echo e($listItem->product_id); ?>&amount=<?php echo e($listItem->amount); ?>&listitemid=<?php echo e($listItem->id); ?>" <?php if(!empty($listItem->product_id)): ?> data-toggle="tooltip" title="<?php echo e($__t('Add %1$s of %2$s to stock', $listItem->amount . ' ' . $__n($listItem->amount, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name_plural), FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->name, $listItem->amount)); ?>" <?php endif; ?>>
+							<i class="fas fa-box"></i>
+						</a>
+					</td>
+					<td>
+						<?php if(!empty($listItem->product_id)): ?> <?php echo e(FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->name); ?><br><?php endif; ?><em><?php echo nl2br($listItem->note); ?></em>
+					</td>
+					<td>
+						<span class="locale-number locale-number-quantity-amount"><?php echo e($listItem->amount); ?></span> <?php if(!empty($listItem->product_id)): ?><?php echo e($__n($listItem->amount, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name_plural)); ?><?php endif; ?>
+					</td>
+					<td class="d-none">
+						<?php if(!empty(FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->product_group_id)): ?> <?php echo e(FindObjectInArrayByPropertyValue($productGroups, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->product_group_id)->name); ?> <?php else: ?> <span class="font-italic font-weight-light"><?php echo e($__t('Ungrouped')); ?></span> <?php endif; ?>
+					</td>
+					<td class="d-none">
+						<?php if(FindObjectInArrayByPropertyValue($missingProducts, 'id', $listItem->product_id) !== null): ?> belowminstockamount <?php endif; ?>
+					</td>
+
+					<?php echo $__env->make('components.userfields_tbody', array(
+						'userfields' => $userfields,
+						'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $listItem->product_id)
+					), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+
+				</tr>
+				<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+			</tbody>
+		</table>
+	</div>
+
+	<div class="col-xs-12 col-md-4 mt-md-2 d-print-none">
+		<?php echo $__env->make('components.calendarcard', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+	</div>
+</div>
+
+<div class="row mt-3 d-print-none">
+	<div class="col-xs-12 col-md-8">
+		<div class="form-group">
+			<label class="text-larger font-weight-bold" for="notes"><?php echo e($__t('Notes')); ?></label>
+			<a id="save-description-button" class="btn btn-success btn-sm ml-1 mb-2" href="#"><?php echo e($__t('Save')); ?></a>
+			<a id="clear-description-button" class="btn btn-danger btn-sm ml-1 mb-2" href="#"><?php echo e($__t('Clear')); ?></a>
+			<textarea class="form-control wysiwyg-editor" id="description" name="description"><?php echo e(FindObjectInArrayByPropertyValue($shoppingLists, 'id', $selectedShoppingListId)->description); ?></textarea>
+		</div>
+	</div>
+</div>
+
+<div class="modal fade" id="shopping-list-stock-add-workflow-modal" tabindex="-1">
+	<div class="modal-dialog">
+		<div class="modal-content text-center">
+			<div class="modal-body">
+				<iframe id="shopping-list-stock-add-workflow-purchase-form-frame" class="embed-responsive" src=""></iframe>
+			</div>
+			<div class="modal-footer">
+				<span id="shopping-list-stock-add-workflow-purchase-item-count" class="d-none mr-auto"></span>
+				<button id="shopping-list-stock-add-workflow-skip-button" type="button" class="btn btn-primary"><i class="fas fa-angle-double-right"></i> <?php echo e($__t('Skip')); ?></button>
+				<button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo e($__t('Close')); ?></button>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="d-none d-print-block">
+	<h1 class="text-center">
+		<img src="<?php echo e($U('/img/grocy_logo.svg?v=', true)); ?><?php echo e($version); ?>" height="30" class="d-print-flex mx-auto">
+		<?php echo e($__t("Shopping list")); ?>
+
+	</h1>
+	<?php if(FindObjectInArrayByPropertyValue($shoppingLists, 'id', $selectedShoppingListId)->name != $__t("Shopping list")): ?>
+	<h3 class="text-center">
+		<?php echo e(FindObjectInArrayByPropertyValue($shoppingLists, 'id', $selectedShoppingListId)->name); ?>
+
+	</h3>
+	<?php endif; ?>
+	<h6 class="text-center mb-4">
+		<?php echo e($__t('Time of printing')); ?>:
+		<span class="d-inline print-timestamp"></span>
+	</h6>
+	<div class="row w-75">
+		<div class="col">
+			<table class="table">
+				<thead>
+					<tr>
+						<th><?php echo e($__t('Product')); ?> / <em><?php echo e($__t('Note')); ?></em></th>
+						<th><?php echo e($__t('Amount')); ?></th>
+					</tr>
+				</thead>
+				<tbody>
+					<?php $__currentLoopData = $listItems; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $listItem): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+					<tr>
+						<td>
+							<?php if(!empty($listItem->product_id)): ?> <?php echo e(FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->name); ?><br><?php endif; ?><em><?php echo nl2br($listItem->note); ?></em>
+						</td>
+						<td>
+							<?php echo e($listItem->amount); ?> <?php if(!empty($listItem->product_id)): ?><?php echo e($__n($listItem->amount, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name_plural)); ?><?php endif; ?>
+						</td>
+					</tr>
+					<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+				</tbody>
+			</table>
+		</div>
+	</div>
+	<div class="row w-75">
+		<div class="col">
+			<h5><?php echo e($__t('Notes')); ?></h5>
+			<p id="description-for-print"></p>
+		</div>
+	</div>
+</div>
+<?php $__env->stopSection(); ?>
+
+<?php echo $__env->make('layout.default', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?><?php /**PATH /www/views/shoppinglist.blade.php ENDPATH**/ ?>

data_store/viewcache/39d21e45b4010006e2e476f14bd7e98aac6b042a.php

@@ -0,0 +1,28 @@
+<?php if(!GROCY_DISABLE_BROWSER_BARCODE_CAMERA_SCANNING): ?>
+
+<?php $__env->startPush('componentScripts'); ?>
+	<script src="<?php echo e($U('/viewjs/components/barcodescanner.js', true)); ?>?v=<?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<?php $__env->startPush('pageScripts'); ?>
+	<script src="<?php echo e($U('/node_modules/quagga/dist/quagga.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<?php $__env->startPush('pageStyles'); ?>
+	<style>
+		#barcodescanner-start-button {
+			position: absolute;
+			right: 0;
+			margin-top: 4px;
+			margin-right: 5px;
+			cursor: pointer;
+		}
+
+		.combobox-container #barcodescanner-start-button {
+			margin-right: 36px !important;
+		}
+	</style>
+<?php $__env->stopPush(); ?>
+
+<?php endif; ?>
+<?php /**PATH /www/views/components/barcodescanner.blade.php ENDPATH**/ ?>

data_store/viewcache/4a0d0078dcb363915872e1e8e401c2f7cacbcfe7.php

@@ -0,0 +1,50 @@
+<?php $__env->startPush('componentScripts'); ?>
+	<script src="<?php echo e($U('/viewjs/components/datetimepicker.js', true)); ?>?v=<?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<?php if(!isset($isRequired)) { $isRequired = true; } ?>
+<?php if(!isset($initialValue)) { $initialValue = ''; } ?>
+<?php if(empty($earlierThanInfoLimit)) { $earlierThanInfoLimit = ''; } ?>
+<?php if(empty($earlierThanInfoText)) { $earlierThanInfoText = ''; } ?>
+<?php if(empty($additionalCssClasses)) { $additionalCssClasses = ''; } ?>
+<?php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } ?>
+<?php if(empty($invalidFeedback)) { $invalidFeedback = ''; } ?>
+<?php if(!isset($isRequired)) { $isRequired = true; } ?>
+<?php if(!isset($noNameAttribute)) { $noNameAttribute = false; } ?>
+<?php if(!isset($nextInputSelector)) { $nextInputSelector = false; } ?>
+<?php if(empty($additionalAttributes)) { $additionalAttributes = ''; } ?>
+<?php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } ?>
+
+<div class="form-group <?php echo e($additionalGroupCssClasses); ?>">
+	<label for="<?php echo e($id); ?>"><?php echo e($__t($label)); ?>
+
+		<span class="small text-muted">
+			<?php if(!empty($hint)): ?><?php echo e($__t($hint)); ?><?php endif; ?>
+			<time id="datetimepicker-timeago" class="timeago timeago-contextual"></time>
+		</span>
+	</label>
+	<div class="input-group">
+		<div class="input-group date datetimepicker <?php if(!empty($additionalGroupCssClasses)): ?><?php echo e($additionalGroupCssClasses); ?><?php endif; ?>" id="<?php echo e($id); ?>" <?php if(!$noNameAttribute): ?> name="<?php echo e($id); ?>" <?php endif; ?> data-target-input="nearest">
+			<input <?php echo $additionalAttributes; ?> type="text" <?php if($isRequired): ?> <?php if($isRequired): ?> required <?php endif; ?> <?php endif; ?> class="form-control datetimepicker-input <?php if(!empty($additionalCssClasses)): ?><?php echo e($additionalCssClasses); ?><?php endif; ?>"
+				data-target="#<?php echo e($id); ?>" data-format="<?php echo e($format); ?>"
+				data-init-with-now="<?php echo e(BoolToString($initWithNow)); ?>"
+				data-init-value="<?php echo e($initialValue); ?>"
+				data-limit-end-to-now="<?php echo e(BoolToString($limitEndToNow)); ?>"
+				data-limit-start-to-now="<?php echo e(BoolToString($limitStartToNow)); ?>"
+				data-next-input-selector="<?php echo e($nextInputSelector); ?>"
+				data-earlier-than-limit="<?php echo e($earlierThanInfoLimit); ?>" />
+			<div class="input-group-append" data-target="#<?php echo e($id); ?>" data-toggle="datetimepicker">
+				<div class="input-group-text"><i class="fas fa-calendar"></i></div>
+			</div>
+			<div class="invalid-feedback"><?php echo e($invalidFeedback); ?></div>
+		</div>
+		<div id="datetimepicker-earlier-than-info" class="form-text text-info font-italic d-none"><?php echo e($earlierThanInfoText); ?></div>
+		<?php if(isset($shortcutValue) && isset($shortcutLabel)): ?>
+		<div class="form-check w-100">
+			<input class="form-check-input" type="checkbox" id="datetimepicker-shortcut" data-datetimepicker-shortcut-value="<?php echo e($shortcutValue); ?>">
+			<label class="form-check-label" for="datetimepicker-shortcut"><?php echo e($__t($shortcutLabel)); ?></label>
+		</div>
+		<?php endif; ?>
+	</div>
+</div>
+<?php /**PATH /www/views/components/datetimepicker.blade.php ENDPATH**/ ?>

data_store/viewcache/4b3e495a8ce1359c2f68eb6c33e07337aa6b2a0f.php

@@ -0,0 +1,37 @@
+<?php $__env->startSection('title', $__t('Login')); ?>
+<?php $__env->startSection('viewJsName', 'login'); ?>
+
+<?php $__env->startSection('content'); ?>
+<div class="row">
+	<div class="col-lg-6 offset-lg-3 col-xs-12">
+		<h1 class="text-center"><?php echo $__env->yieldContent('title'); ?></h1>
+
+		<form method="post" action="<?php echo e($U('/login')); ?>" id="login-form" novalidate>
+
+			<div class="form-group">
+				<label for="name"><?php echo e($__t('Username')); ?></label>
+				<input type="text" class="form-control" required id="username" name="username">
+			</div>
+
+			<div class="form-group">
+				<label for="name"><?php echo e($__t('Password')); ?></label>
+				<input type="password" class="form-control" required id="password" name="password">
+				<div id="login-error" class="form-text text-danger d-none"></div>
+			</div>
+
+			<div class="checkbox">
+				<label for="stay_logged_in">
+					<input type="checkbox" id="stay_logged_in" name="stay_logged_in"> <?php echo e($__t('Stay logged in permanently')); ?>
+
+					<p class="form-text text-muted small my-0"><?php echo e($__t('When not set, you will get logged out at latest after 30 days')); ?></p>
+				</label>
+			</div>
+
+			<button id="login-button" class="btn btn-success"><?php echo e($__t('OK')); ?></button>
+
+		</form>
+	</div>
+</div>
+<?php $__env->stopSection(); ?>
+
+<?php echo $__env->make('layout.default', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?><?php /**PATH /www/views/login.blade.php ENDPATH**/ ?>

data_store/viewcache/57fe3959c5e97932a57e2d10e997533fecfd8f71.php

@@ -0,0 +1,12 @@
+<?php if(count($userfields) > 0): ?>
+
+<?php $__currentLoopData = $userfields; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $userfield): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+
+<?php if($userfield->show_as_column_in_tables == 1): ?>
+	<th><?php echo e($userfield->caption); ?></th>
+<?php endif; ?>
+
+<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+
+<?php endif; ?>
+<?php /**PATH /www/views/components/userfields_thead.blade.php ENDPATH**/ ?>

data_store/viewcache/5d2f03dcf0ea442cee57afbc3b65dd60e85038ad.php

@@ -0,0 +1,264 @@
+<?php if($mode == 'edit'): ?>
+	<?php $__env->startSection('title', $__t('Edit recipe')); ?>
+<?php else: ?>
+	<?php $__env->startSection('title', $__t('Create recipe')); ?>
+<?php endif; ?>
+
+<?php $__env->startSection('viewJsName', 'recipeform'); ?>
+
+<?php $__env->startPush('pageScripts'); ?>
+	<script src="<?php echo e($U('/node_modules/datatables.net-rowgroup/js/dataTables.rowGroup.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/datatables.net-rowgroup-bs4/js/rowGroup.bootstrap4.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<?php $__env->startPush('pageStyles'); ?>
+	<link href="<?php echo e($U('/node_modules/datatables.net-rowgroup-bs4/css/rowGroup.bootstrap4.min.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+<?php $__env->stopPush(); ?>
+
+<?php $__env->startSection('content'); ?>
+<div class="row">
+	<div class="col">
+		<h1><?php echo $__env->yieldContent('title'); ?></h1>
+
+		<script>
+			Grocy.EditMode = '<?php echo e($mode); ?>';
+			Grocy.QuantityUnits = <?php echo json_encode($quantityunits); ?>;
+			Grocy.QuantityUnitConversionsResolved = <?php echo json_encode($quantityUnitConversionsResolved); ?>;
+		</script>
+
+		<?php if($mode == 'edit'): ?>
+			<script>Grocy.EditObjectId = <?php echo e($recipe->id); ?>;</script>
+
+			<?php if(!empty($recipe->picture_file_name)): ?>
+				<script>Grocy.RecipePictureFileName = '<?php echo e($recipe->picture_file_name); ?>';</script>
+			<?php endif; ?>
+		<?php endif; ?>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-xs-12 col-md-7 pb-3">
+		<form id="recipe-form" novalidate>
+
+			<div class="form-group">
+				<label for="name"><?php echo e($__t('Name')); ?></label>
+				<input type="text" class="form-control" required id="name" name="name" value="<?php if($mode == 'edit'): ?><?php echo e($recipe->name); ?><?php endif; ?>">
+				<div class="invalid-feedback"><?php echo e($__t('A name is required')); ?></div>
+			</div>
+
+			<div class="form-group">
+				<label for="description"><?php echo e($__t('Preparation')); ?></label>
+				<textarea id="description" class="form-control wysiwyg-editor" name="description"><?php if($mode == 'edit'): ?><?php echo e($recipe->description); ?><?php endif; ?></textarea>
+			</div>
+
+			<?php if($mode == 'edit') { $value = $recipe->base_servings; } else { $value = 1; } ?>
+			<?php echo $__env->make('components.numberpicker', array(
+				'id' => 'base_servings',
+				'label' => 'Servings',
+				'min' => 1,
+				'value' => $value,
+				'invalidFeedback' => $__t('This cannot be lower than %s', '1'),
+				'hint' => $__t('The ingredients listed here result in this amount of servings')
+			), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+
+			<div class="form-group">
+				<div class="form-check">
+					<input type="hidden" name="not_check_shoppinglist" value="0">
+					<input <?php if($mode == 'edit' && $recipe->not_check_shoppinglist == 1): ?> checked <?php endif; ?> class="form-check-input" type="checkbox" id="not_check_shoppinglist" name="not_check_shoppinglist" value="1">
+					<label class="form-check-label" for="not_check_shoppinglist"><?php echo e($__t('Do not check against the shopping list when adding missing items to it')); ?>&nbsp;&nbsp;
+						<span class="small text-muted"><?php echo e($__t('By default the amount to be added to the shopping list is "needed amount - stock amount - shopping list amount" - when this is enabled, it is only checked against the stock amount, not against what is already on the shopping list')); ?></span>
+					</label>
+				</div>
+			</div>
+
+			<div class="form-group">
+				<label for="recipe-picture"><?php echo e($__t('Picture')); ?>
+
+					<span class="text-muted small"><?php echo e($__t('If you don\'t select a file, the current picture will not be altered')); ?></span>
+				</label>
+				<div class="custom-file">
+					<input type="file" class="custom-file-input" id="recipe-picture" accept="image/*">
+					<label class="custom-file-label" for="recipe-picture"><?php echo e($__t('No file selected')); ?></label>
+				</div>
+			</div>
+
+			<?php echo $__env->make('components.userfieldsform', array(
+				'userfields' => $userfields,
+				'entity' => 'recipes'
+			), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+
+			<button id="save-recipe-button" class="btn btn-success"><?php echo e($__t('Save')); ?></button>
+
+		</form>
+	</div>
+
+	<div class="col-xs-12 col-md-5 pb-3">
+		<div class="row">
+			<div class="col">
+				<h2>
+					<?php echo e($__t('Ingredients list')); ?>
+
+					<a id="recipe-pos-add-button" class="btn btn-outline-dark" href="#">
+						<i class="fas fa-plus"></i> <?php echo e($__t('Add')); ?>
+
+					</a>
+				</h2>
+				
+				<table id="recipes-pos-table" class="table table-sm table-striped dt-responsive">
+					<thead>
+						<tr>
+							<th class="border-right"></th>
+							<th><?php echo e($__t('Product')); ?></th>
+							<th><?php echo e($__t('Amount')); ?></th>
+							<th class="fit-content"><?php echo e($__t('Note')); ?></th>
+							<th class="d-none">Hiden ingredient group</th>
+						</tr>
+					</thead>
+					<tbody class="d-none">
+						<?php if($mode == "edit"): ?>
+						<?php $__currentLoopData = $recipePositions; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $recipePosition): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+						<tr>
+							<td class="fit-content border-right">
+								<a class="btn btn-sm btn-info recipe-pos-edit-button" href="#" data-recipe-pos-id="<?php echo e($recipePosition->id); ?>">
+									<i class="fas fa-edit"></i>
+								</a>
+								<a class="btn btn-sm btn-danger recipe-pos-delete-button" href="#" data-recipe-pos-id="<?php echo e($recipePosition->id); ?>" data-recipe-pos-name="<?php echo e(FindObjectInArrayByPropertyValue($products, 'id', $recipePosition->product_id)->name); ?>">
+									<i class="fas fa-trash"></i>
+								</a>
+							</td>
+							<td>
+								<?php echo e(FindObjectInArrayByPropertyValue($products, 'id', $recipePosition->product_id)->name); ?>
+
+							</td>
+							<td>
+								<?php
+									$product = FindObjectInArrayByPropertyValue($products, 'id', $recipePosition->product_id);
+									$productQuConversions = FindAllObjectsInArrayByPropertyValue($quantityUnitConversionsResolved, 'product_id', $product->id);
+									$productQuConversions = FindAllObjectsInArrayByPropertyValue($productQuConversions, 'from_qu_id', $product->qu_id_stock);
+									$productQuConversion = FindObjectInArrayByPropertyValue($productQuConversions, 'to_qu_id', $recipePosition->qu_id);
+									if ($productQuConversion)
+									{
+										$recipePosition->amount = $recipePosition->amount * $productQuConversion->factor;
+									}
+								?>
+								<?php if(!empty($recipePosition->variable_amount)): ?>
+									<?php echo e($recipePosition->variable_amount); ?>
+
+								<?php else: ?>
+									<span class="locale-number locale-number-quantity-amount"><?php if($recipePosition->amount == round($recipePosition->amount)): ?><?php echo e(round($recipePosition->amount)); ?><?php else: ?><?php echo e($recipePosition->amount); ?><?php endif; ?></span>
+								<?php endif; ?>
+								<?php echo e($__n($recipePosition->amount, FindObjectInArrayByPropertyValue($quantityunits, 'id', $recipePosition->qu_id)->name, FindObjectInArrayByPropertyValue($quantityunits, 'id', $recipePosition->qu_id)->name_plural)); ?>
+
+							</td>
+							<td class="fit-content">
+								<a class="btn btn-sm btn-info recipe-pos-show-note-button <?php if(empty($recipePosition->note)): ?> disabled <?php endif; ?>" href="#" data-toggle="tooltip" data-placement="top" title="<?php echo e($__t('Show notes')); ?>" data-recipe-pos-note="<?php echo e($recipePosition->note); ?>">
+									<i class="fas fa-eye"></i>
+								</a>
+							</td>
+							<td>
+								<?php echo e($recipePosition->ingredient_group); ?>
+
+							</td>
+						</tr>
+						<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+						<?php endif; ?>
+					</tbody>
+				</table>
+			</div>
+		</div>
+
+		<div class="row mt-5">
+			<div class="col">
+				<h2>
+					<?php echo e($__t('Included recipes')); ?>
+
+					<a id="recipe-include-add-button" class="btn btn-outline-dark" href="#">
+						<i class="fas fa-plus"></i> <?php echo e($__t('Add')); ?>
+
+					</a>
+				</h2>
+				<table id="recipes-includes-table" class="table table-sm table-striped dt-responsive">
+					<thead>
+						<tr>
+							<th class="border-right"></th>
+							<th><?php echo e($__t('Recipe')); ?></th>
+							<th><?php echo e($__t('Servings')); ?></th>
+						</tr>
+					</thead>
+					<tbody class="d-none">
+						<?php if($mode == "edit"): ?>
+						<?php $__currentLoopData = $recipeNestings; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $recipeNesting): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+						<tr>
+							<td class="fit-content border-right">
+								<a class="btn btn-sm btn-info recipe-include-edit-button" href="#" data-recipe-include-id="<?php echo e($recipeNesting->id); ?>" data-recipe-included-recipe-id="<?php echo e($recipeNesting->includes_recipe_id); ?>" data-recipe-included-recipe-servings="<?php echo e($recipeNesting->servings); ?>">
+									<i class="fas fa-edit"></i>
+								</a>
+								<a class="btn btn-sm btn-danger recipe-include-delete-button" href="#" data-recipe-include-id="<?php echo e($recipeNesting->id); ?>" data-recipe-include-name="<?php echo e(FindObjectInArrayByPropertyValue($recipes, 'id', $recipeNesting->includes_recipe_id)->name); ?>">
+									<i class="fas fa-trash"></i>
+								</a>
+							</td>
+							<td>
+								<?php echo e(FindObjectInArrayByPropertyValue($recipes, 'id', $recipeNesting->includes_recipe_id)->name); ?>
+
+							</td>
+							<td>
+								<?php echo e($recipeNesting->servings); ?>
+
+							</td>
+						</tr>
+						<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+						<?php endif; ?>
+					</tbody>
+				</table>
+			</div>
+		</div>
+
+		<div class="row mt-5">
+			<div class="col">
+				<label class="mt-2"><?php echo e($__t('Picture')); ?></label>
+				<button id="delete-current-recipe-picture-button" class="btn btn-sm btn-danger <?php if(empty($recipe->picture_file_name)): ?> disabled <?php endif; ?>"><i class="fas fa-trash"></i> <?php echo e($__t('Delete')); ?></button>
+				<?php if(!empty($recipe->picture_file_name)): ?>
+					<p><img id="current-recipe-picture" data-src="<?php echo e($U('/api/files/recipepictures/' . base64_encode($recipe->picture_file_name) . '?force_serve_as=picture&best_fit_width=400')); ?>" class="img-fluid img-thumbnail mt-2 lazy"></p>
+					<p id="delete-current-recipe-picture-on-save-hint" class="form-text text-muted font-italic d-none"><?php echo e($__t('The current picture will be deleted when you save the recipe')); ?></p>
+				<?php else: ?>
+					<p id="no-current-recipe-picture-hint" class="form-text text-muted font-italic"><?php echo e($__t('No picture available')); ?></p>
+				<?php endif; ?>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="modal fade" id="recipe-include-editform-modal" tabindex="-1">
+	<div class="modal-dialog">
+		<div class="modal-content text-center">
+			<div class="modal-header">
+				<h4 id="recipe-include-editform-title" class="modal-title w-100"></h4>
+			</div>
+			<div class="modal-body">
+				<form id="recipe-include-form" novalidate>
+
+					<?php echo $__env->make('components.recipepicker', array(
+						'recipes' => $recipes,
+						'isRequired' => true
+					), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+
+					<?php echo $__env->make('components.numberpicker', array(
+						'id' => 'includes_servings',
+						'label' => 'Servings',
+						'min' => 1,
+						'value' => '1',
+						'invalidFeedback' => $__t('This cannot be lower than %s', '1')
+					), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo e($__t('Cancel')); ?></button>
+				<button id="save-recipe-include-button" data-dismiss="modal" class="btn btn-success"><?php echo e($__t('Save')); ?></button>
+			</div>
+		</div>
+	</div>
+</div>
+<?php $__env->stopSection(); ?>
+
+<?php echo $__env->make('layout.default', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?><?php /**PATH /www/views/recipeform.blade.php ENDPATH**/ ?>

data_store/viewcache/7a587134e83dd5e10195488fea86663d4fb1b9e9.php

@@ -0,0 +1,43 @@
+<?php $__env->startPush('componentScripts'); ?>
+	<script src="<?php echo e($U('/node_modules/chart.js/dist/Chart.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/viewjs/components/productcard.js', true)); ?>?v=<?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<div class="card">
+	<div class="card-header">
+		<i class="fab fa-product-hunt"></i> <?php echo e($__t('Product overview')); ?>
+
+		<a id="productcard-product-edit-button" class="btn btn-sm btn-outline-info py-0 float-right disabled" href="#" data-toggle="tooltip" title="<?php echo e($__t('Edit product')); ?>">
+			<i class="fas fa-edit"></i>
+		</a>
+		<a id="productcard-product-journal-button" class="btn btn-sm btn-outline-secondary py-0 mr-2 float-right disabled show-as-dialog-link" href="#" data-toggle="tooltip" title="<?php echo e($__t('Stock journal for this product')); ?>">
+			<i class="fas fa-file-alt"></i>
+		</a>
+	</div>
+	<div class="card-body">
+		<h3><span id="productcard-product-name"></span></h3>
+
+		<div id="productcard-product-description-wrapper" class="expandable-text mb-2 d-none">
+			<p id="productcard-product-description" class="text-muted collapse mb-0"></p>
+			<a class="collapsed" data-toggle="collapse" href="#productcard-product-description"><?php echo e($__t('Show more')); ?></a>
+		</div>
+
+		<strong><?php echo e($__t('Stock amount') . ' / ' . $__t('Quantity unit')); ?>:</strong> <span id="productcard-product-stock-amount" class="locale-number locale-number-quantity-amount"></span> <span id="productcard-product-stock-qu-name"></span> <span id="productcard-product-stock-opened-amount" class="small font-italic locale-number locale-number-quantity-amount"></span>
+		<span id="productcard-aggregated-amounts" class="pl-2 text-secondary d-none"><i class="fas fa-custom-sigma-sign"></i> <span id="productcard-product-stock-amount-aggregated" class="locale-number locale-number-quantity-amount"></span> <span id="productcard-product-stock-qu-name-aggregated"></span> <span id="productcard-product-stock-opened-amount-aggregated locale-number locale-number-quantity-amount" class="small font-italic"></span></span><br>
+		<?php if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING): ?><strong><?php echo e($__t('Location')); ?>:</strong> <span id="productcard-product-location"></span><br><?php endif; ?>
+		<strong><?php echo e($__t('Last purchased')); ?>:</strong> <span id="productcard-product-last-purchased"></span> <time id="productcard-product-last-purchased-timeago" class="timeago timeago-contextual"></time><br>
+		<strong><?php echo e($__t('Last used')); ?>:</strong> <span id="productcard-product-last-used"></span> <time id="productcard-product-last-used-timeago" class="timeago timeago-contextual"></time><br>
+		<?php if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING): ?><strong><?php echo e($__t('Last price')); ?>:</strong> <span id="productcard-product-last-price"></span><br><?php endif; ?>
+		<?php if(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING): ?><strong><?php echo e($__t('Average shelf life')); ?>:</strong> <span id="productcard-product-average-shelf-life"></span><br><?php endif; ?>
+		<strong><?php echo e($__t('Spoil rate')); ?>:</strong> <span id="productcard-product-spoil-rate"></span>
+
+		<p class="w-75 mt-3 mx-auto"><img id="productcard-product-picture" data-src="" class="img-fluid img-thumbnail d-none lazy"></p>
+
+		<?php if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING): ?>
+		<h5 class="mt-3"><?php echo e($__t('Price history')); ?></h5>
+		<canvas id="productcard-product-price-history-chart" class="w-100 d-none"></canvas>
+		<span id="productcard-no-price-data-hint" class="font-italic d-none"><?php echo e($__t('No price history available')); ?></span>
+		<?php endif; ?>
+	</div>
+</div>
+<?php /**PATH /www/views/components/productcard.blade.php ENDPATH**/ ?>

data_store/viewcache/7bfad8d8bfd10d511647e8f534be836dae05c01f.php

@@ -0,0 +1,129 @@
+<?php $__env->startSection('title', $__t('Tasks')); ?>
+<?php $__env->startSection('activeNav', 'tasks'); ?>
+<?php $__env->startSection('viewJsName', 'tasks'); ?>
+
+<?php $__env->startPush('pageScripts'); ?>
+	<script src="<?php echo e($U('/node_modules/jquery-ui-dist/jquery-ui.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/datatables.net-rowgroup/js/dataTables.rowGroup.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/datatables.net-rowgroup-bs4/js/rowGroup.bootstrap4.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<?php $__env->startPush('pageStyles'); ?>
+	<link href="<?php echo e($U('/node_modules/datatables.net-rowgroup-bs4/css/rowGroup.bootstrap4.min.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+<?php $__env->stopPush(); ?>
+
+<?php $__env->startSection('content'); ?>
+<div class="row">
+	<div class="col">
+		<h1>
+			<?php echo $__env->yieldContent('title'); ?>
+			<a class="btn btn-outline-dark responsive-button" href="<?php echo e($U('/task/new')); ?>">
+				<i class="fas fa-plus"></i> <?php echo e($__t('Add')); ?>
+
+			</a>
+		</h1>
+		<p id="info-due-tasks" data-status-filter="duesoon" data-next-x-days="<?php echo e($nextXDays); ?>" class="btn btn-lg btn-warning status-filter-button responsive-button mr-2"></p>
+		<p id="info-overdue-tasks" data-status-filter="overdue" class="btn btn-lg btn-danger status-filter-button responsive-button"></p>
+	</div>
+</div>
+
+<div class="row mt-3">
+	<div class="col-xs-12 col-md-6 col-xl-3">
+		<label for="search"><?php echo e($__t('Search')); ?></label> <i class="fas fa-search"></i>
+		<input type="text" class="form-control" id="search">
+	</div>
+	<div class="col-xs-12 col-md-6 col-xl-3">
+		<label for="status-filter"><?php echo e($__t('Filter by status')); ?></label> <i class="fas fa-filter"></i>
+		<select class="form-control" id="status-filter">
+			<option class="bg-white" value="all"><?php echo e($__t('All')); ?></option>
+			<option class="bg-warning" value="duesoon"><?php echo e($__t('Due soon')); ?></option>
+			<option class="bg-danger" value="overdue"><?php echo e($__t('Overdue')); ?></option>
+		</select>
+	</div>
+	<div class="col-xs-12 col-md-6 col-xl-3 d-flex align-items-end">
+		<div class="form-check">
+			<input class="form-check-input" type="checkbox" id="show-done-tasks">
+			<label class="form-check-label" for="show-done-tasks">
+				<?php echo e($__t('Show done tasks')); ?>
+
+			</label>
+		</div>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col">
+		<table id="tasks-table" class="table table-sm table-striped dt-responsive">
+			<thead>
+				<tr>
+					<th class="border-right"></th>
+					<th><?php echo e($__t('Task')); ?></th>
+					<th><?php echo e($__t('Due')); ?></th>
+					<th class="d-none">Hidden category</th>
+					<th><?php echo e($__t('Assigned to')); ?></th>
+					<th class="d-none">Hidden status</th>
+
+					<?php echo $__env->make('components.userfields_thead', array(
+						'userfields' => $userfields
+					), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+
+				</tr>
+			</thead>
+			<tbody class="d-none">
+				<?php $__currentLoopData = $tasks; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $task): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+				<tr id="task-<?php echo e($task->id); ?>-row" class="<?php if($task->done == 1): ?> text-muted <?php endif; ?> <?php if(!empty($task->due_date) && $task->due_date < date('Y-m-d')): ?> table-danger <?php elseif(!empty($task->due_date) && $task->due_date < date('Y-m-d', strtotime("+$nextXDays days"))): ?> table-warning <?php endif; ?>">
+					<td class="fit-content border-right">
+						<?php if($task->done == 0): ?>
+						<a class="btn btn-success btn-sm do-task-button" href="#" data-toggle="tooltip" data-placement="left" title="<?php echo e($__t('Mark task "%s" as completed', $task->name)); ?>"
+							data-task-id="<?php echo e($task->id); ?>"
+							data-task-name="<?php echo e($task->name); ?>">
+							<i class="fas fa-check"></i>
+						</a>
+						<?php else: ?>
+						<a class="btn btn-secondary btn-sm undo-task-button" href="#" data-toggle="tooltip" data-placement="left" title="<?php echo e($__t('Undo task "%s"', $task->name)); ?>"
+							data-task-id="<?php echo e($task->id); ?>"
+							data-task-name="<?php echo e($task->name); ?>">
+							<i class="fas fa-undo"></i>
+						</a>
+						<?php endif; ?>
+						<a class="btn btn-sm btn-danger delete-task-button" href="#"
+							data-task-id="<?php echo e($task->id); ?>"
+							data-task-name="<?php echo e($task->name); ?>">
+							<i class="fas fa-trash"></i>
+						</a>
+						<a class="btn btn-info btn-sm" href="<?php echo e($U('/task/')); ?><?php echo e($task->id); ?>">
+							<i class="fas fa-edit"></i>
+						</a>
+					</td>
+					<td id="task-<?php echo e($task->id); ?>-name" class="<?php if($task->done == 1): ?> text-strike-through <?php endif; ?>">
+						<?php echo e($task->name); ?>
+
+					</td>
+					<td>
+						<span><?php echo e($task->due_date); ?></span>
+						<time class="timeago timeago-contextual" datetime="<?php echo e($task->due_date); ?>"></time>
+					</td>
+					<td class="d-none">
+						<?php if($task->category_id != null): ?> <span><?php echo e(FindObjectInArrayByPropertyValue($taskCategories, 'id', $task->category_id)->name); ?></span> <?php else: ?> <span class="font-italic font-weight-light"><?php echo e($__t('Uncategorized')); ?></span><?php endif; ?>
+					</td>
+					<td>
+						<?php if($task->assigned_to_user_id != null): ?> <span><?php echo e(GetUserDisplayName(FindObjectInArrayByPropertyValue($users, 'id', $task->assigned_to_user_id))); ?></span> <?php endif; ?>
+					</td>
+					<td class="d-none">
+						<?php if($task->done == 1): ?> text-muted <?php endif; ?> <?php if(!empty($task->due_date) && $task->due_date < date('Y-m-d')): ?> overdue <?php elseif(!empty($task->due_date) && $task->due_date < date('Y-m-d', strtotime("+$nextXDays days"))): ?> duesoon <?php endif; ?>
+					</td>
+
+					<?php echo $__env->make('components.userfields_tbody', array(
+						'userfields' => $userfields,
+						'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $task->id)
+					), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+
+				</tr>
+				<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+			</tbody>
+		</table>
+	</div>
+</div>
+<?php $__env->stopSection(); ?>
+
+<?php echo $__env->make('layout.default', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?><?php /**PATH /www/views/tasks.blade.php ENDPATH**/ ?>

data_store/viewcache/7c8eb218e5b8735076b4a5ec83d6999af734f724.php

@@ -0,0 +1,27 @@
+<?php if(count($userfields) > 0): ?>
+
+<?php $__currentLoopData = $userfields; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $userfield): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+
+<?php if($userfield->show_as_column_in_tables == 1): ?>
+	<?php $userfieldObject = FindObjectInArrayByPropertyValue($userfieldValues, 'name', $userfield->name) ?>
+	<td>
+	<?php if($userfieldObject !== null): ?>
+		<?php if($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_CHECKBOX): ?>
+			<?php if($userfieldObject->value == 1): ?><i class="fas fa-check"></i><?php endif; ?>
+		<?php elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_PRESET_CHECKLIST): ?>
+			<?php echo str_replace(',', '<br>', $userfieldObject->value); ?>
+
+		<?php elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_LINK): ?>
+			<a href="<?php echo e($userfieldObject->value); ?>" target="_blank"><?php echo e($userfieldObject->value); ?></a>
+		<?php else: ?>
+			<?php echo e($userfieldObject->value); ?>
+
+		<?php endif; ?>
+	<?php endif; ?>
+	</td>
+<?php endif; ?>
+
+<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+
+<?php endif; ?>
+<?php /**PATH /www/views/components/userfields_tbody.blade.php ENDPATH**/ ?>

data_store/viewcache/8bfed2511a9e63f9b7d6395e3ff778ec424da5a4.php

@@ -0,0 +1,242 @@
+<?php $__env->startSection('title', $__t('Stock overview')); ?>
+<?php $__env->startSection('activeNav', 'stockoverview'); ?>
+<?php $__env->startSection('viewJsName', 'stockoverview'); ?>
+
+<?php $__env->startPush('pageScripts'); ?>
+	<script src="<?php echo e($U('/node_modules/jquery-ui-dist/jquery-ui.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/viewjs/purchase.js?v=', true)); ?><?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<?php $__env->startPush('pageStyles'); ?>
+	<style>
+		.product-name-cell[data-product-has-picture='true'] {
+			cursor: pointer;
+		}
+	</style>
+<?php $__env->stopPush(); ?>
+
+<?php $__env->startSection('content'); ?>
+<div class="row">
+	<div class="col">
+		<h1><?php echo $__env->yieldContent('title'); ?>
+			<small id="info-current-stock" class="text-muted"></small>
+			<a class="btn btn-outline-dark responsive-button" href="<?php echo e($U('/stockjournal')); ?>">
+				<i class="fas fa-file-alt"></i> <?php echo e($__t('Journal')); ?>
+
+			</a>
+			<?php if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING): ?>
+			<a class="btn btn-outline-dark responsive-button" href="<?php echo e($U('/locationcontentsheet')); ?>">
+				<i class="fas fa-print"></i> <?php echo e($__t('Location Content Sheet')); ?>
+
+			</a>
+			<?php endif; ?>
+		</h1>
+		<?php if(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING): ?>
+		<p id="info-expiring-products" data-next-x-days="<?php echo e($nextXDays); ?>" data-status-filter="expiring" class="btn btn-lg btn-warning status-filter-button responsive-button mr-2"></p>
+		<p id="info-expired-products" data-status-filter="expired" class="btn btn-lg btn-danger status-filter-button responsive-button mr-2"></p>
+		<?php endif; ?>
+		<p id="info-missing-products" data-status-filter="belowminstockamount" class="btn btn-lg btn-info status-filter-button responsive-button"></p>
+	</div>
+</div>
+
+<div class="row mt-3">
+	<div class="col-xs-12 col-md-6 col-xl-3">
+		<label for="search"><?php echo e($__t('Search')); ?></label> <i class="fas fa-search"></i>
+		<input type="text" class="form-control" id="search">
+	</div>
+	<?php if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING): ?>
+	<div class="col-xs-12 col-md-6 col-xl-3">
+		<label for="location-filter"><?php echo e($__t('Filter by location')); ?></label> <i class="fas fa-filter"></i>
+		<select class="form-control" id="location-filter">
+			<option value="all"><?php echo e($__t('All')); ?></option>
+			<?php $__currentLoopData = $locations; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $location): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+				<option value="<?php echo e($location->name); ?>"><?php echo e($location->name); ?></option>
+			<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+		</select>
+	</div>
+	<?php endif; ?>
+	<div class="col-xs-12 col-md-6 col-xl-3">
+		<label for="location-filter"><?php echo e($__t('Filter by product group')); ?></label> <i class="fas fa-filter"></i>
+		<select class="form-control" id="product-group-filter">
+			<option value="all"><?php echo e($__t('All')); ?></option>
+			<?php $__currentLoopData = $productGroups; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $productGroup): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+				<option value="<?php echo e($productGroup->name); ?>"><?php echo e($productGroup->name); ?></option>
+			<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+		</select>
+	</div>
+	<div class="col-xs-12 col-md-6 col-xl-3">
+		<label for="status-filter"><?php echo e($__t('Filter by status')); ?></label> <i class="fas fa-filter"></i>
+		<select class="form-control" id="status-filter">
+			<option class="bg-white" value="all"><?php echo e($__t('All')); ?></option>
+			<?php if(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING): ?>
+			<option class="bg-warning" value="expiring"><?php echo e($__t('Expiring soon')); ?></option>
+			<option class="bg-danger" value="expired"><?php echo e($__t('Already expired')); ?></option>
+			<?php endif; ?>
+			<option class="bg-info" value="belowminstockamount"><?php echo e($__t('Below min. stock amount')); ?></option>
+		</select>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col">
+		<table id="stock-overview-table" class="table table-sm table-striped dt-responsive">
+			<thead>
+				<tr>
+					<th class="border-right"></th>
+					<th><?php echo e($__t('Product')); ?></th>
+					<th><?php echo e($__t('Amount')); ?></th>
+					<th><?php echo e($__t('Next best before date')); ?></th>
+					<th class="d-none">Hidden location</th>
+					<th class="d-none">Hidden status</th>
+					<th class="d-none">Hidden product group</th>
+
+					<?php echo $__env->make('components.userfields_thead', array(
+						'userfields' => $userfields
+					), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+					
+				</tr>
+			</thead>
+			<tbody class="d-none">
+				<?php $__currentLoopData = $currentStock; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $currentStockEntry): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?> 
+				<tr id="product-<?php echo e($currentStockEntry->product_id); ?>-row" class="<?php if(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING && $currentStockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime('-1 days')) && $currentStockEntry->amount > 0): ?> table-danger <?php elseif(GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING && $currentStockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime("+$nextXDays days")) && $currentStockEntry->amount > 0): ?> table-warning <?php elseif(FindObjectInArrayByPropertyValue($missingProducts, 'id', $currentStockEntry->product_id) !== null): ?> table-info <?php endif; ?>">
+					<td class="fit-content border-right">
+						<a class="btn btn-success btn-sm product-consume-button <?php if($currentStockEntry->amount < 1): ?> disabled <?php endif; ?>" href="#" data-toggle="tooltip" data-placement="left" title="<?php echo e($__t('Consume %1$s of %2$s', '1 ' . FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name, FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name)); ?>"
+							data-product-id="<?php echo e($currentStockEntry->product_id); ?>"
+							data-product-name="<?php echo e(FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name); ?>"
+							data-product-qu-name="<?php echo e(FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name); ?>"
+							data-consume-amount="1">
+							<i class="fas fa-utensils"></i> 1
+						</a>
+						<a id="product-<?php echo e($currentStockEntry->product_id); ?>-consume-all-button" class="btn btn-danger btn-sm product-consume-button <?php if($currentStockEntry->amount == 0): ?> disabled <?php endif; ?>" href="#" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Consume all %s which are currently in stock', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name)); ?>"
+							data-product-id="<?php echo e($currentStockEntry->product_id); ?>"
+							data-product-name="<?php echo e(FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name); ?>"
+							data-product-qu-name="<?php echo e(FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name); ?>"
+							data-consume-amount="<?php echo e($currentStockEntry->amount); ?>">
+							<i class="fas fa-utensils"></i> <?php echo e($__t('All')); ?>
+
+						</a>
+						<?php if(GROCY_FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING): ?>
+						<a class="btn btn-success btn-sm product-open-button <?php if($currentStockEntry->amount < 1 || $currentStockEntry->amount == $currentStockEntry->amount_opened): ?> disabled <?php endif; ?>" href="#" data-toggle="tooltip" data-placement="left" title="<?php echo e($__t('Mark %1$s of %2$s as open', '1 ' . FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name, FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name)); ?>"
+							data-product-id="<?php echo e($currentStockEntry->product_id); ?>"
+							data-product-name="<?php echo e(FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name); ?>"
+							data-product-qu-name="<?php echo e(FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name); ?>">
+							<i class="fas fa-box-open"></i> 1
+						</a>
+						<?php endif; ?>
+						<div class="dropdown d-inline-block">
+							<button class="btn btn-sm btn-light text-secondary" type="button" data-toggle="dropdown">
+								<i class="fas fa-ellipsis-v"></i>
+							</button>
+							<div class="dropdown-menu">
+								<a class="dropdown-item product-add-to-shopping-list-button" type="button" href="#"
+									data-product-id="<?php echo e($currentStockEntry->product_id); ?>">
+									<i class="fas fa-shopping-cart"></i> <?php echo e($__t('Add to shopping list')); ?>
+
+								</a>
+								<div class="dropdown-divider"></div>
+								<a class="dropdown-item product-purchase-button" type="button" href="#"
+									data-product-id="<?php echo e($currentStockEntry->product_id); ?>">
+									<i class="fas fa-shopping-cart"></i> <?php echo e($__t('Purchase')); ?>
+
+								</a>
+								<a class="dropdown-item product-consume-custom-amount-button <?php if($currentStockEntry->amount < 1): ?> disabled <?php endif; ?>" type="button" href="#"
+									data-product-id="<?php echo e($currentStockEntry->product_id); ?>">
+									<i class="fas fa-utensils"></i> <?php echo e($__t('Consume')); ?>
+
+								</a>
+								<a class="dropdown-item product-inventory-button" type="button" href="#"
+									data-product-id="<?php echo e($currentStockEntry->product_id); ?>">
+									<i class="fas fa-list"></i> <?php echo e($__t('Inventory')); ?>
+
+								</a>
+								<div class="dropdown-divider"></div>
+								<a class="dropdown-item product-name-cell" data-product-id="<?php echo e($currentStockEntry->product_id); ?>" type="button" href="#">
+									<i class="fas fa-info"></i> <?php echo e($__t('Show product details')); ?>
+
+								</a>
+								<a class="dropdown-item" type="button" href="<?php echo e($U('/stockjournal?product=')); ?><?php echo e($currentStockEntry->product_id); ?>">
+									<i class="fas fa-file-alt"></i> <?php echo e($__t('Stock journal for this product')); ?>
+
+								</a>
+								<a class="dropdown-item" type="button" href="<?php echo e($U('/product/')); ?><?php echo e($currentStockEntry->product_id . '?returnto=%2Fstockoverview'); ?>">
+									<i class="fas fa-edit"></i> <?php echo e($__t('Edit product')); ?>
+
+								</a>
+								<div class="dropdown-divider"></div>
+								<a class="dropdown-item product-consume-button product-consume-button-spoiled <?php if($currentStockEntry->amount < 1): ?> disabled <?php endif; ?>" type="button" href="#"
+									data-product-id="<?php echo e($currentStockEntry->product_id); ?>"
+									data-product-name="<?php echo e(FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name); ?>"
+									data-product-qu-name="<?php echo e(FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name); ?>"
+									data-consume-amount="1">
+									<i class="fas fa-utensils"></i> <?php echo e($__t('Consume %1$s of %2$s as spoiled', '1 ' . FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name, FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name)); ?>
+
+								</a>
+								<?php if(GROCY_FEATURE_FLAG_RECIPES): ?>
+								<a class="dropdown-item" type="button" href="<?php echo e($U('/recipes?search=')); ?><?php echo e(FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name); ?>">
+									<i class="fas fa-cocktail"></i> <?php echo e($__t('Search for recipes containing this product')); ?>
+
+								</a>
+								<?php endif; ?>
+							</div>
+						</div>
+					</td>
+					<td class="product-name-cell cursor-link" data-product-id="<?php echo e($currentStockEntry->product_id); ?>">
+						<?php echo e(FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name); ?>
+
+					</td>
+					<td>
+						<span id="product-<?php echo e($currentStockEntry->product_id); ?>-amount" class="locale-number locale-number-quantity-amount"><?php echo e($currentStockEntry->amount); ?></span> <span id="product-<?php echo e($currentStockEntry->product_id); ?>-qu-name"><?php echo e($__n($currentStockEntry->amount, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name_plural)); ?></span>
+						<span id="product-<?php echo e($currentStockEntry->product_id); ?>-opened-amount" class="small font-italic"><?php if($currentStockEntry->amount_opened > 0): ?><?php echo e($__t('%s opened', $currentStockEntry->amount_opened)); ?><?php endif; ?></span>
+						<?php if($currentStockEntry->is_aggregated_amount == 1): ?>
+						<span class="pl-1 text-secondary">
+							<i class="fas fa-custom-sigma-sign"></i> <span id="product-<?php echo e($currentStockEntry->product_id); ?>-amount-aggregated" class="locale-number locale-number-quantity-amount"><?php echo e($currentStockEntry->amount_aggregated); ?></span> <?php echo e($__n($currentStockEntry->amount_aggregated, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name_plural)); ?>
+
+							<?php if($currentStockEntry->amount_opened_aggregated > 0): ?><span id="product-<?php echo e($currentStockEntry->product_id); ?>-opened-amount-aggregated" class="small font-italic"><?php echo e($__t('%s opened', $currentStockEntry->amount_opened_aggregated)); ?></span><?php endif; ?>
+						</span>
+						<?php endif; ?>
+					</td>
+					<td>
+						<span id="product-<?php echo e($currentStockEntry->product_id); ?>-next-best-before-date"><?php echo e($currentStockEntry->best_before_date); ?></span>
+						<time id="product-<?php echo e($currentStockEntry->product_id); ?>-next-best-before-date-timeago" class="timeago timeago-contextual" datetime="<?php echo e($currentStockEntry->best_before_date); ?> 23:59:59"></time>
+					</td>
+					<td class="d-none">
+						<?php $__currentLoopData = FindAllObjectsInArrayByPropertyValue($currentStockLocations, 'product_id', $currentStockEntry->product_id); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $locationsForProduct): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?> 
+						<?php echo e(FindObjectInArrayByPropertyValue($locations, 'id', $locationsForProduct->location_id)->name); ?>
+
+						<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+					</td>
+					<td class="d-none">
+						<?php if($currentStockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime('-1 days')) && $currentStockEntry->amount > 0): ?> expired <?php elseif($currentStockEntry->best_before_date < date('Y-m-d 23:59:59', strtotime("+$nextXDays days")) && $currentStockEntry->amount > 0): ?> expiring <?php endif; ?> <?php if(FindObjectInArrayByPropertyValue($missingProducts, 'id', $currentStockEntry->product_id) !== null): ?> belowminstockamount <?php endif; ?>
+					</td>
+					<?php $productGroup = FindObjectInArrayByPropertyValue($productGroups, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->product_group_id) ?>
+					<td class="d-none">
+						<?php if($productGroup !== null): ?><?php echo e($productGroup->name); ?><?php endif; ?>
+					</td>
+
+					<?php echo $__env->make('components.userfields_tbody', array(
+						'userfields' => $userfields,
+						'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $currentStockEntry->product_id)
+					), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+
+				</tr>
+				<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+			</tbody>
+		</table>
+	</div>
+</div>
+
+<div class="modal fade" id="stockoverview-productcard-modal" tabindex="-1">
+	<div class="modal-dialog">
+		<div class="modal-content text-center">
+			<div class="modal-body">
+				<?php echo $__env->make('components.productcard', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo e($__t('Close')); ?></button>
+			</div>
+		</div>
+	</div>
+</div>
+<?php $__env->stopSection(); ?>
+
+<?php echo $__env->make('layout.default', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?><?php /**PATH /www/views/stockoverview.blade.php ENDPATH**/ ?>

data_store/viewcache/8c45b988174216735b56839991ffb942255949ad.php

@@ -0,0 +1,130 @@
+<?php $__env->startSection('title', $__t('Batteries overview')); ?>
+<?php $__env->startSection('activeNav', 'batteriesoverview'); ?>
+<?php $__env->startSection('viewJsName', 'batteriesoverview'); ?>
+
+<?php $__env->startPush('pageScripts'); ?>
+	<script src="<?php echo e($U('/node_modules/jquery-ui-dist/jquery-ui.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<?php $__env->startSection('content'); ?>
+<div class="row">
+	<div class="col">
+		<h1><?php echo $__env->yieldContent('title'); ?>
+			<a class="btn btn-outline-dark responsive-button" href="<?php echo e($U('/batteriesjournal')); ?>">
+				<i class="fas fa-file-alt"></i> <?php echo e($__t('Journal')); ?>
+
+			</a>
+		</h1>
+		<p id="info-due-batteries" data-status-filter="duesoon" data-next-x-days="<?php echo e($nextXDays); ?>" class="btn btn-lg btn-warning status-filter-button responsive-button mr-2"></p>
+		<p id="info-overdue-batteries" data-status-filter="overdue" class="btn btn-lg btn-danger status-filter-button responsive-button"></p>
+	</div>
+</div>
+
+<div class="row mt-3">
+	<div class="col-xs-12 col-md-6 col-xl-3">
+		<label for="search"><?php echo e($__t('Search')); ?></label> <i class="fas fa-search"></i>
+		<input type="text" class="form-control" id="search">
+	</div>
+	<div class="col-xs-12 col-md-6 col-xl-3">
+		<label for="status-filter"><?php echo e($__t('Filter by status')); ?></label> <i class="fas fa-filter"></i>
+		<select class="form-control" id="status-filter">
+			<option class="bg-white" value="all"><?php echo e($__t('All')); ?></option>
+			<option class="bg-warning" value="duesoon"><?php echo e($__t('Due soon')); ?></option>
+			<option class="bg-danger" value="overdue"><?php echo e($__t('Overdue')); ?></option>
+		</select>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col">
+		<table id="batteries-overview-table" class="table table-sm table-striped dt-responsive">
+			<thead>
+				<tr>
+					<th class="border-right"></th>
+					<th><?php echo e($__t('Battery')); ?></th>
+					<th><?php echo e($__t('Last charged')); ?></th>
+					<th><?php echo e($__t('Next planned charge cycle')); ?></th>
+					<th class="d-none">Hidden status</th>
+
+					<?php echo $__env->make('components.userfields_thead', array(
+						'userfields' => $userfields
+					), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+					
+				</tr>
+			</thead>
+			<tbody class="d-none">
+				<?php $__currentLoopData = $current; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $curentBatteryEntry): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+				<tr id="battery-<?php echo e($curentBatteryEntry->battery_id); ?>-row" class="<?php if(FindObjectInArrayByPropertyValue($batteries, 'id', $curentBatteryEntry->battery_id)->charge_interval_days > 0 && $curentBatteryEntry->next_estimated_charge_time < date('Y-m-d H:i:s')): ?> table-danger <?php elseif(FindObjectInArrayByPropertyValue($batteries, 'id', $curentBatteryEntry->battery_id)->charge_interval_days > 0 && $curentBatteryEntry->next_estimated_charge_time < date('Y-m-d H:i:s', strtotime("+$nextXDays days"))): ?> table-warning <?php endif; ?>">
+					<td class="fit-content border-right">
+						<a class="btn btn-success btn-sm track-charge-cycle-button" href="#" data-toggle="tooltip" data-placement="left" title="<?php echo e($__t('Track charge cycle of battery %s', FindObjectInArrayByPropertyValue($batteries, 'id', $curentBatteryEntry->battery_id)->name)); ?>"
+							data-battery-id="<?php echo e($curentBatteryEntry->battery_id); ?>"
+							data-battery-name="<?php echo e(FindObjectInArrayByPropertyValue($batteries, 'id', $curentBatteryEntry->battery_id)->name); ?>">
+							<i class="fas fa-fire"></i>
+						</a>
+						<div class="dropdown d-inline-block">
+							<button class="btn btn-sm btn-light text-secondary" type="button" data-toggle="dropdown">
+								<i class="fas fa-ellipsis-v"></i>
+							</button>
+							<div class="dropdown-menu">
+								<a class="dropdown-item battery-name-cell" data-chore-id="<?php echo e($curentBatteryEntry->battery_id); ?>" type="button" href="#">
+									<i class="fas fa-info"></i> <?php echo e($__t('Show battery details')); ?>
+
+								</a>
+								<a class="dropdown-item" type="button" href="<?php echo e($U('/batteriesjournal?battery=')); ?><?php echo e($curentBatteryEntry->battery_id); ?>">
+									<i class="fas fa-file-alt"></i> <?php echo e($__t('Journal for this battery')); ?>
+
+								</a>
+								<a class="dropdown-item" type="button" href="<?php echo e($U('/battery/')); ?><?php echo e($curentBatteryEntry->battery_id); ?>">
+									<i class="fas fa-edit"></i> <?php echo e($__t('Edit battery')); ?>
+
+								</a>
+							</div>
+						</div>
+					</td>
+					<td class="battery-name-cell cursor-link" data-battery-id="<?php echo e($curentBatteryEntry->battery_id); ?>">
+						<?php echo e(FindObjectInArrayByPropertyValue($batteries, 'id', $curentBatteryEntry->battery_id)->name); ?>
+
+					</td>
+					<td>
+						<span id="battery-<?php echo e($curentBatteryEntry->battery_id); ?>-last-tracked-time"><?php echo e($curentBatteryEntry->last_tracked_time); ?></span>
+						<time id="battery-<?php echo e($curentBatteryEntry->battery_id); ?>-last-tracked-time-timeago" class="timeago timeago-contextual" datetime="<?php echo e($curentBatteryEntry->last_tracked_time); ?>"></time>
+					</td>
+					<td>
+						<?php if(FindObjectInArrayByPropertyValue($batteries, 'id', $curentBatteryEntry->battery_id)->charge_interval_days > 0): ?>
+							<span id="battery-<?php echo e($curentBatteryEntry->battery_id); ?>-next-charge-time"><?php echo e($curentBatteryEntry->next_estimated_charge_time); ?></span>
+							<time id="battery-<?php echo e($curentBatteryEntry->battery_id); ?>-next-charge-time-timeago" class="timeago timeago-contextual" datetime="<?php echo e($curentBatteryEntry->next_estimated_charge_time); ?>"></time>
+						<?php else: ?>
+							...
+						<?php endif; ?>
+					</td>
+					<td class="d-none">
+						"<?php if(FindObjectInArrayByPropertyValue($batteries, 'id', $curentBatteryEntry->battery_id)->charge_interval_days > 0 && $curentBatteryEntry->next_estimated_charge_time < date('Y-m-d H:i:s')): ?> overdue <?php elseif(FindObjectInArrayByPropertyValue($batteries, 'id', $curentBatteryEntry->battery_id)->charge_interval_days > 0 && $curentBatteryEntry->next_estimated_charge_time < date('Y-m-d H:i:s', strtotime("+$nextXDays days"))): ?> duesoon <?php endif; ?>
+					</td>
+
+					<?php echo $__env->make('components.userfields_tbody', array(
+						'userfields' => $userfields,
+						'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $curentBatteryEntry->battery_id)
+					), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+
+				</tr>
+				<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+			</tbody>
+		</table>
+	</div>
+</div>
+
+<div class="modal fade" id="batteriesoverview-batterycard-modal" tabindex="-1">
+	<div class="modal-dialog">
+		<div class="modal-content text-center">
+			<div class="modal-body">
+				<?php echo $__env->make('components.batterycard', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo e($__t('Close')); ?></button>
+			</div>
+		</div>
+	</div>
+</div>
+<?php $__env->stopSection(); ?>
+
+<?php echo $__env->make('layout.default', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?><?php /**PATH /www/views/batteriesoverview.blade.php ENDPATH**/ ?>

data_store/viewcache/957b4116c291a84fef1574ba8fd17cfd04bf68ca.php

@@ -0,0 +1,23 @@
+<?php $__env->startPush('componentScripts'); ?>
+	<script src="<?php echo e($U('/viewjs/components/batterycard.js', true)); ?>?v=<?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<div class="card">
+	<div class="card-header">
+		<i class="fas fa-battery-three-quarters"></i> <?php echo e($__t('Battery overview')); ?>
+
+		<a id="batterycard-battery-edit-button" class="btn btn-sm btn-outline-info py-0 float-right disabled" href="#" data-toggle="tooltip" title="<?php echo e($__t('Edit battery')); ?>">
+			<i class="fas fa-edit"></i>
+		</a>
+		<a id="batterycard-battery-journal-button" class="btn btn-sm btn-outline-secondary py-0 mr-2 float-right disabled show-as-dialog-link" href="#" data-toggle="tooltip" title="<?php echo e($__t('Journal for this battery')); ?>">
+			<i class="fas fa-file-alt"></i>
+		</a>
+	</div>
+	<div class="card-body">
+		<h3><span id="batterycard-battery-name"></span></h3>
+		<strong><?php echo e($__t('Used in')); ?>:</strong> <span id="batterycard-battery-used_in"></span><br>
+		<strong><?php echo e($__t('Charge cycles count')); ?>:</strong> <span id="batterycard-battery-charge-cycles-count" class="locale-number locale-number-generic"></span><br>
+		<strong><?php echo e($__t('Last charged')); ?>:</strong> <span id="batterycard-battery-last-charged"></span> <time id="batterycard-battery-last-charged-timeago" class="timeago timeago-contextual"></time><br>
+	</div>
+</div>
+<?php /**PATH /www/views/components/batterycard.blade.php ENDPATH**/ ?>

data_store/viewcache/9c18943018de8b0d6192e2bee416e2ec48b762c4.php

@@ -0,0 +1,20 @@
+<?php $__env->startPush('componentScripts'); ?>
+	<script src="<?php echo e($U('/viewjs/components/locationpicker.js', true)); ?>?v=<?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<?php if(empty($prefillByName)) { $prefillByName = ''; } ?>
+<?php if(empty($prefillById)) { $prefillById = ''; } ?>
+<?php if(!isset($isRequired)) { $isRequired = true; } ?>
+<?php if(empty($hint)) { $hint = ''; } ?>
+
+<div class="form-group" data-next-input-selector="<?php echo e($nextInputSelector); ?>" data-prefill-by-name="<?php echo e($prefillByName); ?>" data-prefill-by-id="<?php echo e($prefillById); ?>">
+	<label for="location_id"><?php echo e($__t('Location')); ?>&nbsp;&nbsp;<span id="<?php echo e($hintId); ?>" class="small text-muted"><?php echo e($hint); ?></span></label>
+	<select class="form-control location-combobox" id="location_id" name="location_id" <?php if($isRequired): ?> required <?php endif; ?>>
+		<option value=""></option>
+		<?php $__currentLoopData = $locations; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $location): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+			<option value="<?php echo e($location->id); ?>"><?php echo e($location->name); ?></option>
+		<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+	</select>
+	<div class="invalid-feedback"><?php echo e($__t('You have to select a location')); ?></div>
+</div>
+<?php /**PATH /www/views/components/locationpicker.blade.php ENDPATH**/ ?>

data_store/viewcache/a1d3550b16c42761b213c96f314a94a48d635636.php

@@ -0,0 +1,95 @@
+<?php $__env->startSection('title', $__t('Purchase')); ?>
+<?php $__env->startSection('activeNav', 'purchase'); ?>
+<?php $__env->startSection('viewJsName', 'purchase'); ?>
+
+<?php $__env->startSection('content'); ?>
+<div class="row">
+	<div class="col-xs-12 col-md-6 col-xl-4 pb-3">
+		<h1><?php echo $__env->yieldContent('title'); ?></h1>
+
+		<form id="purchase-form" novalidate>
+
+			<?php echo $__env->make('components.productpicker', array(
+				'products' => $products,
+				'nextInputSelector' => '#best_before_date .datetimepicker-input'
+			), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+
+			<?php
+				$additionalGroupCssClasses = '';
+				if (!GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING)
+				{
+					$additionalGroupCssClasses = 'd-none';
+				}
+			?>
+			<?php echo $__env->make('components.datetimepicker', array(
+				'id' => 'best_before_date',
+				'label' => 'Best before',
+				'format' => 'YYYY-MM-DD',
+				'initWithNow' => false,
+				'limitEndToNow' => false,
+				'limitStartToNow' => false,
+				'invalidFeedback' => $__t('A best before date is required'),
+				'nextInputSelector' => '#amount',
+				'additionalCssClasses' => 'date-only-datetimepicker',
+				'shortcutValue' => '2999-12-31',
+				'shortcutLabel' => 'Never expires',
+				'earlierThanInfoLimit' => date('Y-m-d'),
+				'earlierThanInfoText' => $__t('The given date is earlier than today, are you sure?'),
+				'additionalGroupCssClasses' => $additionalGroupCssClasses
+			), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+			<?php $additionalGroupCssClasses = ''; ?>
+
+			<?php echo $__env->make('components.numberpicker', array(
+				'id' => 'amount',
+				'label' => 'Amount',
+				'hintId' => 'amount_qu_unit',
+				'min' => 1,
+				'invalidFeedback' => $__t('The amount cannot be lower than %s', '1'),
+				'additionalHtmlContextHelp' => '<div id="tare-weight-handling-info" class="text-info font-italic d-none">' . $__t('Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated') . '</div>'
+			), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+
+			<?php if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING): ?>
+			<?php echo $__env->make('components.numberpicker', array(
+				'id' => 'price',
+				'label' => 'Price',
+				'min' => 0,
+				'step' => 0.0001,
+				'value' => '',
+				'hint' => $__t('in %s and based on the purchase quantity unit', GROCY_CURRENCY),
+				'invalidFeedback' => $__t('The price cannot be lower than %s', '0'),
+				'isRequired' => false,
+				'additionalGroupCssClasses' => 'mb-1'
+			), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+			<div class="form-check form-check-inline mb-3">
+				<input class="form-check-input" type="radio" name="price-type" id="price-type-unit-price" value="unit-price" checked>
+				<label class="form-check-label" for="price-type-unit-price"><?php echo e($__t('Unit price')); ?></label>
+			</div>
+			<div class="form-check form-check-inline mb-3">
+				<input class="form-check-input" type="radio" name="price-type" id="price-type-total-price" value="total-price">
+				<label class="form-check-label" for="price-type-total-price"><?php echo e($__t('Total price')); ?></label>
+			</div>
+			<?php else: ?>
+			<input type="hidden" name="price" id="price" value="0">
+			<?php endif; ?>
+
+			<?php if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING): ?>
+			<?php echo $__env->make('components.locationpicker', array(
+				'locations' => $locations,
+				'isRequired' => false
+			), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+			<?php else: ?>
+			<input type="hidden" name="location_id" id="location_id" value="1">
+			<?php endif; ?>
+
+			<button id="save-purchase-button" class="btn btn-success"><?php echo e($__t('OK')); ?></button>
+
+		</form>
+	</div>
+
+	<div class="col-xs-12 col-md-6 col-xl-4 hide-when-embedded">
+		<?php echo $__env->make('components.productcard', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+	</div>
+</div>
+<?php $__env->stopSection(); ?>
+
+<?php echo $__env->make('layout.default', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?><?php /**PATH /www/views/purchase.blade.php ENDPATH**/ ?>

data_store/viewcache/a719dd39ae3425fe1fbe35f2b27e142d533daa57.php

@@ -0,0 +1,34 @@
+<?php $__env->startPush('componentScripts'); ?>
+	<script src="<?php echo e($U('/viewjs/components/numberpicker.js', true)); ?>?v=<?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<?php if(!isset($value)) { $value = 1; } ?>
+<?php if(empty($min)) { $min = 0; } ?>
+<?php if(empty($max)) { $max = 999999; } ?>
+<?php if(empty($step)) { $step = 1; } ?>
+<?php if(empty($hint)) { $hint = ''; } ?>
+<?php if(empty($hintId)) { $hintId = ''; } ?>
+<?php if(empty($additionalCssClasses)) { $additionalCssClasses = ''; } ?>
+<?php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } ?>
+<?php if(empty($additionalAttributes)) { $additionalAttributes = ''; } ?>
+<?php if(empty($additionalHtmlElements)) { $additionalHtmlElements = ''; } ?>
+<?php if(empty($additionalHtmlContextHelp)) { $additionalHtmlContextHelp = ''; } ?>
+<?php if(!isset($isRequired)) { $isRequired = true; } ?>
+<?php if(!isset($noNameAttribute)) { $noNameAttribute = false; } ?>
+
+<div class="form-group <?php echo e($additionalGroupCssClasses); ?>">
+	<label for="<?php echo e($id); ?>"><?php echo e($__t($label)); ?>&nbsp;&nbsp;<span id="<?php echo e($hintId); ?>" class="small text-muted"><?php echo e($hint); ?></span><?php echo $additionalHtmlContextHelp; ?></label>
+	<div class="input-group">
+		<input <?php echo $additionalAttributes; ?> type="number" class="form-control numberpicker <?php echo e($additionalCssClasses); ?>" id="<?php echo e($id); ?>" <?php if(!$noNameAttribute): ?> name="<?php echo e($id); ?>" <?php endif; ?> value="<?php echo e($value); ?>" min="<?php echo e($min); ?>" max="<?php echo e($max); ?>" step="<?php echo e($step); ?>" <?php if($isRequired): ?> required <?php endif; ?>>
+		<div class="input-group-append">
+			<div class="input-group-text numberpicker-up-button"><i class="fas fa-arrow-up"></i></div>
+		</div>
+		<div class="input-group-append">
+			<div class="input-group-text numberpicker-down-button"><i class="fas fa-arrow-down"></i></div>
+		</div>
+		<div class="invalid-feedback"><?php echo e($invalidFeedback); ?></div>
+	</div>
+	<?php echo $additionalHtmlElements; ?>
+
+</div>
+<?php /**PATH /www/views/components/numberpicker.blade.php ENDPATH**/ ?>

data_store/viewcache/aea3dd024b357cb5f729714f3ed8fb2ad1d2bdb1.php

@@ -0,0 +1,319 @@
+<?php $__env->startSection('title', $__t('Recipes')); ?>
+<?php $__env->startSection('activeNav', 'recipes'); ?>
+<?php $__env->startSection('viewJsName', 'recipes'); ?>
+
+<?php $__env->startSection('content'); ?>
+<script>
+	Grocy.QuantityUnits = <?php echo json_encode($quantityUnits); ?>;
+	Grocy.QuantityUnitConversionsResolved = <?php echo json_encode($quantityUnitConversionsResolved); ?>;
+</script>
+
+<div class="row">
+	
+	<div class="col-xs-12 col-md-6 pb-3">
+		<h1>
+			<?php echo $__env->yieldContent('title'); ?>
+			<a class="btn btn-outline-dark" href="<?php echo e($U('/recipe/new')); ?>">
+				<i class="fas fa-plus"></i> <?php echo e($__t('Add')); ?>
+
+			</a>
+		</h1>
+
+		<div class="row">
+			<div class="col-6">
+				<label for="search"><?php echo e($__t('Search')); ?></label> <i class="fas fa-search"></i>
+				<input type="text" class="form-control" id="search">
+			</div>
+
+			<div class="col-6">
+				<label for="status-filter"><?php echo e($__t('Filter by status')); ?></label> <i class="fas fa-filter"></i>
+				<select class="form-control" id="status-filter">
+					<option class="bg-white" value="all"><?php echo e($__t('All')); ?></option>
+					<option class="bg-success" value="enoughtinstock"><?php echo e($__t('Enough in stock')); ?></option>
+					<option class="bg-warning" value="enoughinstockwithshoppinglist"><?php echo e($__t('Not enough in stock, but already on the shopping list')); ?></option>
+					<option class="bg-danger" value="notenoughinstock"><?php echo e($__t('Not enough in stock')); ?></option>
+				</select>
+			</div>
+		</div>
+
+		<ul class="nav nav-tabs mt-3">
+			<li class="nav-item">
+				<a class="nav-link active" id="list-tab" data-toggle="tab" href="#list"><?php echo e($__t('List')); ?></a>
+			</li>
+			<li class="nav-item">
+				<a class="nav-link" id="gallery-tab" data-toggle="tab" href="#gallery"><?php echo e($__t('Gallery')); ?></a>
+			</li>
+		</ul>
+
+		<div class="tab-content">
+
+			<div class="tab-pane show active" id="list">
+				<table id="recipes-table" class="table table-striped dt-responsive">
+					<thead>
+						<tr>
+							<th><?php echo e($__t('Name')); ?></th>
+							<th><?php echo e($__t('Servings')); ?></th>
+							<th><?php echo e($__t('Requirements fulfilled')); ?></th>
+							<th class="d-none">Hidden status for sorting of "Requirements fulfilled" column</th>
+							<th class="d-none">Hidden status for filtering by status</th>
+							<th class="d-none">Hidden recipe ingredient product names</th>
+
+							<?php echo $__env->make('components.userfields_thead', array(
+								'userfields' => $userfields
+							), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+
+						</tr>
+					</thead>
+					<tbody class="d-none">
+						<?php $__currentLoopData = $recipes; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $recipe): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+						<tr id="recipe-row-<?php echo e($recipe->id); ?>" data-recipe-id="<?php echo e($recipe->id); ?>">
+							<td>
+								<?php echo e($recipe->name); ?>
+
+							</td>
+							<td>
+								<?php echo e($recipe->desired_servings); ?>
+
+							</td>
+							<td>
+								<?php if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled == 1): ?><i class="fas fa-check text-success"></i><?php elseif(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled_with_shopping_list == 1): ?><i class="fas fa-exclamation text-warning"></i><?php else: ?><i class="fas fa-times text-danger"></i><?php endif; ?>
+								<span class="timeago-contextual"><?php if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled == 1): ?><?php echo e($__t('Enough in stock')); ?><?php elseif(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled_with_shopping_list == 1): ?><?php echo e($__n(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->missing_products_count, 'Not enough in stock, %s ingredient missing but already on the shopping list', 'Not enough in stock, %s ingredients missing but already on the shopping list')); ?><?php else: ?><?php echo e($__n(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->missing_products_count, 'Not enough in stock, %s ingredient missing', 'Not enough in stock, %s ingredients missing')); ?><?php endif; ?></span>
+							</td>
+							<td class="d-none">
+								<?php echo e(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->missing_products_count); ?>
+
+							</td>
+							<td class="d-none">
+								<?php if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled == 1): ?> enoughtinstock <?php elseif(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled_with_shopping_list == 1): ?> enoughinstockwithshoppinglist <?php else: ?> notenoughinstock <?php endif; ?>
+							</td>
+							<td class="d-none">
+								<?php $__currentLoopData = FindAllObjectsInArrayByPropertyValue($recipePositionsResolved, 'recipe_id', $recipe->id); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $recipePos): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+									<?php echo e(FindObjectInArrayByPropertyValue($products, 'id', $recipePos->product_id)->name . ' '); ?>
+
+								<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+							</td>
+
+							<?php echo $__env->make('components.userfields_tbody', array(
+								'userfields' => $userfields,
+								'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $recipe->id)
+							), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+
+						</tr>
+						<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+					</tbody>
+				</table>
+			</div>
+
+			<div class="tab-pane show" id="gallery">
+				<div class="row no-gutters">
+					<?php $__currentLoopData = $recipes; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $recipe): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+					<div class="col-6 recipe-gallery-item-container">
+						<a class="discrete-link recipe-gallery-item" data-recipe-id="<?php echo e($recipe->id); ?>" href="#">
+							<div id="recipe-card-<?php echo e($recipe->id); ?>" class="card border-white mb-0 recipe-card">
+								<?php if(!empty($recipe->picture_file_name)): ?>
+								<img data-src="<?php echo e($U('/api/files/recipepictures/' . base64_encode($recipe->picture_file_name) . '?force_serve_as=picture&best_fit_width=400')); ?>" class="img-fluid lazy">
+								<?php endif; ?>
+								<div class="card-body text-center">
+									<h5 class="card-title mb-1"><?php echo e($recipe->name); ?></h5>
+									<p class="card-text">
+										<?php if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled == 1): ?><i class="fas fa-check text-success"></i><?php elseif(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled_with_shopping_list == 1): ?><i class="fas fa-exclamation text-warning"></i><?php else: ?><i class="fas fa-times text-danger"></i><?php endif; ?>
+										<span class="timeago-contextual"><?php if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled == 1): ?><?php echo e($__t('Enough in stock')); ?><?php elseif(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled_with_shopping_list == 1): ?><?php echo e($__n(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->missing_products_count, 'Not enough in stock, %s ingredient missing but already on the shopping list', 'Not enough in stock, %s ingredients missing but already on the shopping list')); ?><?php else: ?><?php echo e($__n(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->missing_products_count, 'Not enough in stock, %s ingredient missing', 'Not enough in stock, %s ingredients missing')); ?><?php endif; ?></span>
+									</p>
+								</div>
+							</div>
+						</a>
+					</div>
+				<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+				</div>
+			</div>
+			
+		</div>
+	</div>
+
+	<?php if($selectedRecipe !== null): ?>
+	<div class="col-xs-12 col-md-6">
+		<div class="card-header">
+			<i class="fas fa-cocktail"></i> <?php echo e($selectedRecipe->name); ?>&nbsp;&nbsp;
+			<a id="selectedRecipeConsumeButton" class="btn btn-sm btn-outline-success py-0 hide-when-embedded hide-on-fullscreen-card <?php if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $selectedRecipe->id)->need_fulfilled == 0): ?> disabled <?php endif; ?>" href="#" data-toggle="tooltip" title="<?php echo e($__t('Consume all ingredients needed by this recipe')); ?>" data-recipe-id="<?php echo e($selectedRecipe->id); ?>" data-recipe-name="<?php echo e($selectedRecipe->name); ?>">
+				<i class="fas fa-utensils"></i>
+			</a>
+			<a class="btn btn-sm btn-outline-primary py-0 recipe-order-missing-button hide-when-embedded hide-on-fullscreen-card <?php if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $selectedRecipe->id)->need_fulfilled_with_shopping_list == 1): ?> disabled <?php endif; ?>" href="#" data-toggle="tooltip" title="<?php echo e($__t('Put missing products on shopping list')); ?>" data-recipe-id="<?php echo e($selectedRecipe->id); ?>" data-recipe-name="<?php echo e($selectedRecipe->name); ?>">
+				<i class="fas fa-cart-plus"></i>
+			</a>&nbsp;&nbsp;
+			<a id="selectedRecipeEditButton" class="btn btn-sm btn-outline-info hide-when-embedded hide-on-fullscreen-card py-0" href="<?php echo e($U('/recipe/')); ?><?php echo e($selectedRecipe->id); ?>">
+				<i class="fas fa-edit"></i>
+			</a>
+			<a id="selectedRecipeDeleteButton" class="btn btn-sm btn-outline-danger hide-when-embedded hide-on-fullscreen-card py-0" href="#" data-recipe-id="<?php echo e($selectedRecipe->id); ?>" data-recipe-name="<?php echo e($selectedRecipe->name); ?>">
+				<i class="fas fa-trash"></i>
+			</a>
+			<a id="selectedRecipeToggleFullscreenButton" class="btn btn-sm btn-outline-secondary py-0 hide-when-embedded float-right" href="#" data-toggle="tooltip" title="<?php echo e($__t('Expand to fullscreen')); ?>">
+				<i class="fas fa-expand-arrows-alt"></i>
+			</a>
+		</div>
+		<div id="selectedRecipeCard" class="card">
+			<div class="card-body mb-0 pb-0">
+				<div class="row">
+					<div class="col-4">
+						<?php echo $__env->make('components.numberpicker', array(
+							'id' => 'servings-scale',
+							'label' => 'Servings',
+							'min' => 1,
+							'value' => $selectedRecipe->desired_servings,
+							'invalidFeedback' => $__t('This cannot be lower than %s', '1'),
+							'additionalAttributes' => 'data-recipe-id="' . $selectedRecipe->id . '"'
+						), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+					</div>
+					<?php if(!empty($selectedRecipeTotalCalories) && intval($selectedRecipeTotalCalories) > 0): ?>
+					<div class="col-2">
+						<label><?php echo e($__t('Energy (kcal)')); ?></label>
+						<p class="mb-0">
+							<h3 class="locale-number locale-number-generic pt-0"><?php echo e($selectedRecipeTotalCalories); ?></h3>
+						</p>
+					</div>
+					<?php endif; ?>
+					<?php if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING): ?>
+					<div class="col-6">
+						<label><?php echo e($__t('Costs')); ?>&nbsp;&nbsp;
+							<span class="small text-muted"><?php echo e($__t('Based on the prices of the last purchase per product')); ?></span>
+						</label>
+						<p class="mb-0">
+							<h3 class="locale-number locale-number-currency pt-0"><?php echo e($selectedRecipeTotalCosts); ?></h3>
+						</p>
+					</div>
+					<?php endif; ?>
+				</div>
+			</div>
+
+			<!-- Subrecipes first -->
+			<?php $__currentLoopData = $selectedRecipeSubRecipes; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $selectedRecipeSubRecipe): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+				<div class="card-body">
+					<h3 class="mb-0"><?php echo e($selectedRecipeSubRecipe->name); ?></h3>
+				</div>
+
+				<?php if(!empty($selectedRecipeSubRecipe->picture_file_name)): ?>
+					<p class="w-75 mx-auto txt-center"><img src="<?php echo e($U('/api/files/recipepictures/' . base64_encode($selectedRecipeSubRecipe->picture_file_name) . '?force_serve_as=picture&best_fit_width=400')); ?>" class="img-fluid img-thumbnail lazy"></p>
+				<?php endif; ?>
+
+				<?php $selectedRecipeSubRecipePositionsFiltered = FindAllObjectsInArrayByPropertyValue($selectedRecipeSubRecipesPositions, 'child_recipe_id', $selectedRecipeSubRecipe->id); ?>
+				<?php if(count($selectedRecipeSubRecipePositionsFiltered) > 0): ?>
+				<div class="card-body">
+					<h5 class="mb-0"><?php echo e($__t('Ingredients')); ?></h5>
+				</div>
+				<ul class="list-group list-group-flush">
+					<?php $lastGroup = 'undefined'; ?>
+					<?php $__currentLoopData = $selectedRecipeSubRecipePositionsFiltered; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $selectedRecipePosition): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+					<?php if($lastGroup != $selectedRecipePosition->ingredient_group): ?>
+						<h5 class="mb-2 mt-2 ml-4"><strong><?php echo e($selectedRecipePosition->ingredient_group); ?></strong></h5>
+					<?php endif; ?>
+					<li class="list-group-item">
+						<?php
+							$product = FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id);
+							$productQuConversions = FindAllObjectsInArrayByPropertyValue($quantityUnitConversionsResolved, 'product_id', $product->id);
+							$productQuConversions = FindAllObjectsInArrayByPropertyValue($productQuConversions, 'from_qu_id', $product->qu_id_stock);
+							$productQuConversion = FindObjectInArrayByPropertyValue($productQuConversions, 'to_qu_id', $selectedRecipePosition->qu_id);
+							if ($productQuConversion)
+							{
+								$selectedRecipePosition->recipe_amount = $selectedRecipePosition->recipe_amount * $productQuConversion->factor;
+							}
+						?>
+						<?php if(!empty($selectedRecipePosition->recipe_variable_amount)): ?>
+							<?php echo e($selectedRecipePosition->recipe_variable_amount); ?>
+
+						<?php else: ?>
+							<span class="llocale-number locale-number-quantity-amount"><?php if($selectedRecipePosition->recipe_amount == round($selectedRecipePosition->recipe_amount, 2)): ?><?php echo e(round($selectedRecipePosition->recipe_amount, 2)); ?><?php else: ?><?php echo e($selectedRecipePosition->recipe_amount); ?><?php endif; ?></span>
+						<?php endif; ?>
+						<?php echo e($__n($selectedRecipePosition->recipe_amount, FindObjectInArrayByPropertyValue($quantityUnits, 'id', $selectedRecipePosition->qu_id)->name, FindObjectInArrayByPropertyValue($quantityUnits, 'id', $selectedRecipePosition->qu_id)->name_plural)); ?> <?php echo e(FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id)->name); ?>
+
+						<?php if($selectedRecipePosition->need_fulfilled == 1): ?><i class="fas fa-check text-success"></i><?php elseif($selectedRecipePosition->need_fulfilled_with_shopping_list == 1): ?><i class="fas fa-exclamation text-warning"></i><?php else: ?><i class="fas fa-times text-danger"></i><?php endif; ?>
+						<span class="timeago-contextual"><?php if(FindObjectInArrayByPropertyValue($selectedRecipeSubRecipesPositions, 'recipe_pos_id', $selectedRecipePosition->id)->need_fulfilled == 1): ?> <?php echo e($__t('Enough in stock')); ?> <?php else: ?> <?php echo e($__t('Not enough in stock, %1$s missing, %2$s already on shopping list', round(FindObjectInArrayByPropertyValue($selectedRecipeSubRecipesPositions, 'recipe_pos_id', $selectedRecipePosition->id)->missing_amount, 2), round(FindObjectInArrayByPropertyValue($selectedRecipeSubRecipesPositions, 'recipe_pos_id', $selectedRecipePosition->id)->amount_on_shopping_list, 2))); ?> <?php endif; ?></span>
+
+						<?php if(!empty($selectedRecipePosition->note)): ?>
+						<div class="text-muted"><?php echo nl2br($selectedRecipePosition->note); ?></div>
+						<?php endif; ?>
+					</li>
+					<?php $lastGroup = $selectedRecipePosition->ingredient_group; ?>
+					<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+				</ul>
+				<?php endif; ?>
+				<?php if(!empty($selectedRecipeSubRecipe->description)): ?>
+				<div class="card-body">
+					<h5><?php echo e($__t('Preparation')); ?></h5>
+					<?php echo $selectedRecipeSubRecipe->description; ?>
+
+				</div>
+				<?php endif; ?>
+			<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+
+			<!-- Selected recipe -->
+			<?php if(!empty($selectedRecipe->picture_file_name)): ?>
+				<p class="w-75 mx-auto text-center"><img src="<?php echo e($U('/api/files/recipepictures/' . base64_encode($selectedRecipe->picture_file_name) . '?force_serve_as=picture&best_fit_width=400')); ?>" class="img-fluid img-thumbnail lazy"></p>
+			<?php endif; ?>
+
+			<?php if($selectedRecipePositionsResolved->count() > 0): ?>
+			<div class="card-body">
+				<h5 class="mb-0"><?php echo e($__t('Ingredients')); ?></h5>
+			</div>
+			<ul class="list-group list-group-flush">
+				<?php $lastGroup = 'undefined'; ?>
+				<?php $__currentLoopData = $selectedRecipePositionsResolved; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $selectedRecipePosition): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+				<?php if($lastGroup != $selectedRecipePosition->ingredient_group): ?>
+					<h5 class="mb-2 mt-2 ml-4"><strong><?php echo e($selectedRecipePosition->ingredient_group); ?></strong></h5>
+				<?php endif; ?>
+				<li class="list-group-item">
+					<?php
+						$product = FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id);
+						$productQuConversions = FindAllObjectsInArrayByPropertyValue($quantityUnitConversionsResolved, 'product_id', $product->id);
+						$productQuConversions = FindAllObjectsInArrayByPropertyValue($productQuConversions, 'from_qu_id', $product->qu_id_stock);
+						$productQuConversion = FindObjectInArrayByPropertyValue($productQuConversions, 'to_qu_id', $selectedRecipePosition->qu_id);
+						if ($productQuConversion)
+						{
+							$selectedRecipePosition->recipe_amount = $selectedRecipePosition->recipe_amount * $productQuConversion->factor;
+						}
+					?>
+					<?php if(!empty($selectedRecipePosition->recipe_variable_amount)): ?>
+						<?php echo e($selectedRecipePosition->recipe_variable_amount); ?>
+
+					<?php else: ?>
+						<span class="locale-number locale-number-quantity-amount"><?php if($selectedRecipePosition->recipe_amount == round($selectedRecipePosition->recipe_amount, 2)): ?><?php echo e(round($selectedRecipePosition->recipe_amount, 2)); ?><?php else: ?><?php echo e($selectedRecipePosition->recipe_amount); ?><?php endif; ?></span>
+					<?php endif; ?>
+					<?php echo e($__n($selectedRecipePosition->recipe_amount, FindObjectInArrayByPropertyValue($quantityUnits, 'id', $selectedRecipePosition->qu_id)->name, FindObjectInArrayByPropertyValue($quantityUnits, 'id', $selectedRecipePosition->qu_id)->name_plural)); ?> <?php echo e(FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id)->name); ?>
+
+					<?php if($selectedRecipePosition->need_fulfilled == 1): ?><i class="fas fa-check text-success"></i><?php elseif($selectedRecipePosition->need_fulfilled_with_shopping_list == 1): ?><i class="fas fa-exclamation text-warning"></i><?php else: ?><i class="fas fa-times text-danger"></i><?php endif; ?>
+					<span class="timeago-contextual"><?php if(FindObjectInArrayByPropertyValue($recipePositionsResolved, 'recipe_pos_id', $selectedRecipePosition->id)->need_fulfilled == 1): ?> <?php echo e($__t('Enough in stock')); ?> <?php else: ?> <?php echo e($__t('Not enough in stock, %1$s missing, %2$s already on shopping list', round(FindObjectInArrayByPropertyValue($recipePositionsResolved, 'recipe_pos_id', $selectedRecipePosition->id)->missing_amount, 2), round(FindObjectInArrayByPropertyValue($recipePositionsResolved, 'recipe_pos_id', $selectedRecipePosition->id)->amount_on_shopping_list, 2))); ?> <?php endif; ?></span>
+
+					<?php if(!empty($selectedRecipePosition->note)): ?>
+					<div class="text-muted"><?php echo nl2br($selectedRecipePosition->note); ?></div>
+					<?php endif; ?>
+				</li>
+				<?php $lastGroup = $selectedRecipePosition->ingredient_group; ?>
+				<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+			</ul>
+			<?php endif; ?>
+			<?php if(!empty($selectedRecipe->description)): ?>
+			<div class="card-body">
+				<h5><?php echo e($__t('Preparation')); ?></h5>
+				<?php echo $selectedRecipe->description; ?>
+
+			</div>
+			<?php endif; ?>
+		</div>
+	</div>
+	<?php endif; ?>
+</div>
+
+<div id="missing-recipe-pos-list" class="list-group d-none mt-3">
+	<?php $__currentLoopData = $recipePositionsResolved; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $recipePos): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+		<?php if(in_array($recipePos->recipe_id, $includedRecipeIdsAbsolute) && $recipePos->missing_amount > 0): ?>
+			<a href="#" class="list-group-item list-group-item-action list-group-item-primary missing-recipe-pos-select-button">
+				<div class="form-check form-check-inline">
+					<input class="form-check-input missing-recipe-pos-product-checkbox" type="checkbox" data-product-id="<?php echo e($recipePos->product_id); ?>" checked>
+				</div>
+				<?php echo e(FindObjectInArrayByPropertyValue($products, 'id', $recipePos->product_id)->name); ?>
+
+			</a>
+		<?php endif; ?>
+	<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+</div>
+<?php $__env->stopSection(); ?>
+
+<?php echo $__env->make('layout.default', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?><?php /**PATH /www/views/recipes.blade.php ENDPATH**/ ?>

data_store/viewcache/afa5e1136a37e89676e37ef7c5ac4e8b5b4a0516.php

@@ -0,0 +1,108 @@
+<?php $__env->startPush('componentScripts'); ?>
+	<script src="<?php echo e($U('/viewjs/components/userfieldsform.js', true)); ?>?v=<?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<?php if(count($userfields) > 0): ?>
+
+<div id="userfields-form" data-entity="<?php echo e($entity); ?>" class="border border-info p-2 mb-2" novalidate>
+	<h2 class="small"><?php echo e($__t('Userfields')); ?></h2>
+
+	<?php $__currentLoopData = $userfields; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $userfield): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+
+	<?php if($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_SINGLE_LINE_TEXT): ?>
+	<div class="form-group">
+		<label for="name"><?php echo e($userfield->caption); ?></label>
+		<input type="text" class="form-control userfield-input" data-userfield-name="<?php echo e($userfield->name); ?>">
+	</div>
+	<?php elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_SINGLE_MULTILINE_TEXT): ?>
+	<div class="form-group">
+		<label for="description"><?php echo e($userfield->caption); ?></label>
+		<textarea class="form-control userfield-input" rows="4" data-userfield-name="<?php echo e($userfield->name); ?>"></textarea>
+	</div>
+	<?php elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_INTEGRAL_NUMBER): ?>
+	<?php echo $__env->make('components.numberpicker', array(
+		'id' => $userfield->name,
+		'label' => $userfield->caption,
+		'noNameAttribute' => true,
+		'min' => 0,
+		'isRequired' => false,
+		'additionalCssClasses' => 'userfield-input',
+		'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"'
+	), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+	<?php elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_DECIMAL_NUMBER): ?>
+	<?php echo $__env->make('components.numberpicker', array(
+		'id' => '',
+		'label' => $userfield->caption,
+		'noNameAttribute' => true,
+		'min' => 0,
+		'step' => 0.01,
+		'isRequired' => false,
+		'additionalCssClasses' => 'userfield-input',
+		'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"'
+	), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+	<?php elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_DATE): ?>
+	<?php echo $__env->make('components.datetimepicker', array(
+		'id' => $userfield->name,
+		'label' => $userfield->caption,
+		'noNameAttribute' => true,
+		'format' => 'YYYY-MM-DD',
+		'initWithNow' => false,
+		'limitEndToNow' => false,
+		'limitStartToNow' => false,
+		'additionalGroupCssClasses' => 'date-only-datetimepicker',
+		'isRequired' => false,
+		'additionalCssClasses' => 'userfield-input',
+		'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"'
+	), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+	<?php elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_DATETIME): ?>
+	<?php echo $__env->make('components.datetimepicker', array(
+		'id' => $userfield->name,
+		'label' => $userfield->caption,
+		'noNameAttribute' => true,
+		'format' => 'YYYY-MM-DD HH:mm:ss',
+		'initWithNow' => false,
+		'limitEndToNow' => false,
+		'limitStartToNow' => false,
+		'isRequired' => false,
+		'additionalCssClasses' => 'userfield-input',
+		'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"'
+	), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+	<?php elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_CHECKBOX): ?>
+	<div class="form-group">
+		<div class="form-check">
+			<input class="form-check-input userfield-input" type="checkbox" data-userfield-name="<?php echo e($userfield->name); ?>" value="1">
+			<label class="form-check-label" for="<?php echo e($userfield->name); ?>"><?php echo e($userfield->caption); ?></label>
+		</div>
+	</div>
+	<?php elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_PRESET_LIST): ?>
+	<div class="form-group">
+		<label for="<?php echo e($userfield->name); ?>"><?php echo e($userfield->caption); ?></label>
+		<select class="form-control userfield-input" data-userfield-name="<?php echo e($userfield->name); ?>">
+			<option></option>
+			<?php $__currentLoopData = preg_split('/\r\n|\r|\n/', $userfield->config); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $option): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+				<option value="<?php echo e($option); ?>"><?php echo e($option); ?></option>
+			<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+		</select>
+	</div>
+	<?php elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_PRESET_CHECKLIST): ?>
+	<div class="form-group">
+		<label for="<?php echo e($userfield->name); ?>"><?php echo e($userfield->caption); ?></label>
+		<select multiple class="form-control userfield-input selectpicker" data-userfield-name="<?php echo e($userfield->name); ?>" data-actions-Box="true" data-live-search="true">
+			<?php $__currentLoopData = preg_split('/\r\n|\r|\n/', $userfield->config); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $option): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+				<option value="<?php echo e($option); ?>"><?php echo e($option); ?></option>
+			<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+		</select>
+	</div>
+	<?php elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_LINK): ?>
+	<div class="form-group">
+		<label for="name"><?php echo e($userfield->caption); ?></label>
+		<input type="link" class="form-control userfield-input" data-userfield-name="<?php echo e($userfield->name); ?>">
+	</div>
+	<?php endif; ?>
+
+	<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+
+</div>
+
+<?php endif; ?>
+<?php /**PATH /www/views/components/userfieldsform.blade.php ENDPATH**/ ?>

data_store/viewcache/b2b4fe4d54950bc85b1226911a70bb9c1f601dac.php

@@ -0,0 +1,22 @@
+<?php $__env->startPush('componentScripts'); ?>
+	<script src="<?php echo e($U('/viewjs/components/recipepicker.js', true)); ?>?v=<?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<?php if(empty($prefillByName)) { $prefillByName = ''; } ?>
+<?php if(empty($prefillById)) { $prefillById = ''; } ?>
+<?php if(!isset($isRequired)) { $isRequired = true; } ?>
+<?php if(empty($hint)) { $hint = ''; } ?>
+<?php if(empty($hintId)) { $hintId = ''; } ?>
+<?php if(empty($nextInputSelector)) { $nextInputSelector = ''; } ?>
+
+<div class="form-group" data-next-input-selector="<?php echo e($nextInputSelector); ?>" data-prefill-by-name="<?php echo e($prefillByName); ?>" data-prefill-by-id="<?php echo e($prefillById); ?>">
+	<label for="recipe_id"><?php echo e($__t('Recipe')); ?>&nbsp;&nbsp;<span id="<?php echo e($hintId); ?>" class="small text-muted"><?php echo e($hint); ?></span></label>
+	<select class="form-control recipe-combobox" id="recipe_id" name="recipe_id" <?php if($isRequired): ?> required <?php endif; ?>>
+		<option value=""></option>
+		<?php $__currentLoopData = $recipes; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $recipe): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+			<option value="<?php echo e($recipe->id); ?>"><?php echo e($recipe->name); ?></option>
+		<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+	</select>
+	<div class="invalid-feedback"><?php echo e($__t('You have to select a recipe')); ?></div>
+</div>
+<?php /**PATH /www/views/components/recipepicker.blade.php ENDPATH**/ ?>

data_store/viewcache/c030d61cec8494e8f3b3c1941a331867552e684f.php

@@ -0,0 +1,32 @@
+<?php $__env->startPush('componentScripts'); ?>
+	<script src="<?php echo e($U('/viewjs/components/productpicker.js', true)); ?>?v=<?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<?php if(empty($disallowAddProductWorkflows)) { $disallowAddProductWorkflows = false; } ?>
+<?php if(empty($disallowAllProductWorkflows)) { $disallowAllProductWorkflows = false; } ?>
+<?php if(empty($prefillByName)) { $prefillByName = ''; } ?>
+<?php if(empty($prefillById)) { $prefillById = ''; } ?>
+<?php if(!isset($isRequired)) { $isRequired = true; } ?>
+<?php if(!isset($label)) { $label = 'Product'; } ?>
+<?php if(!isset($disabled)) { $disabled = false; } ?>
+<?php if(empty($hint)) { $hint = ''; } ?>
+<?php if(empty($nextInputSelector)) { $nextInputSelector = ''; } ?>
+
+<div class="form-group" data-next-input-selector="<?php echo e($nextInputSelector); ?>" data-disallow-add-product-workflows="<?php echo e(BoolToString($disallowAddProductWorkflows)); ?>" data-disallow-all-product-workflows="<?php echo e(BoolToString($disallowAllProductWorkflows)); ?>" data-prefill-by-name="<?php echo e($prefillByName); ?>" data-prefill-by-id="<?php echo e($prefillById); ?>">
+	<label for="product_id"><?php echo e($__t($label)); ?> <i class="fas fa-barcode"></i><span id="barcode-lookup-disabled-hint" class="small text-muted d-none"> <?php echo e($__t('Barcode lookup is disabled')); ?></span>&nbsp;&nbsp;<span class="small text-muted"><?php echo e($hint); ?></span></label>
+	<select class="form-control product-combobox barcodescanner-input" id="product_id" name="product_id" <?php if($isRequired): ?> required <?php endif; ?> <?php if($disabled): ?> disabled <?php endif; ?>>
+		<option value=""></option>
+		<?php $__currentLoopData = $products; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $product): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+			<option data-additional-searchdata="<?php echo e($product->barcode); ?><?php if(!empty($product->barcode)): ?>,<?php endif; ?>" value="<?php echo e($product->id); ?>"><?php echo e($product->name); ?></option>
+		<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+	</select>
+	<div class="invalid-feedback"><?php echo e($__t('You have to select a product')); ?></div>
+	<div id="custom-productpicker-error" class="form-text text-danger d-none"></div>
+	<?php if(!$disallowAllProductWorkflows): ?>
+		<div class="form-text text-info small"><?php echo e($__t('Type a new product name or barcode and hit TAB to start a workflow')); ?></div>
+	<?php endif; ?>
+	<div id="flow-info-addbarcodetoselection" class="form-text text-muted small d-none"><strong><span id="addbarcodetoselection"></span></strong> <?php echo e($__t('will be added to the list of barcodes for the selected product on submit')); ?></div>
+</div>
+
+<?php echo $__env->make('components.barcodescanner', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
+<?php /**PATH /www/views/components/productpicker.blade.php ENDPATH**/ ?>

data_store/viewcache/e3b11bbec6075caba3edd0a878f615b4bba9c000.php

@@ -0,0 +1,446 @@
+<!DOCTYPE html>
+<html lang="<?php echo e(GROCY_CULTURE); ?>">
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="x-ua-compatible" content="ie=edge">
+	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+	<meta name="robots" content="noindex,nofollow">
+	<meta name="format-detection" content="telephone=no">
+
+	<meta name="author" content="Bernd Bestel (bernd@berrnd.de)">
+
+	<link rel="apple-touch-icon" sizes="180x180" href="<?php echo e($U('/img/appicons/apple-touch-icon.png?v=', true)); ?><?php echo e($version); ?>">
+	<link rel="icon" type="image/png" sizes="32x32" href="<?php echo e($U('/img/appicons/favicon-32x32.png?v=', true)); ?><?php echo e($version); ?>">
+	<link rel="icon" type="image/png" sizes="16x16" href="<?php echo e($U('/img/appicons/favicon-16x16.png?v=', true)); ?><?php echo e($version); ?>">
+	<link rel="manifest" href="<?php echo e($U('/img/appicons/site.webmanifest?v=', true)); ?><?php echo e($version); ?>">
+	<link rel="mask-icon" href="<?php echo e($U('/img/appicons/safari-pinned-tab.svg?v=', true)); ?><?php echo e($version); ?>" color="#0b024c">
+	<link rel="shortcut icon" href="<?php echo e($U('/img/appicons/favicon.ico?v=', true)); ?><?php echo e($version); ?>">
+	<meta name="apple-mobile-web-app-title" content="grocy">
+	<meta name="application-name" content="grocy">
+	<meta name="msapplication-TileColor" content="#e5e5e5">
+	<meta name="msapplication-config" content="<?php echo e($U('/img/appicons/browserconfig.xml?v=', true)); ?><?php echo e($version); ?>">
+	<meta name="theme-color" content="#ffffff">
+
+	<title><?php echo $__env->yieldContent('title'); ?> | grocy</title>
+
+	<link href="<?php echo e($U('/node_modules/bootstrap/dist/css/bootstrap.min.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+	<link href="<?php echo e($U('/node_modules/startbootstrap-sb-admin/css/sb-admin.min.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+	<link href="<?php echo e($U('/node_modules/@fortawesome/fontawesome-free/css/all.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+	<link href="<?php echo e($U('/node_modules/@danielfarrell/bootstrap-combobox/css/bootstrap-combobox.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+	<link href="<?php echo e($U('/node_modules/datatables.net-bs4/css/dataTables.bootstrap4.min.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+	<link href="<?php echo e($U('/node_modules/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+	<link href="<?php echo e($U('/node_modules/datatables.net-colreorder-bs4/css/colReorder.bootstrap4.min.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+	<link href="<?php echo e($U('/node_modules/datatables.net-select-bs4/css/select.bootstrap4.min.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+	<link href="<?php echo e($U('/node_modules/toastr/build/toastr.min.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">	
+	<link href="<?php echo e($U('/node_modules/tempusdominus-bootstrap-4/build/css/tempusdominus-bootstrap-4.min.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+	<link href="<?php echo e($U('/node_modules/summernote/dist/summernote-bs4.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+	<link href="<?php echo e($U('/node_modules/bootstrap-select/dist/css/bootstrap-select.min.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+	<link href="<?php echo e($U('/components_unmanaged/noto-sans-v9-latin/noto-sans-v9-latin.min.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+	<link href="<?php echo e($U('/css/grocy.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+	<link href="<?php echo e($U('/css/grocy_night_mode.css?v=', true)); ?><?php echo e($version); ?>" rel="stylesheet">
+	<?php echo $__env->yieldPushContent('pageStyles'); ?>
+
+	<?php if(file_exists(GROCY_DATAPATH . '/custom_css.html')): ?>
+		<?php include GROCY_DATAPATH . '/custom_css.html' ?>
+	<?php endif; ?>
+
+	<script>
+		var Grocy = { };
+		Grocy.Components = { };
+		Grocy.Mode = '<?php echo e(GROCY_MODE); ?>';
+		Grocy.BaseUrl = '<?php echo e($U('/')); ?>';
+		Grocy.CurrentUrlRelative = "/" + window.location.toString().replace(Grocy.BaseUrl, "");
+		Grocy.ActiveNav = '<?php echo $__env->yieldContent('activeNav', ''); ?>';
+		Grocy.Culture = '<?php echo e(GROCY_CULTURE); ?>';
+		Grocy.Currency = '<?php echo e(GROCY_CURRENCY); ?>';
+		Grocy.CalendarFirstDayOfWeek = '<?php echo e(GROCY_CALENDAR_FIRST_DAY_OF_WEEK); ?>';
+		Grocy.CalendarShowWeekNumbers = <?php echo e(BoolToString(GROCY_CALENDAR_SHOW_WEEK_OF_YEAR)); ?>;
+		Grocy.GettextPo = <?php echo $GettextPo; ?>;
+		Grocy.FeatureFlags = <?php echo json_encode($featureFlags); ?>;
+
+		<?php if(GROCY_AUTHENTICATED): ?>
+		Grocy.UserSettings = <?php echo json_encode($userSettings); ?>;
+		Grocy.UserId = <?php echo e(GROCY_USER_ID); ?>;
+		<?php else: ?>
+		Grocy.UserSettings = { };
+		Grocy.UserId = -1;
+		<?php endif; ?>
+	</script>
+</head>
+
+<body class="fixed-nav <?php if(boolval($userSettings['night_mode_enabled']) || (boolval($userSettings['auto_night_mode_enabled']) && boolval($userSettings['currently_inside_night_mode_range']))): ?> night-mode <?php endif; ?> <?php if($embedded): ?> embedded <?php endif; ?>">
+	<?php if(!($embedded)): ?>
+	<nav id="mainNav" class="navbar navbar-expand-lg navbar-light fixed-top">
+		<a class="navbar-brand py-0" href="<?php echo e($U('/')); ?>"><img src="<?php echo e($U('/img/grocy_logo.svg?v=', true)); ?><?php echo e($version); ?>" height="30"></a>
+		<span id="clock-container" class="text-muted font-italic d-none">
+			<i class="far fa-clock"></i>
+			<span id="clock-small" class="d-inline d-sm-none"></span>
+			<span id="clock-big" class="d-none d-sm-inline"></span>
+		</span>
+		
+		<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#sidebarResponsive">
+			<span class="navbar-toggler-icon"></span>
+		</button>
+
+		<?php if(GROCY_AUTHENTICATED): ?>
+		<div id="sidebarResponsive" class="collapse navbar-collapse">
+			<ul class="navbar-nav navbar-sidenav pt-2">
+
+				<?php if(GROCY_FEATURE_FLAG_STOCK): ?>
+				<li class="nav-item" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Stock overview')); ?>" data-nav-for-page="stockoverview">
+					<a class="nav-link discrete-link" href="<?php echo e($U('/stockoverview')); ?>">
+						<i class="fas fa-box"></i>
+						<span class="nav-link-text"><?php echo e($__t('Stock overview')); ?></span>
+					</a>
+				</li>
+				<?php endif; ?>
+				<?php if(GROCY_FEATURE_FLAG_SHOPPINGLIST): ?>
+				<li class="nav-item" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Shopping list')); ?>" data-nav-for-page="shoppinglist">
+					<a class="nav-link discrete-link" href="<?php echo e($U('/shoppinglist')); ?>">
+						<i class="fas fa-shopping-cart"></i>
+						<span class="nav-link-text"><?php echo e($__t('Shopping list')); ?></span>
+					</a>
+				</li>
+				<?php endif; ?>
+				<?php if(GROCY_FEATURE_FLAG_RECIPES): ?>
+				<li class="nav-item" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Recipes')); ?>" data-nav-for-page="recipes">
+					<a class="nav-link discrete-link" href="<?php echo e($U('/recipes')); ?>">
+						<i class="fas fa-cocktail"></i>
+						<span class="nav-link-text"><?php echo e($__t('Recipes')); ?></span>
+					</a>
+				</li>
+				<?php endif; ?>
+				<?php if(GROCY_FEATURE_FLAG_CHORES): ?>
+				<li class="nav-item" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Chores overview')); ?>" data-nav-for-page="choresoverview">
+					<a class="nav-link discrete-link" href="<?php echo e($U('/choresoverview')); ?>">
+						<i class="fas fa-home"></i>
+						<span class="nav-link-text"><?php echo e($__t('Chores overview')); ?></span>
+					</a>
+				</li>
+				<?php endif; ?>
+				<?php if(GROCY_FEATURE_FLAG_TASKS): ?>
+				<li class="nav-item" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Tasks')); ?>" data-nav-for-page="tasks">
+					<a class="nav-link discrete-link" href="<?php echo e($U('/tasks')); ?>">
+						<i class="fas fa-tasks"></i>
+						<span class="nav-link-text"><?php echo e($__t('Tasks')); ?></span>
+					</a>
+				</li>
+				<?php endif; ?>
+				<?php if(GROCY_FEATURE_FLAG_BATTERIES): ?>
+				<li class="nav-item" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Batteries overview')); ?>" data-nav-for-page="batteriesoverview">
+					<a class="nav-link discrete-link" href="<?php echo e($U('/batteriesoverview')); ?>">
+						<i class="fas fa-battery-half"></i>
+						<span class="nav-link-text"><?php echo e($__t('Batteries overview')); ?></span>
+					</a>
+				</li>
+				<?php endif; ?>
+				<?php if(GROCY_FEATURE_FLAG_EQUIPMENT): ?>
+				<li class="nav-item" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Equipment')); ?>" data-nav-for-page="equipment">
+					<a class="nav-link discrete-link" href="<?php echo e($U('/equipment')); ?>">
+						<i class="fas fa-toolbox"></i>
+						<span class="nav-link-text"><?php echo e($__t('Equipment')); ?></span>
+					</a>
+				</li>
+				<?php endif; ?>
+				
+				<?php if(GROCY_FEATURE_FLAG_STOCK): ?>
+				<li class="nav-item mt-4" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Purchase')); ?>" data-nav-for-page="purchase">
+					<a class="nav-link discrete-link" href="<?php echo e($U('/purchase')); ?>">
+						<i class="fas fa-shopping-cart"></i>
+						<span class="nav-link-text"><?php echo e($__t('Purchase')); ?></span>
+					</a>
+				</li>
+				<li class="nav-item" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Consume')); ?>" data-nav-for-page="consume">
+					<a class="nav-link discrete-link" href="<?php echo e($U('/consume')); ?>">
+						<i class="fas fa-utensils"></i>
+						<span class="nav-link-text"><?php echo e($__t('Consume')); ?></span>
+					</a>
+				</li>
+				<li class="nav-item" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Inventory')); ?>" data-nav-for-page="inventory">
+					<a class="nav-link discrete-link" href="<?php echo e($U('/inventory')); ?>">
+						<i class="fas fa-list"></i>
+						<span class="nav-link-text"><?php echo e($__t('Inventory')); ?></span>
+					</a>
+				</li>
+				<?php endif; ?>
+				<?php if(GROCY_FEATURE_FLAG_CHORES): ?>
+				<li class="nav-item" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Chore tracking')); ?>" data-nav-for-page="choretracking">
+					<a class="nav-link discrete-link" href="<?php echo e($U('/choretracking')); ?>">
+						<i class="fas fa-play"></i>
+						<span class="nav-link-text"><?php echo e($__t('Chore tracking')); ?></span>
+					</a>
+				</li>
+				<?php endif; ?>
+				<?php if(GROCY_FEATURE_FLAG_BATTERIES): ?>
+				<li class="nav-item" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Battery tracking')); ?>" data-nav-for-page="batterytracking">
+					<a class="nav-link discrete-link" href="<?php echo e($U('/batterytracking')); ?>">
+						<i class="fas fa-fire"></i>
+						<span class="nav-link-text"><?php echo e($__t('Battery tracking')); ?></span>
+					</a>
+				</li>
+				<?php endif; ?>
+				<?php if(GROCY_FEATURE_FLAG_CALENDAR): ?>
+				<li class="nav-item mt-4" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Calendar')); ?>" data-nav-for-page="calendar">
+					<a class="nav-link discrete-link" href="<?php echo e($U('/calendar')); ?>">
+						<i class="fas fa-calendar-alt"></i>
+						<span class="nav-link-text"><?php echo e($__t('Calendar')); ?></span>
+					</a>
+				</li>
+				<?php endif; ?>
+				<?php if(GROCY_FEATURE_FLAG_RECIPES): ?>
+				<li class="nav-item" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Meal plan')); ?>" data-nav-for-page="mealplan">
+					<a class="nav-link discrete-link" href="<?php echo e($U('/mealplan')); ?>">
+						<i class="fas fa-paper-plane"></i>
+						<span class="nav-link-text"><?php echo e($__t('Meal plan')); ?></span>
+					</a>
+				</li>
+				<?php endif; ?>
+
+				<?php $firstUserentity = true; ?>
+				<?php $__currentLoopData = $userentitiesForSidebar; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $userentity): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
+				<li class="nav-item <?php if($firstUserentity): ?> mt-4 <?php endif; ?>" data-toggle="tooltip" data-placement="right" title="<?php echo e($userentity->caption); ?>" data-nav-for-page="userentity-<?php echo e($userentity->name); ?>">
+					<a class="nav-link discrete-link" href="<?php echo e($U('/userobjects/' . $userentity->name)); ?>">
+						<i class="<?php echo e($userentity->icon_css_class); ?>"></i>
+						<span class="nav-link-text"><?php echo e($userentity->caption); ?></span>
+					</a>
+				</li>
+				<?php if ($firstUserentity) { $firstUserentity = false; } ?>
+				<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
+				
+				<li class="nav-item mt-4" data-toggle="tooltip" data-placement="right" title="<?php echo e($__t('Manage master data')); ?>">
+					<a class="nav-link nav-link-collapse collapsed discrete-link" data-toggle="collapse" href="#top-nav-manager-master-data">
+						<i class="fas fa-table"></i>
+						<span class="nav-link-text"><?php echo e($__t('Manage master data')); ?></span>
+					</a>
+					<ul id="top-nav-manager-master-data" class="sidenav-second-level collapse">
+						<?php if(GROCY_FEATURE_FLAG_STOCK): ?>
+						<li data-nav-for-page="products" data-sub-menu-of="#top-nav-manager-master-data">
+							<a class="nav-link discrete-link" href="<?php echo e($U('/products')); ?>">
+								<i class="fab fa-product-hunt"></i>
+								<span class="nav-link-text"><?php echo e($__t('Products')); ?></span>
+							</a>
+						</li>
+						<?php if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING): ?>
+						<li data-nav-for-page="locations" data-sub-menu-of="#top-nav-manager-master-data">
+							<a class="nav-link discrete-link" href="<?php echo e($U('/locations')); ?>">
+								<i class="fas fa-map-marker-alt"></i>
+								<span class="nav-link-text"><?php echo e($__t('Locations')); ?></span>
+							</a>
+						</li>
+						<?php endif; ?>
+						<li data-nav-for-page="quantityunits" data-sub-menu-of="#top-nav-manager-master-data">
+							<a class="nav-link discrete-link" href="<?php echo e($U('/quantityunits')); ?>">
+								<i class="fas fa-balance-scale"></i>
+								<span class="nav-link-text"><?php echo e($__t('Quantity units')); ?></span>
+							</a>
+						</li>
+						<li data-nav-for-page="productgroups" data-sub-menu-of="#top-nav-manager-master-data">
+							<a class="nav-link discrete-link" href="<?php echo e($U('/productgroups')); ?>">
+								<i class="fas fa-object-group"></i>
+								<span class="nav-link-text"><?php echo e($__t('Product groups')); ?></span>
+							</a>
+						</li>
+						<?php endif; ?>
+						<?php if(GROCY_FEATURE_FLAG_CHORES): ?>
+						<li data-nav-for-page="chores" data-sub-menu-of="#top-nav-manager-master-data">
+							<a class="nav-link discrete-link" href="<?php echo e($U('/chores')); ?>">
+								<i class="fas fa-home"></i>
+								<span class="nav-link-text"><?php echo e($__t('Chores')); ?></span>
+							</a>
+						</li>
+						<?php endif; ?>
+						<?php if(GROCY_FEATURE_FLAG_BATTERIES): ?>
+						<li data-nav-for-page="batteries" data-sub-menu-of="#top-nav-manager-master-data">
+							<a class="nav-link discrete-link" href="<?php echo e($U('/batteries')); ?>">
+								<i class="fas fa-battery-half"></i>
+								<span class="nav-link-text"><?php echo e($__t('Batteries')); ?></span>
+							</a>
+						</li>
+						<?php endif; ?>
+						<?php if(GROCY_FEATURE_FLAG_TASKS): ?>
+						<li data-nav-for-page="taskcategories" data-sub-menu-of="#top-nav-manager-master-data">
+							<a class="nav-link discrete-link" href="<?php echo e($U('/taskcategories')); ?>">
+								<i class="fas fa-project-diagram "></i>
+								<span class="nav-link-text"><?php echo e($__t('Task categories')); ?></span>
+							</a>
+						</li>
+						<?php endif; ?>
+						<li data-nav-for-page="userfields" data-sub-menu-of="#top-nav-manager-master-data">
+							<a class="nav-link discrete-link" href="<?php echo e($U('/userfields')); ?>">
+								<i class="fas fa-bookmark "></i>
+								<span class="nav-link-text"><?php echo e($__t('Userfields')); ?></span>
+							</a>
+						</li>
+						<li data-nav-for-page="userentities" data-sub-menu-of="#top-nav-manager-master-data">
+							<a class="nav-link discrete-link" href="<?php echo e($U('/userentities')); ?>">
+								<i class="fas fa-bookmark "></i>
+								<span class="nav-link-text"><?php echo e($__t('Userentities')); ?></span>
+							</a>
+						</li>
+					</ul>
+				</li>
+			</ul>
+
+			<ul class="navbar-nav sidenav-toggler">
+				<li class="nav-item">
+					<a id="sidenavToggler" class="nav-link text-center">
+						<i class="fas fa-angle-left"></i>
+					</a>
+				</li>
+			</ul>
+
+			<ul class="navbar-nav ml-auto">
+				<?php if(GROCY_AUTHENTICATED === true && !GROCY_IS_EMBEDDED_INSTALL): ?>
+				<li class="nav-item dropdown">
+					<a class="nav-link dropdown-toggle discrete-link" href="#" data-toggle="dropdown"><i class="fas fa-user"></i> <?php echo e(GROCY_USER_USERNAME); ?></a>
+
+					<div class="dropdown-menu dropdown-menu-right">
+						<a class="dropdown-item logout-button discrete-link" href="<?php echo e($U('/logout')); ?>"><i class="fas fa-sign-out-alt"></i>&nbsp;<?php echo e($__t('Logout')); ?></a>
+						<div class="dropdown-divider"></div>
+						<a class="dropdown-item logout-button discrete-link" href="<?php echo e($U('/user/' . GROCY_USER_ID . '?changepw=true')); ?>"><i class="fas fa-key"></i>&nbsp;<?php echo e($__t('Change password')); ?></a>
+					</div>
+				</li>
+				<?php endif; ?>
+
+				<?php if(GROCY_AUTHENTICATED === true): ?>
+				<li class="nav-item dropdown">
+					<a class="nav-link dropdown-toggle discrete-link" href="#" data-toggle="dropdown"><i class="fas fa-sliders-h"></i> <span class="d-inline d-lg-none"><?php echo e($__t('View settings')); ?></span></a>
+
+					<div class="dropdown-menu dropdown-menu-right">
+						<div class="dropdown-item">
+							<div class="form-check">
+								<input class="form-check-input user-setting-control" type="checkbox" id="auto-reload-enabled" data-setting-key="auto_reload_on_db_change">
+								<label class="form-check-label" for="auto-reload-enabled">
+									<?php echo e($__t('Auto reload on external changes')); ?>
+
+								</label>
+							</div>
+						</div>
+						<div class="dropdown-item">
+							<div class="form-check">
+								<input class="form-check-input user-setting-control" type="checkbox" id="show-clock-in-header" data-setting-key="show_clock_in_header">
+								<label class="form-check-label" for="show-clock-in-header">
+									<?php echo e($__t('Show clock in header')); ?>
+
+								</label>
+							</div>
+						</div>
+						<div class="dropdown-divider"></div>
+						<div class="dropdown-item">
+							<div class="form-check">
+								<input class="form-check-input user-setting-control" type="checkbox" id="night-mode-enabled" data-setting-key="night_mode_enabled">
+								<label class="form-check-label" for="night-mode-enabled">
+									<?php echo e($__t('Enable night mode')); ?>
+
+								</label>
+							</div>
+						</div>
+						<div class="dropdown-item">
+							<div class="form-check">
+								<input class="form-check-input user-setting-control" type="checkbox" id="auto-night-mode-enabled" data-setting-key="auto_night_mode_enabled">
+								<label class="form-check-label" for="auto-night-mode-enabled">
+									<?php echo e($__t('Auto enable in time range')); ?>
+
+								</label>
+							</div>
+							<div class="form-inline">
+								<input type="text" class="form-control my-1 user-setting-control" readonly id="auto-night-mode-time-range-from" placeholder="<?php echo e($__t('From')); ?> (<?php echo e($__t('in format')); ?> HH:mm)" data-setting-key="auto_night_mode_time_range_from">
+								<input type="text" class="form-control user-setting-control" readonly id="auto-night-mode-time-range-to" placeholder="<?php echo e($__t('To')); ?> (<?php echo e($__t('in format')); ?> HH:mm)" data-setting-key="auto_night_mode_time_range_to">
+							</div>
+							<div class="form-check mt-1">
+								<input class="form-check-input user-setting-control" type="checkbox" id="auto-night-mode-time-range-goes-over-midgnight" data-setting-key="auto_night_mode_time_range_goes_over_midnight">
+								<label class="form-check-label" for="auto-night-mode-time-range-goes-over-midgnight">
+									<?php echo e($__t('Time range goes over midnight')); ?>
+
+								</label>
+							</div>
+							<input class="form-check-input d-none user-setting-control" type="checkbox" id="currently-inside-night-mode-range" data-setting-key="currently_inside_night_mode_range">
+						</div>
+					</div>
+				</li>
+				<?php endif; ?>
+
+				<li class="nav-item dropdown">
+					<a class="nav-link dropdown-toggle discrete-link" href="#" data-toggle="dropdown"><i class="fas fa-wrench"></i> <span class="d-inline d-lg-none"><?php echo e($__t('Settings')); ?></span></a>
+
+					<div class="dropdown-menu dropdown-menu-right">
+						<a class="dropdown-item discrete-link" href="<?php echo e($U('/stocksettings')); ?>"><i class="fas fa-box"></i>&nbsp;<?php echo e($__t('Stock settings')); ?></a>
+						<?php if(GROCY_FEATURE_FLAG_CHORES): ?>
+						<a class="dropdown-item discrete-link" href="<?php echo e($U('/choressettings')); ?>"><i class="fas fa-home"></i>&nbsp;<?php echo e($__t('Chores settings')); ?></a>
+						<?php endif; ?>
+						<?php if(GROCY_FEATURE_FLAG_BATTERIES): ?>
+						<a class="dropdown-item discrete-link" href="<?php echo e($U('/batteriessettings')); ?>"><i class="fas fa-battery-half"></i>&nbsp;<?php echo e($__t('Batteries settings')); ?></a>
+						<?php endif; ?>
+						<?php if(GROCY_FEATURE_FLAG_TASKS): ?>
+						<a class="dropdown-item discrete-link" href="<?php echo e($U('/taskssettings')); ?>"><i class="fas fa-tasks"></i>&nbsp;<?php echo e($__t('Tasks settings')); ?></a>
+						<?php endif; ?>
+						<div class="dropdown-divider"></div>
+						<a class="dropdown-item discrete-link" href="<?php echo e($U('/users')); ?>"><i class="fas fa-users"></i>&nbsp;<?php echo e($__t('Manage users')); ?></a>
+						<div class="dropdown-divider"></div>
+						<a class="dropdown-item discrete-link" href="<?php echo e($U('/manageapikeys')); ?>"><i class="fas fa-handshake"></i>&nbsp;<?php echo e($__t('Manage API keys')); ?></a>
+						<a class="dropdown-item discrete-link" target="_blank" href="<?php echo e($U('/api')); ?>"><i class="fas fa-book"></i>&nbsp;<?php echo e($__t('REST API & data model documentation')); ?></a>
+						<a class="dropdown-item discrete-link" href="<?php echo e($U('/barcodescannertesting')); ?>"><i class="fas fa-barcode"></i>&nbsp;<?php echo e($__t('Barcode scanner testing')); ?></a>
+						<div class="dropdown-divider"></div>
+						<a id="about-dialog-link" class="dropdown-item discrete-link" href="#"><i class="fas fa-info fa-fw"></i>&nbsp;<?php echo e($__t('About grocy')); ?> (Version <?php echo e($version); ?>)</a>
+					</div>
+				</li>
+			</ul>
+		</div><?php endif; ?>
+	</nav>
+	<?php endif; ?>
+
+	<div class="content-wrapper">
+		<div class="container-fluid">
+			<div class="row mb-3">
+				<div id="page-content" class="col content-text">
+					<?php echo $__env->yieldContent('content'); ?>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<script src="<?php echo e($U('/node_modules/jquery/dist/jquery.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/startbootstrap-sb-admin/js/sb-admin.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/bootbox/dist/bootbox.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/jquery-serializejson/jquery.serializejson.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/moment/min/moment.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<?php if(!empty($__t('moment_locale') && $__t('moment_locale') != 'x')): ?><script src="<?php echo e($U('/node_modules', true)); ?>/moment/locale/<?php echo e($__t('moment_locale')); ?>.js?v=<?php echo e($version); ?>"></script><?php endif; ?>
+	<script src="<?php echo e($U('/node_modules/@danielfarrell/bootstrap-combobox/js/bootstrap-combobox.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/datatables.net/js/jquery.dataTables.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/datatables.net-bs4/js/dataTables.bootstrap4.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/datatables.net-responsive/js/dataTables.responsive.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/datatables.net-colreorder/js/dataTables.colReorder.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/datatables.net-colreorder-bs4/js/colReorder.bootstrap4.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/datatables.net-select/js/dataTables.select.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/datatables.net-select-bs4/js/select.bootstrap4.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/timeago/jquery.timeago.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules', true)); ?>/timeago/locales/jquery.timeago.<?php echo e($__t('timeago_locale')); ?>.js?v=<?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/toastr/build/toastr.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/sprintf-js/dist/sprintf.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/gettext-translator/src/translator.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/node_modules/summernote/dist/summernote-bs4.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<?php if(!empty($__t('summernote_locale') && $__t('summernote_locale') != 'x')): ?><script src="<?php echo e($U('/node_modules', true)); ?>/summernote/dist/lang/summernote-<?php echo e($__t('summernote_locale')); ?>.js?v=<?php echo e($version); ?>"></script><?php endif; ?>
+	<script src="<?php echo e($U('/node_modules/bootstrap-select/dist/js/bootstrap-select.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<?php if(!empty($__t('bootstrap-select_locale') && $__t('bootstrap-select_locale') != 'x')): ?><script src="<?php echo e($U('/node_modules', true)); ?>/bootstrap-select/dist/js/i18n/defaults-<?php echo e($__t('bootstrap-select_locale')); ?>.js?v=<?php echo e($version); ?>"></script><?php endif; ?>
+	<script src="<?php echo e($U('/node_modules/jquery-lazy/jquery.lazy.min.js?v=', true)); ?><?php echo e($version); ?>"></script>
+
+	<script src="<?php echo e($U('/js/extensions.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/js/grocy.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/js/grocy_dbchangedhandling.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/js/grocy_nightmode.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<script src="<?php echo e($U('/js/grocy_clock.js?v=', true)); ?><?php echo e($version); ?>"></script>
+	<?php echo $__env->yieldPushContent('pageScripts'); ?>
+	<?php echo $__env->yieldPushContent('componentScripts'); ?>
+	<?php if (! empty(trim($__env->yieldContent('viewJsName')))): ?><script src="<?php echo e($U('/viewjs', true)); ?>/<?php echo $__env->yieldContent('viewJsName'); ?>.js?v=<?php echo e($version); ?>"></script><?php endif; ?>
+
+	<?php if(file_exists(GROCY_DATAPATH . '/custom_js.html')): ?>
+		<?php include GROCY_DATAPATH . '/custom_js.html' ?>
+	<?php endif; ?>
+</body>
+
+</html>
+<?php /**PATH /www/views/layout/default.blade.php ENDPATH**/ ?>

data_store/viewcache/fec608612fe1aa786c4f9bb67feb433ccfc78010.php

@@ -0,0 +1,14 @@
+<?php $__env->startPush('componentScripts'); ?>
+	<script src="<?php echo e($U('/viewjs/components/calendarcard.js', true)); ?>?v=<?php echo e($version); ?>"></script>
+<?php $__env->stopPush(); ?>
+
+<div class="card">
+	<div class="card-header">
+		<i class="fas fa-calendar"></i> <?php echo e($__t('Calendar')); ?>
+
+	</div>
+	<div class="card-body">
+		<div id="calendar" data-target-input="nearest"></div>
+	</div>
+</div>
+<?php /**PATH /www/views/components/calendarcard.blade.php ENDPATH**/ ?>

grocy.openapi.json

@@ -18,6 +18,40 @@
 		{
 			"name": "Generic entity interactions",
 			"description": "A limited set of entities are directly exposed for convenience"
+		},
+		{
+			"name": "System"
+		},
+		{
+			"name": "User management"
+		},
+		{
+			"name": "User settings"
+		},
+		{
+			"name": "Stock"
+		},
+		{
+			"name": "Stock \"by-barcode\"",
+			"description": "Some of the *Stock* routes, but access them by the products barcode instead of its id"
+		},
+		{
+			"name": "Recipes"
+		},
+		{
+			"name": "Chores"
+		},
+		{
+			"name": "Batteries"
+		},
+		{
+			"name": "Tasks"
+		},
+		{
+			"name": "Calendar"
+		},
+		{
+			"name": "Files"
 		}
 	],
 	"paths": {
@@ -129,7 +163,7 @@
 						"required": true,
 						"description": "A valid entity name",
 						"schema": {
-							"$ref": "#/components/internalSchemas/ExposedEntity"
+							"$ref": "#/components/internalSchemas/ExposedEntityButNoListing"
 						}
 					}
 				],
@@ -163,7 +197,7 @@
 											{
 												"$ref": "#/components/schemas/StockEntry"
 											}
-										]	
+										]
 									}
 								}
 							}
@@ -274,7 +308,7 @@
 						"required": true,
 						"description": "A valid entity name",
 						"schema": {
-							"$ref": "#/components/internalSchemas/ExposedEntity"
+							"$ref": "#/components/internalSchemas/ExposedEntityButNoListing"
 						}
 					},
 					{
@@ -626,7 +660,7 @@
 					}
 				}
 			}
-		},		
+		},
 		"/files/{group}/{fileName}": {
 			"get": {
 				"summary": "Serves the given file",
@@ -673,8 +707,7 @@
 						"schema": {
 							"type": "integer"
 						}
-					}
-					,
+					},
 					{
 						"in": "query",
 						"name": "best_fit_width",
@@ -1050,12 +1083,64 @@
 						}
 					}
 				}
+			}
+		},
+		"/stock/entry/{entryId}": {
+			"get": {
+				"summary": "Returns details of the given stock",
+				"tags": [
+					"Stock"
+				],
+				"parameters": [
+					{
+						"in": "path",
+						"name": "entryId",
+						"required": true,
+						"description": "A valid stock row id",
+						"schema": {
+							"type": "integer"
+						}
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "A StockEntry Response object",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/StockEntry"
+								}
+							}
+						}
+					},
+					"400": {
+						"description": "The operation was not successful (possible errors are: Not existing product)",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/GenericErrorResponse"
+								}
+							}
+						}
+					}
+				}
 			},
 			"put": {
 				"summary": "Edits the stock entry",
 				"tags": [
 					"Stock"
 				],
+				"parameters": [
+					{
+						"in": "path",
+						"name": "entryId",
+						"required": true,
+						"description": "A valid stock row id",
+						"schema": {
+							"type": "integer"
+						}
+					}
+				],
 				"requestBody": {
 					"required": true,
 					"content": {
@@ -1063,11 +1148,6 @@
 							"schema": {
 								"type": "object",
 								"properties": {
-									"stock_row_id": {
-										"type": "number",
-										"format": "number",
-										"description": "The Stock Row Id"
-									},
 									"amount": {
 										"type": "number",
 										"format": "number",
@@ -1078,23 +1158,34 @@
 										"format": "date",
 										"description": "The best before date of the product to add, when omitted, the current date is used"
 									},
+									"price": {
+										"type": "number",
+										"format": "number",
+										"description": "The price per purchase quantity unit in configured currency"
+									},
+									"open": {
+										"type": "boolean",
+										"description": "If the stock entry was already opened or not"
+									},
 									"location_id": {
 										"type": "number",
 										"format": "integer",
 										"description": "If omitted, the default location of the product is used"
 									},
-									"price": {
-										"type": "number",
-										"format": "number",
-										"description": "The price per purchase quantity unit in configured currency"
+									"purchased_date": {
+										"type": "string",
+										"format": "date",
+										"description": "The date when this stock entry was purchased"
 									}
 								},
 								"example": {
-									"stock_row_id":	2,
-									"amount": 1,
-									"best_before_date": "2019-01-19",
-									"location_id": 2,
-									"price": "1.99"
+									"id": "2",
+									"amount": "1",
+									"best_before_date": "2021-07-19",
+									"purchased_date": "2020-01-01",
+									"price": "22.03",
+									"open": false,
+									"location_id": "4"
 								}
 							}
 						}
@@ -1106,7 +1197,7 @@
 						"content": {
 							"application/json": {
 								"schema": {
-									"$ref": "#/components/schemas/StockLogEntry"
+									"$ref": "#/components/schemas/StockEntry"
 								}
 							}
 						}
@@ -1259,6 +1350,15 @@
 						"schema": {
 							"type": "integer"
 						}
+					},
+					{
+						"in": "query",
+						"name": "include_sub_products",
+						"required": false,
+						"description": "If sub products should be included (if the given product is a parent product and in addition to the ones of the given product)",
+						"schema": {
+							"type": "boolean"
+						}
 					}
 				],
 				"responses": {
@@ -1713,7 +1813,7 @@
 			"get": {
 				"summary": "Returns details of the given product by its barcode",
 				"tags": [
-					"Stock"
+					"Stock \"by-barcode\""
 				],
 				"parameters": [
 					{
@@ -1754,7 +1854,7 @@
 			"post": {
 				"summary": "Adds the given amount of the by its barcode given product to stock",
 				"tags": [
-					"Stock"
+					"Stock \"by-barcode\""
 				],
 				"parameters": [
 					{
@@ -1836,7 +1936,7 @@
 			"post": {
 				"summary": "Removes the given amount of the by its barcode given product from stock",
 				"tags": [
-					"Stock"
+					"Stock \"by-barcode\""
 				],
 				"parameters": [
 					{
@@ -1919,7 +2019,7 @@
 			"post": {
 				"summary": "Transfers the given amount of the by its barcode given product from one location to another (this is currently not supported for tare weight handling enabled products)",
 				"tags": [
-					"Stock"
+					"Stock \"by-barcode\""
 				],
 				"parameters": [
 					{
@@ -1995,7 +2095,7 @@
 			"post": {
 				"summary": "Inventories the by its barcode given product (adds/removes based on the given new amount)",
 				"tags": [
-					"Stock"
+					"Stock \"by-barcode\""
 				],
 				"parameters": [
 					{
@@ -2067,7 +2167,7 @@
 			"post": {
 				"summary": "Marks the given amount of the by its barcode given product as opened",
 				"tags": [
-					"Stock"
+					"Stock \"by-barcode\""
 				],
 				"parameters": [
 					{
@@ -3203,7 +3303,6 @@
 					"quantity_unit_conversions",
 					"shopping_list",
 					"shopping_lists",
-					"stock",
 					"recipes",
 					"recipes_pos",
 					"recipes_nestings",
@@ -3218,10 +3317,28 @@
 					"meal_plan"
 				]
 			},
-			"ExposedEntitiesPreventListing": {
+			"ExposedEntityButNoListing": {
 				"type": "string",
 				"enum": [
-					"api_keys"
+					"products",
+					"chores",
+					"batteries",
+					"locations",
+					"quantity_units",
+					"quantity_unit_conversions",
+					"shopping_list",
+					"shopping_lists",
+					"recipes",
+					"recipes_pos",
+					"recipes_nestings",
+					"tasks",
+					"task_categories",
+					"product_groups",
+					"equipment",
+					"userfields",
+					"userentities",
+					"userobjects",
+					"meal_plan"
 				]
 			},
 			"StockTransactionType": {
@@ -3392,8 +3509,11 @@
 					"location_id": {
 						"type": "integer"
 					},
-					"name": {
+					"location_name": {
 						"type": "string"
+					},
+					"location_is_freezer": {
+						"type": "integer"
 					}
 				},
 				"example": {
@@ -4025,6 +4145,9 @@
 					"is_aggregated_amount": {
 						"type": "boolean",
 						"description": "Indicates wheter this product has sub-products or not / if the fields `amount_aggregated` and `amount_opened_aggregated` are filled"
+					},
+					"product": {
+						"$ref": "#/components/schemas/Product"
 					}
 				}
 			},
@@ -4080,7 +4203,20 @@
 					"missing_products": {
 						"type": "array",
 						"items": {
-							"$ref": "#/components/schemas/CurrentStockResponse"
+							"properties": {
+								"id": {
+									"type": "integer"
+								},
+								"name": {
+									"type": "string"
+								},
+								"amount_missing": {
+									"type": "number"
+								},
+								"is_partly_in_stock": {
+									"type": "integer"
+								}
+							}
 						}
 					}
 				}

helpers/extensions.php

@@ -82,7 +82,7 @@ function SumArrayValue($array, $propertyName)
 	$sum = 0;
 	foreach($array as $object)
 	{
-		$sum += $object->{$propertyName};
+		$sum += floatval($object->{$propertyName});
 	}
 
 	return $sum;

localization/da/chore_period_types.po

@@ -1,5 +1,7 @@
 # Translators:
 # Troels Siggaard <troels@siggaard.com>, 2019
+# Rasmus Bojsen <rasmus@bojsen.cn>, 2019
+# Brian Moos Lindberg <brian@blueeel.dk>, 2019
 # 
 msgid ""
 msgstr ""
@@ -7,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Troels Siggaard <troels@siggaard.com>, 2019\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +22,7 @@ msgid "manually"
 msgstr "manuelt"
 
 msgid "dynamic-regular"
-msgstr "gentagende-dynamisk"
+msgstr "dynamisk-regelmæssig"
 
 msgid "daily"
 msgstr "daglig"
@@ -30,3 +32,6 @@ msgstr "ugentlig"
 
 msgid "monthly"
 msgstr "månedlig"
+
+msgid "yearly"
+msgstr "årlig"

localization/da/demo_data.po

@@ -1,6 +1,8 @@
 # Translators:
 # dark159123 <r.j.hansen@protonmail.com>, 2019
 # Troels Siggaard <troels@siggaard.com>, 2019
+# Rasmus Bojsen <rasmus@bojsen.cn>, 2019
+# Brian Moos Lindberg <brian@blueeel.dk>, 2019
 # 
 msgid ""
 msgstr ""
@@ -8,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Troels Siggaard <troels@siggaard.com>, 2019\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,8 +39,8 @@ msgstr "Køleskab"
 
 msgid "Piece"
 msgid_plural "Pieces"
-msgstr[0] "Styk"
-msgstr[1] "Stykker"
+msgstr[0] "stk"
+msgstr[1] "stk"
 
 msgid "Pack"
 msgid_plural "Packs"
@@ -81,7 +83,7 @@ msgid "Pickles"
 msgstr "Syltede agurker"
 
 msgid "Gulash soup"
-msgstr "Gulash"
+msgstr "Gullashsuppe"
 
 msgid "Yogurt"
 msgstr "Yoghurt"
@@ -161,14 +163,11 @@ msgstr "Tysk"
 msgid "Italian"
 msgstr "Italiensk"
 
-msgid "Demo in different language"
-msgstr "Demo på et andet sprog"
-
 msgid "This is the note content of the recipe ingredient"
 msgstr "Dette er indholdet af opskrift-ingrediensens notefeltet"
 
 msgid "Demo User"
-msgstr "Demo Bruger"
+msgstr "Demobruger"
 
 msgid "Gram"
 msgid_plural "Grams"
@@ -218,7 +217,7 @@ msgid "Vegetables/Fruits"
 msgstr "Frugt og grønt"
 
 msgid "Refrigerated products"
-msgstr "Køleskabsprodukter"
+msgstr "Køleskabsvarer"
 
 msgid "Coffee machine"
 msgstr "Kaffemaskine"
@@ -284,27 +283,66 @@ msgid "Polish"
 msgstr "Polsk"
 
 msgid "Milk Chocolate"
-msgstr ""
+msgstr "Mælkechokolade"
 
 msgid "Dark Chocolate"
-msgstr ""
+msgstr "Mørk chokolade"
 
 msgid "Slice"
 msgid_plural "Slices"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Skive"
+msgstr[1] "Skiver"
 
 msgid "Example userentity"
-msgstr ""
+msgstr "Eksempel-brugerenhed"
 
 msgid "This is an example user entity..."
-msgstr ""
+msgstr "Dette er en eksempel-brugerenhed..."
 
 msgid "Custom field"
-msgstr ""
+msgstr "Brugerdefineret felt"
 
 msgid "Example field value..."
-msgstr ""
+msgstr "Eksempel-feltværdi..."
 
 msgid "Waffle rolls"
+msgstr "Vaffelruller"
+
+msgid "Danish"
+msgstr "Dansk"
+
+msgid "Dutch"
+msgstr "Hollandsk"
+
+msgid "Norwegian"
+msgstr "Norsk"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Stabil version"
+
+msgid "Preview version"
+msgstr "Forhåndsvisningsversion"
+
+msgid "current release"
+msgstr "aktuel udgivelse"
+
+msgid "not yet released"
+msgstr "Ikke frigivet endnu"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugisisk (Brasilien)"
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
 msgstr ""

localization/da/stock_transaction_types.po

@@ -1,5 +1,6 @@
 # Translators:
 # Troels Siggaard <troels@siggaard.com>, 2019
+# Brian Moos Lindberg <brian@blueeel.dk>, 2019
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Troels Siggaard <troels@siggaard.com>, 2019\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +20,12 @@ msgstr ""
 msgid "purchase"
 msgstr "køb"
 
+msgid "transfer_from"
+msgstr "flyt_fra"
+
+msgid "transfer_to"
+msgstr "flyt_til"
+
 msgid "consume"
 msgstr "forbrug"
 
@@ -27,3 +34,12 @@ msgstr "beholdningsrettelse"
 
 msgid "product-opened"
 msgstr "produkt-åbnet"
+
+msgid "stock-edit-old"
+msgstr "lager-redigering-gammel"
+
+msgid "stock-edit-new"
+msgstr "lager-redigering-ny"
+
+msgid "self-production"
+msgstr ""

localization/da/userfield_types.po

@@ -1,3 +1,5 @@
+# Translators:
+# Brian Moos Lindberg <brian@blueeel.dk>, 2019
 # 
 msgid ""
 msgstr ""
@@ -5,6 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:43+0000\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,22 +17,31 @@ msgstr ""
 "X-Domain: grocy/userfield_types\n"
 
 msgid "text-single-line"
-msgstr ""
+msgstr "tekst-enkelt-linje"
 
 msgid "text-multi-line"
-msgstr ""
+msgstr "tekst-flere-linjer"
 
 msgid "number-integral"
-msgstr ""
+msgstr "tal-heltal"
 
 msgid "number-decimal"
-msgstr ""
+msgstr "tal-decimal"
 
 msgid "date"
-msgstr ""
+msgstr "dato"
 
 msgid "datetime"
-msgstr ""
+msgstr "datotid"
 
 msgid "checkbox"
-msgstr ""
+msgstr "afkrydsningsfelt"
+
+msgid "preset-list"
+msgstr "forudindstillet-liste"
+
+msgid "preset-checklist"
+msgstr "forudindstillet-tjekliste"
+
+msgid "link"
+msgstr "link"

localization/de/demo_data.po

@@ -1,5 +1,5 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# Bernd Bestel <bernd@berrnd.de>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
 "Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -328,3 +328,18 @@ msgstr "aktuelles Release"
 
 msgid "not yet released"
 msgstr "noch nicht freigegeben"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugiesisch (Brasilien)"
+
+msgid "This is a note"
+msgstr "Dies ist eine Notiz"
+
+msgid "Freezer"
+msgstr "Gefrierschrank"
+
+msgid "Hungarian"
+msgstr "Ungarisch"
+
+msgid "Slovak"
+msgstr "Slowakisch"

localization/de/stock_transaction_types.po

@@ -1,5 +1,5 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# Bernd Bestel <bernd@berrnd.de>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
 "Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,12 @@ msgstr ""
 msgid "purchase"
 msgstr "Einkauf"
 
+msgid "transfer_from"
+msgstr "Umlagerung von"
+
+msgid "transfer_to"
+msgstr "Umlagerung nach"
+
 msgid "consume"
 msgstr "Verbrauch"
 
@@ -27,3 +33,12 @@ msgstr "Inventur-Korrektur"
 
 msgid "product-opened"
 msgstr "Produkt geöffnet"
+
+msgid "stock-edit-old"
+msgstr "Bestandseintrag bearbeitet (alte Werte)"
+
+msgid "stock-edit-new"
+msgstr "Bestandseintrag bearbeitet (neue Werte)"
+
+msgid "self-production"
+msgstr "Eigenproduktion"

localization/de/strings.po

@@ -1,5 +1,6 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# H T <github@fvbor.de>, 2020
+# Bernd Bestel <bernd@berrnd.de>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
 "Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -676,7 +677,7 @@ msgstr ""
 msgid "Consume all ingredients needed by this recipe"
 msgstr ""
 "Alle Zutaten, die von diesem Rezept benötigt werden, aus dem Bestand "
-"enternen"
+"entfernen"
 
 msgid "Click to show technical details"
 msgstr "Klick um technische Details anzuzeigen"
@@ -975,12 +976,12 @@ msgid "Mark %1$s of %2$s as open"
 msgstr "%1$s %2$s als geöffnet markieren"
 
 msgid ""
-"When a product was marked as opened, the best before date will be replaced "
-"by today + this amount of days (a value of 0 disables this)"
+"When this product was marked as opened, the best before date will be "
+"replaced by today + this amount of days (a value of 0 disables this)"
 msgstr ""
-"Wenn ein Produkt als geöffnet markiert wurde, wird das "
+"Wenn dieses Produkt als geöffnet markiert wurde, wird das "
 "Mindesthaltbarkeitsdatum durch heute + diese Anzahl von Tagen ersetzt (ein "
-"Wert von 0 deaktiviert dies)"
+"Wert von 0 deaktiviert dies) "
 
 msgid "Default best before days after opened"
 msgstr "Standard Haltbarkeit in Tagen nach dem Öffnen"
@@ -991,9 +992,6 @@ msgstr "%1$s %2$s als geöffnet markiert"
 msgid "Mark as opened"
 msgstr "Als geöffnet markieren"
 
-msgid "Expires on %1$s; Bought on %2$s"
-msgstr "Läuft ab am %1$s; Gekauft am %2$s"
-
 msgid "Not opened"
 msgstr "Nicht geöffnet"
 
@@ -1309,6 +1307,9 @@ msgstr "Nicht ausreichend im Bestand"
 msgid "Expiring soon days"
 msgstr "\"Bald ablaufend\"-Tage"
 
+msgid "Default location"
+msgstr "Standard Standort"
+
 msgid "Default amount for purchase"
 msgstr "Standardmenge für Einkauf"
 
@@ -1745,3 +1746,178 @@ msgid ""
 msgstr ""
 "Das bedeutet, dass eine erneute Ausführung der Hausarbeit nur alle %s Jahre "
 "geplant wird"
+
+msgid "Transfer"
+msgstr "Umlagern"
+
+msgid "From location"
+msgstr "Von Standort"
+
+msgid "To location"
+msgstr "Nach Standort"
+
+msgid "There are no units available at this location"
+msgstr "Keine Einheiten an diesem Standort verfügbar"
+
+msgid "Amount: %1$s; Expires on %2$s; Bought on %3$s"
+msgstr "Menge: %1$s; Läuft ab am %2$s; Gekauft am %3$s "
+
+msgid "Transfered %1$s of %2$s from %3$s to %4$s"
+msgstr "%1$s %2$s von %3$s nach %4$s verschoben"
+
+msgid "Show stock entries"
+msgstr "Bestandseinträge anzeigen"
+
+msgid "Stock entries"
+msgstr "Bestandseinträge"
+
+msgid "Best before date"
+msgstr "MHD"
+
+msgid "Purchased date"
+msgstr "Einkaufsdatum"
+
+msgid "Consume all %s for this stock entry"
+msgstr "Verbrauche alle %s dieses Bestandseintrags"
+
+msgid "The amount cannot be lower than %1$s"
+msgstr "Die Menge darf nicht kleiner als %1$s sein"
+
+msgid "Stock entry successfully updated"
+msgstr "Bestandseintrag wurde erfolgreich aktualisiert"
+
+msgid "Edit stock entry"
+msgstr "Bestandseintrag bearbeiten"
+
+msgid ""
+"Camera access is on only possible when supported and allowed by your browser"
+" and when grocy is served via a secure (https://) connection"
+msgstr ""
+"Der Kamerazugriff ist nur möglich, wenn dein Browser dies unterstützt und "
+"zulässt und wenn auf grocy über eine sichere Verbindung (https://) "
+"zugegriffen wird"
+
+msgid "Keep screen on"
+msgstr "Bildschirm eingeschaltet lassen"
+
+msgid "Keep screen on while displaying a \"fullscreen-card\""
+msgstr ""
+"Bildschirm eingeschaltet lassen während eine \"fullscreen-card\" angezeigt "
+"wird"
+
+msgid "A purchased date is required"
+msgstr "Ein Einkaufsdatum ist erforderlich"
+
+msgid ""
+"When a product is selected, one unit (per serving in purchase quantity unit)"
+" will be added to stock on consuming this recipe"
+msgstr ""
+"Wenn ein Produkt ausgewählt ist, wird beim Verbrauch dieses Rezeptes eine "
+"Einheit (pro Portion in Einkaufsmengeneinheit) dem Bestand hinzugefügt"
+
+msgid "Produces product"
+msgstr "Produziertes Produkt"
+
+msgid "This booking cannot be undone"
+msgstr "Die Buchung kann nicht rückgängig gemacht werden"
+
+msgid "Booking does not exist or was already undone"
+msgstr "Buchung existiert nicht oder wurde bereits rückgängig gemacht"
+
+msgid "Are you sure to delete API key \"%s\"?"
+msgstr "API key \"%s\" wirklich löschen?"
+
+msgid "Add note"
+msgstr "Notiz hinzufügen"
+
+msgid "Add note to %s"
+msgstr "Notiz zu %s hinzufügen"
+
+msgid "per day"
+msgstr "pro Tag"
+
+msgid "Compact view"
+msgstr "Kompakte Ansicht"
+
+msgid "Normal view"
+msgstr "Normale Ansicht"
+
+msgid "Only undone items"
+msgstr "Nur unerledigte Einträge"
+
+msgid "Add product"
+msgstr "Produkt hinzufügen"
+
+msgid "Add product to %s"
+msgstr "Produkt zu %s hinzufügen"
+
+msgid "Consume all ingredients needed by this weeks recipes or products"
+msgstr ""
+"Alle Zutaten, die diese Woche von Rezepten oder Produkten benötigt werden, "
+"aus dem Bestand entfernen"
+
+msgid "Meal plan recipe"
+msgstr "Speiseplan Rezept"
+
+msgid "Meal plan note"
+msgstr "Speiseplan Notiz"
+
+msgid "Meal plan product"
+msgstr "Speiseplan Produkt"
+
+msgid "Scan mode"
+msgstr "Scan-Modus"
+
+msgid "on"
+msgstr "an"
+
+msgid "off"
+msgstr "aus"
+
+msgid ""
+"Scan mode is on but not all required fields could be populated automatically"
+msgstr ""
+"Scan-Modus ist eingeschaltet, aber nicht alle erforderlichen Felder konnten "
+"automatisch ausgefüllt werden"
+
+msgid "Is freezer"
+msgstr "Ist ein Gefrier-Standort (also z. B. ein Gefrierschrank)"
+
+msgid ""
+"When moving products from/to a freezer location, the products best before "
+"date is automatically adjusted according to the product settings"
+msgstr ""
+"Beim Umlagen von Produkten von/zu einem Gefrier-Standort wird das "
+"Mindesthaltbarkeitsdatum der Produkte automatisch entsprechend den "
+"Produkteinstellungen angepasst"
+
+msgid ""
+"On moving this product to a freezer location (so when freezing it), the best"
+" before date will be replaced by today + this amount of days"
+msgstr ""
+"Wenn dieses Produkt zu einem Gefrier-Standort umgelagert (sprich "
+"eingefroren) wird, wird das Mindesthaltbarkeitsdatum durch heute + diese "
+"Anzahl von Tagen ersetzt"
+
+msgid "Default best before days after freezing"
+msgstr "Standard Haltbartkeit in Tagen nach dem Einfrieren"
+
+msgid ""
+"On moving this product from a freezer location (so when thawing it), the "
+"best before date will be replaced by today + this amount of days"
+msgstr ""
+"Wenn dieses Produkt von einem Gefrier-Standort umgelagert (sprich aufgetaut)"
+" wird, wird das Mindesthaltbarkeitsdatum durch heute + diese Anzahl von "
+"Tagen ersetzt"
+
+msgid "Default best before days after thawing"
+msgstr "Standard Haltbartkeit in Tagen nach dem Auftauen"
+
+msgid "This cannot be the same as the \"From\" location"
+msgstr "Dies kann nicht derselbe Standort wie \"Von Standort\" sein"
+
+msgid "Thawed"
+msgstr "Aufgetaut"
+
+msgid "Frozen"
+msgstr "Eingefroren"

localization/demo_data.pot

@@ -327,3 +327,15 @@ msgstr ""
 
 msgid "Portuguese (Brazil)"
 msgstr ""
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
+msgstr ""

localization/en/stock_transaction_types.po

@@ -35,3 +35,6 @@ msgstr "Stock entry edited (old values)"
 
 msgid "stock-edit-new"
 msgstr "Stock entry edited (new values)"
+
+msgid "self-production"
+msgstr "Self-production"

localization/en_GB/chore_assignment_types.po

@@ -1,3 +1,5 @@
+# Translators:
+# Jonathan Adams <jonathan@connockadams.uk>, 2020
 # 
 msgid ""
 msgstr ""
@@ -5,6 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,13 +17,13 @@ msgstr ""
 "X-Domain: grocy/chore_assignment_types\n"
 
 msgid "no-assignment"
-msgstr ""
+msgstr "no-assignment"
 
 msgid "who-least-did-first"
-msgstr ""
+msgstr "who-least-did-first"
 
 msgid "random"
-msgstr ""
+msgstr "random"
 
 msgid "in-alphabetical-order"
-msgstr ""
+msgstr "in-alphabetical-order"

localization/en_GB/chore_period_types.po

@@ -1,3 +1,5 @@
+# Translators:
+# Jonathan Adams <jonathan@connockadams.uk>, 2020
 # 
 msgid ""
 msgstr ""
@@ -5,6 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,19 +17,19 @@ msgstr ""
 "X-Domain: grocy/chore_types\n"
 
 msgid "manually"
-msgstr ""
+msgstr "manually"
 
 msgid "dynamic-regular"
-msgstr ""
+msgstr "dynamic-regular"
 
 msgid "daily"
-msgstr ""
+msgstr "daily"
 
 msgid "weekly"
-msgstr ""
+msgstr "weekly"
 
 msgid "monthly"
-msgstr ""
+msgstr "monthly"
 
 msgid "yearly"
-msgstr ""
+msgstr "yearly"

localization/en_GB/demo_data.po

@@ -1,3 +1,5 @@
+# Translators:
+# Jonathan Adams <jonathan@connockadams.uk>, 2020
 # 
 msgid ""
 msgstr ""
@@ -5,6 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,314 +17,329 @@ msgstr ""
 "X-Domain: grocy/demo_data\n"
 
 msgid "Cookies"
-msgstr ""
+msgstr "Cookies"
 
 msgid "Chocolate"
-msgstr ""
+msgstr "Chocolate"
 
 msgid "Pantry"
-msgstr ""
+msgstr "Pantry"
 
 msgid "Candy cupboard"
-msgstr ""
+msgstr "Candy cupboard"
 
 msgid "Tinned food cupboard"
-msgstr ""
+msgstr "Tinned food cupboard"
 
 msgid "Fridge"
-msgstr ""
+msgstr "Fridge"
 
 msgid "Piece"
 msgid_plural "Pieces"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Piece"
+msgstr[1] "Pieces"
 
 msgid "Pack"
 msgid_plural "Packs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pack"
+msgstr[1] "Packs"
 
 msgid "Glass"
 msgid_plural "Glasses"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Glass"
+msgstr[1] "Glasses"
 
 msgid "Tin"
 msgid_plural "Tins"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tin"
+msgstr[1] "Tins"
 
 msgid "Can"
 msgid_plural "Cans"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Can"
+msgstr[1] "Cans"
 
 msgid "Bunch"
 msgid_plural "Bunches"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bunch"
+msgstr[1] "Bunches"
 
 msgid "Gummy bears"
-msgstr ""
+msgstr "Gummy bears"
 
 msgid "Crisps"
-msgstr ""
+msgstr "Crisps"
 
 msgid "Eggs"
-msgstr ""
+msgstr "Eggs"
 
 msgid "Noodles"
-msgstr ""
+msgstr "Noodles"
 
 msgid "Pickles"
-msgstr ""
+msgstr "Pickles"
 
 msgid "Gulash soup"
-msgstr ""
+msgstr "Gulash soup"
 
 msgid "Yogurt"
-msgstr ""
+msgstr "Yogurt"
 
 msgid "Cheese"
-msgstr ""
+msgstr "Cheese"
 
 msgid "Cold cuts"
-msgstr ""
+msgstr "Cold cuts"
 
 msgid "Paprika"
-msgstr ""
+msgstr "Paprika"
 
 msgid "Cucumber"
-msgstr ""
+msgstr "Cucumber"
 
 msgid "Radish"
-msgstr ""
+msgstr "Radish"
 
 msgid "Tomato"
-msgstr ""
+msgstr "Tomato"
 
 msgid "Changed towels in the bathroom"
-msgstr ""
+msgstr "Changed towels in the bathroom"
 
 msgid "Cleaned the kitchen floor"
-msgstr ""
+msgstr "Cleaned the kitchen floor"
 
 msgid "Warranty ends"
-msgstr ""
+msgstr "Warranty ends"
 
 msgid "TV remote control"
-msgstr ""
+msgstr "TV remote control"
 
 msgid "Alarm clock"
-msgstr ""
+msgstr "Alarm clock"
 
 msgid "Heat remote control"
-msgstr ""
+msgstr "Heat remote control"
 
 msgid "Lawn mowed in the garden"
-msgstr ""
+msgstr "Lawn mowed in the garden"
 
 msgid "Some good snacks"
-msgstr ""
+msgstr "Some good snacks"
 
 msgid "Pizza dough"
-msgstr ""
+msgstr "Pizza dough"
 
 msgid "Sieved tomatoes"
-msgstr ""
+msgstr "Sieved tomatoes"
 
 msgid "Salami"
-msgstr ""
+msgstr "Salami"
 
 msgid "Toast"
-msgstr ""
+msgstr "Toast"
 
 msgid "Minced meat"
-msgstr ""
+msgstr "Minced meat"
 
 msgid "Pizza"
-msgstr ""
+msgstr "Pizza"
 
 msgid "Spaghetti bolognese"
-msgstr ""
+msgstr "Spaghetti bolognese"
 
 msgid "Sandwiches"
-msgstr ""
+msgstr "Sandwiches"
 
 msgid "English"
-msgstr ""
+msgstr "English"
 
 msgid "German"
-msgstr ""
+msgstr "German"
 
 msgid "Italian"
-msgstr ""
+msgstr "Italian"
 
 msgid "This is the note content of the recipe ingredient"
-msgstr ""
+msgstr "This is the note content of the recipe ingredient"
 
 msgid "Demo User"
-msgstr ""
+msgstr "Demo User"
 
 msgid "Gram"
 msgid_plural "Grams"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Gram"
+msgstr[1] "Grams"
 
 msgid "Flour"
-msgstr ""
+msgstr "Flour"
 
 msgid "Pancakes"
-msgstr ""
+msgstr "Pancakes"
 
 msgid "Sugar"
-msgstr ""
+msgstr "Sugar"
 
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 msgid "Life"
-msgstr ""
+msgstr "Life"
 
 msgid "Projects"
-msgstr ""
+msgstr "Projects"
 
 msgid "Repair the garage door"
-msgstr ""
+msgstr "Repair the garage door"
 
 msgid "Fork and improve grocy"
-msgstr ""
+msgstr "Fork and improve grocy"
 
 msgid "Find a solution for what to do when I forget the door keys"
-msgstr ""
+msgstr "Find a solution for what to do when I forget the door keys"
 
 msgid "Sweets"
-msgstr ""
+msgstr "Sweets"
 
 msgid "Bakery products"
-msgstr ""
+msgstr "Bakery products"
 
 msgid "Tinned food"
-msgstr ""
+msgstr "Tinned food"
 
 msgid "Butchery products"
-msgstr ""
+msgstr "Butchery products"
 
 msgid "Vegetables/Fruits"
-msgstr ""
+msgstr "Vegetables/Fruits"
 
 msgid "Refrigerated products"
-msgstr ""
+msgstr "Refrigerated products"
 
 msgid "Coffee machine"
-msgstr ""
+msgstr "Coffee machine"
 
 msgid "Dishwasher"
-msgstr ""
+msgstr "Dishwasher"
 
 msgid "Liter"
-msgstr ""
+msgstr "Liter"
 
 msgid "Liters"
-msgstr ""
+msgstr "Liters"
 
 msgid "Bottle"
-msgstr ""
+msgstr "Bottle"
 
 msgid "Bottles"
-msgstr ""
+msgstr "Bottles"
 
 msgid "Milk"
-msgstr ""
+msgstr "Milk"
 
 msgid "Chocolate sauce"
-msgstr ""
+msgstr "Chocolate sauce"
 
 msgid "Milliliters"
-msgstr ""
+msgstr "Milliliters"
 
 msgid "Milliliter"
-msgstr ""
+msgstr "Milliliter"
 
 msgid "Bottom"
-msgstr ""
+msgstr "Bottom"
 
 msgid "Topping"
-msgstr ""
+msgstr "Topping"
 
 msgid "French"
-msgstr ""
+msgstr "French"
 
 msgid "Turkish"
-msgstr ""
+msgstr "Turkish"
 
 msgid "Spanish"
-msgstr ""
+msgstr "Spanish"
 
 msgid "Russian"
-msgstr ""
+msgstr "Russian"
 
 msgid "The thing which happens on the 5th of every month"
-msgstr ""
+msgstr "The thing which happens on the 5th of every month"
 
 msgid "The thing which happens daily"
-msgstr ""
+msgstr "The thing which happens daily"
 
 msgid "The thing which happens on Mondays and Wednesdays"
-msgstr ""
+msgstr "The thing which happens on Mondays and Wednesdays"
 
 msgid "Swedish"
-msgstr ""
+msgstr "Swedish"
 
 msgid "Polish"
-msgstr ""
+msgstr "Polish"
 
 msgid "Milk Chocolate"
-msgstr ""
+msgstr "Milk Chocolate"
 
 msgid "Dark Chocolate"
-msgstr ""
+msgstr "Dark Chocolate"
 
 msgid "Slice"
 msgid_plural "Slices"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Slice"
+msgstr[1] "Slices"
 
 msgid "Example userentity"
-msgstr ""
+msgstr "Example userentity"
 
 msgid "This is an example user entity..."
-msgstr ""
+msgstr "This is an example user entity..."
 
 msgid "Custom field"
-msgstr ""
+msgstr "Custom field"
 
 msgid "Example field value..."
-msgstr ""
+msgstr "Example field value..."
 
 msgid "Waffle rolls"
-msgstr ""
+msgstr "Waffle rolls"
 
 msgid "Danish"
-msgstr ""
+msgstr "Danish"
 
 msgid "Dutch"
-msgstr ""
+msgstr "Dutch"
 
 msgid "Norwegian"
-msgstr ""
+msgstr "Norwegian"
 
 msgid "Demo"
-msgstr ""
+msgstr "Demo"
 
 msgid "Stable version"
-msgstr ""
+msgstr "Stable version"
 
 msgid "Preview version"
-msgstr ""
+msgstr "Preview version"
 
 msgid "current release"
-msgstr ""
+msgstr "current release"
 
 msgid "not yet released"
+msgstr "not yet released"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portuguese (Brazil)"
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
 msgstr ""

localization/en_GB/stock_transaction_types.po

@@ -1,3 +1,5 @@
+# Translators:
+# Jonathan Adams <jonathan@connockadams.uk>, 2020
 # 
 msgid ""
 msgstr ""
@@ -5,6 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,13 +17,28 @@ msgstr ""
 "X-Domain: grocy/stock_transaction_types\n"
 
 msgid "purchase"
-msgstr ""
+msgstr "purchase"
+
+msgid "transfer_from"
+msgstr "transfer_from"
+
+msgid "transfer_to"
+msgstr "transfer_to"
 
 msgid "consume"
-msgstr ""
+msgstr "consume"
 
 msgid "inventory-correction"
-msgstr ""
+msgstr "inventory-correction"
 
 msgid "product-opened"
+msgstr "product-opened"
+
+msgid "stock-edit-old"
+msgstr "stock-edit-old"
+
+msgid "stock-edit-new"
+msgstr "stock-edit-new"
+
+msgid "self-production"
 msgstr ""

localization/en_GB/userfield_types.po

@@ -1,3 +1,5 @@
+# Translators:
+# Jonathan Adams <jonathan@connockadams.uk>, 2020
 # 
 msgid ""
 msgstr ""
@@ -5,6 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:43+0000\n"
+"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,31 +17,31 @@ msgstr ""
 "X-Domain: grocy/userfield_types\n"
 
 msgid "text-single-line"
-msgstr ""
+msgstr "text-single-line"
 
 msgid "text-multi-line"
-msgstr ""
+msgstr "text-multi-line"
 
 msgid "number-integral"
-msgstr ""
+msgstr "number-integral"
 
 msgid "number-decimal"
-msgstr ""
+msgstr "number-decimal"
 
 msgid "date"
-msgstr ""
+msgstr "date"
 
 msgid "datetime"
-msgstr ""
+msgstr "datetime"
 
 msgid "checkbox"
-msgstr ""
+msgstr "checkbox"
 
 msgid "preset-list"
-msgstr ""
+msgstr "preset-list"
 
 msgid "preset-checklist"
-msgstr ""
+msgstr "preset-checklist"
 
 msgid "link"
-msgstr ""
+msgstr "link"

localization/es/demo_data.po

@@ -162,9 +162,6 @@ msgstr "Alemán"
 msgid "Italian"
 msgstr "Italiano"
 
-msgid "Demo in different language"
-msgstr "Demo en otro idioma"
-
 msgid "This is the note content of the recipe ingredient"
 msgstr "Este es el contenido de la nota del ingrediente de la receta"
 
@@ -315,3 +312,36 @@ msgstr ""
 
 msgid "Dutch"
 msgstr ""
+
+msgid "Norwegian"
+msgstr ""
+
+msgid "Demo"
+msgstr ""
+
+msgid "Stable version"
+msgstr ""
+
+msgid "Preview version"
+msgstr ""
+
+msgid "current release"
+msgstr ""
+
+msgid "not yet released"
+msgstr ""
+
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
+msgstr ""

localization/fr/chore_period_types.po

@@ -1,6 +1,7 @@
 # Translators:
 # Bernd Bestel <bernd@berrnd.de>, 2019
 # Alex Deneuvillers <alex.deneuvillers@gmail.com>, 2019
+# Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -8,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Alex Deneuvillers <alex.deneuvillers@gmail.com>, 2019\n"
+"Last-Translator: Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019\n"
 "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,3 +32,6 @@ msgstr "Hebdomadaire"
 
 msgid "monthly"
 msgstr "Mensuelle"
+
+msgid "yearly"
+msgstr "Annuelle"

localization/fr/demo_data.po

@@ -2,6 +2,8 @@
 # Cedric Octave <transifex@octvcdrc.fr>, 2019
 # bigoudo, 2019
 # Matthieu K, 2019
+# Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019
+# Zkryvix <angelo.frangione@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -9,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Matthieu K, 2019\n"
+"Last-Translator: Zkryvix <angelo.frangione@gmail.com>, 2020\n"
 "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -145,7 +147,7 @@ msgid "Minced meat"
 msgstr "Viande hachée"
 
 msgid "Pizza"
-msgstr "PIzza"
+msgstr "Pizza"
 
 msgid "Spaghetti bolognese"
 msgstr "Spaghetti bolognaise"
@@ -162,9 +164,6 @@ msgstr "Allemand"
 msgid "Italian"
 msgstr "Italien"
 
-msgid "Demo in different language"
-msgstr "Démo dans une langue différente"
-
 msgid "This is the note content of the recipe ingredient"
 msgstr "Ceci est le contenu de la note concernant l'ingrédient de la recette"
 
@@ -224,7 +223,7 @@ msgid "Refrigerated products"
 msgstr "Produits réfrigérés"
 
 msgid "Coffee machine"
-msgstr "Machie à café"
+msgstr "Machine à café"
 
 msgid "Dishwasher"
 msgstr "Lave-vaisselle"
@@ -287,27 +286,66 @@ msgid "Polish"
 msgstr "Polonais"
 
 msgid "Milk Chocolate"
-msgstr ""
+msgstr "Chocolat au lait"
 
 msgid "Dark Chocolate"
-msgstr ""
+msgstr "Chocolat noir"
 
 msgid "Slice"
 msgid_plural "Slices"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tranche"
+msgstr[1] "Tranches"
 
 msgid "Example userentity"
-msgstr ""
+msgstr "Exemple entité utilisateur"
 
 msgid "This is an example user entity..."
-msgstr ""
+msgstr "Ceci est un exemple d'entité utilisateur"
 
 msgid "Custom field"
-msgstr ""
+msgstr "Champ personnalisé"
 
 msgid "Example field value..."
-msgstr ""
+msgstr "Exemple de valeur de champ..."
 
 msgid "Waffle rolls"
+msgstr "Gaufrettes roulées"
+
+msgid "Danish"
+msgstr "Danois"
+
+msgid "Dutch"
+msgstr "Néerlandais"
+
+msgid "Norwegian"
+msgstr "Norvégien"
+
+msgid "Demo"
+msgstr "Démo"
+
+msgid "Stable version"
+msgstr "Version stable"
+
+msgid "Preview version"
+msgstr "Version d'aperçu"
+
+msgid "current release"
+msgstr "Version actuelle"
+
+msgid "not yet released"
+msgstr "pas encore publiée"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugais (Brésil)"
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr "Congélateur"
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
 msgstr ""

localization/fr/stock_transaction_types.po

@@ -1,5 +1,7 @@
 # Translators:
 # Bernd Bestel <bernd@berrnd.de>, 2019
+# Guillaume RICHARD <giz.richard@gmail.com>, 2020
+# Zkryvix <angelo.frangione@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Zkryvix <angelo.frangione@gmail.com>, 2020\n"
 "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +21,12 @@ msgstr ""
 msgid "purchase"
 msgstr "Achat"
 
+msgid "transfer_from"
+msgstr "transféré depuis"
+
+msgid "transfer_to"
+msgstr "transféré à"
+
 msgid "consume"
 msgstr "Consommation"
 
@@ -27,3 +35,12 @@ msgstr "Correction d'inventaire"
 
 msgid "product-opened"
 msgstr "Produit ouvert"
+
+msgid "stock-edit-old"
+msgstr "Éditer l'ancien stock"
+
+msgid "stock-edit-new"
+msgstr "Éditer le nouveau stock"
+
+msgid "self-production"
+msgstr "Autoproduction"

localization/fr/strings.po

@@ -5,7 +5,14 @@
 # Cedric Octave <transifex@octvcdrc.fr>, 2019
 # Hydreliox Hydreliox <hydreliox@gmail.com>, 2019
 # Matthieu K, 2019
+# Jérémy Tisserand <jeremy.tisserand@gmail.com>, 2019
 # Mathieu Fortin <mathieugfortin@gmail.com>, 2019
+# Pierre-Emmanuel Colas <transiflex@atnock.fr>, 2019
+# Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019
+# Adrien Guillement <adrien.guillement@gmail.com>, 2019
+# Matthias Baumgartner <dersoistargate@gmail.com>, 2019
+# Guillaume RICHARD <giz.richard@gmail.com>, 2020
+# Zkryvix <angelo.frangione@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -13,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Mathieu Fortin <mathieugfortin@gmail.com>, 2019\n"
+"Last-Translator: Zkryvix <angelo.frangione@gmail.com>, 2020\n"
 "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,7 +73,7 @@ msgid "Chores overview"
 msgstr "Aperçu des corvées"
 
 msgid "Batteries overview"
-msgstr "Piles"
+msgstr "Aperçu des piles"
 
 msgid "Purchase"
 msgstr "Achat"
@@ -87,7 +94,7 @@ msgid "Battery tracking"
 msgstr "Suivi des piles"
 
 msgid "Locations"
-msgstr "Emplacements"
+msgstr "Il n'y a pas d'unités disponibles à cet endroit."
 
 msgid "Quantity units"
 msgstr "Formats"
@@ -96,7 +103,7 @@ msgid "Chores"
 msgstr "Corvées"
 
 msgid "Batteries"
-msgstr "Batteries"
+msgstr "Piles"
 
 msgid "Chore"
 msgstr "Corvée"
@@ -165,7 +172,7 @@ msgid "Tracked count"
 msgstr "Nombre de réalisations"
 
 msgid "Battery overview"
-msgstr "Aperçu des batteries"
+msgstr "Aperçu des piles"
 
 msgid "Charge cycles count"
 msgstr "Nombre de charges"
@@ -243,10 +250,10 @@ msgid "Used in"
 msgstr "Utilisé dans"
 
 msgid "Create battery"
-msgstr "Créer une batterie"
+msgstr "Créer une pile"
 
 msgid "Edit battery"
-msgstr "Modifier une batterie"
+msgstr "Modifier une pile"
 
 msgid "Edit chore"
 msgstr "Modifier une corvée"
@@ -368,14 +375,14 @@ msgid "This means %s will be removed from stock"
 msgstr "%s sera supprimé du stock"
 
 msgid ""
-"This means it is estimated that a new execution of this chore is tracked %s "
-"days after the last was tracked"
+"This means the next execution of this chore is scheduled %s days after the "
+"last execution"
 msgstr ""
-"La prochaine exécution de cette corvée sera programmée %s jours après sa "
+"La prochaine exécution de cette corvée sera programmée %s jours après la "
 "dernière exécution"
 
 msgid "Removed %1$s of %2$s from stock"
-msgstr "%1$senlevé du stock de%2$s "
+msgstr "%1$s enlevée du stock de%2$s "
 
 msgid "About grocy"
 msgstr "À propos de grocy"
@@ -426,7 +433,7 @@ msgid "You have to select a chore"
 msgstr "Vous devez sélectionner une corvée"
 
 msgid "You have to select a battery"
-msgstr "Vous devez sélectionner une batterie"
+msgstr "Vous devez sélectionner une pile"
 
 msgid "A name is required"
 msgstr "Un nom est requis"
@@ -790,7 +797,7 @@ msgid "View settings"
 msgstr "Voir les paramètres"
 
 msgid "Auto reload on external changes"
-msgstr "Mettre à jour automatiquement lors d'un changement externe"
+msgstr "MàJ automatique lors de changements externe"
 
 msgid "Enable night mode"
 msgstr "Activer le mode nuit"
@@ -926,7 +933,7 @@ msgid "Batteries journal"
 msgstr "Journal des batteries"
 
 msgid "Filter by battery"
-msgstr "Filtrer par batterie"
+msgstr "Filtrer par pile"
 
 msgid "Undo charge cycle"
 msgstr "Annuler le cycle de charge"
@@ -976,12 +983,9 @@ msgid "Mark %1$s of %2$s as open"
 msgstr "Indiquer%1$s de %2$s comme ouvert"
 
 msgid ""
-"When a product was marked as opened, the best before date will be replaced "
-"by today + this amount of days (a value of 0 disables this)"
+"When this product was marked as opened, the best before date will be "
+"replaced by today + this amount of days (a value of 0 disables this)"
 msgstr ""
-"Quand un produit est marqué comme ouvert, la date de péremption sera "
-"remplacée par la date du jour + ce nombre de jours (une valeur de 0 "
-"désactive ce changement)"
 
 msgid "Default best before days after opened"
 msgstr "Date de péremption en jours par défaut après ouverture"
@@ -992,9 +996,6 @@ msgstr "Indiqué%1$s de %2$s comme ouvert"
 msgid "Mark as opened"
 msgstr "Indiquer comme ouvert"
 
-msgid "Expires on %1$s; Bought on %2$s"
-msgstr "Se périmera le%1$s; Acheté le %2$s"
-
 msgid "Not opened"
 msgstr "Non ouvert"
 
@@ -1139,10 +1140,10 @@ msgid "Journal for this chore"
 msgstr "Journal de la corvée"
 
 msgid "Show battery details"
-msgstr "Voir les détails"
+msgstr "Voir les détails de la pile"
 
 msgid "Journal for this battery"
-msgstr "Journal individuel"
+msgstr "Journal de cette pile"
 
 msgid "System info"
 msgstr "Informations système"
@@ -1238,7 +1239,7 @@ msgid "Sunday"
 msgstr "Dimanche"
 
 msgid "Configure userfields"
-msgstr "Configurer les attributs personalisés"
+msgstr "Configurer les attributs personnalisés"
 
 msgid "Userfields"
 msgstr "Attributs personalisés"
@@ -1308,6 +1309,9 @@ msgstr "Pas assez en stock"
 msgid "Expiring soon days"
 msgstr "Jours avant péremption"
 
+msgid "Default location"
+msgstr "Emplacement par défaut"
+
 msgid "Default amount for purchase"
 msgstr "Quantité ajoutée par défaut lors d'un achat"
 
@@ -1367,25 +1371,532 @@ msgid "Products"
 msgstr "Produits"
 
 msgid "Marked task %s as completed on %s"
-msgstr ""
+msgstr "%s tâche marquée complétée sur %s"
 
 msgid "Booking has subsequent dependent bookings, undo not possible"
 msgstr "La réservation a des dépendances, impossible de revenir en arrière"
 
 msgid "per serving"
-msgstr ""
+msgstr "par portion"
 
 msgid "Never"
-msgstr ""
+msgstr "Jamais"
 
 msgid "Today"
-msgstr ""
+msgstr "Aujourd'hui"
 
 msgid "Consume %1$s of %2$s as spoiled"
-msgstr ""
+msgstr "Consommer %1$s de %2$s comme périmée"
 
 msgid "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
 msgstr ""
+"Des ingrédients de la recette \"%s\" sont manquants,\n"
+"rien n'est retiré"
 
 msgid "Undo task \"%s\""
+msgstr "Annuler tâche \"%s\""
+
+msgid "Due date rollover"
+msgstr "Report de la date d'échéance"
+
+msgid ""
+"When enabled the chore can never be overdue, the due date will shift forward"
+" each day when due"
+msgstr ""
+"Si activé la corvée ne sera jamais due, la date d'échéance sera avancée "
+"quand atteinte."
+
+msgid "Location Content Sheet"
+msgstr "Emplacement du stock"
+
+msgid "Print"
+msgstr "Imprimer"
+
+msgid "all locations"
+msgstr "Tous les emplacements"
+
+msgid ""
+"Here you can print a page per location with the current stock, maybe to hang"
+" it there and note the consumed things on it."
+msgstr ""
+"Ici vous pouvez imprimer une fiche du stock actuel classé par emplacement, "
+"vous pouvez par exemple l'accrocher et noter les produits qui ont été "
+"consommés dessus."
+
+msgid "this location"
+msgstr "Cet emplacement"
+
+msgid "Consumend amount"
+msgstr "Quantité consommé"
+
+msgid "Time of printing"
+msgstr "Temps d'impression"
+
+msgid "Are you sure to delete equipment \"%s\"?"
+msgstr "Êtes-vous certain de vouloir effacer l'équipement \"%s\"?"
+
+msgid "Parent product"
+msgstr "Produit parent"
+
+msgid ""
+"Not possible because this product is already used as a parent product in "
+"another product"
+msgstr ""
+"Impossible, ce produit est déjà assigné comme parent sur un autre produit"
+
+msgid "Default conversions"
+msgstr "Conversions par défaut"
+
+msgid "Factor"
+msgstr "Facteur"
+
+msgid "1 %s is the same as..."
+msgstr "1 %s corresponds aussi à..."
+
+msgid "Create QU conversion"
+msgstr "Créer une conversion d'UQ"
+
+msgid "Default for QU"
+msgstr "Défaut pour l'unité de quantité"
+
+msgid "Quantity unit from"
+msgstr "De l'unité de quantité"
+
+msgid "Quantity unit to"
+msgstr "À l'unité de quantité"
+
+msgid ""
+"This cannot be lower than %1$s and must be a valid number with max. %2$s "
+"decimal places"
+msgstr ""
+"Cela ne peut être inférieur à  %1$s et doit être un nombre valide avec "
+"maximum. %2$s décimales."
+
+msgid "This cannot be equal to %s"
+msgstr "Ne peut être égale à %s"
+
+msgid "This means 1 %1$s is the same as %2$s %3$s"
+msgstr "Signifie que  1 %1$s corresponds aussi à %2$s %3$s"
+
+msgid "QU conversions"
+msgstr "Conversions d'UQ"
+
+msgid "Product overrides"
+msgstr "Règles du produit"
+
+msgid "Override for product"
+msgstr "Règle pour le produit"
+
+msgid "This equals %1$s %2$s in stock"
+msgstr "Égal à %1$s%2$s en stock"
+
+msgid "Edit QU conversion"
+msgstr "Éditer la conversion d'UQ"
+
+msgid "An assignment type is required"
+msgstr "Un type de tâche est requis"
+
+msgid "Assignment type"
+msgstr "Type de tâche"
+
+msgid ""
+"This means the next execution of this chore is scheduled 1 day after the "
+"last execution"
+msgstr ""
+"La prochaine exécution de cette corvée sera programmé 1 jour après la "
+"dernière exécution"
+
+msgid ""
+"This means the next execution of this chore is scheduled 1 day after the "
+"last execution, but only for the weekdays selected below"
+msgstr ""
+"Signifie que la prochaine exécution de cette corvée est programmé 1 jour "
+"après la dernière exécution, mais uniquement pour les jours sélectionnés ci-"
+"dessous"
+
+msgid "This means the next execution of this chore is not scheduled"
+msgstr "Cette corvée n'a pas d'exécution de programmée. "
+
+msgid ""
+"This means the next execution of this chore is scheduled on the below "
+"selected day of each month"
+msgstr ""
+"Signifie que la prochaine exécution de cette corvée sera programmé à la date"
+" sélectionnée ci-dessous chaque mois"
+
+msgid ""
+"This means the next execution of this chore will not be assigned to anyone"
+msgstr ""
+"Signifie que la prochaine exécution de cette corvée ne sera assigné à "
+"personne"
+
+msgid ""
+"This means the next execution of this chore will be assigned to the one who "
+"executed it least"
+msgstr ""
+"Signifie que la prochaine exécution de cette corvée sera assignée à celui "
+"qui l'a effectué en dernier"
+
+msgid "This means the next execution of this chore will be assigned randomly"
+msgstr ""
+"Signifie que la prochaine exécution de cette corvée sera assignée "
+"aléatoirement"
+
+msgid ""
+"This means the next execution of this chore will be assigned to the next one"
+" in alphabetical order"
+msgstr ""
+"Signifie que la prochaine exécution de cette corvée sera assigné au prochain"
+" par ordre alphabétique"
+
+msgid "Assign to"
+msgstr "Assigné à"
+
+msgid "This assignment type requires that at least one is assigned"
+msgstr "Ce type de tâche nécessite au moins une personne assignée"
+
+msgid "%s chore is assigned to me"
+msgid_plural "%s chores are assigned to me"
+msgstr[0] "%s corvée m'est assignée"
+msgstr[1] "%s corvées me sont assignées"
+
+msgid "Assigned to me"
+msgstr "Assigné à moi"
+
+msgid "assigned to %s"
+msgstr "assigné à %s"
+
+msgid "Filter by assignment"
+msgstr "Filtrer par tâche"
+
+msgid "Consume product on chore execution"
+msgstr "Consommer un produit lors de l'exécution de la corvée"
+
+msgid "Are you sure to delete user field \"%s\"?"
+msgstr "Êtes-vous sûr de vouloir supprimer le champ utilisateur \"%s\" ?"
+
+msgid "Userentities"
+msgstr "Entités utilisateur"
+
+msgid "Create userentity"
+msgstr "Créer une entité utilisateur"
+
+msgid "Show in sidebar menu"
+msgstr "Afficher dans le menu latérale"
+
+msgid "Edit userentity"
+msgstr "Éditer l'entité utilisateur"
+
+msgid "Edit %s"
+msgstr "Éditer %s"
+
+msgid "Create %s"
+msgstr "Créer %s"
+
+msgid "Are you sure to delete this userobject?"
+msgstr "Êtes-vous sûr de vouloir supprimer cet objet utilisateur ?"
+
+msgid "Icon CSS class"
+msgstr "Classe CSS de l'icône"
+
+msgid "For example"
+msgstr "Par exemple"
+
+msgid "Configure fields"
+msgstr "Configurer les champs"
+
+msgid "Quantity unit plural form testing"
+msgstr "Test de la forme pluriel de l'unité de quantité"
+
+msgid "Result"
+msgstr "Résultat"
+
+msgid "Test plural forms"
+msgstr "Tester les formes pluriel"
+
+msgid "Scan a barcode"
+msgstr "Scanner un code barre"
+
+msgid "Error while initializing the barcode scanning library"
+msgstr "Erreur lors de l'initialisation de la librairie de scan de code barre"
+
+msgid ""
+"The resulting price of this ingredient will be multiplied by this factor"
+msgstr "Le prix final de cet ingrédient sera multiplié par ce facteur"
+
+msgid "Price factor"
+msgstr "Facteur de prix"
+
+msgid "Do you find grocy useful?"
+msgstr "Vous trouvez grocy utile ?"
+
+msgid "Say thanks"
+msgstr "Remercier"
+
+msgid "Search for recipes containing this product"
+msgstr "Chercher des recettes contenant ce produit"
+
+msgid "Add to shopping list"
+msgstr "Ajouter à la liste de courses"
+
+msgid "Added %1$s of %2$s to the shopping list \"%3$s\""
+msgstr "%1$s de %2$s ajouté à la liste de course \"%3$s\""
+
+msgid "Output"
+msgstr "Sortie"
+
+msgid "Energy (kcal)"
+msgstr "Énergie (kcal)"
+
+msgid "Per stock quantity unit"
+msgstr "Unité de quantité par stock"
+
+msgid "Barcode scanner testing"
+msgstr "Test du scanner de code barre"
+
+msgid "Expected barcode"
+msgstr "Code barre attendu"
+
+msgid "Scan field"
+msgstr "Champ du scan"
+
+msgid "Scanned barcodes"
+msgstr "Codes barre scanné"
+
+msgid "Hit"
+msgstr "Touché"
+
+msgid "Miss"
+msgstr "Raté"
+
+msgid "Display recipe"
+msgstr "Afficher la recette"
+
+msgid "Accumulate sub products min. stock amount"
+msgstr "Accumuler le stock minimal des sous produits"
+
+msgid ""
+"If enabled, the min. stock amount of sub products will be accumulated into "
+"this product, means the sub product will never be \"missing\", only this "
+"product"
+msgstr ""
+"Si activé, la somme du stock minimal des sous produits sera accumulé sur ce "
+"produit, signifiant que le sous produit ne sera jamais \"en manque\", "
+"seulement ce produit"
+
+msgid "Are you sure to remove this conversion?"
+msgstr "Êtes-vous sûr de vouloir supprimer cette conversion ?"
+
+msgid "Unit price"
+msgstr "Prix unitaire"
+
+msgid "Total price"
+msgstr "Prix total"
+
+msgid "in %s and based on the purchase quantity unit"
+msgstr "dans %s et basé sur la quantité unitaire d'achat"
+
+msgid "Unlimited"
+msgstr "Illimité"
+
+msgid "Clear"
+msgstr "Vider"
+
+msgid "Are you sure to remove the included recipe \"%s\"?"
+msgstr "Êtes-vous sûr de vouloir supprimer la recette incluse \"%s\"?"
+
+msgid "Period interval"
+msgstr "Intervalle de temps"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s days"
+msgstr ""
+"La prochaine exécution de cette corvée ne doit être uniquement programmée "
+"que tous les %s jours"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s weeks"
+msgstr ""
+"La prochaine exécution de cette corvée ne doit être uniquement programmée "
+"que toutes les %s semaines"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s months"
+msgstr ""
+"La prochaine exécution de cette corvée ne doit être uniquement programmée "
+"que tous les %s mois"
+
+msgid ""
+"This means the next execution of this chore is scheduled 1 year after the "
+"last execution"
+msgstr ""
+"La prochaine exécution de cette corvée sera programmé 1 an après la dernière"
+" exécution"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s years"
+msgstr ""
+"Signifie que la prochaine exécution de cette corvée ne doit uniquement être "
+"programmé que tous les %s ans"
+
+msgid "Transfer"
+msgstr "Transfert"
+
+msgid "From location"
+msgstr "De"
+
+msgid "To location"
+msgstr "A"
+
+msgid "There are no units available at this location"
+msgstr "Il n'y a pas d'unité disponible à cet endroit."
+
+msgid "Amount: %1$s; Expires on %2$s; Bought on %3$s"
+msgstr "Quantité : %1$s; Expire le %2$s; Acheté le %3$s"
+
+msgid "Transfered %1$s of %2$s from %3$s to %4$s"
+msgstr "A transferé%1$sde %2$svenant de %3$s à %4$s"
+
+msgid "Show stock entries"
+msgstr ""
+
+msgid "Stock entries"
+msgstr ""
+
+msgid "Best before date"
+msgstr "A consommer de préférence avant le"
+
+msgid "Purchased date"
+msgstr "Date d'achat"
+
+msgid "Consume all %s for this stock entry"
+msgstr ""
+
+msgid "The amount cannot be lower than %1$s"
+msgstr "La quantité ne peut être inférieure à %s"
+
+msgid "Stock entry successfully updated"
+msgstr ""
+
+msgid "Edit stock entry"
+msgstr ""
+
+msgid ""
+"Camera access is on only possible when supported and allowed by your browser"
+" and when grocy is served via a secure (https://) connection"
+msgstr ""
+
+msgid "Keep screen on"
+msgstr "Garder l'écran allumé"
+
+msgid "Keep screen on while displaying a \"fullscreen-card\""
+msgstr ""
+
+msgid "A purchased date is required"
+msgstr ""
+
+msgid ""
+"When a product is selected, one unit (per serving in purchase quantity unit)"
+" will be added to stock on consuming this recipe"
+msgstr ""
+
+msgid "Produces product"
+msgstr ""
+
+msgid "This booking cannot be undone"
+msgstr ""
+
+msgid "Booking does not exist or was already undone"
+msgstr ""
+
+msgid "Are you sure to delete API key \"%s\"?"
+msgstr ""
+
+msgid "Add note"
+msgstr ""
+
+msgid "Add note to %s"
+msgstr ""
+
+msgid "per day"
+msgstr ""
+
+msgid "Compact view"
+msgstr ""
+
+msgid "Normal view"
+msgstr ""
+
+msgid "Only undone items"
+msgstr ""
+
+msgid "Add product"
+msgstr ""
+
+msgid "Add product to %s"
+msgstr ""
+
+msgid "Consume all ingredients needed by this weeks recipes or products"
+msgstr ""
+
+msgid "Meal plan recipe"
+msgstr "Recette des prévisions de repas"
+
+msgid "Meal plan note"
+msgstr ""
+
+msgid "Meal plan product"
+msgstr "Produit des prévisions de repas"
+
+msgid "Scan mode"
+msgstr ""
+
+msgid "on"
+msgstr "Allumé"
+
+msgid "off"
+msgstr "Éteint"
+
+msgid ""
+"Scan mode is on but not all required fields could be populated automatically"
+msgstr ""
+
+msgid "Is freezer"
+msgstr ""
+
+msgid ""
+"When moving products from/to a freezer location, the products best before "
+"date is automatically adjusted according to the product settings"
+msgstr ""
+
+msgid ""
+"On moving this product to a freezer location (so when freezing it), the best"
+" before date will be replaced by today + this amount of days"
+msgstr ""
+
+msgid "Default best before days after freezing"
+msgstr ""
+
+msgid ""
+"On moving this product from a freezer location (so when thawing it), the "
+"best before date will be replaced by today + this amount of days"
+msgstr ""
+
+msgid "Default best before days after thawing"
+msgstr ""
+
+msgid "This cannot be the same as the \"From\" location"
+msgstr ""
+
+msgid "Thawed"
+msgstr ""
+
+msgid "Frozen"
+msgstr "Congelé"
+
+msgid "Are you sure to delete userentity \"%s\"?"
 msgstr ""

localization/fr/userfield_types.po

@@ -1,5 +1,6 @@
 # Translators:
 # Hydreliox Hydreliox <hydreliox@gmail.com>, 2019
+# Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:43+0000\n"
-"Last-Translator: Hydreliox Hydreliox <hydreliox@gmail.com>, 2019\n"
+"Last-Translator: Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019\n"
 "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,3 +40,9 @@ msgstr "case à cocher"
 
 msgid "preset-list"
 msgstr "liste prédéfinie"
+
+msgid "preset-checklist"
+msgstr "liste multiple prédéfinie"
+
+msgid "link"
+msgstr "lien"

localization/hu/chore_assignment_types.po

@@ -0,0 +1,30 @@
+# Translators:
+# Márk Kökény <oregapamgroup@gmail.com>, 2019
+# Ádám Kovács <kovacsadam07@outlook.hu>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Ádám Kovács <kovacsadam07@outlook.hu>, 2019\n"
+"Language-Team: Hungarian (https://www.transifex.com/grocy/teams/93189/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "nincs-hozzárendelés"
+
+msgid "who-least-did-first"
+msgstr "ki-legkevésbé-csinálta-először"
+
+msgid "random"
+msgstr "véletlen"
+
+msgid "in-alphabetical-order"
+msgstr "ABC sorrendben"

localization/hu/chore_period_types.po

@@ -0,0 +1,35 @@
+# Translators:
+# Ádám Kovács <kovacsadam07@outlook.hu>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Ádám Kovács <kovacsadam07@outlook.hu>, 2019\n"
+"Language-Team: Hungarian (https://www.transifex.com/grocy/teams/93189/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_types\n"
+
+msgid "manually"
+msgstr "manuálisan"
+
+msgid "dynamic-regular"
+msgstr "változó gyakorisággal"
+
+msgid "daily"
+msgstr "naponta"
+
+msgid "weekly"
+msgstr "hetente"
+
+msgid "monthly"
+msgstr "havonta"
+
+msgid "yearly"
+msgstr "évente"

localization/hu/component_translations.po

@@ -0,0 +1,52 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
+"Language-Team: Hungarian (https://www.transifex.com/grocy/teams/93189/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/component_translations\n"
+
+msgid "timeago_locale"
+msgstr "hu"
+
+msgid "timeago_nan"
+msgstr "NaN éve"
+
+msgid "moment_locale"
+msgstr "hu"
+
+msgid "datatables_localization"
+msgstr ""
+"{\"sEmptyTable\":\"Nincs rendelkezésre álló adat\",\"sInfo\":\"Találatok: "
+"_START_ - _END_ Összesen: _TOTAL_\",\"sInfoEmpty\":\"Nulla "
+"találat\",\"sInfoFiltered\":\"(_MAX_ összes rekord közül "
+"szűrve)\",\"sInfoPostFix\":\"\",\"sInfoThousands\":\" "
+"\",\"sLengthMenu\":\"_MENU_ találat "
+"oldalanként\",\"sLoadingRecords\":\"Betöltés...\",\"sProcessing\":\"Feldolgozás...\",\"sSearch\":\"Keresés:\",\"sZeroRecords\":\"Nincs"
+" a keresésnek megfelelő "
+"találat\",\"oPaginate\":{\"sFirst\":\"Első\",\"sPrevious\":\"Előző\",\"sNext\":\"Következő\",\"sLast\":\"Utolsó\"},\"oAria\":{\"sSortAscending\":\":"
+" aktiválja a növekvő rendezéshez\",\"sSortDescending\":\": aktiválja a "
+"csökkenő rendezéshez\"},\"select\":{\"rows\":{\"0\":\"\",\"1\":\"1 sor "
+"kiválasztva\",\"_\":\"%d sor "
+"kiválasztva\"}},\"buttons\":{\"print\":\"Nyomtatás\",\"colvis\":\"Oszlopok\",\"copy\":\"Másolás\",\"copyTitle\":\"Vágólapra"
+" másolás\",\"copySuccess\":{\"1\":\"1 sor másolva\",\"_\":\"%d sor "
+"másolva\"}}}"
+
+msgid "summernote_locale"
+msgstr "hu-HU"
+
+msgid "fullcalendar_locale"
+msgstr "hu"
+
+msgid "bootstrap-select_locale"
+msgstr "hu_HU"

localization/hu/demo_data.po

@@ -0,0 +1,348 @@
+# Translators:
+# Richard Szolár <szolar.richard@gmail.com>, 2019
+# Márk Kökény <oregapamgroup@gmail.com>, 2019
+# Bernd Bestel <bernd@berrnd.de>, 2020
+# Gábor Szellő <gabor.szello@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Gábor Szellő <gabor.szello@gmail.com>, 2020\n"
+"Language-Team: Hungarian (https://www.transifex.com/grocy/teams/93189/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/demo_data\n"
+
+msgid "Cookies"
+msgstr "Keksz"
+
+msgid "Chocolate"
+msgstr "Csokoládé"
+
+msgid "Pantry"
+msgstr "Éléskamra"
+
+msgid "Candy cupboard"
+msgstr "Édességszekrény"
+
+msgid "Tinned food cupboard"
+msgstr "Konzverves szekrény"
+
+msgid "Fridge"
+msgstr "Hűtő"
+
+msgid "Piece"
+msgid_plural "Pieces"
+msgstr[0] "Darab"
+msgstr[1] "Darab"
+
+msgid "Pack"
+msgid_plural "Packs"
+msgstr[0] "Csomag"
+msgstr[1] "Csomag"
+
+msgid "Glass"
+msgid_plural "Glasses"
+msgstr[0] "Üveg"
+msgstr[1] "Üveg"
+
+msgid "Tin"
+msgid_plural "Tins"
+msgstr[0] "Konzerv"
+msgstr[1] "Konzerv"
+
+msgid "Can"
+msgid_plural "Cans"
+msgstr[0] "Képes"
+msgstr[1] "Kancsó"
+
+msgid "Bunch"
+msgid_plural "Bunches"
+msgstr[0] "Csokor"
+msgstr[1] "Csokor"
+
+msgid "Gummy bears"
+msgstr "Gumimaci"
+
+msgid "Crisps"
+msgstr "Ropogtatnivaló"
+
+msgid "Eggs"
+msgstr "Tojás"
+
+msgid "Noodles"
+msgstr "Tészta"
+
+msgid "Pickles"
+msgstr "Savanyúság"
+
+msgid "Gulash soup"
+msgstr "Gulyásleves"
+
+msgid "Yogurt"
+msgstr "Joghurt"
+
+msgid "Cheese"
+msgstr "Sajt"
+
+msgid "Cold cuts"
+msgstr "Felvágott"
+
+msgid "Paprika"
+msgstr "Paprika"
+
+msgid "Cucumber"
+msgstr "Uborka"
+
+msgid "Radish"
+msgstr "Retek"
+
+msgid "Tomato"
+msgstr "Paradicsom"
+
+msgid "Changed towels in the bathroom"
+msgstr "Törölközők cseréje a fürdőszobában"
+
+msgid "Cleaned the kitchen floor"
+msgstr "Konyhapadló felmosása"
+
+msgid "Warranty ends"
+msgstr "Garancia lejár"
+
+msgid "TV remote control"
+msgstr "TV távirányító"
+
+msgid "Alarm clock"
+msgstr "Ébresztőóra"
+
+msgid "Heat remote control"
+msgstr "Termosztát"
+
+msgid "Lawn mowed in the garden"
+msgstr "Fűnyírás a kertben"
+
+msgid "Some good snacks"
+msgstr "Néhány jó kis nasi"
+
+msgid "Pizza dough"
+msgstr "Pizzatekercs"
+
+msgid "Sieved tomatoes"
+msgstr "Paradicsompüré"
+
+msgid "Salami"
+msgstr "Szalámi"
+
+msgid "Toast"
+msgstr "Toast kenyér"
+
+msgid "Minced meat"
+msgstr "Darált hús"
+
+msgid "Pizza"
+msgstr "Pizza"
+
+msgid "Spaghetti bolognese"
+msgstr "Bolognai spagetti"
+
+msgid "Sandwiches"
+msgstr "Szendvics"
+
+msgid "English"
+msgstr "Angol"
+
+msgid "German"
+msgstr "Német"
+
+msgid "Italian"
+msgstr "Olasz"
+
+msgid "This is the note content of the recipe ingredient"
+msgstr "Ez a recept hozzávalójának megjegyzés tartalma"
+
+msgid "Demo User"
+msgstr "Demo felhasználó"
+
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] "Gramm"
+msgstr[1] "Gramm"
+
+msgid "Flour"
+msgstr "Liszt"
+
+msgid "Pancakes"
+msgstr "Palacsinta"
+
+msgid "Sugar"
+msgstr "Cukor"
+
+msgid "Home"
+msgstr "Otthon"
+
+msgid "Life"
+msgstr "Élet"
+
+msgid "Projects"
+msgstr "Projektek"
+
+msgid "Repair the garage door"
+msgstr "Garázsajtó megjavítása"
+
+msgid "Fork and improve grocy"
+msgstr "Forkold és fejleszd te is Grocyt"
+
+msgid "Find a solution for what to do when I forget the door keys"
+msgstr "Megoldást találni, mit tennék akkor, ha elhagyom a lakáskulcsot"
+
+msgid "Sweets"
+msgstr "Édességek"
+
+msgid "Bakery products"
+msgstr "Péktermékek"
+
+msgid "Tinned food"
+msgstr "Konzerves étel"
+
+msgid "Butchery products"
+msgstr "Hentes termékek"
+
+msgid "Vegetables/Fruits"
+msgstr "Zöldségek/Gyümölcsök"
+
+msgid "Refrigerated products"
+msgstr "Hűtött termékek"
+
+msgid "Coffee machine"
+msgstr "Kávéfőző"
+
+msgid "Dishwasher"
+msgstr "Mosogató"
+
+msgid "Liter"
+msgstr "Liter"
+
+msgid "Liters"
+msgstr "Liter"
+
+msgid "Bottle"
+msgstr "Üveg"
+
+msgid "Bottles"
+msgstr "Üveg"
+
+msgid "Milk"
+msgstr "Tej"
+
+msgid "Chocolate sauce"
+msgstr "Csokiszósz"
+
+msgid "Milliliters"
+msgstr "Milliliter"
+
+msgid "Milliliter"
+msgstr "Milliliter"
+
+msgid "Bottom"
+msgstr "Alsó"
+
+msgid "Topping"
+msgstr "Feltét"
+
+msgid "French"
+msgstr "Francia"
+
+msgid "Turkish"
+msgstr "Török"
+
+msgid "Spanish"
+msgstr "Spanyol"
+
+msgid "Russian"
+msgstr "Orosz"
+
+msgid "The thing which happens on the 5th of every month"
+msgstr "A dolog, amely minden hónap 5. napján megtörténik"
+
+msgid "The thing which happens daily"
+msgstr "A dolog, amely minden nap megtörténik"
+
+msgid "The thing which happens on Mondays and Wednesdays"
+msgstr "A dolog, amely minden hétfőn és szerdán megtörténik"
+
+msgid "Swedish"
+msgstr "Svéd"
+
+msgid "Polish"
+msgstr "Lengyel"
+
+msgid "Milk Chocolate"
+msgstr "Tejcsokoládé"
+
+msgid "Dark Chocolate"
+msgstr "Étcsokoládé"
+
+msgid "Slice"
+msgid_plural "Slices"
+msgstr[0] "Szelet"
+msgstr[1] "Szelet"
+
+msgid "Example userentity"
+msgstr "Példa felhasználóentitás"
+
+msgid "This is an example user entity..."
+msgstr "Ez egy példa felhasználóentitás"
+
+msgid "Custom field"
+msgstr "Egyéni mező"
+
+msgid "Example field value..."
+msgstr "Példa egyéni mező érték..."
+
+msgid "Waffle rolls"
+msgstr "Gofri tekercs"
+
+msgid "Danish"
+msgstr "Dán"
+
+msgid "Dutch"
+msgstr "Holland"
+
+msgid "Norwegian"
+msgstr "Norvég"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Stabil verzió"
+
+msgid "Preview version"
+msgstr "Előzetes verzió"
+
+msgid "current release"
+msgstr "jelenlegi kiadás"
+
+msgid "not yet released"
+msgstr "még nem megjelent"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugál (Brazil)"
+
+msgid "This is a note"
+msgstr "Ez egy jegyzet"
+
+msgid "Freezer"
+msgstr "Fagyasztószekrény"
+
+msgid "Hungarian"
+msgstr "Magyar"
+
+msgid "Slovak"
+msgstr "Szlovák"

localization/hu/stock_transaction_types.po

@@ -0,0 +1,45 @@
+# Translators:
+# Márk Kökény <oregapamgroup@gmail.com>, 2019
+# Gabor Pilsits <gabor.pilsits@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Gabor Pilsits <gabor.pilsits@gmail.com>, 2020\n"
+"Language-Team: Hungarian (https://www.transifex.com/grocy/teams/93189/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/stock_transaction_types\n"
+
+msgid "purchase"
+msgstr "vásárlás"
+
+msgid "transfer_from"
+msgstr "mozgatás innen"
+
+msgid "transfer_to"
+msgstr "mozgatás ide"
+
+msgid "consume"
+msgstr "elfogyasztás"
+
+msgid "inventory-correction"
+msgstr "készlet-korrekció"
+
+msgid "product-opened"
+msgstr "felbontott-termék"
+
+msgid "stock-edit-old"
+msgstr "régi készlet szerkesztése"
+
+msgid "stock-edit-new"
+msgstr "új készlet szerkesztése"
+
+msgid "self-production"
+msgstr "sajátkészítés"

localization/hu/userfield_types.po

@@ -0,0 +1,49 @@
+# Translators:
+# Márk Kökény <oregapamgroup@gmail.com>, 2019
+# Ádám Kovács <kovacsadam07@outlook.hu>, 2019
+# Gábor Szellő <gabor.szello@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:43+0000\n"
+"Last-Translator: Gábor Szellő <gabor.szello@gmail.com>, 2020\n"
+"Language-Team: Hungarian (https://www.transifex.com/grocy/teams/93189/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/userfield_types\n"
+
+msgid "text-single-line"
+msgstr "egysoros szöveg"
+
+msgid "text-multi-line"
+msgstr "többsoros szöveg"
+
+msgid "number-integral"
+msgstr "egész szám"
+
+msgid "number-decimal"
+msgstr "decimális szám"
+
+msgid "date"
+msgstr "dátum"
+
+msgid "datetime"
+msgstr "dátumidőpont"
+
+msgid "checkbox"
+msgstr "jelölőnégyzet"
+
+msgid "preset-list"
+msgstr "előre beállított lista"
+
+msgid "preset-checklist"
+msgstr "előre beállított jelölőlista"
+
+msgid "link"
+msgstr "link"

localization/it/demo_data.po

@@ -1,7 +1,7 @@
 # Translators:
 # Sergio Zampello <seriotv88@gmail.com>, 2019
 # Bernd Bestel <bernd@berrnd.de>, 2019
-# Antonino Ursino <ninus_@libero.it>, 2019
+# Antonino Ursino <ninus_@libero.it>, 2020
 # 
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2019\n"
+"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2020\n"
 "Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -331,3 +331,18 @@ msgstr "versione attuale"
 
 msgid "not yet released"
 msgstr "non ancora pubblicata"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portoghese (Brasile)"
+
+msgid "This is a note"
+msgstr "Questa è una nota"
+
+msgid "Freezer"
+msgstr "Congelatore"
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
+msgstr ""

localization/it/stock_transaction_types.po

@@ -1,5 +1,5 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# Antonino Ursino <ninus_@libero.it>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2020\n"
 "Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,13 +17,28 @@ msgstr ""
 "X-Domain: grocy/stock_transaction_types\n"
 
 msgid "purchase"
-msgstr "Acquista"
+msgstr "comprare"
+
+msgid "transfer_from"
+msgstr "trasferito_da"
+
+msgid "transfer_to"
+msgstr "trasferito_a"
 
 msgid "consume"
-msgstr "Consumare"
+msgstr "consumare"
 
 msgid "inventory-correction"
-msgstr "Correzione dell'inventario"
+msgstr "rettifica-inventario"
 
 msgid "product-opened"
-msgstr "Prodotto aperto"
+msgstr "prodotto-aperto"
+
+msgid "stock-edit-old"
+msgstr "modifica-dispensa-vecchio"
+
+msgid "stock-edit-new"
+msgstr "modifica-dispensa-nuovo"
+
+msgid "self-production"
+msgstr "auto-produzione"

localization/it/strings.po

@@ -3,7 +3,7 @@
 # Bernd Bestel <bernd@berrnd.de>, 2019
 # Matteo Piotto <matteo.piotto@welaika.com>, 2019
 # Matteo Parolin <matteoparolin99@gmail.com>, 2019
-# Antonino Ursino <ninus_@libero.it>, 2019
+# Antonino Ursino <ninus_@libero.it>, 2020
 # 
 msgid ""
 msgstr ""
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2019\n"
+"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2020\n"
 "Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +41,8 @@ msgstr[1] "%s prodotti sono già scaduti"
 msgid "%s product is below defined min. stock amount"
 msgid_plural "%s products are below defined min. stock amount"
 msgstr[0] "%s prodotto sotto la quantità minima di dispensa definita"
-msgstr[1] "%s prodotti sono sotto la quantità minima di dispensa definita"
+msgstr[1] ""
+"%s prodotti sono al di sotto della quantità minima di dispensa definita"
 
 msgid "Product"
 msgstr "Prodotto"
@@ -978,12 +979,12 @@ msgid "Mark %1$s of %2$s as open"
 msgstr "Segna %1$s di %2$s come aperti"
 
 msgid ""
-"When a product was marked as opened, the best before date will be replaced "
-"by today + this amount of days (a value of 0 disables this)"
+"When this product was marked as opened, the best before date will be "
+"replaced by today + this amount of days (a value of 0 disables this)"
 msgstr ""
-"Quando un prodotto è stato contrassegnato come aperto, la data di scadenza "
-"verrà sostituita con oggi + questo numero di giorni (un valore di 0 lo "
-"disabilita)"
+"Quando questo prodotto è stato contrassegnato come aperto, la data di "
+"scadenza verrà sostituita con: \"oggi\" + \"questo numero di giorni\" (il "
+"valore 0 disabilita)"
 
 msgid "Default best before days after opened"
 msgstr "Giorni di scadenza predefiniti dopo l'apertura"
@@ -994,9 +995,6 @@ msgstr "Segnato %1$s di %2$s come aperti"
 msgid "Mark as opened"
 msgstr "Segna come aperto"
 
-msgid "Expires on %1$s; Bought on %2$s"
-msgstr "Scade il %1$s; Comprato il %2$s"
-
 msgid "Not opened"
 msgstr "Non aperto"
 
@@ -1312,6 +1310,9 @@ msgstr "Non abbastanza in dispensa"
 msgid "Expiring soon days"
 msgstr "In scadenza  tra pochi giorni"
 
+msgid "Default location"
+msgstr "Posizione predefinita"
+
 msgid "Default amount for purchase"
 msgstr "Quantità predefinita per l'acquisto"
 
@@ -1751,3 +1752,177 @@ msgid ""
 msgstr ""
 "Questo significa che la prossima esecuzione di questa faccenda dovrebbe "
 "essere programmata solo ogni %s anni"
+
+msgid "Transfer"
+msgstr "Trasferire"
+
+msgid "From location"
+msgstr "Dalla posizione"
+
+msgid "To location"
+msgstr "Alla posizione"
+
+msgid "There are no units available at this location"
+msgstr "Non ci sono unità disponibili in questa posizione"
+
+msgid "Amount: %1$s; Expires on %2$s; Bought on %3$s"
+msgstr "Quantità: %1$s; Scade il: %2$s; Comprato il: %3$s"
+
+msgid "Transfered %1$s of %2$s from %3$s to %4$s"
+msgstr "Trasferiti %1$s di %2$s da %3$s a %4$s"
+
+msgid "Show stock entries"
+msgstr "Mostra voci di dispensa"
+
+msgid "Stock entries"
+msgstr "Voci di dispensa"
+
+msgid "Best before date"
+msgstr "Data di scadenza"
+
+msgid "Purchased date"
+msgstr "Data di acquisto"
+
+msgid "Consume all %s for this stock entry"
+msgstr "Consuma tutte le %s per questa voce di dispensa"
+
+msgid "The amount cannot be lower than %1$s"
+msgstr "La quantità non può essere inferiore a %1$s"
+
+msgid "Stock entry successfully updated"
+msgstr "Voce di dispensa aggiornata correttamente"
+
+msgid "Edit stock entry"
+msgstr "Modifica voce di dispensa"
+
+msgid ""
+"Camera access is on only possible when supported and allowed by your browser"
+" and when grocy is served via a secure (https://) connection"
+msgstr ""
+"L'accesso alla videocamera è possibile solo se supportato e consentito dal "
+"browser e quando grocy è connesso tramite una connessione sicura (https://)"
+
+msgid "Keep screen on"
+msgstr "Mantieni lo schermo acceso"
+
+msgid "Keep screen on while displaying a \"fullscreen-card\""
+msgstr ""
+"Mantieni lo schermo acceso mentre visualizzi una \"scheda a schermo intero\""
+
+msgid "A purchased date is required"
+msgstr "È richiesta la data di acquisto"
+
+msgid ""
+"When a product is selected, one unit (per serving in purchase quantity unit)"
+" will be added to stock on consuming this recipe"
+msgstr ""
+"Quando viene selezionato un prodotto, un'unità (per porzione nell'unità di "
+"quantità di acquisto) verrà aggiunta alla dispensa consumando questa ricetta"
+" "
+
+msgid "Produces product"
+msgstr "Produce prodotto"
+
+msgid "This booking cannot be undone"
+msgstr "Questa prenotazione non può essere annullata"
+
+msgid "Booking does not exist or was already undone"
+msgstr "La prenotazione non esiste o è stata già annullata"
+
+msgid "Are you sure to delete API key \"%s\"?"
+msgstr "Eliminare la chiave API \"%s\"?"
+
+msgid "Add note"
+msgstr "Aggiungi nota"
+
+msgid "Add note to %s"
+msgstr "Aggiungi nota a %s"
+
+msgid "per day"
+msgstr "al giorno"
+
+msgid "Compact view"
+msgstr "Vista compatta"
+
+msgid "Normal view"
+msgstr "Vista normale"
+
+msgid "Only undone items"
+msgstr "Solo oggetti annullati"
+
+msgid "Add product"
+msgstr "Aggiungi prodotto"
+
+msgid "Add product to %s"
+msgstr "Aggiungi prodotto a %s"
+
+msgid "Consume all ingredients needed by this weeks recipes or products"
+msgstr ""
+"Consuma tutti gli ingredienti necessari per ricette o prodotti di questa "
+"settimana"
+
+msgid "Meal plan recipe"
+msgstr "Ricetta del Piano dei pasti"
+
+msgid "Meal plan note"
+msgstr "Nota del Piano dei pasti"
+
+msgid "Meal plan product"
+msgstr "Prodotto del Piano dei pasti"
+
+msgid "Scan mode"
+msgstr "Modalità di scansione"
+
+msgid "on"
+msgstr "accesa"
+
+msgid "off"
+msgstr "spenta"
+
+msgid ""
+"Scan mode is on but not all required fields could be populated automatically"
+msgstr ""
+"La modalità di scansione è attiva ma non è possibile compilare "
+"automaticamente tutti i campi richiesti"
+
+msgid "Is freezer"
+msgstr "È congelato"
+
+msgid ""
+"When moving products from/to a freezer location, the products best before "
+"date is automatically adjusted according to the product settings"
+msgstr ""
+"Quando si spostano i prodotti da/verso un congelatore, la data di scadenza "
+"dei prodotti viene regolata automaticamente in base alle impostazioni del "
+"prodotto"
+
+msgid ""
+"On moving this product to a freezer location (so when freezing it), the best"
+" before date will be replaced by today + this amount of days"
+msgstr ""
+"Spostando questo prodotto in una posizione di congelatore (quindi quando lo "
+"si congela), la data di scadenza verrà sostituita con: \"oggi\" + \"questa "
+"quantità di giorni\""
+
+msgid "Default best before days after freezing"
+msgstr "Data di scadenza predefinita dopo il congelamento"
+
+msgid ""
+"On moving this product from a freezer location (so when thawing it), the "
+"best before date will be replaced by today + this amount of days"
+msgstr ""
+"Quando si sposta questo prodotto da una posizione del congelatore (quindi "
+"quando lo si scongela), la data di scadenza verrà sostituita con: \"oggi\" +"
+" \"questa quantità di giorni\""
+
+msgid "Default best before days after thawing"
+msgstr "Data di scadenza predefinita dopo lo scongelamento"
+
+msgid "This cannot be the same as the \"From\" location"
+msgstr "Non può essere uguale alla posizione \"Da\""
+
+msgid "Thawed"
+msgstr "Scongelato"
+
+msgid "Frozen"
+msgstr "Congelato"

localization/it/userfield_types.po

@@ -1,5 +1,5 @@
 # Translators:
-# Antonino Ursino <ninus_@libero.it>, 2019
+# Antonino Ursino <ninus_@libero.it>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:43+0000\n"
-"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2019\n"
+"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2020\n"
 "Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,4 +44,4 @@ msgid "preset-checklist"
 msgstr "Lista di controllo predefinita"
 
 msgid "link"
-msgstr "collegamento"
+msgstr "Collegamento"

localization/nl/chore_assignment_types.po

@@ -1,3 +1,6 @@
+# Translators:
+# Kees van Nieuwenhuijzen <kees@vannieuwenhuijzen.com>, 2019
+# Daniel Polders <zigurana@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -5,6 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Daniel Polders <zigurana@gmail.com>, 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/grocy/teams/93189/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,13 +18,13 @@ msgstr ""
 "X-Domain: grocy/chore_assignment_types\n"
 
 msgid "no-assignment"
-msgstr ""
+msgstr "niet-toegewezen"
 
 msgid "who-least-did-first"
-msgstr ""
+msgstr "wie-minst-gedaan-heeft-eerst"
 
 msgid "random"
-msgstr ""
+msgstr "willekeurig"
 
 msgid "in-alphabetical-order"
-msgstr ""
+msgstr "in-alfabetische-volgorde"

localization/nl/chore_period_types.po

@@ -1,6 +1,5 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
-# Engelbert Mercelis <engelbertmercelis@gmail.com>, 2019
+# Daniel Polders <zigurana@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -8,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Engelbert Mercelis <engelbertmercelis@gmail.com>, 2019\n"
+"Last-Translator: Daniel Polders <zigurana@gmail.com>, 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/grocy/teams/93189/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,16 +17,19 @@ msgstr ""
 "X-Domain: grocy/chore_types\n"
 
 msgid "manually"
-msgstr "Handmatig"
+msgstr "handmatig"
 
 msgid "dynamic-regular"
-msgstr "Dynamisch-regelmatig"
+msgstr "dynamisch-regelmatig"
 
 msgid "daily"
-msgstr "Dagelijks"
+msgstr "dagelijks"
 
 msgid "weekly"
-msgstr "Wekelijks"
+msgstr "wekelijks"
 
 msgid "monthly"
-msgstr "Maandelijks"
+msgstr "maandelijks"
+
+msgid "yearly"
+msgstr "jaarlijks"

localization/nl/demo_data.po

@@ -1,11 +1,13 @@
 # Translators:
-# Llewy <carlvanoene@gmail.com>, 2019
 # Adriaan Peeters <apeeters@lashout.net>, 2019
 # Grocy NL, 2019
 # Seppe <van.winkel.seppe@me.com>, 2019
 # Engelbert Mercelis <engelbertmercelis@gmail.com>, 2019
 # Niels Tholenaar <info@123quality.nl>, 2019
 # Frank Klaassen <frank@frankklaassen.nl>, 2019
+# gggg <bashankamp@gmail.com>, 2019
+# Kees van Nieuwenhuijzen <kees@vannieuwenhuijzen.com>, 2019
+# Llewy <carlvanoene@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -13,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Frank Klaassen <frank@frankklaassen.nl>, 2019\n"
+"Last-Translator: Llewy <carlvanoene@gmail.com>, 2019\n"
 "Language-Team: Dutch (https://www.transifex.com/grocy/teams/93189/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,7 +82,7 @@ msgid "Eggs"
 msgstr "Eieren"
 
 msgid "Noodles"
-msgstr "Noodles"
+msgstr "Noedels"
 
 msgid "Pickles"
 msgstr "Augurken"
@@ -166,9 +168,6 @@ msgstr "Duits"
 msgid "Italian"
 msgstr "Italiaans"
 
-msgid "Demo in different language"
-msgstr "Demo in een andere taal"
-
 msgid "This is the note content of the recipe ingredient"
 msgstr "Dit is de inhoud van de opmerking van het recept-ingrediënt"
 
@@ -199,7 +198,7 @@ msgid "Projects"
 msgstr "Projecten"
 
 msgid "Repair the garage door"
-msgstr "Herstel de garagepoort"
+msgstr "De garagedeur repareren"
 
 msgid "Fork and improve grocy"
 msgstr "Fork en verbeter grocy"
@@ -217,7 +216,7 @@ msgid "Tinned food"
 msgstr "Ingeblikt voedsel"
 
 msgid "Butchery products"
-msgstr "Slagerij producten"
+msgstr "Vleeswaren"
 
 msgid "Vegetables/Fruits"
 msgstr "Groenten/Fruit"
@@ -289,27 +288,66 @@ msgid "Polish"
 msgstr "Pools"
 
 msgid "Milk Chocolate"
-msgstr ""
+msgstr "Melk Chocolade"
 
 msgid "Dark Chocolate"
-msgstr ""
+msgstr "Pure Chocolade"
 
 msgid "Slice"
 msgid_plural "Slices"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Punt"
+msgstr[1] "Puntjes"
 
 msgid "Example userentity"
-msgstr ""
+msgstr "Voorbeeld gebruikersentiteit"
 
 msgid "This is an example user entity..."
-msgstr ""
+msgstr "Dit is een voorbeeld van een gebruikers entiteit......"
 
 msgid "Custom field"
-msgstr ""
+msgstr "Custom veld"
 
 msgid "Example field value..."
-msgstr ""
+msgstr "Voorbeeld veld waarde...."
 
 msgid "Waffle rolls"
+msgstr "Wafel rollen"
+
+msgid "Danish"
+msgstr "Deens"
+
+msgid "Dutch"
+msgstr "Nederlands"
+
+msgid "Norwegian"
+msgstr "Norwegen"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Stabiele versie"
+
+msgid "Preview version"
+msgstr "Preview versie"
+
+msgid "current release"
+msgstr "Huidige versie"
+
+msgid "not yet released"
+msgstr "Nog niet uitgegeven"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugees (Brazilië)"
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
 msgstr ""

localization/nl/stock_transaction_types.po

@@ -1,5 +1,6 @@
 # Translators:
 # Bernd Bestel <bernd@berrnd.de>, 2019
+# Boding Clockchain <joost_nl@live.nl>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Boding Clockchain <joost_nl@live.nl>, 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/grocy/teams/93189/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +20,12 @@ msgstr ""
 msgid "purchase"
 msgstr "Aankoop"
 
+msgid "transfer_from"
+msgstr "Overdragen van"
+
+msgid "transfer_to"
+msgstr "Overdragen naar"
+
 msgid "consume"
 msgstr "Consumeren"
 
@@ -27,3 +34,12 @@ msgstr "Voorraadcorrectie"
 
 msgid "product-opened"
 msgstr "Product geopend"
+
+msgid "stock-edit-old"
+msgstr "Bewerk oude voorraad"
+
+msgid "stock-edit-new"
+msgstr "Bewerk oude voorraad"
+
+msgid "self-production"
+msgstr "Eigen gemaakt"

localization/nl/userfield_types.po

@@ -1,6 +1,7 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
 # Mitchel Nijkamp <mitchelnijkamp1@msn.com>, 2019
+# Kees van Nieuwenhuijzen <kees@vannieuwenhuijzen.com>, 2019
+# Daniel Polders <zigurana@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -8,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:43+0000\n"
-"Last-Translator: Mitchel Nijkamp <mitchelnijkamp1@msn.com>, 2019\n"
+"Last-Translator: Daniel Polders <zigurana@gmail.com>, 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/grocy/teams/93189/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,25 +19,31 @@ msgstr ""
 "X-Domain: grocy/userfield_types\n"
 
 msgid "text-single-line"
-msgstr "Tekst (één regel)"
+msgstr "tekst (één regel)"
 
 msgid "text-multi-line"
-msgstr "Tekst (meerdere regels)"
+msgstr "tekst (meerdere regels)"
 
 msgid "number-integral"
-msgstr "Number (héél getal)"
+msgstr "nummer (héél getal)"
 
 msgid "number-decimal"
-msgstr "Nummer (decimaal)"
+msgstr "nummer (decimaal)"
 
 msgid "date"
-msgstr "Getal (zonder tijd)"
+msgstr "datum"
 
 msgid "datetime"
-msgstr "Datum en tijd"
+msgstr "datum en tijd"
 
 msgid "checkbox"
-msgstr "Checkbox"
+msgstr "selectievak"
 
 msgid "preset-list"
 msgstr "vooringestelde lijst"
+
+msgid "preset-checklist"
+msgstr "vooringestelde-lijst"
+
+msgid "link"
+msgstr "koppeling"