Fixed typo (references #697)

(cherry picked from commit 30908f5ba9)

.devtools/create_release_package.bat

@@ -0,0 +1,16 @@
+set projectPath=%~dp0
+if %projectPath:~-1%==\ set projectPath=%projectPath:~0,-1%
+set projectPath=%projectPath%\..
+
+set releasePath=%projectPath%\.release
+mkdir "%releasePath%"
+
+copy "%projectPath%\version.json" versiontemp.json
+for /f "tokens=*" %%a in ('jq .Version versiontemp.json --raw-output') do set version=%%a
+del versiontemp.json
+
+del "%releasePath%\grocy_%version%.zip"
+7za a -r "%releasePath%\grocy_%version%.zip" "%projectPath%\*" -xr!.* -xr!build.bat -xr!composer.json -xr!composer.lock -xr!package.json -xr!yarn.lock -xr!publication_assets
+7za a "%releasePath%\grocy_%version%.zip" "%projectPath%\public\.htaccess"
+7za rn "%releasePath%\grocy_%version%.zip" .htaccess public\.htaccess
+7za d "%releasePath%\grocy_%version%.zip" data\*.* data\storage data\viewcache\*

.devtools/install_dependencies.bat

@@ -0,0 +1,4 @@
+pushd ..
+call composer install
+yarn install
+popd

.devtools/transifex_download.bat

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

.devtools/transifex_upload.bat

@@ -0,0 +1,3 @@
+pushd ..
+tx push --source
+popd

.devtools/update_dependencies.bat

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

.gitattributes

@@ -0,0 +1,2 @@
+* text=auto
+*.sh text eol=lf

.tx/config

@@ -0,0 +1,44 @@
+[main]
+host = https://www.transifex.com
+
+[grocy.chore_period_types]
+file_filter = localization/<lang>/chore_period_types.po
+source_file = localization/chore_period_types.pot
+source_lang = en
+type = PO
+
+[grocy.chore_assignment_types]
+file_filter = localization/<lang>/chore_assignment_types.po
+source_file = localization/chore_assignment_types.pot
+source_lang = en
+type = PO
+
+[grocy.component_translations]
+file_filter = localization/<lang>/component_translations.po
+source_file = localization/component_translations.pot
+source_lang = en
+type = PO
+
+[grocy.demo_data]
+file_filter = localization/<lang>/demo_data.po
+source_file = localization/demo_data.pot
+source_lang = en
+type = PO
+
+[grocy.stock_transaction_types]
+file_filter = localization/<lang>/stock_transaction_types.po
+source_file = localization/stock_transaction_types.pot
+source_lang = en
+type = PO
+
+[grocy.strings]
+file_filter = localization/<lang>/strings.po
+source_file = localization/strings.pot
+source_lang = en
+type = PO
+
+[grocy.userfield_types]
+file_filter = localization/<lang>/userfield_types.po
+source_file = localization/userfield_types.pot
+source_lang = en
+type = PO

README.md

@@ -5,45 +5,60 @@ ERP beyond your fridge
 - Public demo of the latest stable version → [https://demo.grocy.info](https://demo.grocy.info)
 - Public demo of the latest pre-release version (current master branch) → [https://demo-prerelease.grocy.info](https://demo-prerelease.grocy.info)
 
+## Getting in touch
+There is the [r/grocy subreddit](https://www.reddit.com/r/grocy) to connect with other grocy users. If you've found something that does not work or if you have an idea for an improvement or new things which you would find useful, feel free to open an issue in the [issue tracker](https://github.com/grocy/grocy/issues) here.
+
+## Community contributions
+See the website for a list of community contributed Add-ons / Tools: [https://grocy.info/#addons](https://grocy.info/#addons)
+
 ## Motivation
-A household needs to be managed. I did this so far (almost 10 years) with my first self written software (a C# windows forms application) and with a bunch of Excel sheets. The software is a pain to use and Excel is Excel. So I searched for and tried different things for a (very) long time, nothing 100 % fitted, so this is my aim for a "complete houshold management"-thing. ERP your fridge!
+A household needs to be managed. I did this so far (almost 10 years) with my first self written software (a C# windows forms application) and with a bunch of Excel sheets. The software is a pain to use and Excel is Excel. So I searched for and tried different things for a (very) long time, nothing 100 % fitted, so this is my aim for a "complete household management"-thing. ERP your fridge!
 
 ## How to install
-> **NEW**
+> Checkout grocy-desktop, if you want to run grocy without a webserver just like a normal (windows) desktop application.
 >
-> There is now grocy-desktop if you want to run grocy without a webserver just like a normal (windows) desktop application.
->
-> See https://github.com/berrnd/grocy-desktop or directly download the [latest release](https://releases.grocy.info/latest-desktop) - the installation is nothing more than just clicking 2 times "next"...
+> See https://github.com/grocy/grocy-desktop or directly download the [latest release](https://releases.grocy.info/latest-desktop) - the installation is nothing more than just clicking 2 times "next"...
 
-Just unpack the [latest release](https://releases.grocy.info/latest) on your PHP (SQLite extension required, currently only tested with PHP 7.2) enabled webserver (webservers root should point to the `public` directory), copy `config-dist.php` to `data/config.php`, edit it to your needs, ensure that the `data` directory is writable and you're ready to go, (to make writable `chown -R www-data:www-data data/`). Default login is user `admin` with password `admin`, please change the password immediately (see user menu).
+Just unpack the [latest release](https://releases.grocy.info/latest) on your PHP (SQLite (3.8.3 or higher) extension required, currently only tested with PHP 7.3) enabled webserver (webservers root should point to the `public` directory), copy `config-dist.php` to `data/config.php`, edit it to your needs, ensure that the `data` directory is writable and you're ready to go, (to make it writable, maybe use `chown -R www-data:www-data data/`). Default login is user `admin` with password `admin`, please change the password immediately (see user menu).
 
 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);`).
 
-## How to update
-Just overwrite everything with the latest release while keeping the `data` directory, check `config-dist.php` for new configuration options and add them to your `data/config.php` (the default from values `config-dist.php` will be used for not in `data/config.php` defined settings). Just to be sure, please empty `data/viewcache`.
+See the website for further installation guides and troubleshooting help: https://grocy.info/links
 
-If you run grocy on Linux, there is also `update.sh` (remember to make the script executable, `chmod +x update.sh` and ensure that you have `unzip` installed) which does exactly this and additionally creates a backup (`.tgz` archive) of the current installation in `data/backups` (backups older than 60 days will be deleted during the update).
+## How to run using Docker
+
+See [grocy/grocy-docker](https://github.com/grocy/grocy-docker) or [linuxserver/docker-grocy](https://github.com/linuxserver/docker-grocy) for instructions.
+
+## How to update
+Just overwrite everything with the latest release while keeping the `data` directory, check `config-dist.php` for new configuration options and add them to your `data/config.php` where appropriate (the default values from `config-dist.php` will be used for not in `data/config.php` defined settings). Just to be sure, please empty `data/viewcache`.
+
+If you run grocy on Linux, there is also `update.sh` (remember to make the script executable (`chmod +x update.sh`) and ensure that you have `unzip` installed) which does exactly this and additionally creates a backup (`.tgz` archive) of the current installation in `data/backups` (backups older than 60 days will be deleted during the update).
 
 ## Localization
-grocy is fully localizable - the default language is English (integrated into code), a German localization is always maintained by me. There is one file per language in the `localization` directory, if you want to create a translation, it's best to copy `localization/de.php` to a new one (e. g. `localization/it.php`) and translating all strings there. (Language can be changed in `data/config.php`, e. g. `Setting('CULTURE', 'it');`)
+grocy is fully localizable - the default language is English (integrated into code), a German localization is always maintained by me.
+You can easily help translating grocy at https://www.transifex.com/grocy/grocy, if your language is incomplete or not available yet.
+(Language can be changed in `data/config.php`, e. g. `Setting('CULTURE', 'it');`)
 
-### Maintaining your own localization
-As the German translation will always be the most complete one, for maintaining your localization it would be easiest when you compare your localization with the German one with a diff tool of your choice.
+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-en.grocy.info/api).
+See the integrated Swagger UI instance on [/api](https://demo.grocy.info/api).
 
-### Barcode readers
-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.
+### Barcode readers & camera scanning
+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`
@@ -52,8 +67,10 @@ The following shorthands are available:
 - `YYYYMMe` or `YYYYMM+` gets expanded to the end of the given month in the given year in proper notation
   - Example: `201807e` will be converted to `2018-07-31`
 - `x` gets expanded to `2999-12-31` (which I use for products which never expire)
-- Down/up arrow keys will increase/decrease the date by one day
+- Down/up arrow keys will increase/decrease the date by 1 day
 - Right/left arrow keys will increase/decrease the date by 1 week
+- Shift + down/up arrow keys will increase/decrease the date by 1 month
+- Shift + right/left arrow keys will increase/decrease the date by 1 year
 
 ### Keyboard shorthands for buttons
 Wherever a button contains a bold highlighted letter, this is a shortcut key.
@@ -67,27 +84,35 @@ There is no plugin included for any service, see the reference implementation in
 ### Database migrations
 Database schema migration is automatically done when visiting the root (`/`) route (click on the logo in the left upper edge).
 
+### Disable certain features
+If you don't use certain feature sets of grocy (for example if you don't need "Chores"), there are feature flags per major feature set to hide/disable the related UI elements (see `config-dist.php`)
+
 ### Adding your own CSS or JS without to have to modify the application itself
 - When the file `data/custom_js.html` exists, the contents of the file will be added just before `</body>` (end of body) on every page
 - 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/berrnd/grocy-desktop)).
+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)).
 
 In embedded mode, settings can be overridden by text files in `data/settingoverrides`, the file name must be `<SettingName>.txt` (e. g. `BASE_URL.txt`) and the content must be the setting value (normally one single line).
 
+## Contributing / Say thanks
+Any help is more than appreciated. Feel free to pick any open unassigned issue and submit a pull request, but please leave a short comment or assign the issue yourself, to avoid working on the same thing.
+
+See https://grocy.info/#say-thanks for more ideas if you just want to say thanks.
+
 ## Screenshots
 #### Dashboard
-![Dashboard](https://github.com/berrnd/grocy/raw/master/publication_assets/dashboard.png "Dashboard")
+![Dashboard](https://github.com/grocy/grocy/raw/master/publication_assets/dashboard.png "Dashboard")
 
 #### Purchase - with barcode scan
-![Purchase - with barcode scan](https://github.com/berrnd/grocy/raw/master/publication_assets/purchase-with-barcode.gif "purchase-with-barcode")
+![Purchase - with barcode scan](https://github.com/grocy/grocy/raw/master/publication_assets/purchase-with-barcode.gif "purchase-with-barcode")
 
 #### Consume - with manual search
-![Consume - with manual search](https://github.com/berrnd/grocy/raw/master/publication_assets/consume.gif "consume")
+![Consume - with manual search](https://github.com/grocy/grocy/raw/master/publication_assets/consume.gif "consume")
 
 ## License
 The MIT License (MIT)

app.php

@@ -1,10 +1,12 @@
 <?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 \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,53 +21,61 @@ 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';
 
 // Load config files
 require_once GROCY_DATAPATH . '/config.php';
-require_once __DIR__ . '/config-dist.php'; //For not in own config defined values we use the default ones
+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)
+{
+	if (!defined('GROCY_USER_ID'))
+	{
+		define('GROCY_USER_ID', 1);
+	}
+}
 
 // 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';
 
+// Set base path if defined
+if (!empty(GROCY_BASE_PATH))
+{
+	$app->setBasePath(GROCY_BASE_PATH);
+}
+
+// Add default middleware
+$app->addRoutingMiddleware();
+$app->addErrorMiddleware(true, false, false);
+
 $app->run();

build.bat

@@ -1,13 +0,0 @@
-set projectPath=%~dp0
-if %projectPath:~-1%==\ set projectPath=%projectPath:~0,-1%
-
-set releasePath=%projectPath%\.release
-mkdir "%releasePath%"
-
-for /f "tokens=*" %%a in ('build_tools\jq.exe .Version version.json --raw-output') do set version=%%a
-
-del "%releasePath%\grocy_%version%.zip"
-"build_tools\7za.exe" a -r "%releasePath%\grocy_%version%.zip" "%projectPath%\*" -xr!.* -xr!build_tools -xr!build.bat -xr!composer.json -xr!composer.lock -xr!package.json -xr!yarn.lock -xr!publication_assets
-"build_tools\7za.exe" a "%releasePath%\grocy_%version%.zip" "%projectPath%\public\.htaccess"
-"build_tools\7za.exe" rn "%releasePath%\grocy_%version%.zip" .htaccess public\.htaccess
-"build_tools\7za.exe" d "%releasePath%\grocy_%version%.zip" data\*.* data\storage data\viewcache\*

changelog/10_1.4.0_2017-06-04.md

@@ -0,0 +1 @@
+- Added a login screen and switched to cookie/session based authentication instead of HTTP-basic-auth

changelog/11_1.5.0_2017-07-25.md

@@ -0,0 +1,2 @@
+- New feature: Habit tracking
+- Fixed an issue which prevented that the databse is correctly created on unix systems

changelog/12_1.6.0_2017-11-06.md

@@ -0,0 +1,2 @@
+- New feature: Rechargeable battery management
+- Improved productivity of input forms

changelog/13_1.6.1_2017-11-09.md

@@ -0,0 +1 @@
+- Improved sidebar responsiveness

changelog/14_1.7.0_2018-04-15.md

@@ -0,0 +1,2 @@
+- Allow to add anything to the shopping list, not only products
+- Major project refactoring

changelog/15_1.8.0_2018-04-16.md

@@ -0,0 +1 @@
+- grocy is now fully localizable and ships by default with English and German translations

changelog/16_1.8.1_2018-04-18.md

@@ -0,0 +1,2 @@
+- New configuration option "BASE_URL" to define base installation URL (should make subdirectory installations possible, see #3)
+- Added some missing translations

changelog/17_1.8.2_2018-04-18.md

@@ -0,0 +1 @@
+- Fixed login form didn't respect the configured BASE_URL

changelog/18_1.9.0_2018-04-21.md

@@ -0,0 +1 @@
+- Documented the REST API and data model, see the integrated instance of Swagger UI at [/api](https://demo.grocy.info/api)

changelog/19_1.9.1_2018-04-22.md

@@ -0,0 +1 @@
+- Added validation of all API requests and improved Swagger/OpenAPI description

changelog/1_0.1.0_2017-04-15.md

@@ -0,0 +1 @@
+- Basic features, mainly about a interface to record grocery purchases and consumptions

changelog/20_1.9.2_2018-04-22.md

@@ -0,0 +1 @@
+- Added a plugin system for looking up products against external services by barcode, see #6 for reference

changelog/21_1.10.0_2018-05-12.md

@@ -0,0 +1,4 @@
+- It's now possible to consume products directly from stock overview with one click
+- Added due/overdue info on bateries- and habits overview (like on stock overview)
+- Reworked general page layout and improved responsiveness (see #9 and thanks @d-Rickyy-b)
+- Translations fixes

changelog/22_1.11.0_2018-06-15.md

@@ -0,0 +1 @@
+- Added an option to not use URL rewriting (for webservers which, however, don't support URL rewriting)

changelog/23_1.12.0_2018-07-08.md

@@ -0,0 +1,2 @@
+- On the stockoverview it's now possible to filter the products by location
+- All dropdowns are now sorted alphabetically

changelog/24_1.12.1_2018-07-08.md

@@ -0,0 +1 @@
+- Bug fix for location filtering on stock overview page did not work in all browsers

changelog/25_1.13.0_2018-07-12.md

@@ -0,0 +1,3 @@
+- Upgraded Bootstrap and some other dependencies (grocy now looks even better!)
+- Added Italian translation (thanks @davidoskky)
+  - => Demo for this language available at: https://it.demo.grocy.info

changelog/26_1.13.1_2018-07-12.md

@@ -0,0 +1,5 @@
+This was released shortly after the last release to fix a small regression bug, original changes from Version 1.13.0:
+
+- Upgraded Bootstrap and some other dependencies (grocy now looks even better!)
+- Added Italian translation (thanks @davidoskky)
+  - => Demo for this language available at: https://it.demo.grocy.info

changelog/27_1.14.0_2018-07-15.md

@@ -0,0 +1,13 @@
+- New feature: **Recipes**
+  - Organize a list of products, amounts and a description into recipes and see at a glance if everything needed is in stock or put the missing things with one click on the shopping list
+  - Try it live on the demo page: => https://demo.grocy.info/recipes
+- Added norwegian translation (thanks @BlizzWave)
+  - Demo available at: => https://no.demo.grocy.info
+- A lot of small UI improvements
+  - Columns in tables can now be reordered
+  - Show a calendar on the shopping list page (useful, at least for me)
+  - Table column ordering and sorting is now remembered
+  - Sidebar collapse state is now remembered
+  - Fixed datetimepicker border
+  - Keep the parent sidebar menu item expanded if the active page is a sub menu item
+- Custom JS/CSS file names have changed [see README](https://github.com/berrnd/grocy#adding-your-own-css-or-js-without-to-have-to-modify-the-application-itself)

changelog/28_1.15.0_2018-07-22.md

@@ -0,0 +1,9 @@
+- New related project: **grocy-desktop**
+  - => https://github.com/berrnd/grocy-desktop
+  - Run grocy without a webserver just like a normal (windows) desktop application
+  - New "embedded mode" for grocy to help running in "desktop application mode" [see README](https://github.com/berrnd/grocy#embedded-mode)
+- New datepicker shorthands and improvements
+  - `YYYYMMe` or `YYYYMM+` gets expanded to the end of the given month in the given year in proper notation
+  - Changed: `MMDD` will be expanded to the given day next year if > today
+  - [see README](https://github.com/berrnd/grocy#input-shorthands-for-date-fields)
+- Some other small bug fixes

changelog/29_1.16.0_2018-07-25.md

@@ -0,0 +1,8 @@
+- Replaced the single user (so far defined in `/data/config.php`) with a multi-user management
+  - The currently defined user will automatically be migrated, please remove `HTTP_USER` and `HTTP_PASSWORD` from your config file afterwards
+  - For this it was necessary to delete all sessions and API keys during the migration
+- Added an update script (`/update.sh`) to make updates (on Linux machines) easier
+  - See also ["How to update" in README](https://github.com/berrnd/grocy#how-to-update)
+- Added the possibility to track who did a habit
+- Added a rudimentary habit analysis possibility
+- Different small UI, code and translation improvements

changelog/2_0.2.0_2017-04-16.md

@@ -0,0 +1 @@
+- General improvements, the work goes on...

changelog/30_1.17.0_2018-08-04.md

@@ -0,0 +1,4 @@
+- Basic product price tracking (can be entered on purchase, a little price history chart is shown in the product card - right side on purchase/consume/etc. pages)
+- Proper pluralization of everything (for quantity units you can enter the plural form in master data)
+- On all overview pages the statistics shown in the header are now updated when doing changes directly on the page (e. g. consuming a product)
+- Lots of small fixes and improvements (form validation, translations - thanks for keeping the norwegian translation always updated @BlizzWave, other small bugs)

changelog/31_1.18.0_2018-08-11.md

@@ -0,0 +1,5 @@
+- The complete row is now refreshed on changes on all overview pages
+- Added a checkbox to set the "never expires date" in best before date inputs (alternative to shortcut "x")
+- Recipes can now have arbitrary quantity units and stock is only checked for one unit then (imagine you have sugar in "Packs" in stock but your recipe "Pancakes" needs 200 grams)
+- Added a "consume this recipe button" to remove all ingredients of a recipe from stock with one click
+- Other small UI changes/improvements

changelog/32_1.18.1_2018-09-08.md

@@ -0,0 +1 @@
+- Some smaller UI bug fixes and enhancements (thanks again for all the testing @BlizzWave)

changelog/33_1.19.0_2018-09-24.md

@@ -0,0 +1,6 @@
+- New feature: Tasks / To-do list
+- Renamed habits to chores as this is more what it is about
+- Products can now be organized in product groups, this group is also used to group the items on the shopping list (you can use this to optimize your way in the supermarket for example)
+- Added an option to stay logged in permanently (checkbox on the login page)
+- When the database was changed externally, the current page is automatically reloaded when there was no input for at least 50 seconds
+- Fixed some minor UI bugs

changelog/34_1.19.1_2018-09-27.md

@@ -0,0 +1,2 @@
+- The colored info bars on top of all (overview)pages can now be clicked to filter the table accordingly
+- Fixed some minor mostly UI related bugs

changelog/35_1.19.2_2018-09-29.md

@@ -0,0 +1,2 @@
+- Important bug fix: All forms were submitted twice when using ENTER instead of the OK/Save button
+- Norwegian translation updates (thanks @BlizzWave )

changelog/36_1.20.0_2018-09-30.md

@@ -0,0 +1,3 @@
+- New optional "Night Mode" (thanks a lot @BlizzWave, can also be activated automatically by a time range - see the new dropdown menu next to the user menu)
+- Docker support (thanks @talmai)
+- Fixed some minor UI bugs

changelog/37_1.21.0_2018-10-06.md

@@ -0,0 +1,6 @@
+- New feature: Equipment
+  - Manage all your household equipment/devices in one place and have the information/instruction manual at hand when needed
+- New feature: Products can now have pictures
+  - Add them in the product edit page
+  - Will be shown in the productcard (purchase/consume/etc. pages) and when you click the product name on the stock overview page (a little image icon next to the product name indicates if the product has an image)
+- Recipes and the new equipment edit page now have a little editor with text formatting capabilities

changelog/38_1.22.0_2018-10-27.md

@@ -0,0 +1,14 @@
+- Added a journal for stock bookings, chore executions and battery charge cycles
+  - => Button in each line on the overview pages or the "Journal" button next to the headline on every overview page
+- Added the possibility to undo any stock booking, chore execution and battery charge cycle
+  - => Button in the success popup while booking a purchase/consume/etc. or on the new journal pages (see above)
+- Presets for new products are now configurable
+  - => "Presets for new products" button next to the headline on the products list page
+- Recipes can now be nested (include a recipe into another one)
+- Recipe ingredients can now be grouped together which will result in headlines per group in the rendered recipe
+  - => Group can be set on the recipe position edit page, demo recipe is "Pizza")
+- On the stock overview page, the product card is now shown when clicking the product name
+- Added option to filter by product group on stock overview page
+- When auto reloading on external changes is enabled, the page is not reloaded when there is a fullscreen card active (recipe/equipment instruction manual)
+- On the product-/chore-/batterycard there is now a link to the edit page of the corresponding item
+- Some other minor bug fixes

changelog/39_1.23.0_2018-11-24.md

@@ -0,0 +1,18 @@
+- New feature: "Shopping list to stock workflow"
+  - Add a single shopping list item or all at once to stock directly from the shopping list
+  - There are new "stock settings" under settings menu in the top right corner
+  - You can enable there, that all products which have "Default best before days" set, are added without confirmation in this workflow
+  - => This means, you can add the whole shopping list to stock with one click, if you want
+- Improved stock handling
+  - On consume, a specific stock item can now be picked
+  - A stock item can now be marked as "opened" (on the consume page or directly from stock overview, visible in the product card and on the stock overview page)
+- New feature: Calendar
+  - Shows all upcoming product expirations, due chores, due tasks and due battery charge cycles
+- New translation: French (thanks all the translators)
+  - As for all languages, a demo is available at: https://fr.demo.grocy.info
+- Small other improvements
+  - Allow fraction numbers for recipe ingredients when not checked against stock and add an option to not check stock for a recipe position
+  - The current time can now be shown in the header (see the settings menu next to the user icon)
+- Changed: Docker related things are now in a separate repository: https://github.com/grocy/grocy-docker
+- Changed: Translations are now managed with Transifex: https://www.transifex.com/grocy/grocy
+

changelog/3_0.3.0_2017-04-17.md

@@ -0,0 +1 @@
+- Form validation and barcode input handling improvements

changelog/40_1.23.1_2018-11-27.md

@@ -0,0 +1,2 @@
+- Added a skip button when adding all shopping list items in "Shopping list to stock workflow"
+- Fixed some minor UI related bugs

changelog/41_1.24.0_2018-12-30.md

@@ -0,0 +1 @@
+- All `config.php` settings can now also be set via environment variables (for [grocy-docker](https://github.com/grocy/grocy-docker))

changelog/42_1.24.1_2019-01-10.md

@@ -0,0 +1,5 @@
+- Fixed a SQL error during database migration when using SQLite >= 3.25.2
+- Improved data tables loading time
+- Location edit form did not work (master data)
+- Quantity unit "purchase to stock factor" was not respected when putting a recipe on the shopping list or when comparing the already on the shopping list amount
+- Better API response for POST routes when there is no or invalid JSON request body content

changelog/43_2.0.0_2019-03-06.md

@@ -0,0 +1,23 @@
+- Breaking change: The API has been completely reworked, please review [the documentation](https://demo.grocy.info/api) before updating when you are using the API
+- New feature: Tare weight handling
+  - An option per product
+  - Imagine this: You have flour in jars, the jar weighs 500 grams, currently there are 1000 grams in stock, the new weight including the jar is 1100 grams - grocy can now calculate the used amount on consume/purchase/inventory automatically, you only have to enter the weighed amount including the jar (demo product to showcase this "Flour")
+- Recipe improvements
+  - Recipes are now scalable - define per recipe for how much servings it is, change the desired servings on the fly when the recipe is displayed, ingredient amounts are scaled accordingly
+  - The cost of a recipe is now displayed based on the last purchase price per ingredient (recipe scaling also applies)
+  - When putting all missing recipe ingredients on the shopping list, it is now possible to ignore certain ingredients (in the popup when clicking the "Put missing items on shopping list" button)
+  - A new option per recipe to not check against the amount already on the shopping list when putting all missing ingredients on it (by default, only the amount not already on the shopping list is added, when this is enabled, always the whole missing amount will be put on the shopping list)
+  - On consume, there can now be tracked for which recipe it was, this is also tracked automatically when using the "Consume all ingredients needed by this recipe" button (for future statistical purposes)
+  - Recipes can now have pictures
+  - New "gallery view" for recipes (demo available at https://demo.grocy.info/recipes?tab=gallery)
+- Stock improvements
+  - It is now optionally possible to have partial units in stock (option per product)
+  - On purchase, a different location can now be assigned (imagine you have two freezers, by default you store your pizza there, but sometimes there)
+- New translations: (thanks all the translators)
+  - Spanish (demo available at https://es.demo.grocy.info)
+  - Turkish (demo available at https://tr.demo.grocy.info)
+- Other improvements
+  - The calendar can now be shared/integrated in iCal format (button in the header on the calendar page)
+  - Added feature flags to hide/disable certain parts of grocy when you don't use them (for example hide "Chores" and all related UI elements, when you don't use it, see `config-dist.php`)
+  - Added a "Apple Touch Icon" and a "Web App Manifest" which should improve grocy on mobile devices and also enables "Add to Home screen" on major mobile browsers
+  - A lot of other minor small and bigger UI improvements

changelog/44_2.1.0_2019-03-09.md

@@ -0,0 +1,10 @@
+- Some small UI fixes & improvements
+  - Recipe ingredient notes were not displayed
+  - Edit/delete buttons on the equipment page had no icons
+  - Improved the overview pages "action buttons column" (e. g. hide more rarely used actions behind a context/dropdown menu)
+  - The "purchase to stock conversion factor" is now displayed on the purchase page when QU units are different (above the amount field)
+  - Some JS files were not loaded correctly on case sensitive file systems
+  - The changelog is now included as markdown files (in `/changelog` directory, one file per release with a filename in format `<ReleaseNumber>_<Version>_<ReleaseDateIso>.md`) and shown in the about dialog
+  - Please review your `CURRENCY` setting in `data/config.php`, see also `config-dist.php` - this should be the ISO 4217 code of the currency to properly work with the JS `toLocaleString` function
+- New translation: (thanks all the translators)
+  - Russian (demo available at https://ru.demo.grocy.info)

changelog/45_2.2.0_2019-03-10.md

@@ -0,0 +1,5 @@
+- New API method to get a product by its barcode (`/stock/products/by-barcode/{barcode}`, thanks @matejdro)
+- The best before date on the purchase and inventory page can now also be today or earlier, but when so, a short hint is displayed
+- Fixed some UI bugs
+  - When consuming a product with "Allow partial units in stock" enabled from the stock overview page, the displayed amount after the stock booking was wrong
+  - The inventory form was not validated with certain click paths

changelog/46_2.3.0_2019-04-06.md

@@ -0,0 +1,17 @@
+- Stock improvements
+  - A different location can now also be set during inventory (as for purchases)
+  - A partial minimum stock amount can now be set when "Allow partial units in stock" is enabled (product option)
+- Recipe improvements
+  - There is now a default per product for "Disable stock fulfillment checking for this ingredient" (ingredient option, default can be defined as a product option)
+- Some small UI fixes & improvements
+  - THe "Mark as open" button on the stock overview page was disabled when the current stock amount was exactly 1
+  - The number in the "x products expiring within the next 5 days" badge was incorrect for products expiring exactly in 5 days
+  - On the product groups page there is now a new column which displays the product count per group (+ a link to the products page filtered by that product group)
+  - Added a message to clarify that in product dropdowns also something unknown can be entered to start a workflow
+  - Some other small CSS fixes (context menus were not fully displayed when the parent container was to small, improved padding for text inputs)
+- As always: Updated translations (thanks all the translators)
+
+### Self promotion
+[grocy-desktop](https://github.com/grocy/grocy-desktop) is now also available through the Microsoft Store 
+
+<a href="//www.microsoft.com/store/apps/9nwb1trnnksf?cid=storebadge&ocid=badge"><img src="https://assets.windowsphone.com/85864462-9c82-451e-9355-a3d5f874397a/English_get-it-from-MS_InvariantCulture_Default.png" alt="Get it from Microsoft" width="150px" /></a>

changelog/47_2.4.0_2019-05-10.md

@@ -0,0 +1,34 @@
+- New feature: Userfields
+  - Attach any custom field to any entity (Products, Locations, Euqipment, etc.)
+  - Userfields can have types (Text, Number, Date, etc.)
+  - Will be shown / can be filled on the edit page of the corresponding entity and will also optionally show in the corresponding tables (inclcudes overview pages)
+  - => Can be configured under Master data / Userfields
+- New feature: Meal planning
+  - Simple approach for the beginning (more to come): A week view where you can add recipes for each day (new menu entry in the sidebar, below calendar)
+  - Of course it's also possible to put missing things directly on the shopping list from there, also for a complete week at once
+- General improvements
+  - The "expires soon" or "due soon" days (yelllow bar at the top of each overview page) can now be configured
+    - => New settings page for each area under the settings icon at the top right
+- Stock improvements
+  - It's now possible to have multiple / named shopping lists
+    - Automations still use the default shopping list and also the default shopping list cannot be deleted
+  - More information on the product card like "Spoil rate" or "Average shelf life"
+  - It's now possible to set a price for added products during inventory
+  - It's now possible to customize the default amount for purchase/consume (see stock settings under the settings icon on the top right)
+- Chores improvements
+  - New recurrence patterns - chores can now also be "scheduled" to repat daily/weekly/monthly
+  - It's now possible to track the day of a chore execution only (without the time, option per chore)
+- Recipe improvements
+  - It's now possible to enter a "variable amount" (e. g. if a recipe needs "1 - 2 cups"), the original amount is still used for stock fulfillment checking (if enabled for that recipe ingredient)
+- New translations: (thanks all the translators)
+  - Swedish (demo available at https://sv.demo.grocy.info)
+  - Polish (demo available at https://pl.demo.grocy.info)
+- Internal improvement: Localizations are now handled via gettext, both on server and client side
+  - Mainly to properly handle languages with more than 2 plural forms
+  - This involved some string changes which results in a needed (re)translation of about 20 strings (excluding demo data)
+  - Also applies to quantity units, n-plural forms can be entered on the quantity unit edit page
+  - It's not required to install the PHP gettext extension, on both, server and client, managed implementations of gettext are used ([oscarotero/Gettext](https://github.com/oscarotero/Gettext) & [oscarotero/gettext-translator](https://github.com/oscarotero/gettext-translator))
+- Some other small fixes and improvements
+  - The "Add as barcode to existing product" productpicker workflow failed to add the barcode to the given product
+  - Recipes can now be filter by stock availability
+  - Added a feature flag (`config.php` setting) to also be able to hide all stock related UI elements and routes

changelog/48_2.4.1_2019-05-16.md

@@ -0,0 +1,2 @@
+- Fixed a performance problem for loading data tables related to the new Userfields feature
+- Fixed that when using single quotes in a product name did not trigger the workflow popup

changelog/49_2.4.2_2019-06-09.md

@@ -0,0 +1,11 @@
+- Fixed that deleting meal plan entries did not work
+- Fixed a problem that the user settings were not properly initialized for the frontend JS part when not logged only (so potentially affected only the login page)
+- Fixed an issue that the shopping list did not load when a plural translation for a quantity unit was missing
+- Fixed that tooltips were visible forever when consuming all products on the stock overview page
+- Fixed that login did not work when "Stay logged in permanently" was set and grocy runs on a 32-bit system (thanks @matejdro)
+- Fixed page reloads when "Auto reload on external changes" is enabled and there is unsaved form data (the detection did not work for forms in modal dialogs, e. g. when adding a entry to the meal plan)
+- Fixed (again) that the product picker did not work properly when the product name contains single quotes
+- Fixed that a entered barcode on the product edit page was only saved when "adding" it to the barcodes list by pressing `TAB` (is now automatically added to the list also when just leaving the field)
+- Improved that errors/messages from the API are shown properly when undoing a stock booking is not possible (stock journal page)
+- Improved night mode CSS (done by @BlizzWave, thanks!)
+- A new localization for `en_GB` is now always included - nothing is really translated there, it's only about component "translations" that e. g. the first day of the week is correct for calendars

changelog/4_0.4.0_2017-04-18.md

@@ -0,0 +1 @@
+- Add possibility to have multiple barcodes per product

changelog/50_2.4.3_2019-07-06.md

@@ -0,0 +1,16 @@
+- Fixed the messed up message/toast after consuming a product from the stock overview page
+- Fixed that "Track date only" chores were always tracked today, regardless of the given date
+- Fixed that the "week costs" were wrong after removing a meal plan entry
+- Fixed wrong recipes costs calculation with nested recipes when the base recipe servings are > 1 (also affected the meal plan when adding such a recipe there)
+- Fixed consuming recipes did not consume ingredients of the nested recipes
+- Improved recipes API - added new endpoints to get stock fulfillment information (thanks @Aerex)
+- Improved date display for products that never expires (instead of "2999-12-31" now just "Never" will be shown)
+- Improved date display for dates of today and no time (instead of the hours since midnight now just "Today" will be shown)
+- Improved shopping list handling
+  - Items can now be switched between lists (there is a shopping list dropdown on the item edit page)
+  - Items can now be marked as "done" (new check mark button per item, when clicked, the item will be displayed greyed out, when clicked again the item will be displayed normally again)
+- Improved that products can now also be consumed as spoiled from the stock overview page (option in the more/context menu per line)
+- Added a "consume this recipe"-button to the meal plan (and also a button to consume all recipes for a whole week)
+- Added the possibility to undo a task (new button per task, only visible when task is already completed) and also a corresponding API endpoint
+- Added a new `config.php` setting `DISABLE_AUTH` to be able to disable authentication / the login screen, defaults to `false`
+- Added a new `config.php` setting `CALENDAR_FIRST_DAY_OF_WEEK` to be able to change the first day of a week used for calendar views (meal plan for example) in the frontend, defaults to locale default

changelog/51_2.4.4_2019-07-07.md

@@ -0,0 +1,6 @@
+- Fixed that price data (last price & chart) was not taken from inventory correction bookings, only purchases
+- Fixed weekly chores were scheduled on the same day after execution
+- Fixed that undone chores were also included in "Last tracked"
+- Fixed the date-time-picker width was too narrow sometimes
+- Improved that execution dates of "Track date only" chores will never display the time part
+- Improved date display for products that never expire (again, there was a display problem after consuming an item on the stock overview page)

changelog/52_2.5.0_2019-09-22.md

@@ -0,0 +1,107 @@
+### New feature: Custom entities / objects / lists
+- Custom entities are based on Userfields and can be used to add any custom lists you want to have in grocy
+- They can have an own menu entry in the sidebar
+- => See "Manage master data" -> "Userentities" or try it on the demo: https://demo.grocy.info/userobjects/exampleuserentity
+
+### New feature: Use the device camera for barcode scanning
+- Available on any barcode-enabled field (so currently only for picking products) - a new camera button at the right of side the text field
+- Implemented using [QuaggaJS](https://github.com/serratus/quaggaJS) - camera stream processing happens totally offline / client-side
+- Please note due to browser security restrictions, this only works when serving grocy via a secure connection (`https://`)
+- There is also a `config.php` setting `DISABLE_BROWSER_BARCODE_CAMERA_SCANNING` to disable this, if you don't need it at all (defaults to `false`)
+- I you have problems that barcodes are not recognized properly, there is a little "barcode scanner testing page" at [/barcodescannertesting](https://demo.grocy.info/barcodescannertesting)
+- => Quick video demo: https://www.youtube.com/watch?v=Y5YH6IJFnfc
+
+### Stock improvements/fixes
+- Products can now have variations (nested products)
+  - Define the parent product for a product on the product edit page (only one level is possible, means a product which is used as a parent product in another product, cannot have a parent product itself)
+  - Parent and sub products can have stock (both are regular products, no difference from that side)
+  - On the stock overview page, the aggregated amount is displayed next to the amount (sigma sign)
+  - When a recipe needs a parent product, the need is also fulfilled when enough sub product(s) are in stock
+- Quantity units can now be linked (related measurements / unit conversion)
+  - On the quantity unit edit page default conversion can be defined for each unit
+  - Products "inherit" the default conversion and additionally can have their own / override the default ones
+- It's now possible to print a "Location Content Sheet" with the current stock per location - new button at the top of the stock overview page (thought to hang it at the location, note used amounts on paper and track it in grocy later)
+- Stock overview page improvements
+  - Options in the more/context-menu to directly open the purchase/consume/inventory pages prefilled with the current product in a popup/dialog
+  - Option in the more/context-menu to add the current product directly to a shopping list
+  - Option in the more/context-menu to search for recipes containing the current product
+  - It's now possible to undo stock bookings ("Undo"-button in the success message, like it was already possible on the purchase/consume/inventory pages)
+  - Improved that on any stock changes the corresponding product table row is properly refreshed
+- New `config.php` setting `FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT` to configure if opened products should be considered for minimum stock amounts (defaults to `true`, so opened products will now be considered missing by default - please change this setting if you want the old behavior)
+- The product description now can have formattings (HTML/WYSIWYG editor like for recipes)
+- Products now have a new field for calories (kcal, per stock quantity unit)
+- "Factor purchase to stock quantity unit" (product option) can now also be a decimal number when "Allow partial units in stock" is enabled
+- New "Sub feature flags" in `config.php` to disable some sub-features (hide the corresponding UI elements) if you don't need them (all new feature flags default to `true`, so no changed behavior when not configured)
+  - `FEATURE_FLAG_STOCK_PRICE_TRACKING` to disable product price tracking
+  - `FEATURE_FLAG_STOCK_LOCATION_TRACKING` to disable product location tracking
+  - `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` to disable product best before date tracking
+  - `FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING` to disable product opened tracking
+- Fixed/refined some things regarding purchase/consume/inventory of products with enabled tare weight handling (nothing was broken, but the success popups may not displayed the correct amount that was posted)
+- Fixed that "Spoil rate" and "Average shelf life" on the product card was wrong in most cases
+- When going to the product edit page, after saving the product, it will now always return to the previous page
+
+### Shopping list improvements
+- Shopping lists now have a notes field (HTML/WYSIWYG editor, just to save some notes per shopping list)
+- Shopping lists can now be printed (new button next to the add/delete shopping list button)
+
+### Recipe improvements
+- Based on the new linked quantity units, recipe ingredients can now use any product related unit, the amount is calculated according to the conversion factor of the unit relation
+- Based on the new calories field per product, the calories per recipe are now shown based on the selected servings (in the header, next to the costs)
+- New option "price factor" per recipe ingredient (defaults to `1`) - the resulting costs of the recipe ingredient will be multiplied by that factor
+  - Use this for example for spices in combination with "Only check if a single unit is in stock" to not take the full price of a pack of pepper into account for a recipe
+- The search field on the recipe overview page now also searches for product names of recipe ingredients (means it's possible to search a recipe by a product name)
+- Fixed a problem where the meal plan did not load when a recipe, which was already added to the meal plan, was deleted
+
+### Chores improvements
+- Chores can now be assigned to users
+  - Option per chore, different "assignment types" like "Random", "Who least did first", etc.
+  - On the chores overview page, the list can be filtered to only show chores assigned to the currently logged in user (or to any other user)
+- New option "Due date rollover" per chore which means the chore can never be overdue, the due date will shift forward each day when due
+- New option "Consume product on chore execution" per chore to automatically consume a product when a chore execution is tracked
+- When tracking an execution from the chores overview page, filters are re-applied afterwards (means when you have filtered the page to only show overdue chores and after the execution the chore is not overdue anymore, it will now be immediately hidden)
+
+### Equipment improvements/fixes
+- Fixed that the delete button not always deleted the currently selected equipment item
+
+### Userfield improvements/fixes
+- New Userfield type "Select list" for a list of predefined values where a single or also multiple values can then be selected on the entity object
+- New Userfield type "Link" - a single-line-textbox where the content will be rendered as a clickable link
+- Userfields of type "checkbox" are rendered as a checkmark in tables when checked (instead of "1" as till now)
+- Product Userfields are now also rendered on the shopping list (for items which have a product referenced)
+- Fixed that the Userfield type "Preset list" had always the caption "Product group" instead of the configured one (thanks @oncleben31)
+
+### General & other improvements/fixes
+- Added a new `config.php` setting `CALENDAR_SHOW_WEEK_OF_YEAR` to configure if calendars should show week numbers (defaults to `true`)
+- Fixed that date/time pickers not considered the `config.php` setting `CALENDAR_FIRST_DAY_OF_WEEK`
+- Improved the handling which entry page to use with disabled feature flags (thanks @nielstholenaar)
+- Boolean settings provided via environment variables (so the strings `true` and `false`) are now parsed correctly (thanks @mduret)
+- All uploaded pictures (currently for products and recipes) are now automatically downscaled to the appropriate size when serving them to improve page load times (this requires the `php-gd` extension, if not installed, images will not be downscaled)
+- It's now possible to test plural forms of quantity units (button on the quantity unit edit page, only visible if the current language requires more than 2 plural forms)
+- On the login page the sidebar an all top-navbar menus is now hidden
+- New translations: (thanks all the translators)
+  - Danish (demo available at https://da.demo.grocy.info)
+  - Dutch (demo available at https://nl.demo.grocy.info)
+- Internal change for how the localizations for the demo instances are handled
+  - For the pre-release demo now all currently supported languages are available (was already the case for the stable demo)
+    - Additionally all language files which reached the completion limit of 80 % will now be automatically pulled from Transifex 10 minutes past every hour (to have a kind of instant preview of changed translations)
+  - The URLs have changed, I'll try to keep all existing URLs redirecting properly for a long time
+    - If you want to link to the demo, please only use https://demo.grocy.info (stable demo) or https://demo-prerelease.grocy.info (current master branch demo)
+
+### API improvements & non-breaking changes
+- New endpoint `/objects/{entity}/search/{searchString}` to search for objects by name (contains search)
+- New endpoint `/stock/shoppinglist/add-product` to add a product to a shopping list (thanks @Forceu)
+- New endpoint `/stock/shoppinglist/remove-product` to remove a product from a shopping list (thanks @Forceu)
+- New endpoint `/chores/executions/calculate-next-assignments` to (re)calculate next user assignments for a single or all chores
+- New endpoint `/stock/products/by-barcode/{barcode}/add` to add a product to stock by its barcode
+- New endpoint `/stock/products/by-barcode/{barcode}/consume` to remove a product to stock by its barcode
+- New endpoint `/stock/products/by-barcode/{barcode}/inventory` to inventory a product by its barcode
+- New endpoint `/stock/products/by-barcode/{barcode}/open` to mark a product as opened by its barcode
+- New endpoint `/stock/bookings/{bookingId}` to retrieve a single stock booking
+- Endpoint `GET /files/{group}/{fileName}` can now also downscale pictures (see API documentation on [/api](https://demo.grocy.info/api))
+- When adding a product (through `stock/product/{productId}/add` or `stock/product/{productId}/inventory`) with omitted best before date and if the given product has "Default best before days" set, the best before date is calculated based on that (so far always today was used which is still the case when no date is supplied and also the product has no "Default best before days set) (thanks @Forceu)
+- Field `stock_amount` of endpoint `/stock/products/{productId}` now returns `0` instead of `null` when the given product is not in stock (thanks @Forceu)
+- Fixed that `/system/db-changed-time` always returned the current time (more or less) due to that that time is the database file modification time and the database is effectively changed on each request because of session information tracking - which now explicitly does not change the database file modification time, so this should work again to determine if any data changes happened
+- It's now also possible to provide the API key via a query parameter (same name as the header, so `GROCY-API-KEY`)
+
+#### Say thanks
+Because there were some questions about that in the past: If grocy is useful for you, [say thanks](https://grocy.info/#say-thanks)!

changelog/53_2.5.1_2019-09-28.md

@@ -0,0 +1,37 @@
+### Stock improvements/fixes
+- Fixed that barcode lookups now compare the whole barcode, not parts of it (e. g. when you have two products with the barcodes `$1` and `$10` and scan `$1` maybe the product of `$10` was found till now)
+- Fixed that the "X products are already expired" count on the stock overview page was wrong
+- Fixed that after product actions (consume/purchase/etc.) on the stock overview page the highlighting of the row was maybe wrong
+- After product actions (consume/purchase/etc.) on the stock overview page on a sub product, now also the parent product (row) is refreshed
+- It's now possible to accumulate min. stock amounts on parent product level (new option per product, means the sub product will never be "missing" then, only the parent product)
+- On the purchase page there is now an option to select that the price is the total price (for the whole amount) - below the price field, defaults to "Unit price" (as it was until now), when set to "Total price", the entered price will be divided by the amount before posting
+- "Average shelf life" on the product card now displays just "Unlimited" when the resulting value would be > 200 years (for products which never expire, as they have a best before date of 2999-12-31)
+
+### Shopping list improvements
+- When adding a product to the shopping list from the new context/more menu from the stock overview page and if the product is already on the shopping list, the amount of that entry will be updated acccordingly instead of adding a new (double) shopping list item
+- Added a "clear" button above the new notes field on the shopping list page to quickly clear the notes field with one click
+
+### Recipe improvements/fixes
+- Fixed a problem regarding quantity unit conversion handling for recipe ingredients of products with no unit relations, but only a different purchase/stock quantity unit
+- It's now possible to display a recipe directly from the meal plan (new "eye button") (thanks @kriddles)
+- Improved the responsiveness of the meal plan and calendar page by automatically switching to a day calendar view on smaller screens (thanks for the idea @kriddles)
+
+### Chores improvements
+- There is now a new sub feature flag `FEATURE_FLAG_CHORES_ASSIGNMENTS` to disable chore assignments if you don't need them (defaults to `true`, so no changed behavior when not configured)
+
+### Calendar improvements
+- The calendar now also contains all planned recipes from the meal plan on the corresponding day
+- Improved that dates in the iCal calendar export now include the server timezone
+
+### Custom lists/fields improvements
+- Optimized the custom lists page that it can be printed properly (search field etc. is hidden when printing the page)
+
+### General & other improvements/fixes
+- Fixed that the browser barcode scanner button was not clickable on iOS Safari & other small styles fixes/improvements for iOS Safari (thanks @DeeeeLAN)
+- It's now also possible to set the meal plan page as the default/entry page (`config.php` setting `ENTRY_PAGE`) (thanks @lwis)
+- Some UI detail-refinements
+- In the header of the product-/chore-/battery-card there is now also a button to directly jump to the journal of the current product/chore/battery
+
+### API improvements/fixes
+- The API Endpoint `GET /files/{group}/{fileName}` now also returns a `Cache-Control` header (defaults fixed to 30 days) to further increase page load times
+- Fixed that the API endpoint `/stock/shoppinglist/add-product` failed when a product should be added which was not already on the shopping list (thanks @Forceu)

changelog/54_2.5.2_2019-10-05.md

@@ -0,0 +1,15 @@
+### Stock fixes
+- Fixed that product specific quantity unit conversions (product overrides) were also displayed on the product edit page of other products with the same stock quantity unit
+
+### Recipe fixes
+- Fixed that recipes were displayed without ingredients if the total recipe count was > 100
+
+### Shopping list improvements
+- Added a new sub feature flag `FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS` to disable multiple shopping lists if you only need one (defaults to `true`, so no changed behavior when not configured)
+
+### Chores improvements
+- Added a new period type "yearly" (for yearly schedules)
+- Added a "period interval" option per chore to have more flexible schedules (possible for the daily/weekly/monthly/yearly schedules, means "schedule this chore only every x days/weeks/months" to have for example biweekly schedules)
+
+### General & other improvements
+- New Input shorthands for date fields to increase/decrease the date by 1 month/year (shift + arrow keys, see the full list [here](https://github.com/grocy/grocy#input-shorthands-for-date-fields))

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/56_2.6.1_2020-03-06.md

@@ -0,0 +1,49 @@
+## !! Important notice
+If you run grocy in a subdirectory, you need to set a new `config.php` setting (`BASE_PATH`, see `config-dist.php`)
+
+### Stock fixes
+- Fixed purchase/consume/inventory problems when `FEATURE_FLAG_STOCK_LOCATION_TRACKING` was set to `false`
+- Fixed that products on the Location Content Sheet were not ordered by the product name
+
+### 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)
+- Fixed that the recipe page was reloaded when expanding a collapsed row on mobile (thanks @Mikhail5555)
+
+### 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
+
+### API improvements/fixes
+- The endpoint `/chores` now also includes the chore name (new field `chore_name`) (thanks @DarienFord)
+
+### General & other improvements/fixes
+- Big backend performance improvements (thanks @zebardy)
+- Added a button to enable the device flash light on the camera barcode scanner popup (thanks @radim-ek)
+- 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
+- New translations: (thanks all the translators)
+  - Czech (demo available at https://cs.demo.grocy.info)
+  - Portuguese (Brazil) (demo available at https://pt-pt.demo.grocy.info)

changelog/57_2.6.2_2020-04-03.md

@@ -0,0 +1 @@
+Security fix (see [#696](https://github.com/grocy/grocy/issues/696))

changelog/58_UNRELEASED_2020-xx-xx.md

@@ -0,0 +1,28 @@
+### New feature: Price history per store
+- Define stores under master data
+- New product option to set the default store
+- Track on purchase/inventory in which store you bought the product (gets prefilled by the last store you purchased the product, or the default store of the product if you never bought it)
+- => The price history chart on the product card shows a line per store
+- (Thanks @immae and @kriddles)
+
+### Stock improvements
+- When creating a new product, the "QU id stock" is now preset by the "QU id purchase" (because most of the time that's most probably the same) (thanks @Mik-)
+
+### Recipe fixes
+- Fixed a PHP notice on the recipes page when there are no recipes (thanks @mrunkel)
+
+### Calendar fixes
+- Fixed that the "Share/Integrate calendar (iCal)" button did not work (thanks @tsia)
+
+### API improvements
+- The endpoint `/stock/products/{productId}/locations` now also returns the current stock amount of the product in that loctation (new field/property `amount`) (thanks @Forceu)
+
+### General & other improvements
+- New `config.php` setting `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD` which activates the number pad for best-before-date fields on (supported) mobile browsers (useful because of [shorthands](https://github.com/grocy/grocy#input-shorthands-for-date-fields)) (defaults to `true`) (thanks @Mik-)
+- Enhancements for the camera barcode scanner (thanks @Mik-)
+  - The light button only displayed when the device has a flash light
+  - New `config.php` setting `FEATURE_FLAG_AUTO_TORCH_ON_WITH_CAMERA` to always enable the flash light automatically
+  - Various display/CSS improvements
+- Prerequisites (PHP extensions, critical files/folders) will now be checked and properly reported if there are problems (thanks @Forceu)
+- Improved the the overview pages on mobile devices (main column was hidden) (thanks @Mik-)
+- Optimized the handling of settings provided by `data/settingoverrides` files (thanks @dacto)

changelog/5_1.0.0_2017-04-20.md

@@ -0,0 +1 @@
+- Ready to ERP your fridge!

changelog/6_1.0.1_2017-04-20.md

@@ -0,0 +1 @@
+- Added flow to directly add products and barcodes from purchase and inventory view

changelog/7_1.1.0_2017-04-21.md

@@ -0,0 +1,2 @@
+* New feature: Shopping list (which is also automatically filled based on defined min. stock amount)
+* Small UI changes for better productivity

changelog/8_1.2.0_2017-04-21.md

@@ -0,0 +1 @@
+- Added a flow to add a new product with prefilled barcode

changelog/9_1.3.0_2017-04-22.md

@@ -0,0 +1 @@
+- Added a favicon and more productivity improvements

composer.json

@@ -1,10 +1,17 @@
 {
 	"require": {
 		"php": ">=7.2",
-		"slim/slim": "^3.8",
-		"morris/lessql": "^0.3.4",
+		"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": "^0.7.0"
+		"tuupola/cors-middleware": "^1.1",
+		"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

@@ -1,20 +1,52 @@
 <?php
 
-# Either "production", "dev" or "prerelease"
+# 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"
+# 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 filename (without extension) of
-# one of the other available localization files in the "/localization" directory
+# Either "en" or "de" or the directory name of
+# one of the other available localization folders in the "/localization" directory
 Setting('CULTURE', 'en');
 
-# To keep it simpel, grocy does not handle any currency conversions,
+# 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 can be anything (e. g. "USD" OR "$", doesn't matter...)
-Setting('CURRENCY', '$');
+# so doesn't really matter, but should be the
+# ISO 4217 code of the currency ("USD", "EUR", "GBP", etc.)
+Setting('CURRENCY', 'USD');
+
+# When running grocy in a subdirectory, this should be set to the relative path, otherwise empty
+# Example:
+#  Webserver root directory = /var/www
+#  grocy directory = /var/www/grocy
+#  => BASE_PATH = /grocy
+Setting('BASE_PATH', '');
 
 # 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
+# or for example "https://example.com/grocy" when using a subdirectory
 Setting('BASE_URL', '/');
 
 # The plugin to use for external barcode lookups,
@@ -22,6 +54,102 @@ Setting('BASE_URL', '/');
 # 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
+# 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);
+
+# 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
+# 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)
+
+# 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)
+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);
+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);
+
+# 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);
+
+
+# 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_STOCK_PRODUCT_FREEZING', 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

controllers/BaseApiController.php

@@ -5,23 +5,36 @@ namespace Grocy\Controllers;
 class BaseApiController extends BaseController
 {
 
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->OpenApiSpec = json_decode(file_get_contents(__DIR__ . '/../grocy.openapi.json'));
 	}
 
-	protected $OpenApiSpec;
+	protected $OpenApiSpec = null;
 
-	protected function ApiResponse($data)
+	protected function getOpenApispec()
 	{
-		return json_encode($data);
+		if($this->OpenApiSpec == null)
+		{
+			$this->OpenApiSpec = json_decode(file_get_contents(__DIR__ . '/../grocy.openapi.json'));
+		}
+		return $this->OpenApiSpec;
 	}
 
-	protected function VoidApiActionResponse($response, $success = true, $status = 200, $errorMessage = '')
+	protected function ApiResponse(\Psr\Http\Message\ResponseInterface $response, $data)
+	{
+		$response->getBody()->write(json_encode($data));
+		return $response;
+	}
+
+	protected function EmptyApiResponse(\Psr\Http\Message\ResponseInterface $response, $status = 204)
+	{
+		return $response->withStatus($status);
+	}
+
+	protected function GenericErrorResponse(\Psr\Http\Message\ResponseInterface $response, $errorMessage, $status = 400)
 	{
 		return $response->withStatus($status)->withJson(array(
-			'success' => $success,
 			'error_message' => $errorMessage
 		));
 	}

controllers/BaseController.php

@@ -5,46 +5,167 @@ namespace Grocy\Controllers;
 use \Grocy\Services\DatabaseService;
 use \Grocy\Services\ApplicationService;
 use \Grocy\Services\LocalizationService;
+use \Grocy\Services\StockService;
+use \Grocy\Services\UsersService;
+use \Grocy\Services\UserfieldsService;
+use \Grocy\Services\BatteriesService;
+use \Grocy\Services\CalendarService;
+use \Grocy\Services\SessionService;
+use \Grocy\Services\RecipesService;
+use \Grocy\Services\TasksService;
+use \Grocy\Services\FilesService;
+use \Grocy\Services\ChoresService;
+use \Grocy\Services\ApiKeyService;
 
 class BaseController
 {
-	public function __construct(\Slim\Container $container) {
-		$databaseService = new DatabaseService();
-		$this->Database = $databaseService->GetDbConnection();
-		
-		$localizationService = new LocalizationService(GROCY_CULTURE);
-		$this->LocalizationService = $localizationService;
-
-		if (GROCY_MODE === 'prerelease')
-		{
-			$commitHash = trim(exec('git log --pretty="%h" -n1 HEAD'));
-			$commitDate = trim(exec('git log --date=iso --pretty="%cd" -n1 HEAD'));
-			
-			$container->view->set('version', "pre-release-$commitHash");
-			$container->view->set('releaseDate', \substr($commitDate, 0, 19));
-		}
-		else
-		{
-			$applicationService = new ApplicationService();
-			$versionInfo = $applicationService->GetInstalledVersion();
-			$container->view->set('version', $versionInfo->Version);
-			$container->view->set('releaseDate', $versionInfo->ReleaseDate);
-		}
-
-		$container->view->set('localizationStrings', $localizationService->GetCurrentCultureLocalizations());
-		$container->view->set('L', function($text, ...$placeholderValues) use($localizationService)
-		{
-			return $localizationService->Localize($text, ...$placeholderValues);
-		});
-		$container->view->set('U', function($relativePath, $isResource = false) use($container)
-		{
-			return $container->UrlManager->ConstructUrl($relativePath, $isResource);
-		});
+	public function __construct(\DI\Container $container) {
 
 		$this->AppContainer = $container;
+		$this->View = $container->get('view');
+	}
+
+	protected function render($response, $page, $data = [])
+	{
+		$container = $this->AppContainer;
+
+		$versionInfo = $this->getApplicationService()->GetInstalledVersion();
+		$this->View->set('version', $versionInfo->Version);
+		$this->View->set('releaseDate', $versionInfo->ReleaseDate);
+
+        $localizationService = $this->getLocalizationService();
+		$this->View->set('__t', function(string $text, ...$placeholderValues) use($localizationService)
+		{
+			return $localizationService->__t($text, $placeholderValues);
+		});
+		$this->View->set('__n', function($number, $singularForm, $pluralForm) use($localizationService)
+		{
+			return $localizationService->__n($number, $singularForm, $pluralForm);
+		});
+		$this->View->set('GettextPo', $localizationService->GetPoAsJsonString());
+
+		$this->View->set('U', function($relativePath, $isResource = false) use($container)
+		{
+			return $container->get('UrlManager')->ConstructUrl($relativePath, $isResource);
+		});
+
+		$embedded = false;
+		if (isset($_GET['embedded']))
+		{
+			$embedded = true;
+		}
+		$this->View->set('embedded', $embedded);
+
+		$constants = get_defined_constants();
+		foreach ($constants as $constant => $value)
+		{
+			if (substr($constant, 0, 19) !== 'GROCY_FEATURE_FLAG_')
+			{
+				unset($constants[$constant]);
+			}
+		}
+		$this->View->set('featureFlags', $constants);
+
+		return $this->View->render($response, $page, $data);
+	}
+
+	protected function renderPage($response, $page, $data = [])
+	{
+		$this->View->set('userentitiesForSidebar', $this->getDatabase()->userentities()->where('show_in_sidebar_menu = 1')->orderBy('name'));
+		try
+		{
+			$usersService = $this->getUsersService();
+			if (defined('GROCY_USER_ID'))
+			{
+				$this->View->set('userSettings', $usersService->GetUserSettings(GROCY_USER_ID));
+			}
+			else
+			{
+				$this->View->set('userSettings', null);
+			}
+		}
+		catch (\Exception $ex)
+		{
+			// Happens when database is not initialised or migrated...
+		}
+
+		return $this->render($response, $page, $data);
+	}
+
+    protected function getDatabaseService()
+	{
+		return DatabaseService::getInstance();
+	}
+
+    protected function getDatabase()
+	{
+		return $this->getDatabaseService()->GetDbConnection();
+	}
+
+	protected function getLocalizationService()
+	{
+		return LocalizationService::getInstance(GROCY_CULTURE);
+	}
+
+	protected function getApplicationservice()
+	{
+		return ApplicationService::getInstance();
+	}
+
+	protected function getBatteriesService()
+	{
+		return BatteriesService::getInstance();
+	}
+
+	protected function getCalendarService()
+	{
+		return CalendarService::getInstance();
+	}
+
+    protected 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();
+	}
+
+	protected function getUserfieldsService()
+	{
+		return UserfieldsService::getInstance();
+	}
+
+	protected function getApiKeyService()
+	{
+		return ApiKeyService::getInstance();
+	}
+
+	protected function getChoresService()
+	{
+		return ChoresService::getInstance();
+	}
+
+	protected function getFilesService()
+	{
+		return FilesService::getInstance();
 	}
 	
 	protected $AppContainer;
-	protected $Database;
-	protected $LocalizationService;
 }

controllers/BatteriesApiController.php

@@ -2,51 +2,61 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\BatteriesService;
-
 class BatteriesApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->BatteriesService = new BatteriesService();
 	}
 
-	protected $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)
 	{
-		$trackedTime = date('Y-m-d H:i:s');
-		if (isset($request->getQueryParams()['tracked_time']) && !empty($request->getQueryParams()['tracked_time']) && IsIsoDateTime($request->getQueryParams()['tracked_time']))
-		{
-			$trackedTime = $request->getQueryParams()['tracked_time'];
-		}
+		$requestBody = $request->getParsedBody();
 
 		try
 		{
-			$this->BatteriesService->TrackChargeCycle($args['batteryId'], $trackedTime);
-			return $this->VoidApiActionResponse($response);
+			$trackedTime = date('Y-m-d H:i:s');
+			if (array_key_exists('tracked_time', $requestBody) && IsIsoDateTime($requestBody['tracked_time']))
+			{
+				$trackedTime = $requestBody['tracked_time'];
+			}
+
+			$chargeCycleId = $this->getBatteriesService()->TrackChargeCycle($args['batteryId'], $trackedTime);
+			return $this->ApiResponse($response, $this->getDatabase()->battery_charge_cycles($chargeCycleId));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
-	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->BatteriesService->GetBatteryDetails($args['batteryId']));
+			return $this->ApiResponse($response, $this->getBatteriesService()->GetBatteryDetails($args['batteryId']));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
-	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->BatteriesService->GetCurrent());
+		return $this->ApiResponse($response, $this->getBatteriesService()->GetCurrent());
+	}
+
+	public function UndoChargeCycle(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$this->ApiResponse($response, $this->getBatteriesService()->UndoChargeCycle($args['chargeCycleId']));
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
 	}
 }

controllers/BatteriesController.php

@@ -2,55 +2,72 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\BatteriesService;
-
 class BatteriesController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->BatteriesService = new BatteriesService();
 	}
 
-	protected $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)
 	{
-		return $this->AppContainer->view->render($response, 'batteriesoverview', [
-			'batteries' => $this->Database->batteries()->orderBy('name'),
-			'current' => $this->BatteriesService->GetCurrent(),
-			'nextXDays' => 5
+		$usersService = $this->getUsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['batteries_due_soon_days'];
+
+		return $this->renderPage($response, 'batteriesoverview', [
+			'batteries' => $this->getDatabase()->batteries()->orderBy('name'),
+			'current' => $this->getBatteriesService()->GetCurrent(),
+			'nextXDays' => $nextXDays,
+			'userfields' => $this->getUserfieldsService()->GetFields('batteries'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('batteries')
 		]);
 	}
 
-	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->AppContainer->view->render($response, 'batterytracking', [
-			'batteries' =>  $this->Database->batteries()->orderBy('name')
+		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->AppContainer->view->render($response, 'batteries', [
-			'batteries' => $this->Database->batteries()->orderBy('name')
+		return $this->renderPage($response, 'batteries', [
+			'batteries' => $this->getDatabase()->batteries()->orderBy('name'),
+			'userfields' => $this->getUserfieldsService()->GetFields('batteries'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('batteries')
 		]);
 	}
 
-	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')
 		{
-			return $this->AppContainer->view->render($response, 'batteryform', [
-				'mode' => 'create'
+			return $this->renderPage($response, 'batteryform', [
+				'mode' => 'create',
+				'userfields' => $this->getUserfieldsService()->GetFields('batteries')
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'batteryform', [
-				'battery' =>  $this->Database->batteries($args['batteryId']),
-				'mode' => 'edit'
+			return $this->renderPage($response, 'batteryform', [
+				'battery' =>  $this->getDatabase()->batteries($args['batteryId']),
+				'mode' => 'edit',
+				'userfields' => $this->getUserfieldsService()->GetFields('batteries')
 			]);
 		}
 	}
+
+	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'),
+			'batteries' => $this->getDatabase()->batteries()->orderBy('name')
+		]);
+	}
+
+	public function BatteriesSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($response, 'batteriessettings');
+	}
 }

controllers/CalendarApiController.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace Grocy\Controllers;
+
+class CalendarApiController extends BaseApiController
+{
+	public function __construct(\DI\Container $container)
+	{
+		parent::__construct($container);
+	}
+
+	public function Ical(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$vCalendar = new \Eluceo\iCal\Component\Calendar('grocy');
+
+			$events = $this->getCalendarService()->GetEvents();
+			foreach($events as $event)
+			{
+				$date = new \DateTime($event['start']);
+				$date->setTimezone(date_default_timezone_get());
+
+				if ($event['date_format'] === 'date')
+				{
+					$date->setTime(23, 59, 59);
+				}
+
+				$vEvent = new \Eluceo\iCal\Component\Event();
+				$vEvent->setDtStart($date)
+					->setDtEnd($date)
+					->setSummary($event['title'])
+					->setDescription($event['description'])
+					->setNoTime($event['date_format'] === 'date')
+					->setUseTimezone(true);
+
+				$vCalendar->addComponent($vEvent);
+			}
+
+			$response->write($vCalendar->render());
+			$response = $response->withHeader('Content-Type', 'text/calendar; charset=utf-8');
+			return $response->withHeader('Content-Disposition', 'attachment; filename="grocy.ics"');
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function IcalSharingLink(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			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)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+}

controllers/CalendarController.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Grocy\Controllers;
+
+class CalendarController extends BaseController
+{
+	public function __construct(\DI\Container $container)
+	{
+		parent::__construct($container);
+	}
+
+	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

@@ -2,57 +2,100 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\ChoresService;
-
 class ChoresApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->ChoresService = new ChoresService();
 	}
 
-	protected $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)
 	{
-		$trackedTime = date('Y-m-d H:i:s');
-		if (isset($request->getQueryParams()['tracked_time']) && !empty($request->getQueryParams()['tracked_time']) && IsIsoDateTime($request->getQueryParams()['tracked_time']))
-		{
-			$trackedTime = $request->getQueryParams()['tracked_time'];
-		}
-
-		$doneBy = GROCY_USER_ID;
-		if (isset($request->getQueryParams()['done_by']) && !empty($request->getQueryParams()['done_by']))
-		{
-			$doneBy = $request->getQueryParams()['done_by'];
-		}
+		$requestBody = $request->getParsedBody();
 
 		try
 		{
-			$this->ChoresService->TrackChore($args['choreId'], $trackedTime, $doneBy);
-			return $this->VoidApiActionResponse($response);
+			$trackedTime = date('Y-m-d H:i:s');
+			if (array_key_exists('tracked_time', $requestBody) && (IsIsoDateTime($requestBody['tracked_time']) || IsIsoDate($requestBody['tracked_time'])))
+			{
+				$trackedTime = $requestBody['tracked_time'];
+			}
+
+			$doneBy = GROCY_USER_ID;
+			if (array_key_exists('done_by', $requestBody) && !empty($requestBody['done_by']))
+			{
+				$doneBy = $requestBody['done_by'];
+			}
+
+			$choreExecutionId = $this->getChoresService()->TrackChore($args['choreId'], $trackedTime, $doneBy);
+			return $this->ApiResponse($response, $this->getDatabase()->chores_log($choreExecutionId));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
-	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->ChoresService->GetChoreDetails($args['choreId']));
+			return $this->ApiResponse($response, $this->getChoresService()->GetChoreDetails($args['choreId']));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
-	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->ChoresService->GetCurrent());
+		return $this->ApiResponse($response, $this->getChoresService()->GetCurrent());
+	}
+
+	public function UndoChoreExecution(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$this->ApiResponse($response, $this->getChoresService()->UndoChoreExecution($args['executionId']));
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function CalculateNextExecutionAssignments(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$requestBody = $request->getParsedBody();
+
+			$choreId = null;
+			if (array_key_exists('chore_id', $requestBody) && !empty($requestBody['chore_id']) && is_numeric($requestBody['chore_id']))
+			{
+				$choreId = intval($requestBody['chore_id']);
+			}
+
+			if ($choreId === null)
+			{
+				$chores = $this->getDatabase()->chores();
+				foreach ($chores as $chore)
+				{
+					$this->getChoresService()->CalculateNextExecutionAssignment($chore->id);
+				}
+			}
+			else
+			{
+				$this->getChoresService()->CalculateNextExecutionAssignment($choreId);
+			}
+
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
 	}
 }

controllers/ChoresController.php

@@ -2,67 +2,86 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\ChoresService;
-
 class ChoresController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->ChoresService = new ChoresService();
 	}
 
-	protected $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)
 	{
-		return $this->AppContainer->view->render($response, 'choresoverview', [
-			'chores' => $this->Database->chores()->orderBy('name'),
-			'currentChores' => $this->ChoresService->GetCurrent(),
-			'nextXDays' => 5
+		$usersService = $this->getUsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['chores_due_soon_days'];
+
+		return $this->renderPage($response, 'choresoverview', [
+			'chores' => $this->getDatabase()->chores()->orderBy('name'),
+			'currentChores' => $this->getChoresService()->GetCurrent(),
+			'nextXDays' => $nextXDays,
+			'userfields' => $this->getUserfieldsService()->GetFields('chores'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('chores'),
+			'users' => $usersService->GetUsersAsDto()
 		]);
 	}
 
-	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->AppContainer->view->render($response, 'choretracking', [
-			'chores' => $this->Database->chores()->orderBy('name'),
-			'users' => $this->Database->users()->orderBy('username')
+		return $this->renderPage($response, 'choretracking', [
+			'chores' => $this->getDatabase()->chores()->orderBy('name'),
+			'users' => $this->getDatabase()->users()->orderBy('username')
 		]);
 	}
 
-	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->AppContainer->view->render($response, 'chores', [
-			'chores' => $this->Database->chores()->orderBy('name')
+		return $this->renderPage($response, 'chores', [
+			'chores' => $this->getDatabase()->chores()->orderBy('name'),
+			'userfields' => $this->getUserfieldsService()->GetFields('chores'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('chores')
 		]);
 	}
 
-	public function Analysis(\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->AppContainer->view->render($response, 'choresanalysis', [
-			'choresLog' => $this->Database->chores_log()->orderBy('tracked_time', 'DESC'),
-			'chores' => $this->Database->chores()->orderBy('name'),
-			'users' => $this->Database->users()->orderBy('username')
+		return $this->renderPage($response, 'choresjournal', [
+			'choresLog' => $this->getDatabase()->chores_log()->orderBy('tracked_time', 'DESC'),
+			'chores' => $this->getDatabase()->chores()->orderBy('name'),
+			'users' => $this->getDatabase()->users()->orderBy('username')
 		]);
 	}
 
-	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 = $this->getUsersService();
+		$users = $usersService->GetUsersAsDto();
+
 		if ($args['choreId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'choreform', [
-				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService'),
-				'mode' => 'create'
+			return $this->renderPage($response, 'choreform', [
+				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService', 'CHORE_PERIOD_TYPE_'),
+				'mode' => 'create',
+				'userfields' => $this->getUserfieldsService()->GetFields('chores'),
+				'assignmentTypes' => GetClassConstants('\Grocy\Services\ChoresService', 'CHORE_ASSIGNMENT_TYPE_'),
+				'users' => $users,
+				'products' => $this->getDatabase()->products()->orderBy('name')
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'choreform', [
-				'chore' =>  $this->Database->chores($args['choreId']),
-				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService'),
-				'mode' => 'edit'
+			return $this->renderPage($response, 'choreform', [
+				'chore' =>  $this->getDatabase()->chores($args['choreId']),
+				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService', 'CHORE_PERIOD_TYPE_'),
+				'mode' => 'edit',
+				'userfields' => $this->getUserfieldsService()->GetFields('chores'),
+				'assignmentTypes' => GetClassConstants('\Grocy\Services\ChoresService', 'CHORE_ASSIGNMENT_TYPE_'),
+				'users' => $users,
+				'products' => $this->getDatabase()->products()->orderBy('name')
 			]);
 		}
 	}
+
+	public function ChoresSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($response, 'choressettings');
+	}
 }

controllers/EquipmentController.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Grocy\Controllers;
+
+class EquipmentController extends BaseController
+{
+	public function __construct(\DI\Container $container)
+	{
+		parent::__construct($container);
+	}
+
+	protected $UserfieldsService;
+
+	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'),
+			'userfields' => $this->getUserfieldsService()->GetFields('equipment'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('equipment')
+		]);
+	}
+
+	public function EditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		if ($args['equipmentId'] == 'new')
+		{
+			return $this->renderPage($response, 'equipmentform', [
+				'mode' => 'create',
+				'userfields' => $this->getUserfieldsService()->GetFields('equipment')
+			]);
+		}
+		else
+		{
+			return $this->renderPage($response, 'equipmentform', [
+				'equipment' =>  $this->getDatabase()->equipment($args['equipmentId']),
+				'mode' => 'edit',
+				'userfields' => $this->getUserfieldsService()->GetFields('equipment')
+			]);
+		}
+	}
+}

controllers/FilesApiController.php

@@ -6,33 +6,117 @@ use \Grocy\Services\FilesService;
 
 class FilesApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->FilesService = new FilesService();
 	}
 
-	protected $FilesService;
-
-	public function Upload(\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
 		{
-			if (isset($request->getQueryParams()['file_name']) && !empty($request->getQueryParams()['file_name']) && IsValidFileName($request->getQueryParams()['file_name']))
+			if (IsValidFileName(base64_decode($args['fileName'])))
 			{
-				$fileName = $request->getQueryParams()['file_name'];
+				$fileName = base64_decode($args['fileName']);
 			}
 			else
 			{
-				throw new \Exception('file_name query parameter missing or contains an invalid filename');
+				throw new \Exception('Invalid filename');
 			}
 
 			$data = $request->getBody()->getContents();
-			file_put_contents($this->FilesService->GetFilePath($args['group'], $fileName), $data);
+			file_put_contents($this->getFilesService()->GetFilePath($args['group'], $fileName), $data);
+
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function ServeFile(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			if (IsValidFileName(base64_decode($args['fileName'])))
+			{
+				$fileName = base64_decode($args['fileName']);
+			}
+			else
+			{
+				throw new \Exception('Invalid filename');
+			}
+
+			$forceServeAs = null;
+			if (isset($request->getQueryParams()['force_serve_as']) && !empty($request->getQueryParams()['force_serve_as']))
+			{
+				$forceServeAs = $request->getQueryParams()['force_serve_as'];
+			}
+
+			if ($forceServeAs == FilesService::FILE_SERVE_TYPE_PICTURE)
+			{
+				$bestFitHeight = null;
+				if (isset($request->getQueryParams()['best_fit_height']) && !empty($request->getQueryParams()['best_fit_height']) && is_numeric($request->getQueryParams()['best_fit_height']))
+				{
+					$bestFitHeight = $request->getQueryParams()['best_fit_height'];
+				}
+
+				$bestFitWidth = null;
+				if (isset($request->getQueryParams()['best_fit_width']) && !empty($request->getQueryParams()['best_fit_width']) && is_numeric($request->getQueryParams()['best_fit_width']))
+				{
+					$bestFitWidth = $request->getQueryParams()['best_fit_width'];
+				}
+
+				$filePath = $this->getFilesService()->DownscaleImage($args['group'], $fileName, $bestFitHeight, $bestFitWidth);
+			}
+			else
+			{
+				$filePath = $this->getFilesService()->GetFilePath($args['group'], $fileName);
+			}
+
+			if (file_exists($filePath))
+			{
+				$response->write(file_get_contents($filePath));
+				$response = $response->withHeader('Cache-Control', 'max-age=2592000');
+				$response = $response->withHeader('Content-Type', mime_content_type($filePath));
+				return $response->withHeader('Content-Disposition', 'inline; filename="' . $fileName . '"');
+			}
+			else
+			{
+				return $this->GenericErrorResponse($response, 'File not found', 404);
+			}
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function DeleteFile(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			if (IsValidFileName(base64_decode($args['fileName'])))
+			{
+				$fileName = base64_decode($args['fileName']);
+			}
+			else
+			{
+				throw new \Exception('Invalid filename');
+			}
+
+			$filePath = $this->getFilesService()->GetFilePath($args['group'], $fileName);
+			if (file_exists($filePath))
+			{
+				unlink($filePath);
+			}
+
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 }

controllers/GenericEntityApiController.php

@@ -4,77 +4,168 @@ namespace Grocy\Controllers;
 
 class GenericEntityApiController extends BaseApiController
 {
-	public function GetObjects(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function __construct(\DI\Container $container)
 	{
-		if ($this->IsValidEntity($args['entity']))
+		parent::__construct($container);
+	}
+
+	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->Database->{$args['entity']}());
+			return $this->ApiResponse($response, $this->getDatabase()->{$args['entity']}());
 		}
 		else
 		{
-			return $this->VoidApiActionResponse($response, false, 400, 'Entity does not exist or is not exposed');
+			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
 		}
 	}
 
-	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']))
+		if ($this->IsValidEntity($args['entity']) && !$this->IsEntityWithPreventedListing($args['entity']))
 		{
-			return $this->ApiResponse($this->Database->{$args['entity']}($args['objectId']));
+			return $this->ApiResponse($response, $this->getDatabase()->{$args['entity']}($args['objectId']));
 		}
 		else
 		{
-			return $this->VoidApiActionResponse($response, false, 400, 'Entity does not exist or is not exposed');
+			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
 		}
 	}
 
-	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']))
 		{
-			$newRow = $this->Database->{$args['entity']}()->createRow($request->getParsedBody());
-			$newRow->save();
-			$success = $newRow->isClean();
-			return $this->ApiResponse(array('success' => $success));
+			$requestBody = $request->getParsedBody();
+
+			try
+			{
+				if ($requestBody === null)
+				{
+					throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+				}
+
+				$newRow = $this->getDatabase()->{$args['entity']}()->createRow($requestBody);
+				$newRow->save();
+				$success = $newRow->isClean();
+				return $this->ApiResponse($response, array(
+					'created_object_id' => $this->getDatabase()->lastInsertId()
+				));
+			}
+			catch (\Exception $ex)
+			{
+				return $this->GenericErrorResponse($response, $ex->getMessage());
+			}
 		}
 		else
 		{
-			return $this->VoidApiActionResponse($response, false, 400, 'Entity does not exist or is not exposed');
+			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
 		}
 	}
 
-	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']))
 		{
-			$row = $this->Database->{$args['entity']}($args['objectId']);
-			$row->update($request->getParsedBody());
-			$success = $row->isClean();
-			return $this->ApiResponse(array('success' => $success));
+			$requestBody = $request->getParsedBody();
+
+			try
+			{
+				if ($requestBody === null)
+				{
+					throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+				}
+
+				$row = $this->getDatabase()->{$args['entity']}($args['objectId']);
+				$row->update($requestBody);
+				$success = $row->isClean();
+				return $this->EmptyApiResponse($response);
+			}
+			catch (\Exception $ex)
+			{
+				return $this->GenericErrorResponse($response, $ex->getMessage());
+			}
 		}
 		else
 		{
-			return $this->VoidApiActionResponse($response, false, 400, 'Entity does not exist or is not exposed');
+			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
 		}
 	}
 
-	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']))
 		{
-			$row = $this->Database->{$args['entity']}($args['objectId']);
+			$row = $this->getDatabase()->{$args['entity']}($args['objectId']);
 			$row->delete();
 			$success = $row->isClean();
-			return $this->ApiResponse(array('success' => $success));
+			return $this->EmptyApiResponse($response);
 		}
 		else
 		{
-			return $this->VoidApiActionResponse($response, false, 400, 'Entity does not exist or is not exposed');
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	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($response, $this->getDatabase()->{$args['entity']}()->where('name LIKE ?', '%' . $args['searchString'] . '%'));
+			}
+			catch (\PDOException $ex)
+			{
+				return $this->GenericErrorResponse($response, 'The given entity has no field "name"');
+			}
+		}
+		else
+		{
+			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
+		}
+	}
+
+	public function GetUserfields(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			return $this->ApiResponse($response, $this->getUserfieldsService()->GetValues($args['entity'], $args['objectId']));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function SetUserfields(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+
+		try
+		{
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
+			$this->getUserfieldsService()->SetValues($args['entity'], $args['objectId'], $requestBody);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
 	private function IsValidEntity($entity)
 	{
-		return in_array($entity, $this->OpenApiSpec->components->internalSchemas->ExposedEntity->enum);
+		return in_array($entity, $this->getOpenApiSpec()->components->internalSchemas->ExposedEntity->enum);
+	}
+
+	private function IsEntityWithPreventedListing($entity)
+	{
+		return !in_array($entity, $this->getOpenApiSpec()->components->internalSchemas->ExposedEntityButNoListing->enum);
 	}
 }

controllers/GenericEntityController.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace Grocy\Controllers;
+
+class GenericEntityController extends BaseController
+{
+	public function __construct(\DI\Container $container)
+	{
+		parent::__construct($container);
+	}
+
+	public function UserfieldsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($response, 'userfields', [
+			'userfields' => $this->getUserfieldsService()->GetAllFields(),
+			'entities' => $this->getUserfieldsService()->GetEntities()
+		]);
+	}
+
+	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(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$userentity = $this->getDatabase()->userentities()->where('name = :1', $args['userentityName'])->fetch();
+
+		return $this->renderPage($response, 'userobjects', [
+			'userentity' => $userentity,
+			'userobjects' => $this->getDatabase()->userobjects()->where('userentity_id = :1', $userentity->id),
+			'userfields' => $this->getUserfieldsService()->GetFields('userentity-' . $args['userentityName']),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('userentity-' . $args['userentityName'])
+		]);
+	}
+
+	public function UserfieldEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		if ($args['userfieldId'] == 'new')
+		{
+			return $this->renderPage($response, 'userfieldform', [
+				'mode' => 'create',
+				'userfieldTypes' => $this->getUserfieldsService()->GetFieldTypes(),
+				'entities' => $this->getUserfieldsService()->GetEntities()
+			]);
+		}
+		else
+		{
+			return $this->renderPage($response, 'userfieldform', [
+				'mode' => 'edit',
+				'userfield' =>  $this->getUserfieldsService()->GetField($args['userfieldId']),
+				'userfieldTypes' => $this->getUserfieldsService()->GetFieldTypes(),
+				'entities' => $this->getUserfieldsService()->GetEntities()
+			]);
+		}
+	}
+
+	public function UserentityEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		if ($args['userentityId'] == 'new')
+		{
+			return $this->renderPage($response, 'userentityform', [
+				'mode' => 'create'
+			]);
+		}
+		else
+		{
+			return $this->renderPage($response, 'userentityform', [
+				'mode' => 'edit',
+				'userentity' =>  $this->getDatabase()->userentities($args['userentityId'])
+			]);
+		}
+	}
+
+	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();
+
+		if ($args['userobjectId'] == 'new')
+		{
+			return $this->renderPage($response, 'userobjectform', [
+				'userentity' => $userentity,
+				'mode' => 'create',
+				'userfields' => $this->getUserfieldsService()->GetFields('userentity-' . $args['userentityName'])
+			]);
+		}
+		else
+		{
+			return $this->renderPage($response, 'userobjectform', [
+				'userentity' => $userentity,
+				'mode' => 'edit',
+				'userobject' =>  $this->getDatabase()->userobjects($args['userobjectId']),
+				'userfields' => $this->getUserfieldsService()->GetFields('userentity-' . $args['userentityName'])
+			]);
+		}
+	}
+}

controllers/LoginController.php

@@ -2,35 +2,28 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\SessionService;
-use \Grocy\Services\DatabaseMigrationService;
-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->SessionService = new SessionService();
 		$this->SessionCookieName = $sessionCookieName;
 	}
-
-	protected $SessionService;
 	protected $SessionCookieName;
 
-	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']))
 		{
-			$user = $this->Database->users()->where('username', $postParams['username'])->fetch();
+			$user = $this->getDatabase()->users()->where('username', $postParams['username'])->fetch();
 			$inputPassword = $postParams['password'];
 			$stayLoggedInPermanently = $postParams['stay_logged_in'] == 'on';
 
 			if ($user !== null && password_verify($inputPassword, $user->password))
 			{
-				$sessionKey = $this->SessionService->CreateSession($user->id, $stayLoggedInPermanently);
-				setcookie($this->SessionCookieName, $sessionKey, time() + 31220640000); // Cookie expires in 999 years, but session validity is up to SessionService
+				$sessionKey = $this->getSessionService()->CreateSession($user->id, $stayLoggedInPermanently);
+				setcookie($this->SessionCookieName, $sessionKey, PHP_INT_SIZE == 4 ? PHP_INT_MAX : PHP_INT_MAX>>32); // Cookie expires never, but session validity is up to SessionService
 
 				if (password_needs_rehash($user->password, PASSWORD_DEFAULT))
 				{
@@ -39,43 +32,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->AppContainer->view->render($response, 'login');
+		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->SessionService->RemoveSession($_COOKIE[$this->SessionCookieName]);
-		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/'));
-	}
-
-	public function Root(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		// Schema migration is done here
-		$databaseMigrationService = new DatabaseMigrationService();
-		$databaseMigrationService->MigrateDatabase();
-
-		if (GROCY_IS_DEMO_INSTALL)
-		{
-			$demoDataGeneratorService = new DemoDataGeneratorService();
-			$demoDataGeneratorService->PopulateDemoData();
-		}
-
-		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/stockoverview'));
+		$this->getSessionService()->RemoveSession($_COOKIE[$this->SessionCookieName]);
+		return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl('/'));
 	}
 
 	public function GetSessionCookieName()

controllers/OpenApiController.php

@@ -2,48 +2,42 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\ApplicationService;
-use \Grocy\Services\ApiKeyService;
-
 class OpenApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->ApiKeyService = new ApiKeyService();
 	}
 
-	protected $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->AppContainer->view->render($response, 'openapiui');
+		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 = new ApplicationService();
+		$applicationService = $this->getApplicationService();
 
 		$versionInfo = $applicationService->GetInstalledVersion();
-		$this->OpenApiSpec->info->version = $versionInfo->Version;
-		$this->OpenApiSpec->info->description = str_replace('PlaceHolderManageApiKeysUrl', $this->AppContainer->UrlManager->ConstructUrl('/manageapikeys'), $this->OpenApiSpec->info->description);
-		$this->OpenApiSpec->servers[0]->url = $this->AppContainer->UrlManager->ConstructUrl('/api');
+		$this->getOpenApiSpec()->info->version = $versionInfo->Version;
+		$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->OpenApiSpec);
+		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->AppContainer->view->render($response, 'manageapikeys', [
-			'apiKeys' => $this->Database->api_keys(),
-			'users' => $this->Database->users()
+		return $this->renderPage($response, 'manageapikeys', [
+			'apiKeys' => $this->getDatabase()->api_keys(),
+			'users' => $this->getDatabase()->users()
 		]);
 	}
 
-	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->ApiKeyService->CreateApiKey();
-		$newApiKeyId = $this->ApiKeyService->GetApiKeyId($newApiKey);
-		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl("/manageapikeys?CreatedApiKeyId=$newApiKeyId"));
+		$newApiKey = $this->getApiKeyService()->CreateApiKey();
+		$newApiKeyId = $this->getApiKeyService()->GetApiKeyId($newApiKey);
+		return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl("/manageapikeys?CreatedApiKeyId=$newApiKeyId"));
 	}
 }

controllers/RecipesApiController.php

@@ -2,34 +2,62 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\RecipesService;
-
 class RecipesApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->RecipesService = new RecipesService();
 	}
 
-	protected $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)
 	{
-		$this->RecipesService->AddNotFulfilledProductsToShoppingList($args['recipeId']);
-		return $this->VoidApiActionResponse($response);
+		$requestBody = $request->getParsedBody();
+		$excludedProductIds = null;
+
+		if ($requestBody !== null && array_key_exists('excludedProductIds', $requestBody))
+		{
+			$excludedProductIds = $requestBody['excludedProductIds'];
+		}
+
+		$this->getRecipesService()->AddNotFulfilledProductsToShoppingList($args['recipeId'], $excludedProductIds);
+		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
 		{
-			$this->RecipesService->ConsumeRecipe($args['recipeId']);
-			return $this->VoidApiActionResponse($response);
+			$this->getRecipesService()->ConsumeRecipe($args['recipeId']);
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function GetRecipeFulfillment(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			if(!isset($args['recipeId']))
+			{
+				return $this->ApiResponse($response, $this->getRecipesService()->GetRecipesResolved());
+			}
+
+			$recipeResolved = FindObjectInArrayByPropertyValue($this->getRecipesService()->GetRecipesResolved(), 'recipe_id', $args['recipeId']);
+			if(!$recipeResolved)
+			{
+				throw new \Exception('Recipe does not exist');
+			}
+			else
+			{
+				return $this->ApiResponse($response, $recipeResolved);
+			}
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 }

controllers/RecipesController.php

@@ -6,90 +6,161 @@ use \Grocy\Services\RecipesService;
 
 class RecipesController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->RecipesService = new RecipesService();
 	}
 
-	protected $RecipesService;
-
-	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)
 	{
-		$recipes = $this->Database->recipes()->orderBy('name');
+		$recipes = $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name');
+		$recipesResolved = $this->getRecipesService()->GetRecipesResolved();
 
 		$selectedRecipe = null;
-		$selectedRecipePositions = null;
+		$selectedRecipePositionsResolved = null;
 		if (isset($request->getQueryParams()['recipe']))
 		{
-			$selectedRecipe = $this->Database->recipes($request->getQueryParams()['recipe']);
-			$selectedRecipePositions = $this->Database->recipes_pos()->where('recipe_id', $request->getQueryParams()['recipe']);
+			$selectedRecipe = $this->getDatabase()->recipes($request->getQueryParams()['recipe']);
+			$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;
-				$selectedRecipePositions = $this->Database->recipes_pos()->where('recipe_id', $recipe->id);
+				$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;
 			}
 		}
 
-		return $this->AppContainer->view->render($response, 'recipes', [
+		$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', 'ASC', 'product_group', 'ASC')->fetchAll();
+
+		$includedRecipeIdsAbsolute = array();
+		$includedRecipeIdsAbsolute[] = $selectedRecipe->id;
+		foreach($selectedRecipeSubRecipes as $subRecipe)
+		{
+			$includedRecipeIdsAbsolute[] = $subRecipe->id;
+		}
+
+		return $this->renderPage($response, 'recipes', [
 			'recipes' => $recipes,
-			'recipesFulfillment' => $this->RecipesService->GetRecipesFulfillment(),
-			'recipesSumFulfillment' => $this->RecipesService->GetRecipesSumFulfillment(),
+			'recipesResolved' => $recipesResolved,
+			'recipePositionsResolved' => $this->getDatabase()->recipes_pos_resolved()->where('recipe_type', RecipesService::RECIPE_TYPE_NORMAL),
 			'selectedRecipe' => $selectedRecipe,
-			'selectedRecipePositions' => $selectedRecipePositions,
-			'products' => $this->Database->products(),
-			'quantityunits' => $this->Database->quantity_units()
+			'selectedRecipePositionsResolved' => $selectedRecipePositionsResolved,
+			'products' => $this->getDatabase()->products(),
+			'quantityUnits' => $this->getDatabase()->quantity_units(),
+			'selectedRecipeSubRecipes' => $selectedRecipeSubRecipes,
+			'selectedRecipeSubRecipesPositions' => $selectedRecipeSubRecipesPositions,
+			'includedRecipeIdsAbsolute' => $includedRecipeIdsAbsolute,
+			'selectedRecipeTotalCosts' => FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $selectedRecipe->id)->costs,
+			'selectedRecipeTotalCalories' => FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $selectedRecipe->id)->calories,
+			'userfields' => $this->getUserfieldsService()->GetFields('recipes'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('recipes'),
+			'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved()
 		]);
 	}
 
-	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')
 		{
-			$newRecipe = $this->Database->recipes()->createRow(array(
-				'name' => $this->LocalizationService->Localize('New recipe')
+			$newRecipe = $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->createRow(array(
+				'name' => $this->getLocalizationService()->__t('New recipe')
 			));
 			$newRecipe->save();
 
-			$recipeId = $this->Database->lastInsertId();
+			$recipeId = $this->getDatabase()->lastInsertId();
 		}
 
-		return $this->AppContainer->view->render($response, 'recipeform', [
-			'recipe' =>  $this->Database->recipes($recipeId),
-			'recipePositions' =>  $this->Database->recipes_pos()->where('recipe_id', $recipeId),
+		return $this->renderPage($response, 'recipeform', [
+			'recipe' =>  $this->getDatabase()->recipes($recipeId),
+			'recipePositions' =>  $this->getDatabase()->recipes_pos()->where('recipe_id', $recipeId),
 			'mode' => 'edit',
-			'products' => $this->Database->products(),
-			'quantityunits' => $this->Database->quantity_units(),
-			'recipesFulfillment' => $this->RecipesService->GetRecipesFulfillment(),
-			'recipesSumFulfillment' => $this->RecipesService->GetRecipesSumFulfillment()
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'quantityunits' => $this->getDatabase()->quantity_units(),
+			'recipePositionsResolved' => $this->getRecipesService()->GetRecipesPosResolved(),
+			'recipesResolved' => $this->getRecipesService()->GetRecipesResolved(),
+			'recipes' =>  $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name'),
+			'recipeNestings' =>  $this->getDatabase()->recipes_nestings()->where('recipe_id', $recipeId),
+			'userfields' => $this->getUserfieldsService()->GetFields('recipes'),
+			'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved()
 		]);
 	}
 
-	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')
 		{
-			return $this->AppContainer->view->render($response, 'recipeposform', [
+			return $this->renderPage($response, 'recipeposform', [
 				'mode' => 'create',
-				'recipe' => $this->Database->recipes($args['recipeId']),
-				'products' => $this->Database->products()->orderBy('name'),
-				'quantityUnits' => $this->Database->quantity_units()->orderBy('name')
+				'recipe' => $this->getDatabase()->recipes($args['recipeId']),
+				'recipePos' => new \stdClass(),
+				'products' => $this->getDatabase()->products()->orderBy('name'),
+				'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+				'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved()
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'recipeposform', [
+			return $this->renderPage($response, 'recipeposform', [
 				'mode' => 'edit',
-				'recipe' =>  $this->Database->recipes($args['recipeId']),
-				'recipePos' => $this->Database->recipes_pos($args['recipePosId']),
-				'products' => $this->Database->products()->orderBy('name'),
-				'quantityUnits' => $this->Database->quantity_units()->orderBy('name')
+				'recipe' =>  $this->getDatabase()->recipes($args['recipeId']),
+				'recipePos' => $this->getDatabase()->recipes_pos($args['recipePosId']),
+				'products' => $this->getDatabase()->products()->orderBy('name'),
+				'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+				'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved()
 			]);
 		}
 	}
+
+	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)
+		{
+			$recipe = FindObjectInArrayByPropertyValue($recipes, 'id', $mealPlanEntry['recipe_id']);
+			$title = '';
+			if ($recipe !== null)
+			{
+				$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),
+				'type' => $mealPlanEntry['type'],
+				'productDetails' => json_encode($productDetails)
+			);
+		}
+
+		return $this->renderPage($response, 'mealplan', [
+			'fullcalendarEventSources' => $events,
+			'recipes' => $recipes,
+			'internalRecipes' => $this->getDatabase()->recipes()->whereNot('type', RecipesService::RECIPE_TYPE_NORMAL)->fetchAll(),
+			'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,119 +6,384 @@ use \Grocy\Services\StockService;
 
 class StockApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->StockService = new StockService();
 	}
 
-	protected $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->StockService->GetProductDetails($args['productId']));
+			return $this->ApiResponse($response, $this->getStockService()->GetProductDetails($args['productId']));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
-	public function ProductPriceHistory(\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
 		{
-			return $this->ApiResponse($this->StockService->GetProductPriceHistory($args['productId']));
+			$productId = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
+			return $this->ApiResponse($response, $this->getStockService()->GetProductDetails($productId));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
-	public function AddProduct(\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)
 	{
-		$bestBeforeDate = date('Y-m-d');
-		if (isset($request->getQueryParams()['bestbeforedate']) && !empty($request->getQueryParams()['bestbeforedate']) && IsIsoDate($request->getQueryParams()['bestbeforedate']))
+		try
 		{
-			$bestBeforeDate = $request->getQueryParams()['bestbeforedate'];
+			return $this->ApiResponse($response, $this->getStockService()->GetProductPriceHistory($args['productId']));
 		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
 
-		$price = null;
-		if (isset($request->getQueryParams()['price']) && !empty($request->getQueryParams()['price']) && is_numeric($request->getQueryParams()['price']))
-		{
-			$price = $request->getQueryParams()['price'];
-		}
-
-		$transactionType = StockService::TRANSACTION_TYPE_PURCHASE;
-		if (isset($request->getQueryParams()['transactiontype']) && !empty($request->getQueryParams()['transactiontype']))
-		{
-			$transactionType = $request->getQueryParams()['transactiontype'];
-		}
+	public function AddProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
 
 		try
 		{
-			$this->StockService->AddProduct($args['productId'], $args['amount'], $bestBeforeDate, $transactionType, date('Y-m-d'), $price);
-			return $this->VoidApiActionResponse($response);
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
+			if (!array_key_exists('amount', $requestBody))
+			{
+				throw new \Exception('An amount is required');
+			}
+
+			$bestBeforeDate = null;
+			if (array_key_exists('best_before_date', $requestBody) && IsIsoDate($requestBody['best_before_date']))
+			{
+				$bestBeforeDate = $requestBody['best_before_date'];
+			}
+
+			$price = null;
+			if (array_key_exists('price', $requestBody) && is_numeric($requestBody['price']))
+			{
+				$price = $requestBody['price'];
+			}
+
+			$locationId = null;
+			if (array_key_exists('location_id', $requestBody) && is_numeric($requestBody['location_id']))
+			{
+				$locationId = $requestBody['location_id'];
+			}
+
+			$transactionType = StockService::TRANSACTION_TYPE_PURCHASE;
+			if (array_key_exists('transaction_type', $requestBody)  && !empty($requestBody['transactiontype']))
+			{
+				$transactionType = $requestBody['transactiontype'];
+			}
+
+			$bookingId = $this->getStockService()->AddProduct($args['productId'], $requestBody['amount'], $bestBeforeDate, $transactionType, date('Y-m-d'), $price, $locationId);
+			return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
-	public function ConsumeProduct(\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)
 	{
-		$spoiled = false;
-		if (isset($request->getQueryParams()['spoiled']) && !empty($request->getQueryParams()['spoiled']) && $request->getQueryParams()['spoiled'] == '1')
+		try
 		{
-			$spoiled = true;
+			$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
+			return $this->AddProduct($request, $response, $args);
 		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
 
-		$transactionType = StockService::TRANSACTION_TYPE_CONSUME;
-		if (isset($request->getQueryParams()['transactiontype']) && !empty($request->getQueryParams()['transactiontype']))
-		{
-			$transactionType = $request->getQueryParams()['transactiontype'];
-		}
+	public function EditStockEntry(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
 
 		try
 		{
-			$this->StockService->ConsumeProduct($args['productId'], $args['amount'], $spoiled, $transactionType);
-			return $this->VoidApiActionResponse($response);
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
+			if (!array_key_exists('amount', $requestBody))
+			{
+				throw new \Exception('An amount is required');
+			}
+
+			$bestBeforeDate = null;
+			if (array_key_exists('best_before_date', $requestBody) && IsIsoDate($requestBody['best_before_date']))
+			{
+				$bestBeforeDate = $requestBody['best_before_date'];
+			}
+
+			$price = null;
+			if (array_key_exists('price', $requestBody) && is_numeric($requestBody['price']))
+			{
+				$price = $requestBody['price'];
+			}
+
+			$locationId = null;
+			if (array_key_exists('location_id', $requestBody) && is_numeric($requestBody['location_id']))
+			{
+				$locationId = $requestBody['location_id'];
+			}
+
+			$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)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
-	public function InventoryProduct(\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)
 	{
-		$bestBeforeDate = date('Y-m-d');
-		if (isset($request->getQueryParams()['bestbeforedate']) && !empty($request->getQueryParams()['bestbeforedate']) && IsIsoDate($request->getQueryParams()['bestbeforedate']))
-		{
-			$bestBeforeDate = $request->getQueryParams()['bestbeforedate'];
-		}
+		$requestBody = $request->getParsedBody();
 
 		try
 		{
-			$this->StockService->InventoryProduct($args['productId'], $args['newAmount'], $bestBeforeDate);
-			return $this->VoidApiActionResponse($response);
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
+			if (!array_key_exists('amount', $requestBody))
+			{
+				throw new \Exception('An amount is required');
+			}
+
+			if (!array_key_exists('location_id_from', $requestBody))
+			{
+				throw new \Exception('A transfer from location is required');
+			}
+
+			if (!array_key_exists('location_id_to', $requestBody))
+			{
+				throw new \Exception('A transfer to location is required');
+			}
+
+			$specificStockEntryId = 'default';
+			if (array_key_exists('stock_entry_id', $requestBody) && !empty($requestBody['stock_entry_id']))
+			{
+				$specificStockEntryId = $requestBody['stock_entry_id'];
+			}
+
+			$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)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
-	public function CurrentStock(\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)
 	{
-		return $this->ApiResponse($this->StockService->GetCurrentStock());
+		try
+		{
+			$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
+			return $this->TransferProduct($request, $response, $args);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
 	}
 
-	public function CurrentVolatilStock(\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();
+
+		$result = null;
+
+		try
+		{
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
+			if (!array_key_exists('amount', $requestBody))
+			{
+				throw new \Exception('An amount is required');
+			}
+
+			$spoiled = false;
+			if (array_key_exists('spoiled', $requestBody))
+			{
+				$spoiled = $requestBody['spoiled'];
+			}
+
+			$transactionType = StockService::TRANSACTION_TYPE_CONSUME;
+			if (array_key_exists('transaction_type', $requestBody)  && !empty($requestBody['transactiontype']))
+			{
+				$transactionType = $requestBody['transactiontype'];
+			}
+
+			$specificStockEntryId = 'default';
+			if (array_key_exists('stock_entry_id', $requestBody) && !empty($requestBody['stock_entry_id']))
+			{
+				$specificStockEntryId = $requestBody['stock_entry_id'];
+			}
+
+			$locationId = null;
+			if (array_key_exists('location_id', $requestBody) && !empty($requestBody['location_id']) && is_numeric($requestBody['location_id']))
+			{
+				$locationId = $requestBody['location_id'];
+			}
+
+			$recipeId = null;
+			if (array_key_exists('recipe_id', $requestBody) && is_numeric($requestBody['recipe_id']))
+			{
+				$recipeId = $requestBody['recipe_id'];
+			}
+
+			$bookingId = $this->getStockService()->ConsumeProduct($args['productId'], $requestBody['amount'], $spoiled, $transactionType, $specificStockEntryId, $recipeId, $locationId);
+			return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId));
+		}
+		catch (\Exception $ex)
+		{
+			$result = $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+		return $result;
+	}
+
+	public function ConsumeProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
+			return $this->ConsumeProduct($request, $response, $args);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function InventoryProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+
+		try
+		{
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
+			if (!array_key_exists('new_amount', $requestBody))
+			{
+				throw new \Exception('An new amount is required');
+			}
+
+			$bestBeforeDate = null;
+			if (array_key_exists('best_before_date', $requestBody) && IsIsoDate($requestBody['best_before_date']))
+			{
+				$bestBeforeDate = $requestBody['best_before_date'];
+			}
+
+			$locationId = null;
+			if (array_key_exists('location_id', $requestBody) && is_numeric($requestBody['location_id']))
+			{
+				$locationId = $requestBody['location_id'];
+			}
+
+			$price = null;
+			if (array_key_exists('price', $requestBody) && is_numeric($requestBody['price']))
+			{
+				$price = $requestBody['price'];
+			}
+
+			$bookingId = $this->getStockService()->InventoryProduct($args['productId'], $requestBody['new_amount'], $bestBeforeDate, $locationId, $price);
+			return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function InventoryProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
+			return $this->InventoryProduct($request, $response, $args);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function OpenProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+
+		try
+		{
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
+			if (!array_key_exists('amount', $requestBody))
+			{
+				throw new \Exception('An amount is required');
+			}
+
+			$specificStockEntryId = 'default';
+			if (array_key_exists('stock_entry_id', $requestBody) && !empty($requestBody['stock_entry_id']))
+			{
+				$specificStockEntryId = $requestBody['stock_entry_id'];
+			}
+
+			$bookingId = $this->getStockService()->OpenProduct($args['productId'], $requestBody['amount'], $specificStockEntryId);
+			return $this->ApiResponse($response, $this->getDatabase()->stock_log($bookingId));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function OpenProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
+			return $this->OpenProduct($request, $response, $args);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function CurrentStock(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->ApiResponse($response, $this->getStockService()->GetCurrentStock());
+	}
+
+	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']))
@@ -126,29 +391,137 @@ class StockApiController extends BaseApiController
 			$nextXDays = $request->getQueryParams()['expiring_days'];
 		}
 
-		$expiringProducts = $this->StockService->GetExpiringProducts($nextXDays);
-		$expiredProducts = $this->StockService->GetExpiringProducts(-1);
-		$missingProducts = $this->StockService->GetMissingProducts();
-		return $this->ApiResponse(array(
+		$expiringProducts = $this->getStockService()->GetExpiringProducts($nextXDays, true);
+		$expiredProducts = $this->getStockService()->GetExpiringProducts(-1);
+		$missingProducts = $this->getStockService()->GetMissingProducts();
+		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)
 	{
-		$this->StockService->AddMissingProductsToShoppingList();
-		return $this->VoidApiActionResponse($response);
+		try
+		{
+			$requestBody = $request->getParsedBody();
+
+			$listId = 1;
+			if (array_key_exists('list_id', $requestBody) && !empty($requestBody['list_id']) && is_numeric($requestBody['list_id']))
+			{
+				$listId = intval($requestBody['list_id']);
+			}
+
+			$this->getStockService()->AddMissingProductsToShoppingList($listId);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
 	}
 
-	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)
 	{
-		$this->StockService->ClearShoppingList();
-		return $this->VoidApiActionResponse($response);
+		try
+		{
+			$requestBody = $request->getParsedBody();
+
+			$listId = 1;
+			if (array_key_exists('list_id', $requestBody) && !empty($requestBody['list_id']) && is_numeric($requestBody['list_id']))
+			{
+				$listId = intval($requestBody['list_id']);
+			}
+
+			$this->getStockService()->ClearShoppingList($listId);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
 	}
 
-	public function ExternalBarcodeLookup(\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
+		{
+			$requestBody = $request->getParsedBody();
+
+			$listId = 1;
+			$amount = 1;
+			$productId = null;
+			$note = null;
+			if (array_key_exists('list_id', $requestBody) && !empty($requestBody['list_id']) && is_numeric($requestBody['list_id']))
+			{
+				$listId = intval($requestBody['list_id']);
+			}
+			if (array_key_exists('product_amount', $requestBody) && !empty($requestBody['product_amount']) && is_numeric($requestBody['product_amount']))
+			{
+				$amount = intval($requestBody['product_amount']);
+			}
+			if (array_key_exists('product_id', $requestBody) && !empty($requestBody['product_id']) && is_numeric($requestBody['product_id']))
+			{
+				$productId = intval($requestBody['product_id']);
+			}
+			if (array_key_exists('note', $requestBody) && !empty($requestBody['note']))
+			{
+				$note = $requestBody['note'];
+			}
+
+			if ($productId == null)
+			{
+				throw new \Exception("No product id was supplied");
+			}
+
+			$this->getStockService()->AddProductToShoppingList($productId, $amount, $note, $listId);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function RemoveProductFromShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$requestBody = $request->getParsedBody();
+
+			$listId = 1;
+			$amount = 1;
+			$productId = null;
+			if (array_key_exists('list_id', $requestBody) && !empty($requestBody['list_id']) && is_numeric($requestBody['list_id']))
+			{
+				$listId = intval($requestBody['list_id']);
+			}
+			if (array_key_exists('product_amount', $requestBody) && !empty($requestBody['product_amount']) && is_numeric($requestBody['product_amount']))
+			{
+				$amount = intval($requestBody['product_amount']);
+			}
+			if (array_key_exists('product_id', $requestBody) && !empty($requestBody['product_id']) && is_numeric($requestBody['product_id']))
+			{
+				$productId = intval($requestBody['product_id']);
+			}
+
+			if ($productId == null)
+			{
+				throw new \Exception("No product id was supplied");
+			}
+
+			$this->getStockService()->RemoveProductFromShoppingList($productId, $amount, $listId);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function ExternalBarcodeLookup(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		try
 		{
@@ -158,11 +531,96 @@ class StockApiController extends BaseApiController
 				$addFoundProduct = true;
 			}
 			
-			return $this->ApiResponse($this->StockService->ExternalBarcodeLookup($args['barcode'], $addFoundProduct));
+			return $this->ApiResponse($response, $this->getStockService()->ExternalBarcodeLookup($args['barcode'], $addFoundProduct));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function UndoBooking(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$this->ApiResponse($response, $this->getStockService()->UndoBooking($args['bookingId']));
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function UndoTransaction(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$this->ApiResponse($response, $this->getStockService()->UndoTransaction($args['transactionId']));
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function ProductStockEntries(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$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->getStockService()->GetProductStockEntries($args['productId'], false, $allowSubproductSubstitution));
+	}
+
+	public function ProductStockLocations(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->ApiResponse($response, $this->getStockService()->GetProductStockLocations($args['productId']));
+	}
+
+	public function StockEntry(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->ApiResponse($response, $this->getStockService()->GetStockEntry($args['entryId']));
+	}
+
+	public function StockBooking(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$stockLogRow = $this->getDatabase()->stock_log($args['bookingId']);
+
+			if ($stockLogRow === null)
+			{
+				throw new \Exception('Stock booking does not exist');
+			}
+			
+			return $this->ApiResponse($response, $stockLogRow);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function StockTransactions(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$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($response, $transactionRows);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 }

controllers/StockController.php

@@ -2,184 +2,364 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\StockService;
-
 class StockController extends BaseController
 {
 
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->StockService = new StockService();
 	}
 
-	protected $StockService;
-
-	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->AppContainer->view->render($response, 'stockoverview', [
-			'products' => $this->Database->products()->orderBy('name'),
-			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
-			'locations' => $this->Database->locations()->orderBy('name'),
-			'currentStock' => $this->StockService->GetCurrentStock(),
-			'missingProducts' => $this->StockService->GetMissingProducts(),
-			'nextXDays' => 5
+		$usersService = $this->getUsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expring_soon_days'];
+
+		return $this->renderPage($response, 'stockoverview', [
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name'),
+			'currentStock' => $this->getStockService()->GetCurrentStock(true),
+			'currentStockLocations' => $this->getStockService()->GetCurrentStockLocations(),
+			'missingProducts' => $this->getStockService()->GetMissingProducts(),
+			'nextXDays' => $nextXDays,
+			'productGroups' => $this->getDatabase()->product_groups()->orderBy('name'),
+			'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 Stockentries(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->AppContainer->view->render($response, 'purchase', [
-			'products' => $this->Database->products()->orderBy('name')
+		$usersService = $this->getUsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expring_soon_days'];
+
+		return $this->renderPage($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,
+			'userfields' => $this->getUserfieldsService()->GetFields('products'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('products')
 		]);
 	}
 
-	public function Consume(\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->AppContainer->view->render($response, 'consume', [
-			'products' => $this->Database->products()->orderBy('name')
+		return $this->renderPage($response, 'purchase', [
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name')
 		]);
 	}
 
-	public function Inventory(\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->AppContainer->view->render($response, 'inventory', [
-			'products' => $this->Database->products()->orderBy('name')
+		return $this->renderPage($response, 'consume', [
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'recipes' => $this->getDatabase()->recipes()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name')
 		]);
 	}
 
-	public function ShoppingList(\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, 'shoppinglist', [
-			'listItems' => $this->Database->shopping_list(),
-			'products' => $this->Database->products()->orderBy('name'),
-			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
-			'missingProducts' => $this->StockService->GetMissingProducts(),
-			'productGroups' => $this->Database->product_groups()->orderBy('name')
+		return $this->renderPage($response, 'transfer', [
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'recipes' => $this->getDatabase()->recipes()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name')
 		]);
 	}
 
-	public function ProductsList(\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->AppContainer->view->render($response, 'products', [
-			'products' => $this->Database->products()->orderBy('name'),
-			'locations' => $this->Database->locations()->orderBy('name'),
-			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
-			'productGroups' => $this->Database->product_groups()->orderBy('name')
+		return $this->renderPage($response, 'inventory', [
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name')
 		]);
 	}
 
-	public function LocationsList(\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, 'locations', [
-			'locations' => $this->Database->locations()->orderBy('name')
+		return $this->renderPage($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 ProductGroupsList(\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)
 	{
-		return $this->AppContainer->view->render($response, 'productgroups', [
-			'productGroups' => $this->Database->product_groups()->orderBy('name')
+		$listId = 1;
+		if (isset($request->getQueryParams()['list']))
+		{
+			$listId = $request->getQueryParams()['list'];
+		}
+
+		return $this->renderPage($response, 'shoppinglist', [
+			'listItems' => $this->getDatabase()->shopping_list()->where('shopping_list_id = :1', $listId),
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+			'missingProducts' => $this->getStockService()->GetMissingProducts(),
+			'productGroups' => $this->getDatabase()->product_groups()->orderBy('name'),
+			'shoppingLists' => $this->getDatabase()->shopping_lists()->orderBy('name'),
+			'selectedShoppingListId' => $listId,
+			'userfields' => $this->getUserfieldsService()->GetFields('products'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('products')
 		]);
 	}
 
-	public function QuantityUnitsList(\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->AppContainer->view->render($response, 'quantityunits', [
-			'quantityunits' => $this->Database->quantity_units()->orderBy('name')
+		return $this->renderPage($response, 'products', [
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name'),
+			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+			'productGroups' => $this->getDatabase()->product_groups()->orderBy('name'),
+			'userfields' => $this->getUserfieldsService()->GetFields('products'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('products')
 		]);
 	}
 
-	public function ProductEditForm(\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'),
+			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+			'productGroups' => $this->getDatabase()->product_groups()->orderBy('name')
+		]);
+	}
+
+	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'),
+			'userfields' => $this->getUserfieldsService()->GetFields('locations'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('locations')
+		]);
+	}
+
+	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'),
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'userfields' => $this->getUserfieldsService()->GetFields('product_groups'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('product_groups')
+		]);
+	}
+
+	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'),
+			'userfields' => $this->getUserfieldsService()->GetFields('quantity_units'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('quantity_units')
+		]);
+	}
+
+	public function ProductEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['productId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'productform', [
-				'locations' =>  $this->Database->locations()->orderBy('name'),
-				'quantityunits' =>  $this->Database->quantity_units()->orderBy('name'),
-				'productgroups' => $this->Database->product_groups()->orderBy('name'),
+			return $this->renderPage($response, 'productform', [
+				'locations' =>  $this->getDatabase()->locations()->orderBy('name'),
+				'quantityunits' =>  $this->getDatabase()->quantity_units()->orderBy('name'),
+				'productgroups' => $this->getDatabase()->product_groups()->orderBy('name'),
+				'userfields' => $this->getUserfieldsService()->GetFields('products'),
+				'products' => $this->getDatabase()->products()->where('parent_product_id IS NULL')->orderBy('name'),
+				'isSubProductOfOthers' => false,
 				'mode' => 'create'
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'productform', [
-				'product' =>  $this->Database->products($args['productId']),
-				'locations' =>  $this->Database->locations()->orderBy('name'),
-				'quantityunits' =>  $this->Database->quantity_units()->orderBy('name'),
-				'productgroups' => $this->Database->product_groups()->orderBy('name'),
-				'mode' => 'edit'
+			$product = $this->getDatabase()->products($args['productId']);
+
+			return $this->renderPage($response, 'productform', [
+				'product' =>  $product,
+				'locations' =>  $this->getDatabase()->locations()->orderBy('name'),
+				'quantityunits' =>  $this->getDatabase()->quantity_units()->orderBy('name'),
+				'productgroups' => $this->getDatabase()->product_groups()->orderBy('name'),
+				'userfields' => $this->getUserfieldsService()->GetFields('products'),
+				'products' => $this->getDatabase()->products()->where('id != :1 AND parent_product_id IS NULL', $product->id)->orderBy('name'),
+				'isSubProductOfOthers' => $this->getDatabase()->products()->where('parent_product_id = :1', $product->id)->count() !== 0,
+				'mode' => 'edit',
+				'quConversions' => $this->getDatabase()->quantity_unit_conversions()
 			]);
 		}
 	}
 
-	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')
 		{
-			return $this->AppContainer->view->render($response, 'locationform', [
-				'mode' => 'create'
+			return $this->renderPage($response, 'locationform', [
+				'mode' => 'create',
+				'userfields' => $this->getUserfieldsService()->GetFields('locations')
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'locationform', [
-				'location' =>  $this->Database->locations($args['locationId']),
-				'mode' => 'edit'
+			return $this->renderPage($response, 'locationform', [
+				'location' =>  $this->getDatabase()->locations($args['locationId']),
+				'mode' => 'edit',
+				'userfields' => $this->getUserfieldsService()->GetFields('locations')
 			]);
 		}
 	}
 
-	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')
 		{
-			return $this->AppContainer->view->render($response, 'productgroupform', [
-				'mode' => 'create'
+			return $this->renderPage($response, 'productgroupform', [
+				'mode' => 'create',
+				'userfields' => $this->getUserfieldsService()->GetFields('product_groups')
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'productgroupform', [
-				'group' =>  $this->Database->product_groups($args['productGroupId']),
-				'mode' => 'edit'
+			return $this->renderPage($response, 'productgroupform', [
+				'group' =>  $this->getDatabase()->product_groups($args['productGroupId']),
+				'mode' => 'edit',
+				'userfields' => $this->getUserfieldsService()->GetFields('product_groups')
 			]);
 		}
 	}
 
-	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')
 		{
-			return $this->AppContainer->view->render($response, 'quantityunitform', [
+			return $this->renderPage($response, 'quantityunitform', [
+				'mode' => 'create',
+				'userfields' => $this->getUserfieldsService()->GetFields('quantity_units'),
+				'pluralCount' => $this->getLocalizationService()->GetPluralCount(),
+				'pluralRule' => $this->getLocalizationService()->GetPluralDefinition()
+			]);
+		}
+		else
+		{
+			$quantityUnit = $this->getDatabase()->quantity_units($args['quantityunitId']);
+
+			return $this->renderPage($response, 'quantityunitform', [
+				'quantityUnit' =>  $quantityUnit,
+				'mode' => 'edit',
+				'userfields' => $this->getUserfieldsService()->GetFields('quantity_units'),
+				'pluralCount' => $this->getLocalizationService()->GetPluralCount(),
+				'pluralRule' => $this->getLocalizationService()->GetPluralDefinition(),
+				'defaultQuConversions' => $this->getDatabase()->quantity_unit_conversions()->where('from_qu_id = :1 AND product_id IS NULL', $quantityUnit->id),
+				'quantityUnits' => $this->getDatabase()->quantity_units()
+			]);
+		}
+	}
+
+	public function ShoppingListItemEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		if ($args['itemId'] == 'new')
+		{
+			return $this->renderPage($response, 'shoppinglistitemform', [
+				'products' =>  $this->getDatabase()->products()->orderBy('name'),
+				'shoppingLists' => $this->getDatabase()->shopping_lists()->orderBy('name'),
 				'mode' => 'create'
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'quantityunitform', [
-				'quantityunit' =>  $this->Database->quantity_units($args['quantityunitId']),
+			return $this->renderPage($response, 'shoppinglistitemform', [
+				'listItem' =>  $this->getDatabase()->shopping_list($args['itemId']),
+				'products' =>  $this->getDatabase()->products()->orderBy('name'),
+				'shoppingLists' => $this->getDatabase()->shopping_lists()->orderBy('name'),
 				'mode' => 'edit'
 			]);
 		}
 	}
 
-	public function ShoppingListItemEditForm(\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['itemId'] == 'new')
+		if ($args['listId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'shoppinglistform', [
-				'products' =>  $this->Database->products()->orderBy('name'),
+			return $this->renderPage($response, 'shoppinglistform', [
 				'mode' => 'create'
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'shoppinglistform', [
-				'listItem' =>  $this->Database->shopping_list($args['itemId']),
-				'products' =>  $this->Database->products()->orderBy('name'),
+			return $this->renderPage($response, 'shoppinglistform', [
+				'shoppingList' =>  $this->getDatabase()->shopping_lists($args['listId']),
 				'mode' => 'edit'
 			]);
 		}
 	}
+
+	public function ShoppingListSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($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'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name'),
+			'products' => $this->getDatabase()->products()->orderBy('name'),
+			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name')
+		]);
+	}
+
+	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'),
+			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+			'locations' => $this->getDatabase()->locations()->orderBy('name'),
+			'currentStockLocationContent' => $this->getStockService()->GetCurrentStockLocationContent()
+		]);
+	}
+
+	public function QuantityUnitConversionEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$product = null;
+		if (isset($request->getQueryParams()['product']))
+		{
+			$product = $this->getDatabase()->products($request->getQueryParams()['product']);
+		}
+
+		$defaultQuUnit = null;
+		if (isset($request->getQueryParams()['qu-unit']))
+		{
+			$defaultQuUnit = $this->getDatabase()->quantity_units($request->getQueryParams()['qu-unit']);
+		}
+
+		if ($args['quConversionId'] == 'new')
+		{
+			return $this->renderPage($response, 'quantityunitconversionform', [
+				'mode' => 'create',
+				'userfields' => $this->getUserfieldsService()->GetFields('quantity_unit_conversions'),
+				'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+				'product' => $product,
+				'defaultQuUnit' => $defaultQuUnit
+			]);
+		}
+		else
+		{
+			return $this->renderPage($response, 'quantityunitconversionform', [
+				'quConversion' =>  $this->getDatabase()->quantity_unit_conversions($args['quConversionId']),
+				'mode' => 'edit',
+				'userfields' => $this->getUserfieldsService()->GetFields('quantity_unit_conversions'),
+				'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name'),
+				'product' => $product,
+				'defaultQuUnit' => $defaultQuUnit
+			]);
+		}
+	}
+
+	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

@@ -2,22 +2,40 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\DatabaseService;
-
 class SystemApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->DatabaseService = new DatabaseService();
 	}
 
-	protected $DatabaseService;
-
-	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)
 	{
-		return $this->ApiResponse(array(
-			'changed_time' => $this->DatabaseService->GetDbChangedTime()
-		));
+        return $this->ApiResponse($response, array(
+            'changed_time' => $this->getDatabaseService()->GetDbChangedTime()
+        ));
+	}
+
+	public function LogMissingLocalization(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		if (GROCY_MODE === 'dev')
+		{
+			try
+			{
+				$requestBody = $request->getParsedBody();
+
+				$this->getLocalizationService()->CheckAndAddMissingTranslationToPot($requestBody['text']);
+				return $this->EmptyApiResponse($response);
+			}
+			catch (\Exception $ex)
+			{
+				return $this->GenericErrorResponse($response, $ex->getMessage());
+			}
+		}
+	}
+
+	public function GetSystemInfo(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->ApiResponse($response, $this->getApplicationService()->GetSystemInfo());
 	}
 }

controllers/SystemController.php

@@ -0,0 +1,106 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\DatabaseMigrationService;
+use \Grocy\Services\DemoDataGeneratorService;
+
+class SystemController extends BaseController
+{
+
+	public function __construct(\DI\Container $container)
+	{
+		parent::__construct($container);
+	}
+
+	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_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease')
+		{
+			$demoDataGeneratorService = DemoDataGeneratorService::getInstance();
+			$demoDataGeneratorService->PopulateDemoData();
+		}
+
+		return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl($this->GetEntryPageRelative()));
+	}
+
+	/**
+	 * Get the entry page of the application based on the value of the entry page setting.
+	 *
+	 * We fallback to the about page when no entry page is specified or
+	 * when the specified entry page has been disabled.
+	 *
+	 * @return string
+	 */
+	private function GetEntryPageRelative()
+	{
+		if (defined('GROCY_ENTRY_PAGE')) {
+			$entryPage = constant('GROCY_ENTRY_PAGE');
+		} else {
+			$entryPage = 'stock';
+		}
+
+		// Stock
+		if ($entryPage === 'stock' && constant('GROCY_FEATURE_FLAG_STOCK')) {
+			return '/stockoverview';
+		}
+
+		// Shoppinglist
+		if ($entryPage === 'shoppinglist' && constant('GROCY_FEATURE_FLAG_SHOPPINGLIST')) {
+			return '/shoppinglist';
+		}
+
+		// Recipes
+		if ($entryPage === 'recipes' && constant('GROCY_FEATURE_FLAG_RECIPES')) {
+			return '/recipes';
+		}
+
+		// Chores
+		if ($entryPage === 'chores' && constant('GROCY_FEATURE_FLAG_CHORES')) {
+			return '/choresoverview';
+		}
+
+		// Tasks
+		if ($entryPage === 'tasks' && constant('GROCY_FEATURE_FLAG_TASKS')) {
+			return '/tasks';
+		}
+
+		// Batteries
+		if ($entryPage === 'batteries' && constant('GROCY_FEATURE_FLAG_BATTERIES')) {
+			return '/batteriesoverview';
+		}
+
+		if ($entryPage === 'equipment' && constant('GROCY_FEATURE_FLAG_EQUIPMENT')) {
+			return '/equipment';
+		}
+
+		// Calendar
+		if ($entryPage === 'calendar' && constant('GROCY_FEATURE_FLAG_CALENDAR')) {
+			return '/calendar';
+		}
+
+		// Meal Plan
+		if ($entryPage === 'mealplan' && constant('GROCY_FEATURE_FLAG_RECIPES')) {
+			return '/mealplan';
+		}
+
+		return '/about';
+	}
+
+	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(),
+			'changelog' => $this->getApplicationService()->GetChangelog()
+		]);
+	}
+
+	public function BarcodeScannerTesting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($response, 'barcodescannertesting');
+	}
+}

controllers/TasksApiController.php

@@ -2,39 +2,49 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\TasksService;
-
 class TasksApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->TasksService = new TasksService();
 	}
 
-	protected $TasksService;
-
-	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->TasksService->GetCurrent());
+		return $this->ApiResponse($response, $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)
 	{
-		$doneTime = date('Y-m-d H:i:s');
-		if (isset($request->getQueryParams()['done_time']) && !empty($request->getQueryParams()['done_time']) && IsIsoDateTime($request->getQueryParams()['done_time']))
-		{
-			$doneTime = $request->getQueryParams()['done_time'];
-		}
+		$requestBody = $request->getParsedBody();
 
 		try
 		{
-			$this->TasksService->MarkTaskAsCompleted($args['taskId'], $doneTime);
-			return $this->VoidApiActionResponse($response);
+			$doneTime = date('Y-m-d H:i:s');
+			if (array_key_exists('done_time', $requestBody) && IsIsoDateTime($requestBody['done_time']))
+			{
+				$doneTime = $requestBody['done_time'];
+			}
+
+			$this->getTasksService()->MarkTaskAsCompleted($args['taskId'], $doneTime);
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function UndoTask(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$this->getTasksService()->UndoTask($args['taskId']);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 }

controllers/TasksController.php

@@ -2,79 +2,90 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\TasksService;
-
 class TasksController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->TasksService = new TasksService();
 	}
 
-	protected $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']))
 		{
-			$tasks = $this->Database->tasks()->orderBy('name');
+			$tasks = $this->getDatabase()->tasks()->orderBy('name');
 		}
 		else
 		{
-			$tasks = $this->TasksService->GetCurrent();
+			$tasks = $this->getTasksService()->GetCurrent();
 		}
 
-		return $this->AppContainer->view->render($response, 'tasks', [
+		$usersService = $this->getUsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['tasks_due_soon_days'];
+
+		return $this->renderPage($response, 'tasks', [
 			'tasks' => $tasks,
-			'nextXDays' => 5,
-			'taskCategories' => $this->Database->task_categories()->orderBy('name'),
-			'users' => $this->Database->users()
+			'nextXDays' => $nextXDays,
+			'taskCategories' => $this->getDatabase()->task_categories()->orderBy('name'),
+			'users' => $this->getDatabase()->users(),
+			'userfields' => $this->getUserfieldsService()->GetFields('tasks'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('tasks')
 		]);
 	}
 
-	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')
 		{
-			return $this->AppContainer->view->render($response, 'taskform', [
+			return $this->renderPage($response, 'taskform', [
 				'mode' => 'create',
-				'taskCategories' => $this->Database->task_categories()->orderBy('name'),
-				'users' => $this->Database->users()->orderBy('username')
+				'taskCategories' => $this->getDatabase()->task_categories()->orderBy('name'),
+				'users' => $this->getDatabase()->users()->orderBy('username'),
+				'userfields' => $this->getUserfieldsService()->GetFields('tasks')
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'taskform', [
-				'task' =>  $this->Database->tasks($args['taskId']),
+			return $this->renderPage($response, 'taskform', [
+				'task' =>  $this->getDatabase()->tasks($args['taskId']),
 				'mode' => 'edit',
-				'taskCategories' => $this->Database->task_categories()->orderBy('name'),
-				'users' => $this->Database->users()->orderBy('username')
+				'taskCategories' => $this->getDatabase()->task_categories()->orderBy('name'),
+				'users' => $this->getDatabase()->users()->orderBy('username'),
+				'userfields' => $this->getUserfieldsService()->GetFields('tasks')
 			]);
 		}
 	}
 
-	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->AppContainer->view->render($response, 'taskcategories', [
-			'taskCategories' => $this->Database->task_categories()->orderBy('name')
+		return $this->renderPage($response, 'taskcategories', [
+			'taskCategories' => $this->getDatabase()->task_categories()->orderBy('name'),
+			'userfields' => $this->getUserfieldsService()->GetFields('task_categories'),
+			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('task_categories')
 		]);
 	}
 
-	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')
 		{
-			return $this->AppContainer->view->render($response, 'taskcategoryform', [
-				'mode' => 'create'
+			return $this->renderPage($response, 'taskcategoryform', [
+				'mode' => 'create',
+				'userfields' => $this->getUserfieldsService()->GetFields('task_categories')
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'taskcategoryform', [
-				'category' =>  $this->Database->task_categories($args['categoryId']),
-				'mode' => 'edit'
+			return $this->renderPage($response, 'taskcategoryform', [
+				'category' =>  $this->getDatabase()->task_categories($args['categoryId']),
+				'mode' => 'edit',
+				'userfields' => $this->getUserfieldsService()->GetFields('task_categories')
 			]);
 		}
 	}
+
+	public function TasksSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->renderPage($response, 'taskssettings');
+	}
 }

controllers/UsersApiController.php

@@ -2,70 +2,98 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\UsersService;
-
 class UsersApiController extends BaseApiController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
-		$this->UsersService = new UsersService();
 	}
 
-	protected $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->UsersService->GetUsersAsDto());
+			return $this->ApiResponse($response, $this->getUsersService()->GetUsersAsDto());
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
-	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();
 
 		try
 		{
-			$this->UsersService->CreateUser($requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
-			return $this->ApiResponse(array('success' => true));
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
+			$this->getUsersService()->CreateUser($requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
-	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
 		{
-			$this->UsersService->DeleteUser($args['userId']);
-			return $this->ApiResponse(array('success' => true));
+			$this->getUsersService()->DeleteUser($args['userId']);
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
-	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();
 
 		try
 		{
-			$this->UsersService->EditUser($args['userId'], $requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
-			return $this->ApiResponse(array('success' => true));
+			$this->getUsersService()->EditUser($args['userId'], $requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	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($response, array('value' => $value));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function SetUserSetting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$requestBody = $request->getParsedBody();
+
+			$value = $this->getUsersService()->SetUserSetting(GROCY_USER_ID, $args['settingKey'], $requestBody['value']);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 }

controllers/UsersController.php

@@ -4,25 +4,25 @@ 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->AppContainer->view->render($response, 'users', [
-			'users' => $this->Database->users()->orderBy('username')
+		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')
 		{
-			return $this->AppContainer->view->render($response, 'userform', [
+			return $this->renderPage($response, 'userform', [
 				'mode' => 'create'
 			]);
 		}
 		else
 		{
-			return $this->AppContainer->view->render($response, 'userform', [
-				'user' =>  $this->Database->users($args['userId']),
+			return $this->renderPage($response, 'userform', [
+				'user' =>  $this->getDatabase()->users($args['userId']),
 				'mode' => 'edit'
 			]);
 		}

data/viewcache/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

helpers/extensions.php

@@ -82,16 +82,26 @@ function SumArrayValue($array, $propertyName)
 	$sum = 0;
 	foreach($array as $object)
 	{
-		$sum += $object->{$propertyName};
+		$sum += floatval($object->{$propertyName});
 	}
 
 	return $sum;
 }
 
-function GetClassConstants($className)
+function GetClassConstants($className, $prefix = null)
 {
 	$r = new ReflectionClass($className);
-	return $r->getConstants();
+	$constants = $r->getConstants();
+
+	if ($prefix === null)
+	{
+		return $constants;
+	}
+	else
+	{
+		$matchingKeys = preg_grep('!^' . $prefix . '!', array_keys($constants));
+		return array_intersect_key($constants, array_flip($matchingKeys));
+	}
 }
 
 function RandomString($length, $allowedChars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
@@ -138,6 +148,21 @@ function Setting(string $name, $value)
 		{
 			define('GROCY_' . $name, file_get_contents($settingOverrideFile));
 		}
+		elseif (getenv('GROCY_' . $name) !== false) // An environment variable with the same name and prefix GROCY_ overwrites the given setting
+		{
+			if (strtolower(getenv('GROCY_' . $name)) === "true")
+			{
+				define('GROCY_' . $name, true);
+			}
+			elseif (strtolower(getenv('GROCY_' . $name)) === "false")
+			{
+				define('GROCY_' . $name, false);
+			}
+			else
+			{
+				define('GROCY_' . $name, getenv('GROCY_' . $name));
+			}
+		}
 		else
 		{
 			define('GROCY_' . $name, $value);
@@ -145,6 +170,17 @@ function Setting(string $name, $value)
 	}
 }
 
+global $GROCY_DEFAULT_USER_SETTINGS;
+$GROCY_DEFAULT_USER_SETTINGS = array();
+function DefaultUserSetting(string $name, $value)
+{
+	global $GROCY_DEFAULT_USER_SETTINGS;
+	if (!array_key_exists($name, $GROCY_DEFAULT_USER_SETTINGS))
+	{
+		$GROCY_DEFAULT_USER_SETTINGS[$name] = $value;
+	}
+}
+
 function GetUserDisplayName($user)
 {
 	$displayName = '';
@@ -169,22 +205,34 @@ function GetUserDisplayName($user)
 	return $displayName;
 }
 
-function Pluralize($number, $singularForm, $pluralForm)
-{
-	$text = $singularForm;
-	if ($number != 1 && $pluralForm !== null && !empty($pluralForm))
-	{
-		$text = $pluralForm;
-	}
-	return $text;
-}
-
 function IsValidFileName($fileName)
 {
-	if(preg_match('#^[a-z0-9]+\.[a-z]+?$#i', $fileName))
+	if(preg_match('=^[^/?*;:{}\\\\]+\.[^/?*;:{}\\\\]+$=', $fileName))
 	{
 		return true;
 	}
 
 	return false;
 }
+
+function IsJsonString($text)
+{
+	json_decode($text);
+	return (json_last_error() == JSON_ERROR_NONE);
+}
+
+function string_starts_with($haystack, $needle)
+{
+	return (substr($haystack, 0, strlen($needle)) === $needle);
+}
+
+function string_ends_with($haystack, $needle)
+{
+	$length = strlen($needle);
+	if ($length == 0)
+	{
+		return true;
+	}
+
+	return (substr($haystack, -$length) === $needle);
+}