Prepared next release

Instead of the hours since midnight now just "Today" will be shown

.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=90
+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
+popd

.gitignore

@@ -1,3 +1,4 @@
 /public/node_modules
 /vendor
 /.release
+embedded.txt

.tx/config

@@ -0,0 +1,38 @@
+[main]
+host = https://www.transifex.com
+
+[grocy.chore_types]
+file_filter = localization/<lang>/chore_types.po
+source_file = localization/chore_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

@@ -2,28 +2,43 @@
 ERP beyond your fridge
 
 ## Give it a try
-Public demo of the latest version → [https://demo.grocy.info](https://demo.grocy.info) 
+- 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.
 
 ## 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.
-
-## What it is about
-For now my main focus is on stock management, 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
-Just unpack the [latest release](https://github.com/berrnd/grocy/releases/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.
+> **NEW**
+>
+> 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/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"...
 
-Default login is user `admin` with password `admin` - see the `data/config.php` file. Alternatively clone this repository and install Composer and Yarn dependencies manually.
+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.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).
+
+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, however, your webserver does not support URL rewriting, set `DISABLE_URL_REWRITING` in `data/config.php` (`Setting('DISABLE_URL_REWRITING', true);`).
 
+## How to run using Docker
+
+See [grocy/grocy-docker](https://github.com/grocy/grocy-docker) 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` (the default from values `config-dist.php` will be used for not in `data/config.php` defined settings).
+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`.
+
+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.
@@ -39,10 +54,12 @@ Some fields also allow to select a value by scanning a barcode. It works best wh
 ### Input shorthands for date fields
 For (productivity) reasons all date (and time) input 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 in proper notation
+- `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`
 - `YYYYMMDD` gets expanded to the proper ISO-8601 notation
   - Example: `20190417` will be converted to `2019-04-17`
+- `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
 - Right/left arrow keys will increase/decrease the date by 1 week
@@ -59,22 +76,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).
 
-### 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.
+### 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.
+
+### Embedded mode
+When the file `embedded.txt` exists, it must contain a valid and writable path which will be used as the data directory instead of `data` and authentication will be disabled (used in [grocy-desktop](https://github.com/grocy/grocy-desktop)).
+
+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
+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.
+
+New ideas are also very welcome, feel free to open an issue to discuss them.
+
 ## 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

@@ -6,10 +6,49 @@ use \Psr\Http\Message\ResponseInterface as Response;
 use \Grocy\Helpers\UrlManager;
 use \Grocy\Controllers\LoginController;
 
+// Definitions for embedded mode
+if (file_exists(__DIR__ . '/embedded.txt'))
+{
+	define('GROCY_IS_EMBEDDED_INSTALL', true);
+	define('GROCY_DATAPATH', file_get_contents(__DIR__ . '/embedded.txt'));
+	define('GROCY_USER_ID', 1);
+}
+else
+{
+	define('GROCY_IS_EMBEDDED_INSTALL', false);
+	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';
-require_once __DIR__ . '/data/config.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
 
+// 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' => [
@@ -18,7 +57,7 @@ $appContainer = new \Slim\Container([
 	],
 	'view' => function($container)
 	{
-		return new \Slim\Views\Blade(__DIR__ . '/views', __DIR__ . '/data/viewcache');
+		return new \Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
 	},
 	'LoginControllerInstance' => function($container)
 	{
@@ -26,7 +65,7 @@ $appContainer = new \Slim\Container([
 	},
 	'UrlManager' => function($container)
 	{
-		return new UrlManager(BASE_URL);
+		return new UrlManager(GROCY_BASE_URL);
 	},
 	'ApiKeyHeaderName' => function($container)
 	{
@@ -35,11 +74,7 @@ $appContainer = new \Slim\Container([
 ]);
 $app = new \Slim\App($appContainer);
 
-if (PHP_SAPI === 'cli')
-{
-	$app->add(\pavlakis\cli\CliRequest::class);
-}
-
+// Load routes from separate file
 require_once __DIR__ . '/routes.php';
 
 $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\sessions 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-en.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://demo-it.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://demo-it.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-en.grocy.info/recipes
+- Added norwegian translation (thanks @BlizzWave)
+  - Demo available at: => https://demo-no.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://demo-fr.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-en.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-en.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://demo-es.grocy.info)
+  - Turkish (demo available at https://demo-tr.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://demo-ru.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://demo-sv.grocy.info)
+  - Polish (demo available at https://demo-pl.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/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,11 +1,13 @@
 {
 	"require": {
 		"php": ">=7.2",
-		"slim/slim": "^3.8",
-		"morris/lessql": "^0.3.4",
-		"pavlakis/slim-cli": "^1.0",
+		"slim/slim": "^3.12.1",
+		"morris/lessql": "^0.4.1",
 		"rubellum/slim-blade-view": "^0.1.1",
-		"tuupola/cors-middleware": "^0.7.0"
+		"tuupola/cors-middleware": "^0.9.4",
+		"eluceo/ical": "^0.15.0",
+		"erusev/parsedown": "^1.7.3",
+		"gettext/gettext": "^4.6.2"
 	},
 	"autoload": {
 		"psr-4": {

config-dist.php

@@ -1,19 +1,40 @@
 <?php
 
-# Login credentials
-Setting('HTTP_USER', 'admin');
-Setting('HTTP_PASSWORD', 'admin');
+# 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" or "dev"
+
+# Either "production", "dev" or "prerelease"
 Setting('MODE', 'production');
 
 # Either "en" or "de" or the filename (without extension) of
 # one of the other available localization files in the "/localization" directory
 Setting('CULTURE', 'en');
 
+# This is used to define the first day of a week for calendar views in the frontend,
+# leave empty to use the locale default
+# Needs to be a number where Sunday = 0, Monday = 1 and so forth
+Setting('CALENDAR_FIRST_DAY_OF_WEEK', '');
+
+# To keep it simple: grocy does not handle any currency conversions,
+# this here is used to format all money values,
+# so doesn't matter really matter, but should be the
+# ISO 4217 code of the currency ("USD", "EUR", "GBP", etc.)
+Setting('CURRENCY', 'USD');
+
 # The base url of your installation,
 # should be just "/" when running directly under the root of a (sub)domain
-# or for example "https:/example.com/grocy" when using a subdirectory
+# or for example "https://example.com/grocy" when using a subdirectory
 Setting('BASE_URL', '/');
 
 # The plugin to use for external barcode lookups,
@@ -24,3 +45,68 @@ Setting('STOCK_BARCODE_LOOKUP_PLUGIN', 'DemoBarcodeLookupPlugin');
 # If, however, your webserver does not support URL rewriting,
 # set this to true
 Setting('DISABLE_URL_REWRITING', false);
+
+# 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);
+
+
+
+
+# Default user settings
+# These settings can be changed per user, here the defaults
+# are defined which are used when the user has not changed the setting so far
+
+# Night mode related
+DefaultUserSetting('night_mode_enabled', false); // If night mode is enabled always
+DefaultUserSetting('auto_night_mode_enabled', false); // If night mode is enabled automatically when inside a given time range (see the two settings below)
+DefaultUserSetting('auto_night_mode_time_range_from', "20:00"); // Format HH:mm
+DefaultUserSetting('auto_night_mode_time_range_to', "07:00"); // Format HH:mm
+DefaultUserSetting('auto_night_mode_time_range_goes_over_midnight', true); // If the time range above goes over midnight
+DefaultUserSetting('currently_inside_night_mode_range', false); // If we're currently inside of night mode time range (this is not user configurable, but stored as a user setting because it's evaluated client side to be able to use the client time instead of the maybe different server time)
+
+# Stock settings
+DefaultUserSetting('product_presets_location_id', -1); // Default location id for new products (-1 means no location is preset)
+DefaultUserSetting('product_presets_product_group_id', -1); // Default product group id for new products (-1 means no product group is preset)
+DefaultUserSetting('product_presets_qu_id', -1); // Default quantity unit id for new products (-1 means no quantity unit is preset)
+DefaultUserSetting('stock_expring_soon_days', 5);
+DefaultUserSetting('stock_default_purchase_amount', 0);
+DefaultUserSetting('stock_default_consume_amount', 1);
+
+# Chores settings
+DefaultUserSetting('chores_due_soon_days', 5);
+
+# Batteries settings
+DefaultUserSetting('batteries_due_soon_days', 5);
+
+# Tasks settings
+DefaultUserSetting('tasks_due_soon_days', 5);
+
+# If the page should be automatically reloaded when there was
+# an external change
+DefaultUserSetting('auto_reload_on_db_change', true);
+
+# Show a clock in the header next to the logo or not
+DefaultUserSetting('show_clock_in_header', false);
+
+# Shopping list to stock workflow:
+# Automatically do the booking using the last price and the amount
+# of the shopping list item, if the product has "Default best before days" set
+DefaultUserSetting('shopping_list_to_stock_workflow_auto_submit_when_prefilled', false);
+
+
+
+
+# Feature flags
+# grocy was initially about "stock management for your household", many other things
+# came and still come by, because they are useful - here you can disable the parts
+# which you don't need to have a less cluttered UI
+# (set the setting to "false" to disable the corresponding part, which should be self explanatory)
+Setting('FEATURE_FLAG_STOCK', true);
+Setting('FEATURE_FLAG_SHOPPINGLIST', true);
+Setting('FEATURE_FLAG_RECIPES', true);
+Setting('FEATURE_FLAG_CHORES', true);
+Setting('FEATURE_FLAG_TASKS', true);
+Setting('FEATURE_FLAG_BATTERIES', true);
+Setting('FEATURE_FLAG_EQUIPMENT', true);
+Setting('FEATURE_FLAG_CALENDAR', true);

controllers/BaseApiController.php

@@ -18,10 +18,14 @@ class BaseApiController extends BaseController
 		return json_encode($data);
 	}
 
-	protected function VoidApiActionResponse($response, $success = true, $status = 200, $errorMessage = '')
+	protected function EmptyApiResponse($response, $status = 204)
+	{
+		return $response->withStatus($status);
+	}
+
+	protected function GenericErrorResponse($response, $errorMessage, $status = 400)
 	{
 		return $response->withStatus($status)->withJson(array(
-			'success' => $success,
 			'error_message' => $errorMessage
 		));
 	}

controllers/BaseController.php

@@ -5,6 +5,7 @@ namespace Grocy\Controllers;
 use \Grocy\Services\DatabaseService;
 use \Grocy\Services\ApplicationService;
 use \Grocy\Services\LocalizationService;
+use \Grocy\Services\UsersService;
 
 class BaseController
 {
@@ -12,24 +13,74 @@ class BaseController
 		$databaseService = new DatabaseService();
 		$this->Database = $databaseService->GetDbConnection();
 		
-		$localizationService = new LocalizationService(CULTURE);
+		$localizationService = new LocalizationService(GROCY_CULTURE);
 		$this->LocalizationService = $localizationService;
 
-		$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)
+		if (GROCY_MODE === 'prerelease')
 		{
-			return $localizationService->Localize($text, ...$placeholderValues);
+			$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('__t', function(string $text, ...$placeholderValues) use($localizationService)
+		{
+			return $localizationService->__t($text, $placeholderValues);
 		});
+		$container->view->set('__n', function($number, $singularForm, $pluralForm) use($localizationService)
+		{
+			return $localizationService->__n($number, $singularForm, $pluralForm);
+		});
+		$container->view->set('GettextPo', $localizationService->GetPoAsJsonString());
+
 		$container->view->set('U', function($relativePath, $isResource = false) use($container)
 		{
 			return $container->UrlManager->ConstructUrl($relativePath, $isResource);
 		});
 
+		$embedded = false;
+		if (isset($container->request->getQueryParams()['embedded']))
+		{
+			$embedded = true;
+		}
+		$container->view->set('embedded', $embedded);
+
+		$constants = get_defined_constants();
+		foreach ($constants as $constant => $value)
+		{
+			if (substr($constant, 0, 19) !== 'GROCY_FEATURE_FLAG_')
+			{
+				unset($constants[$constant]);
+			}
+		}
+		$container->view->set('featureFlags', $constants);
+
+		try
+		{
+			$usersService = new UsersService();
+			if (defined('GROCY_USER_ID'))
+			{
+				$container->view->set('userSettings', $usersService->GetUserSettings(GROCY_USER_ID));
+			}
+			else
+			{
+				$container->view->set('userSettings', null);
+			}
+		}
+		catch (\Exception $ex)
+		{
+			// Happens when database is not initialised or migrated...
+		}
+
 		$this->AppContainer = $container;
 	}
 

controllers/BatteriesApiController.php

@@ -16,20 +16,22 @@ class BatteriesApiController extends BaseApiController
 
 	public function TrackChargeCycle(\Slim\Http\Request $request, \Slim\Http\Response $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->BatteriesService->TrackChargeCycle($args['batteryId'], $trackedTime);
+			return $this->ApiResponse($this->Database->battery_charge_cycles($chargeCycleId));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
@@ -41,7 +43,25 @@ class BatteriesApiController extends BaseApiController
 		}
 		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)
+	{
+		return $this->ApiResponse($this->BatteriesService->GetCurrent());
+	}
+
+	public function UndoChargeCycle(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$this->ApiResponse($this->BatteriesService->UndoChargeCycle($args['chargeCycleId']));
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 }

controllers/BatteriesController.php

@@ -3,6 +3,8 @@
 namespace Grocy\Controllers;
 
 use \Grocy\Services\BatteriesService;
+use \Grocy\Services\UsersService;
+use \Grocy\Services\UserfieldsService;
 
 class BatteriesController extends BaseController
 {
@@ -10,28 +12,23 @@ class BatteriesController extends BaseController
 	{
 		parent::__construct($container);
 		$this->BatteriesService = new BatteriesService();
+		$this->UserfieldsService = new UserfieldsService();
 	}
 
 	protected $BatteriesService;
+	protected $UserfieldsService;
 
 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$nextChargeTimes = array();
-		foreach($this->Database->batteries() as $battery)
-		{
-			$nextChargeTimes[$battery->id] = $this->BatteriesService->GetNextChargeTime($battery->id);
-		}
+		$usersService = new UsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['batteries_due_soon_days'];
 
-		$nextXDays = 5;
-		$countDueNextXDays = count(FindAllItemsInArrayByValue($nextChargeTimes, date('Y-m-d', strtotime("+$nextXDays days")), '<'));
-		$countOverdue = count(FindAllItemsInArrayByValue($nextChargeTimes, date('Y-m-d', strtotime('-1 days')), '<'));
 		return $this->AppContainer->view->render($response, 'batteriesoverview', [
 			'batteries' => $this->Database->batteries()->orderBy('name'),
 			'current' => $this->BatteriesService->GetCurrent(),
-			'nextChargeTimes' => $nextChargeTimes,
 			'nextXDays' => $nextXDays,
-			'countDueNextXDays' => $countDueNextXDays - $countOverdue,
-			'countOverdue' => $countOverdue
+			'userfields' => $this->UserfieldsService->GetFields('batteries'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('batteries')
 		]);
 	}
 
@@ -45,7 +42,9 @@ class BatteriesController extends BaseController
 	public function BatteriesList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'batteries', [
-			'batteries' => $this->Database->batteries()->orderBy('name')
+			'batteries' => $this->Database->batteries()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('batteries'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('batteries')
 		]);
 	}
 
@@ -54,15 +53,30 @@ class BatteriesController extends BaseController
 		if ($args['batteryId'] == 'new')
 		{
 			return $this->AppContainer->view->render($response, 'batteryform', [
-				'mode' => 'create'
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('batteries')
 			]);
 		}
 		else
 		{
 			return $this->AppContainer->view->render($response, 'batteryform', [
 				'battery' =>  $this->Database->batteries($args['batteryId']),
-				'mode' => 'edit'
+				'mode' => 'edit',
+				'userfields' => $this->UserfieldsService->GetFields('batteries')
 			]);
 		}
 	}
+
+	public function Journal(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'batteriesjournal', [
+			'chargeCycles' => $this->Database->battery_charge_cycles()->orderBy('tracked_time', 'DESC'),
+			'batteries' => $this->Database->batteries()->orderBy('name')
+		]);
+	}
+
+	public function BatteriesSettings(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'batteriessettings');
+	}
 }

controllers/CalendarApiController.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\CalendarService;
+use \Grocy\Services\ApiKeyService;
+
+class CalendarApiController extends BaseApiController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->CalendarService = new CalendarService();
+		$this->ApiKeyService = new ApiKeyService();
+	}
+
+	protected $CalendarService;
+	protected $ApiKeyService;
+
+	public function Ical(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$vCalendar = new \Eluceo\iCal\Component\Calendar('grocy');
+
+			$events = $this->CalendarService->GetEvents();
+			foreach($events as $event)
+			{
+				$vEvent = new \Eluceo\iCal\Component\Event();
+				$vEvent->setDtStart(new \DateTime($event['start']))
+					->setDtEnd(new \DateTime($event['start']))
+					->setSummary($event['title'])
+					->setNoTime($event['date_format'] === 'date')
+					->setUseUtc(false);
+				
+				$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(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			return $this->ApiResponse(array(
+				'url' => $this->AppContainer->UrlManager->ConstructUrl('/api/calendar/ical?secret=' . $this->ApiKeyService->GetOrCreateApiKey(ApiKeyService::API_KEY_TYPE_SPECIAL_PURPOSE_CALENDAR_ICAL))
+			));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+}

controllers/CalendarController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\CalendarService;
+
+class CalendarController extends BaseController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->CalendarService = new CalendarService();
+	}
+
+	protected $CalendarService;
+
+	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'calendar', [
+			'fullcalendarEventSources' => $this->CalendarService->GetEvents()
+		]);
+	}
+}

controllers/ChoresApiController.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\ChoresService;
+
+class ChoresApiController extends BaseApiController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->ChoresService = new ChoresService();
+	}
+
+	protected $ChoresService;
+
+	public function TrackChoreExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+
+		try
+		{
+			$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->ChoresService->TrackChore($args['choreId'], $trackedTime, $doneBy);
+			return $this->ApiResponse($this->Database->chores_log($choreExecutionId));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function ChoreDetails(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			return $this->ApiResponse($this->ChoresService->GetChoreDetails($args['choreId']));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function Current(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->ApiResponse($this->ChoresService->GetCurrent());
+	}
+
+	public function UndoChoreExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$this->ApiResponse($this->ChoresService->UndoChoreExecution($args['executionId']));
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+}

controllers/ChoresController.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\ChoresService;
+use \Grocy\Services\UsersService;
+use \Grocy\Services\UserfieldsService;
+
+class ChoresController extends BaseController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->ChoresService = new ChoresService();
+		$this->UserfieldsService = new UserfieldsService();
+	}
+
+	protected $ChoresService;
+	protected $UserfieldsService;
+
+	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$usersService = new UsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['chores_due_soon_days'];
+
+		return $this->AppContainer->view->render($response, 'choresoverview', [
+			'chores' => $this->Database->chores()->orderBy('name'),
+			'currentChores' => $this->ChoresService->GetCurrent(),
+			'nextXDays' => $nextXDays,
+			'userfields' => $this->UserfieldsService->GetFields('chores'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('chores')
+		]);
+	}
+
+	public function TrackChoreExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'choretracking', [
+			'chores' => $this->Database->chores()->orderBy('name'),
+			'users' => $this->Database->users()->orderBy('username')
+		]);
+	}
+
+	public function ChoresList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'chores', [
+			'chores' => $this->Database->chores()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('chores'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('chores')
+		]);
+	}
+
+	public function Journal(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'choresjournal', [
+			'choresLog' => $this->Database->chores_log()->orderBy('tracked_time', 'DESC'),
+			'chores' => $this->Database->chores()->orderBy('name'),
+			'users' => $this->Database->users()->orderBy('username')
+		]);
+	}
+
+	public function ChoreEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['choreId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'choreform', [
+				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService'),
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('chores')
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'choreform', [
+				'chore' =>  $this->Database->chores($args['choreId']),
+				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService'),
+				'mode' => 'edit',
+				'userfields' => $this->UserfieldsService->GetFields('chores')
+			]);
+		}
+	}
+
+	public function ChoresSettings(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'choressettings');
+	}
+}

controllers/CliController.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Grocy\Controllers;
-
-use \Grocy\Services\ApplicationService;
-use \Grocy\Services\DatabaseMigrationService;
-
-class CliController extends BaseController
-{
-	public function RecreateDemo(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		$applicationService = new ApplicationService();
-		if ($applicationService->IsDemoInstallation())
-		{
-			$databaseMigrationService = new DatabaseMigrationService();
-			$databaseMigrationService->RecreateDemo();
-		}
-	}
-}

controllers/EquipmentController.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\UserfieldsService;
+
+class EquipmentController extends BaseController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->UserfieldsService = new UserfieldsService();
+	}
+
+	protected $UserfieldsService;
+
+	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'equipment', [
+			'equipment' => $this->Database->equipment()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('equipment'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('equipment')
+		]);
+	}
+
+	public function EditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['equipmentId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'equipmentform', [
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('equipment')
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'equipmentform', [
+				'equipment' =>  $this->Database->equipment($args['equipmentId']),
+				'mode' => 'edit',
+				'userfields' => $this->UserfieldsService->GetFields('equipment')
+			]);
+		}
+	}
+}

controllers/FilesApiController.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\FilesService;
+
+class FilesApiController extends BaseApiController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->FilesService = new FilesService();
+	}
+
+	protected $FilesService;
+
+	public function UploadFile(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			if (IsValidFileName(base64_decode($args['fileName'])))
+			{
+				$fileName = base64_decode($args['fileName']);
+			}
+			else
+			{
+				throw new \Exception('Invalid filename');
+			}
+
+			$data = $request->getBody()->getContents();
+			file_put_contents($this->FilesService->GetFilePath($args['group'], $fileName), $data);
+
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function ServeFile(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			if (IsValidFileName(base64_decode($args['fileName'])))
+			{
+				$fileName = base64_decode($args['fileName']);
+			}
+			else
+			{
+				throw new \Exception('Invalid filename');
+			}
+
+			$filePath = $this->FilesService->GetFilePath($args['group'], $fileName);
+
+			if (file_exists($filePath))
+			{
+				$response->write(file_get_contents($filePath));
+				$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(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			if (IsValidFileName(base64_decode($args['fileName'])))
+			{
+				$fileName = base64_decode($args['fileName']);
+			}
+			else
+			{
+				throw new \Exception('Invalid filename');
+			}
+
+			$filePath = $this->FilesService->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

@@ -2,29 +2,39 @@
 
 namespace Grocy\Controllers;
 
+use \Grocy\Services\UserfieldsService;
+
 class GenericEntityApiController extends BaseApiController
 {
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->UserfieldsService = new UserfieldsService();
+	}
+
+	protected $UserfieldsService;
+
 	public function GetObjects(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		if ($this->IsValidEntity($args['entity']))
+		if ($this->IsValidEntity($args['entity']) && !$this->IsEntityWithPreventedListing($args['entity']))
 		{
 			return $this->ApiResponse($this->Database->{$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)
 	{
-		if ($this->IsValidEntity($args['entity']))
+		if ($this->IsValidEntity($args['entity']) && !$this->IsEntityWithPreventedListing($args['entity']))
 		{
 			return $this->ApiResponse($this->Database->{$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');
 		}
 	}
 
@@ -32,14 +42,30 @@ class GenericEntityApiController extends BaseApiController
 	{
 		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->Database->{$args['entity']}()->createRow($requestBody);
+				$newRow->save();
+				$success = $newRow->isClean();
+				return $this->ApiResponse(array(
+					'created_object_id' => $this->Database->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');
 		}
 	}
 
@@ -47,14 +73,28 @@ class GenericEntityApiController extends BaseApiController
 	{
 		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->Database->{$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');
 		}
 	}
 
@@ -65,11 +105,43 @@ class GenericEntityApiController extends BaseApiController
 			$row = $this->Database->{$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 GetUserfields(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			return $this->ApiResponse($this->UserfieldsService->GetValues($args['entity'], $args['objectId']));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function SetUserfields(\Slim\Http\Request $request, \Slim\Http\Response $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->UserfieldsService->SetValues($args['entity'], $args['objectId'], $requestBody);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
@@ -77,4 +149,9 @@ class GenericEntityApiController extends BaseApiController
 	{
 		return in_array($entity, $this->OpenApiSpec->components->internalSchemas->ExposedEntity->enum);
 	}
+
+	private function IsEntityWithPreventedListing($entity)
+	{
+		return in_array($entity, $this->OpenApiSpec->components->internalSchemas->ExposedEntitiesPreventListing->enum);
+	}
 }

controllers/GenericEntityController.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\UserfieldsService;
+
+class GenericEntityController extends BaseController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->UserfieldsService = new UserfieldsService();
+	}
+
+	protected $UserfieldsService;
+
+	public function UserfieldsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'userfields', [
+			'userfields' => $this->UserfieldsService->GetAllFields(),
+			'entities' => $this->UserfieldsService->GetEntities()
+		]);
+	}
+
+	public function UserfieldEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['userfieldId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'userfieldform', [
+				'mode' => 'create',
+				'userfieldTypes' => $this->UserfieldsService->GetFieldTypes(),
+				'entities' => $this->UserfieldsService->GetEntities()
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'userfieldform', [
+				'mode' => 'edit',
+				'userfield' =>  $this->UserfieldsService->GetField($args['userfieldId']),
+				'userfieldTypes' => $this->UserfieldsService->GetFieldTypes(),
+				'entities' => $this->UserfieldsService->GetEntities()
+			]);
+		}
+	}
+}

controllers/HabitsApiController.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace Grocy\Controllers;
-
-use \Grocy\Services\HabitsService;
-
-class HabitsApiController extends BaseApiController
-{
-	public function __construct(\Slim\Container $container)
-	{
-		parent::__construct($container);
-		$this->HabitsService = new HabitsService();
-	}
-
-	protected $HabitsService;
-
-	public function TrackHabitExecution(\Slim\Http\Request $request, \Slim\Http\Response $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'];
-		}
-
-		try
-		{
-			$this->HabitsService->TrackHabit($args['habitId'], $trackedTime);
-			return $this->VoidApiActionResponse($response);
-		}
-		catch (\Exception $ex)
-		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
-		}
-	}
-
-	public function HabitDetails(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		try
-		{
-			return $this->ApiResponse($this->HabitsService->GetHabitDetails($args['habitId']));
-		}
-		catch (\Exception $ex)
-		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
-		}
-	}
-}

controllers/HabitsController.php

@@ -1,70 +0,0 @@
-<?php
-
-namespace Grocy\Controllers;
-
-use \Grocy\Services\HabitsService;
-
-class HabitsController extends BaseController
-{
-	public function __construct(\Slim\Container $container)
-	{
-		parent::__construct($container);
-		$this->HabitsService = new HabitsService();
-	}
-
-	protected $HabitsService;
-
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		$nextHabitTimes = array();
-		foreach($this->Database->habits() as $habit)
-		{
-			$nextHabitTimes[$habit->id] = $this->HabitsService->GetNextHabitTime($habit->id);
-		}
-
-		$nextXDays = 5;
-		$countDueNextXDays = count(FindAllItemsInArrayByValue($nextHabitTimes, date('Y-m-d', strtotime("+$nextXDays days")), '<'));
-		$countOverdue = count(FindAllItemsInArrayByValue($nextHabitTimes, date('Y-m-d', strtotime('-1 days')), '<'));
-		return $this->AppContainer->view->render($response, 'habitsoverview', [
-			'habits' => $this->Database->habits()->orderBy('name'),
-			'currentHabits' => $this->HabitsService->GetCurrentHabits(),
-			'nextHabitTimes' => $nextHabitTimes,
-			'nextXDays' => $nextXDays,
-			'countDueNextXDays' => $countDueNextXDays - $countOverdue,
-			'countOverdue' => $countOverdue
-		]);
-	}
-
-	public function TrackHabitExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		return $this->AppContainer->view->render($response, 'habittracking', [
-			'habits' => $this->Database->habits()->orderBy('name')
-		]);
-	}
-
-	public function HabitsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		return $this->AppContainer->view->render($response, 'habits', [
-			'habits' => $this->Database->habits()->orderBy('name')
-		]);
-	}
-
-	public function HabitEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		if ($args['habitId'] == 'new')
-		{
-			return $this->AppContainer->view->render($response, 'habitform', [
-				'periodTypes' => GetClassConstants('\Grocy\Services\HabitsService'),
-				'mode' => 'create'
-			]);
-		}
-		else
-		{
-			return $this->AppContainer->view->render($response, 'habitform', [
-				'habit' =>  $this->Database->habits($args['habitId']),
-				'periodTypes' => GetClassConstants('\Grocy\Services\HabitsService'),
-				'mode' => 'edit'
-			]);
-		}
-	}
-}

controllers/LoginController.php

@@ -3,7 +3,6 @@
 namespace Grocy\Controllers;
 
 use \Grocy\Services\SessionService;
-use \Grocy\Services\ApplicationService;
 use \Grocy\Services\DatabaseMigrationService;
 use \Grocy\Services\DemoDataGeneratorService;
 
@@ -24,10 +23,21 @@ class LoginController extends BaseController
 		$postParams = $request->getParsedBody();
 		if (isset($postParams['username']) && isset($postParams['password']))
 		{
-			if ($postParams['username'] === HTTP_USER && $postParams['password'] === HTTP_PASSWORD)
+			$user = $this->Database->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();
-				setcookie($this->SessionCookieName, $sessionKey, time() + 31536000); // Cookie expires in 1 year, but session validity is up to SessionService
+				$sessionKey = $this->SessionService->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))
+				{
+					$user->update(array(
+						'password' => password_hash($inputPassword, PASSWORD_DEFAULT)
+					));
+				}
 
 				return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/'));
 			}
@@ -53,22 +63,6 @@ class LoginController extends BaseController
 		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();
-
-		$applicationService = new ApplicationService();
-		if ($applicationService->IsDemoInstallation())
-		{
-			$demoDataGeneratorService = new DemoDataGeneratorService();
-			$demoDataGeneratorService->PopulateDemoData();
-		}
-
-		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/stockoverview'));
-	}
-
 	public function GetSessionCookieName()
 	{
 		return $this->SessionCookieName;

controllers/OpenApiController.php

@@ -35,7 +35,8 @@ class OpenApiController extends BaseApiController
 	public function ApiKeysList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'manageapikeys', [
-			'apiKeys' => $this->Database->api_keys()
+			'apiKeys' => $this->Database->api_keys(),
+			'users' => $this->Database->users()
 		]);
 	}
 

controllers/RecipesApiController.php

@@ -1,22 +1,68 @@
-<?php
-
-namespace Grocy\Controllers;
-
-use \Grocy\Services\RecipesService;
-
-class RecipesApiController extends BaseApiController
-{
-	public function __construct(\Slim\Container $container)
-	{
-		parent::__construct($container);
-		$this->RecipesService = new RecipesService();
-	}
-
-	protected $RecipesService;
-
-	public function AddNotFulfilledProductsToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		$this->RecipesService->AddNotFulfilledProductsToShoppingList($args['recipeId']);
-		return $this->VoidApiActionResponse($response);
-	}
-}
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\RecipesService;
+
+class RecipesApiController extends BaseApiController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->RecipesService = new RecipesService();
+	}
+
+	protected $RecipesService;
+
+	public function AddNotFulfilledProductsToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+		$excludedProductIds = null;
+
+		if ($requestBody !== null && array_key_exists('excludedProductIds', $requestBody))
+		{
+			$excludedProductIds = $requestBody['excludedProductIds'];
+		}
+		
+		$this->RecipesService->AddNotFulfilledProductsToShoppingList($args['recipeId'], $excludedProductIds);
+		return $this->EmptyApiResponse($response);
+	}
+
+	public function ConsumeRecipe(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$this->RecipesService->ConsumeRecipe($args['recipeId']);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function GetRecipeFulfillment(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{ 
+			if(!isset($args['recipeId']))
+			{
+				return $this->ApiResponse($this->RecipesService->GetRecipesResolved());
+			}
+
+			$recipeResolved = FindObjectInArrayByPropertyValue($this->RecipesService->GetRecipesResolved(), 'recipe_id', $args['recipeId']);
+			if(!$recipeResolved)
+			{
+				throw new \Exception('Recipe does not exist');
+			}
+			else
+			{
+				return $this->ApiResponse($recipeResolved);
+			}
+		} 
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+}

controllers/RecipesController.php

@@ -3,6 +3,7 @@
 namespace Grocy\Controllers;
 
 use \Grocy\Services\RecipesService;
+use \Grocy\Services\UserfieldsService;
 
 class RecipesController extends BaseController
 {
@@ -10,39 +11,65 @@ class RecipesController extends BaseController
 	{
 		parent::__construct($container);
 		$this->RecipesService = new RecipesService();
+		$this->UserfieldsService = new UserfieldsService();
 	}
 
 	protected $RecipesService;
+	protected $UserfieldsService;
 
 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$recipes = $this->Database->recipes()->orderBy('name');
+		if (isset($request->getQueryParams()['include-internal']))
+		{
+			$recipes = $this->Database->recipes()->orderBy('name');
+		}
+		else
+		{
+			$recipes = $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name');
+		}
+		$recipesResolved = $this->RecipesService->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']);
+			$selectedRecipePositionsResolved = $this->Database->recipes_pos_resolved()->where('recipe_id', $request->getQueryParams()['recipe'])->orderBy('ingredient_group');
 		}
 		else
 		{
 			foreach ($recipes as $recipe)
 			{
 				$selectedRecipe = $recipe;
-				$selectedRecipePositions = $this->Database->recipes_pos()->where('recipe_id', $recipe->id);
+				$selectedRecipePositionsResolved = $this->Database->recipes_pos_resolved()->where('recipe_id', $recipe->id)->orderBy('ingredient_group');
 				break;
 			}
 		}
 
+		$selectedRecipeSubRecipes = $this->Database->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->Database->recipes_pos_resolved()->where('recipe_id = :1', $selectedRecipe->id)->orderBy('ingredient_group')->fetchAll();
+
+		$includedRecipeIdsAbsolute = array();
+		$includedRecipeIdsAbsolute[] = $selectedRecipe->id;
+		foreach($selectedRecipeSubRecipes as $subRecipe)
+		{
+			$includedRecipeIdsAbsolute[] = $subRecipe->id;
+		}
+
 		return $this->AppContainer->view->render($response, 'recipes', [
 			'recipes' => $recipes,
-			'recipesFulfillment' => $this->RecipesService->GetRecipesFulfillment(),
-			'recipesSumFulfillment' => $this->RecipesService->GetRecipesSumFulfillment(),
+			'recipesResolved' => $recipesResolved,
+			'recipePositionsResolved' => $this->Database->recipes_pos_resolved(),
 			'selectedRecipe' => $selectedRecipe,
-			'selectedRecipePositions' => $selectedRecipePositions,
+			'selectedRecipePositionsResolved' => $selectedRecipePositionsResolved,
 			'products' => $this->Database->products(),
-			'quantityunits' => $this->Database->quantity_units()
+			'quantityunits' => $this->Database->quantity_units(),
+			'selectedRecipeSubRecipes' => $selectedRecipeSubRecipes,
+			'selectedRecipeSubRecipesPositions' => $selectedRecipeSubRecipesPositions,
+			'includedRecipeIdsAbsolute' => $includedRecipeIdsAbsolute,
+			'selectedRecipeTotalCosts' => FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $selectedRecipe->id)->costs,
+			'userfields' => $this->UserfieldsService->GetFields('recipes'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('recipes')
 		]);
 	}
 
@@ -51,8 +78,8 @@ class RecipesController extends BaseController
 		$recipeId = $args['recipeId'];
 		if ($recipeId  == 'new')
 		{
-			$newRecipe = $this->Database->recipes()->createRow(array(
-				'name' => $this->LocalizationService->Localize('New recipe')
+			$newRecipe = $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->createRow(array(
+				'name' => $this->LocalizationService->__t('New recipe')
 			));
 			$newRecipe->save();
 
@@ -65,8 +92,11 @@ class RecipesController extends BaseController
 			'mode' => 'edit',
 			'products' => $this->Database->products(),
 			'quantityunits' => $this->Database->quantity_units(),
-			'recipesFulfillment' => $this->RecipesService->GetRecipesFulfillment(),
-			'recipesSumFulfillment' => $this->RecipesService->GetRecipesSumFulfillment()
+			'recipePositionsResolved' => $this->RecipesService->GetRecipesPosResolved(),
+			'recipesResolved' => $this->RecipesService->GetRecipesResolved(),
+			'recipes' =>  $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name'),
+			'recipeNestings' =>  $this->Database->recipes_nestings()->where('recipe_id', $recipeId),
+			'userfields' => $this->UserfieldsService->GetFields('recipes')
 		]);
 	}
 
@@ -76,8 +106,9 @@ class RecipesController extends BaseController
 		{
 			return $this->AppContainer->view->render($response, 'recipeposform', [
 				'mode' => 'create',
-				'recipe' =>  $this->Database->recipes($args['recipeId']),
-				'products' =>  $this->Database->products()->orderBy('name')
+				'recipe' => $this->Database->recipes($args['recipeId']),
+				'products' => $this->Database->products()->orderBy('name'),
+				'quantityUnits' => $this->Database->quantity_units()->orderBy('name')
 			]);
 		}
 		else
@@ -85,9 +116,35 @@ class RecipesController extends BaseController
 			return $this->AppContainer->view->render($response, 'recipeposform', [
 				'mode' => 'edit',
 				'recipe' =>  $this->Database->recipes($args['recipeId']),
-				'recipePos' =>  $this->Database->recipes_pos($args['recipePosId']),
-				'products' =>  $this->Database->products()->orderBy('name')
+				'recipePos' => $this->Database->recipes_pos($args['recipePosId']),
+				'products' => $this->Database->products()->orderBy('name'),
+				'quantityUnits' => $this->Database->quantity_units()->orderBy('name')
 			]);
 		}
 	}
+
+	public function MealPlan(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$recipes = $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->fetchAll();
+
+		$events = array();
+		foreach($this->Database->meal_plan() as $mealPlanEntry)
+		{
+			$events[] = array(
+				'id' => $mealPlanEntry['id'],
+				'title' => FindObjectInArrayByPropertyValue($recipes, 'id', $mealPlanEntry['recipe_id'])->name,
+				'start' => $mealPlanEntry['day'],
+				'date_format' => 'date',
+				'recipe' => json_encode(FindObjectInArrayByPropertyValue($recipes, 'id', $mealPlanEntry['recipe_id'])),
+				'mealPlanEntry' => json_encode($mealPlanEntry)
+			);
+		}
+
+		return $this->AppContainer->view->render($response, 'mealplan', [
+			'fullcalendarEventSources' => $events,
+			'recipes' => $recipes,
+			'internalRecipes' => $this->Database->recipes()->whereNot('type', RecipesService::RECIPE_TYPE_NORMAL)->fetchAll(),
+			'recipesResolved' => $this->RecipesService->GetRecipesResolved()
+		]);
+	}
 }

controllers/StockApiController.php

@@ -22,76 +22,204 @@ class StockApiController extends BaseApiController
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function ProductDetailsByBarcode(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$productId = $this->StockService->GetProductIdFromBarcode($args['barcode']);
+			return $this->ApiResponse($this->StockService->GetProductDetails($productId));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function ProductPriceHistory(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			return $this->ApiResponse($this->StockService->GetProductPriceHistory($args['productId']));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
 	public function AddProduct(\Slim\Http\Request $request, \Slim\Http\Response $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'];
-		}
-
-		$transactionType = StockService::TRANSACTION_TYPE_PURCHASE;
-		if (isset($request->getQueryParams()['transactiontype']) && !empty($request->getQueryParams()['transactiontype']))
-		{
-			$transactionType = $request->getQueryParams()['transactiontype'];
-		}
+		$requestBody = $request->getParsedBody();
 
 		try
 		{
-			$this->StockService->AddProduct($args['productId'], $args['amount'], $bestBeforeDate, $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 = date('Y-m-d');
+			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->StockService->AddProduct($args['productId'], $requestBody['amount'], $bestBeforeDate, $transactionType, date('Y-m-d'), $price, $locationId);
+			return $this->ApiResponse($this->Database->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)
 	{
-		$spoiled = false;
-		if (isset($request->getQueryParams()['spoiled']) && !empty($request->getQueryParams()['spoiled']) && $request->getQueryParams()['spoiled'] == '1')
-		{
-			$spoiled = true;
-		}
-
-		$transactionType = StockService::TRANSACTION_TYPE_CONSUME;
-		if (isset($request->getQueryParams()['transactiontype']) && !empty($request->getQueryParams()['transactiontype']))
-		{
-			$transactionType = $request->getQueryParams()['transactiontype'];
-		}
+		$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');
+			}
+
+			$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'];
+			}
+
+			$recipeId = null;
+			if (array_key_exists('recipe_id', $requestBody) && is_numeric($requestBody['recipe_id']))
+			{
+				$recipeId = $requestBody['recipe_id'];
+			}
+
+			$bookingId = $this->StockService->ConsumeProduct($args['productId'], $requestBody['amount'], $spoiled, $transactionType, $specificStockEntryId, $recipeId);
+			return $this->ApiResponse($this->Database->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)
 	{
-		$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('new_amount', $requestBody))
+			{
+				throw new \Exception('An new amount is required');
+			}
+
+			$bestBeforeDate = date('Y-m-d');
+			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->StockService->InventoryProduct($args['productId'], $requestBody['new_amount'], $bestBeforeDate, $locationId, $price);
+			return $this->ApiResponse($this->Database->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function OpenProduct(\Slim\Http\Request $request, \Slim\Http\Response $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->StockService->OpenProduct($args['productId'], $requestBody['amount'], $specificStockEntryId);
+			return $this->ApiResponse($this->Database->stock_log($bookingId));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 
@@ -100,16 +228,64 @@ class StockApiController extends BaseApiController
 		return $this->ApiResponse($this->StockService->GetCurrentStock());
 	}
 
+	public function CurrentVolatilStock(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$nextXDays = 5;
+		if (isset($request->getQueryParams()['expiring_days']) && !empty($request->getQueryParams()['expiring_days']) && is_numeric($request->getQueryParams()['expiring_days']))
+		{
+			$nextXDays = $request->getQueryParams()['expiring_days'];
+		}
+
+		$expiringProducts = $this->StockService->GetExpiringProducts($nextXDays, true);
+		$expiredProducts = $this->StockService->GetExpiringProducts(-1);
+		$missingProducts = $this->StockService->GetMissingProducts();
+		return $this->ApiResponse(array(
+			 'expiring_products' => $expiringProducts,
+			 'expired_products' => $expiredProducts,
+			 'missing_products' => $missingProducts
+		));
+	}
+
 	public function AddMissingProductsToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $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->StockService->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)
 	{
-		$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->StockService->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)
@@ -126,7 +302,25 @@ class StockApiController extends BaseApiController
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
+
+	public function UndoBooking(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$this->ApiResponse($this->StockService->UndoBooking($args['bookingId']));
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function ProductStockEntries(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->ApiResponse($this->StockService->GetProductStockEntries($args['productId']));
+	}
 }

controllers/StockController.php

@@ -3,6 +3,8 @@
 namespace Grocy\Controllers;
 
 use \Grocy\Services\StockService;
+use \Grocy\Services\UsersService;
+use \Grocy\Services\UserfieldsService;
 
 class StockController extends BaseController
 {
@@ -11,56 +13,71 @@ class StockController extends BaseController
 	{
 		parent::__construct($container);
 		$this->StockService = new StockService();
+		$this->UserfieldsService = new UserfieldsService();
 	}
 
 	protected $StockService;
+	protected $UserfieldsService;
 
 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$currentStock = $this->StockService->GetCurrentStock();
-		$nextXDays = 5;
-		$countExpiringNextXDays = count(FindAllObjectsInArrayByPropertyValue($currentStock, 'best_before_date', date('Y-m-d', strtotime('+5 days')), '<'));
-		$countAlreadyExpired = count(FindAllObjectsInArrayByPropertyValue($currentStock, 'best_before_date', date('Y-m-d', strtotime('-1 days')), '<'));
+		$usersService = new UsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expring_soon_days'];
+
 		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' => $currentStock,
+			'currentStock' => $this->StockService->GetCurrentStock(),
+			'currentStockLocations' => $this->StockService->GetCurrentStockLocations(),
 			'missingProducts' => $this->StockService->GetMissingProducts(),
 			'nextXDays' => $nextXDays,
-			'countExpiringNextXDays' => $countExpiringNextXDays,
-			'countAlreadyExpired' => $countAlreadyExpired
+			'productGroups' => $this->Database->product_groups()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('products'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('products')
 		]);
 	}
 
 	public function Purchase(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'purchase', [
-			'products' => $this->Database->products()->orderBy('name')
+			'products' => $this->Database->products()->orderBy('name'),
+			'locations' => $this->Database->locations()->orderBy('name')
 		]);
 	}
 
 	public function Consume(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'consume', [
-			'products' => $this->Database->products()->orderBy('name')
+			'products' => $this->Database->products()->orderBy('name'),
+			'recipes' => $this->Database->recipes()->orderBy('name')
 		]);
 	}
 
 	public function Inventory(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'inventory', [
-			'products' => $this->Database->products()->orderBy('name')
+			'products' => $this->Database->products()->orderBy('name'),
+			'locations' => $this->Database->locations()->orderBy('name')
 		]);
 	}
 
 	public function ShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
+		$listId = 1;
+		if (isset($request->getQueryParams()['list']))
+		{
+			$listId = $request->getQueryParams()['list'];
+		}
+
 		return $this->AppContainer->view->render($response, 'shoppinglist', [
-			'listItems' => $this->Database->shopping_list(),
+			'listItems' => $this->Database->shopping_list()->where('shopping_list_id = :1', $listId),
 			'products' => $this->Database->products()->orderBy('name'),
 			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
-			'missingProducts' => $this->StockService->GetMissingProducts()
+			'missingProducts' => $this->StockService->GetMissingProducts(),
+			'productGroups' => $this->Database->product_groups()->orderBy('name'),
+			'shoppingLists' => $this->Database->shopping_lists()->orderBy('name'),
+			'selectedShoppingListId' => $listId
 		]);
 	}
 
@@ -69,21 +86,47 @@ class StockController extends BaseController
 		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')
+			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
+			'productGroups' => $this->Database->product_groups()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('products'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('products')
+		]);
+	}
+
+	public function StockSettings(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'stocksettings', [
+			'locations' => $this->Database->locations()->orderBy('name'),
+			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
+			'productGroups' => $this->Database->product_groups()->orderBy('name')
 		]);
 	}
 
 	public function LocationsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'locations', [
-			'locations' => $this->Database->locations()->orderBy('name')
+			'locations' => $this->Database->locations()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('locations'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('locations')
+		]);
+	}
+
+	public function ProductGroupsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'productgroups', [
+			'productGroups' => $this->Database->product_groups()->orderBy('name'),
+			'products' => $this->Database->products()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('product_groups'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('product_groups')
 		]);
 	}
 
 	public function QuantityUnitsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'quantityunits', [
-			'quantityunits' => $this->Database->quantity_units()->orderBy('name')
+			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('quantity_units'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('quantity_units')
 		]);
 	}
 
@@ -94,6 +137,8 @@ class StockController extends BaseController
 			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'),
+				'userfields' => $this->UserfieldsService->GetFields('products'),
 				'mode' => 'create'
 			]);
 		}
@@ -103,6 +148,8 @@ class StockController extends BaseController
 				'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'),
+				'userfields' => $this->UserfieldsService->GetFields('products'),
 				'mode' => 'edit'
 			]);
 		}
@@ -113,14 +160,35 @@ class StockController extends BaseController
 		if ($args['locationId'] == 'new')
 		{
 			return $this->AppContainer->view->render($response, 'locationform', [
-				'mode' => 'create'
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('locations')
 			]);
 		}
 		else
 		{
 			return $this->AppContainer->view->render($response, 'locationform', [
 				'location' =>  $this->Database->locations($args['locationId']),
-				'mode' => 'edit'
+				'mode' => 'edit',
+				'userfields' => $this->UserfieldsService->GetFields('locations')
+			]);
+		}
+	}
+
+	public function ProductGroupEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['productGroupId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'productgroupform', [
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('product_groups')
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'productgroupform', [
+				'group' =>  $this->Database->product_groups($args['productGroupId']),
+				'mode' => 'edit',
+				'userfields' => $this->UserfieldsService->GetFields('product_groups')
 			]);
 		}
 	}
@@ -130,14 +198,20 @@ class StockController extends BaseController
 		if ($args['quantityunitId'] == 'new')
 		{
 			return $this->AppContainer->view->render($response, 'quantityunitform', [
-				'mode' => 'create'
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('quantity_units'),
+				'pluralCount' => $this->LocalizationService->GetPluralCount(),
+				'pluralRule' => $this->LocalizationService->GetPluralDefinition()
 			]);
 		}
 		else
 		{
 			return $this->AppContainer->view->render($response, 'quantityunitform', [
 				'quantityunit' =>  $this->Database->quantity_units($args['quantityunitId']),
-				'mode' => 'edit'
+				'mode' => 'edit',
+				'userfields' => $this->UserfieldsService->GetFields('quantity_units'),
+				'pluralCount' => $this->LocalizationService->GetPluralCount(),
+				'pluralRule' => $this->LocalizationService->GetPluralDefinition()
 			]);
 		}
 	}
@@ -146,18 +220,46 @@ class StockController extends BaseController
 	{
 		if ($args['itemId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'shoppinglistform', [
+			return $this->AppContainer->view->render($response, 'shoppinglistitemform', [
 				'products' =>  $this->Database->products()->orderBy('name'),
+				'shoppingLists' => $this->Database->shopping_lists()->orderBy('name'),
+				'mode' => 'create'
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'shoppinglistitemform', [
+				'listItem' =>  $this->Database->shopping_list($args['itemId']),
+				'products' =>  $this->Database->products()->orderBy('name'),
+				'shoppingLists' => $this->Database->shopping_lists()->orderBy('name'),
+				'mode' => 'edit'
+			]);
+		}
+	}
+
+	public function ShoppingListEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['listId'] == 'new')
+		{
+			return $this->AppContainer->view->render($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'),
+				'shoppingList' =>  $this->Database->shopping_lists($args['listId']),
 				'mode' => 'edit'
 			]);
 		}
 	}
+
+	public function Journal(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'stockjournal', [
+			'stockLog' => $this->Database->stock_log()->orderBy('row_created_timestamp', 'DESC'),
+			'products' => $this->Database->products()->orderBy('name'),
+			'quantityunits' => $this->Database->quantity_units()->orderBy('name')
+		]);
+	}
 }

controllers/SystemApiController.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\DatabaseService;
+use \Grocy\Services\ApplicationService;
+
+class SystemApiController extends BaseApiController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->DatabaseService = new DatabaseService();
+		$this->ApplicationService = new ApplicationService();
+	}
+
+	protected $DatabaseService;
+	protected $ApplicationService;
+
+	public function GetDbChangedTime(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->ApiResponse(array(
+			'changed_time' => $this->DatabaseService->GetDbChangedTime()
+		));
+	}
+
+	public function LogMissingLocalization(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if (GROCY_MODE === 'dev')
+		{
+			try
+			{
+				$requestBody = $request->getParsedBody();
+
+				$this->LocalizationService->CheckAndAddMissingTranslationToPot($requestBody['text']);
+				return $this->EmptyApiResponse($response);
+			}
+			catch (\Exception $ex)
+			{
+				return $this->GenericErrorResponse($response, $ex->getMessage());
+			}
+		}	
+	}
+
+	public function GetSystemInfo(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->ApiResponse($this->ApplicationService->GetSystemInfo());
+	}
+}

controllers/SystemController.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\ApplicationService;
+use \Grocy\Services\DatabaseMigrationService;
+use \Grocy\Services\DemoDataGeneratorService;
+
+class SystemController extends BaseController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->ApplicationService = new ApplicationService();
+	}
+
+	protected $ApplicationService;
+
+	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($this->GetEntryPageRelative()));
+	}
+
+	public function About(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'about', [
+			'system_info' => $this->ApplicationService->GetSystemInfo(),
+			'changelog' => $this->ApplicationService->GetChangelog()
+		]);
+	}
+
+	private function GetEntryPageRelative()
+	{
+		$entryPage = '/stockoverview';
+
+		if (!GROCY_FEATURE_FLAG_STOCK)
+		{
+			$entryPage = '/choresoverview';
+		}
+		if (!GROCY_FEATURE_FLAG_CHORES)
+		{
+			$entryPage = '/batteriesoverview';
+		}
+		if (!GROCY_FEATURE_FLAG_BATTERIES)
+		{
+			$entryPage = '/equipment';
+		}
+
+		return $entryPage;
+	}
+}

controllers/TasksApiController.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\TasksService;
+
+class TasksApiController extends BaseApiController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->TasksService = new TasksService();
+	}
+
+	protected $TasksService;
+
+	public function Current(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->ApiResponse($this->TasksService->GetCurrent());
+	}
+
+	public function MarkTaskAsCompleted(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+
+		try
+		{
+			$doneTime = date('Y-m-d H:i:s');
+			if (array_key_exists('done_time', $requestBody) && IsIsoDateTime($requestBody['done_time']))
+			{
+				$doneTime = $requestBody['done_time'];
+			}
+
+			$this->TasksService->MarkTaskAsCompleted($args['taskId'], $doneTime);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function UndoTask(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$this->TasksService->UndoTask($args['taskId']);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+}

controllers/TasksController.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\TasksService;
+use \Grocy\Services\UsersService;
+use \Grocy\Services\UserfieldsService;
+
+class TasksController extends BaseController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->TasksService = new TasksService();
+		$this->UserfieldsService = new UserfieldsService();
+	}
+
+	protected $TasksService;
+	protected $UserfieldsService;
+
+	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if (isset($request->getQueryParams()['include_done']))
+		{
+			$tasks = $this->Database->tasks()->orderBy('name');
+		}
+		else
+		{
+			$tasks = $this->TasksService->GetCurrent();
+		}
+
+		$usersService = new UsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['tasks_due_soon_days'];
+
+		return $this->AppContainer->view->render($response, 'tasks', [
+			'tasks' => $tasks,
+			'nextXDays' => $nextXDays,
+			'taskCategories' => $this->Database->task_categories()->orderBy('name'),
+			'users' => $this->Database->users(),
+			'userfields' => $this->UserfieldsService->GetFields('tasks'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('tasks')
+		]);
+	}
+
+	public function TaskEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['taskId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'taskform', [
+				'mode' => 'create',
+				'taskCategories' => $this->Database->task_categories()->orderBy('name'),
+				'users' => $this->Database->users()->orderBy('username'),
+				'userfields' => $this->UserfieldsService->GetFields('tasks')
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'taskform', [
+				'task' =>  $this->Database->tasks($args['taskId']),
+				'mode' => 'edit',
+				'taskCategories' => $this->Database->task_categories()->orderBy('name'),
+				'users' => $this->Database->users()->orderBy('username'),
+				'userfields' => $this->UserfieldsService->GetFields('tasks')
+			]);
+		}
+	}
+
+	public function TaskCategoriesList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'taskcategories', [
+			'taskCategories' => $this->Database->task_categories()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('task_categories'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('task_categories')
+		]);
+	}
+
+	public function TaskCategoryEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['categoryId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'taskcategoryform', [
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('task_categories')
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'taskcategoryform', [
+				'category' =>  $this->Database->task_categories($args['categoryId']),
+				'mode' => 'edit',
+				'userfields' => $this->UserfieldsService->GetFields('task_categories')
+			]);
+		}
+	}
+
+	public function TasksSettings(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'taskssettings');
+	}
+}

controllers/UsersApiController.php

@@ -0,0 +1,104 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\UsersService;
+
+class UsersApiController extends BaseApiController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->UsersService = new UsersService();
+	}
+
+	protected $UsersService;
+
+	public function GetUsers(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			return $this->ApiResponse($this->UsersService->GetUsersAsDto());
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function CreateUser(\Slim\Http\Request $request, \Slim\Http\Response $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->UsersService->CreateUser($requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function DeleteUser(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$this->UsersService->DeleteUser($args['userId']);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function EditUser(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+
+		try
+		{
+			$this->UsersService->EditUser($args['userId'], $requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function GetUserSetting(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$value = $this->UsersService->GetUserSetting(GROCY_USER_ID, $args['settingKey']);
+			return $this->ApiResponse(array('value' => $value));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function SetUserSetting(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$requestBody = $request->getParsedBody();
+
+			$value = $this->UsersService->SetUserSetting(GROCY_USER_ID, $args['settingKey'], $requestBody['value']);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+}

controllers/UsersController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Grocy\Controllers;
+
+class UsersController extends BaseController
+{
+	public function UsersList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'users', [
+			'users' => $this->Database->users()->orderBy('username')
+		]);
+	}
+
+	public function UserEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['userId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'userform', [
+				'mode' => 'create'
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'userform', [
+				'user' =>  $this->Database->users($args['userId']),
+				'mode' => 'edit'
+			]);
+		}
+	}
+}

data/viewcache/.gitignore

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

helpers/UrlManager.php

@@ -20,7 +20,7 @@ class UrlManager
 
 	public function ConstructUrl($relativePath, $isResource = false)
 	{
-		if (DISABLE_URL_REWRITING === false || $isResource === true)
+		if (GROCY_DISABLE_URL_REWRITING === false || $isResource === true)
 		{
 			return rtrim($this->BasePath, '/') . $relativePath;
 		}
@@ -32,6 +32,11 @@ class UrlManager
 
 	private function GetBaseUrl()
 	{
+		if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && strpos($_SERVER['HTTP_X_FORWARDED_PROTO'], 'https') !== false)
+		{
+			$_SERVER['HTTPS'] = 'on';
+		}
+
 		return (isset($_SERVER['HTTPS']) ? "https" : "http") . "://$_SERVER[HTTP_HOST]";
 	}
 }

helpers/extensions.php

@@ -130,8 +130,66 @@ function BoolToString(bool $bool)
 
 function Setting(string $name, $value)
 {
-	if (!defined($name))
+	if (!defined('GROCY_' . $name))
 	{
-		define($name, $value);
+		// The content of a $name.txt file in /data/settingoverrides can overwrite the given setting (for embedded mode)
+		$settingOverrideFile = GROCY_DATAPATH . '/settingoverrides/' . $name . '.txt';
+		if (file_exists($settingOverrideFile))
+		{
+			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
+		{
+			define('GROCY_' . $name, getenv('GROCY_' . $name));
+		}
+		else
+		{
+			define('GROCY_' . $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 = '';
+	
+	if (empty($user->first_name) && !empty($user->last_name))
+	{
+		$displayName = $user->last_name;
+	}
+	elseif (empty($user->last_name) && !empty($user->first_name))
+	{
+		$displayName = $user->first_name;
+	}
+	elseif (!empty($user->last_name) && !empty($user->first_name))
+	{
+		$displayName = $user->first_name . ' ' . $user->last_name;
+	}
+	else
+	{
+		$displayName = $user->username;
+	}
+
+	return $displayName;
+}
+
+function IsValidFileName($fileName)
+{
+	if(preg_match('=^[^/?*;:{}\\\\]+\.[^/?*;:{}\\\\]+$=', $fileName))
+	{
+		return true;
+	}
+
+	return false;
+}

localization/chore_types.pot

@@ -0,0 +1,28 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
+"X-Domain: grocy/chore_types\n"
+
+msgid "manually"
+msgstr ""
+
+msgid "dynamic-regular"
+msgstr ""
+
+msgid "daily"
+msgstr ""
+
+msgid "weekly"
+msgstr ""
+
+msgid "monthly"
+msgstr ""

localization/component_translations.pot

@@ -0,0 +1,31 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
+"X-Domain: grocy/component_translations\n"
+
+msgid "timeago_locale"
+msgstr ""
+
+msgid "timeago_nan"
+msgstr ""
+
+msgid "moment_locale"
+msgstr ""
+
+msgid "datatables_localization"
+msgstr ""
+
+msgid "summernote_locale"
+msgstr ""
+
+msgid "fullcalendar_locale"
+msgstr ""

localization/da/chore_types.po

@@ -0,0 +1,32 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_types\n"
+
+msgid "manually"
+msgstr "Manuelt"
+
+msgid "dynamic-regular"
+msgstr ""
+
+msgid "daily"
+msgstr ""
+
+msgid "weekly"
+msgstr ""
+
+msgid "monthly"
+msgstr ""

localization/da/component_translations.po

@@ -0,0 +1,32 @@
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/component_translations\n"
+
+msgid "timeago_locale"
+msgstr ""
+
+msgid "timeago_nan"
+msgstr ""
+
+msgid "moment_locale"
+msgstr ""
+
+msgid "datatables_localization"
+msgstr ""
+
+msgid "summernote_locale"
+msgstr ""
+
+msgid "fullcalendar_locale"
+msgstr ""