This is version 1.15.0

Update no.php

.bowerrc

@@ -1,3 +0,0 @@
-{
-	"directory": "public/bower_components"
-}

.gitignore

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

.yarnrc

@@ -0,0 +1,4 @@
+--modules-folder public/node_modules
+--install.production true
+--install.ignore-scripts true
+--install.ignore-optional true

README.md

@@ -1,22 +1,74 @@
 # grocy
 ERP beyond your fridge
 
-## 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!
-
-# Give it a try
+## Give it a try
 Public demo of the latest version → [https://demo.grocy.info](https://demo.grocy.info) 
 
+## Motivation
+A household needs to be managed. I did this so far (almost 10 years) with my first self written software (a C# windows forms application) and with a bunch of Excel sheets. The software is a pain to use and Excel is Excel. So I searched for and tried different things for a (very) long time, nothing 100 % fitted, so this is my aim for a "complete houshold management"-thing. ERP your fridge!
+
 ## How to install
-Just unpack the [latest release](https://github.com/berrnd/grocy/releases/latest) on your PHP (7.0 or later required) enabled webserver (root is 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. Alternatively clone this repository and install Composer and Bower dependencies manually.
+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.
+
+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.
 
 If you use nginx as your webserver, please include `try_files $uri /index.php;` in your location block.
 
-## Notes about barcode readers
-Some fields also allow to select a value by scanning a barcode. It works best when your barcode reader prefixes every barcode with a letter this is normally not part of a item name (I use a `$`) and sends a `TAB` after a scan.
+If, however, your webserver does not support URL rewriting, set `DISABLE_URL_REWRITING` in `data/config.php` (`Setting('DISABLE_URL_REWRITING', true);`).
+
+## How to update
+Just overwrite everything with the latest release while keeping the `/data` directory, check `config-dist.php` for new configuration options and add them to your `data/config.php` (the default from values `config-dist.php` will be used for not in `data/config.php` defined settings).
+
+## 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');`)
+
+### 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.
+
+## Things worth to know
+
+### REST API & data model documentation
+See the integrated Swagger UI instance on [/api](https://demo-en.grocy.info/api).
+
+### Barcode readers
+Some fields also allow to select a value by scanning a barcode. It works best when your barcode reader prefixes every barcode with a letter which is normally not part of a item name (I use a `$`) and sends a `TAB` after a scan.
+
+### 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, 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
+
+### Keyboard shorthands for buttons
+Wherever a button contains a bold highlighted letter, this is a shortcut key.
+Example: Button "Add as new **p**roduct" can be "pressed" by using the `P` key on your keyboard.
+
+### Barcode lookup via external services
+Products can be directly added to the database via looking them up against external services by a barcode.
+This is currently only possible through the REST API.
+There is no plugin included for any service, see the reference implementation in `data/plugins/DemoBarcodeLookupPlugin.php`.
+
+### Database migrations
+Database schema migration is automatically done when visiting the root (`/`) route (click on the logo in the left upper edge).
+
+### 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/berrnd/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).
 
 ## Screenshots
 #### Dashboard

app.php

@@ -3,40 +3,50 @@
 use \Psr\Http\Message\ServerRequestInterface as Request;
 use \Psr\Http\Message\ResponseInterface as Response;
 
-use \Grocy\Middleware\SessionAuthMiddleware;
-use \Grocy\Services\ApplicationService;
+use \Grocy\Helpers\UrlManager;
+use \Grocy\Controllers\LoginController;
 
-require_once __DIR__ . '/vendor/autoload.php';
-require_once __DIR__ . '/data/config.php';
-require_once __DIR__ . '/extensions.php';
-
-// Setup base application
-if (PHP_SAPI !== 'cli')
+if (file_exists(__DIR__ . '/embedded.txt'))
 {
-	$appContainer = new \Slim\Container([
-		'settings' => [
-			'displayErrorDetails' => true,
-			'determineRouteBeforeAppMiddleware' => true
-		],
-		'view' => function($container)
-		{
-			return new \Slim\Views\Blade(__DIR__ . '/views', __DIR__ . '/data/viewcache');
-		}
-	]);
-
-	$app = new \Slim\App($appContainer);
+	define('DATAPATH', file_get_contents(__DIR__ . '/embedded.txt'));
 }
 else
 {
-	$app = new \Slim\App();
-	$app->add(\pavlakis\cli\CliRequest::class);
+	define('DATAPATH', __DIR__ . '/data');
 }
 
-// Add session handling if this is not a demo installation
-$applicationService = new ApplicationService();
-if (!$applicationService->IsDemoInstallation())
+require_once __DIR__ . '/vendor/autoload.php';
+require_once DATAPATH . '/config.php';
+require_once __DIR__ . '/config-dist.php'; //For not in own config defined values we use the default ones
+
+// Setup base application
+$appContainer = new \Slim\Container([
+	'settings' => [
+		'displayErrorDetails' => true,
+		'determineRouteBeforeAppMiddleware' => true
+	],
+	'view' => function($container)
+	{
+		return new \Slim\Views\Blade(__DIR__ . '/views', DATAPATH . '/viewcache');
+	},
+	'LoginControllerInstance' => function($container)
+	{
+		return new LoginController($container, 'grocy_session');
+	},
+	'UrlManager' => function($container)
+	{
+		return new UrlManager(BASE_URL);
+	},
+	'ApiKeyHeaderName' => function($container)
+	{
+		return 'GROCY-API-KEY';
+	}
+]);
+$app = new \Slim\App($appContainer);
+
+if (PHP_SAPI === 'cli')
 {
-	$app->add(SessionAuthMiddleware::class);
+	$app->add(\pavlakis\cli\CliRequest::class);
 }
 
 require_once __DIR__ . '/routes.php';

bower.json

@@ -1,22 +0,0 @@
-{
-	"name": "grocy",
-	"private": true,
-	"dependencies": {
-		"bootstrap": "^3.3.7",
-		"font-awesome": "^4.7.0",
-		"bootbox": "^4.4.0",
-		"jquery.serializeJSON": "^2.8.1",
-		"bootstrap-validator": "^0.11.9",
-		"bootstrap-datepicker": "^1.7.1",
-		"moment": "^2.18.1",
-		"bootstrap-combobox": "^1.1.8",
-		"datatables.net": "^1.10.15",
-		"datatables.net-bs": "^2.1.1",
-		"datatables.net-responsive": "^2.1.1",
-		"datatables.net-responsive-bs": "^2.1.1",
-		"jquery-timeago": "^1.6.1",
-		"toastr": "^2.1.3",
-		"tagmanager": "^3.0.2",
-		"eonasdan-bootstrap-datetimepicker": "^4.17.47"
-	}
-}

build.bat

@@ -4,10 +4,10 @@ if %projectPath:~-1%==\ set projectPath=%projectPath:~0,-1%
 set releasePath=%projectPath%\.release
 mkdir "%releasePath%"
 
-for /f "tokens=*" %%a in ('type version.txt') do set version=%%a
+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!bower.json -xr!publication_assets
+"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\*

composer.json

@@ -1,15 +1,21 @@
 {
 	"require": {
+		"php": ">=7.2",
 		"slim/slim": "^3.8",
 		"morris/lessql": "^0.3.4",
 		"pavlakis/slim-cli": "^1.0",
-		"rubellum/slim-blade-view": "^0.1.1"
+		"rubellum/slim-blade-view": "^0.1.1",
+		"tuupola/cors-middleware": "^0.7.0"
 	},
 	"autoload": {
 		"psr-4": {
 			"Grocy\\Services\\": "services/",
 			"Grocy\\Controllers\\": "controllers/",
-			"Grocy\\Middleware\\": "middleware/"
-		}
+			"Grocy\\Middleware\\": "middleware/",
+			"Grocy\\Helpers\\": "helpers/"
+		},
+		"files": [
+			"helpers/extensions.php"
+		]
 	}
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "12ebab60e283dfdab831d1cc22430d05",
+    "content-hash": "131ab83ecb1ea3d1a431cc70b5092448",
     "packages": [
         {
             "name": "container-interop/container-interop",
@@ -105,17 +105,69 @@
             "time": "2018-01-09T20:05:19+00:00"
         },
         {
-            "name": "illuminate/container",
-            "version": "v5.6.16",
+            "name": "http-interop/http-factory",
+            "version": "0.3.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/illuminate/container.git",
-                "reference": "4a42d667a05ec6d31f05b532cdac7e8e68e5ea2a"
+                "url": "https://github.com/http-interop/http-factory.git",
+                "reference": "c2587cc0a6f74987fefb5b8074acfd32c69a4b0f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/container/zipball/4a42d667a05ec6d31f05b532cdac7e8e68e5ea2a",
-                "reference": "4a42d667a05ec6d31f05b532cdac7e8e68e5ea2a",
+                "url": "https://api.github.com/repos/http-interop/http-factory/zipball/c2587cc0a6f74987fefb5b8074acfd32c69a4b0f",
+                "reference": "c2587cc0a6f74987fefb5b8074acfd32c69a4b0f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Interop\\Http\\Factory\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2017-03-24T14:48:51+00:00"
+        },
+        {
+            "name": "illuminate/container",
+            "version": "v5.6.27",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/illuminate/container.git",
+                "reference": "1f0757cae8749400aeda730f6438a081fc3c082d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/illuminate/container/zipball/1f0757cae8749400aeda730f6438a081fc3c082d",
+                "reference": "1f0757cae8749400aeda730f6438a081fc3c082d",
                 "shasum": ""
             },
             "require": {
@@ -146,20 +198,20 @@
             ],
             "description": "The Illuminate Container package.",
             "homepage": "https://laravel.com",
-            "time": "2018-01-21T02:13:38+00:00"
+            "time": "2018-05-24T13:16:56+00:00"
         },
         {
             "name": "illuminate/contracts",
-            "version": "v5.6.16",
+            "version": "v5.6.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
-                "reference": "322ec80498b3bf85bc4025d028e130a9b50242b9"
+                "reference": "3dc639feabe0f302f574157a782ede323881a944"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/contracts/zipball/322ec80498b3bf85bc4025d028e130a9b50242b9",
-                "reference": "322ec80498b3bf85bc4025d028e130a9b50242b9",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/3dc639feabe0f302f574157a782ede323881a944",
+                "reference": "3dc639feabe0f302f574157a782ede323881a944",
                 "shasum": ""
             },
             "require": {
@@ -190,11 +242,11 @@
             ],
             "description": "The Illuminate Contracts package.",
             "homepage": "https://laravel.com",
-            "time": "2018-04-07T17:05:26+00:00"
+            "time": "2018-05-11T23:38:58+00:00"
         },
         {
             "name": "illuminate/events",
-            "version": "v5.6.16",
+            "version": "v5.6.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/events.git",
@@ -239,16 +291,16 @@
         },
         {
             "name": "illuminate/filesystem",
-            "version": "v5.6.16",
+            "version": "v5.6.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/filesystem.git",
-                "reference": "c9ab9376076cedd88a374d7281d62b619634d578"
+                "reference": "2677365f61c66fad13ff12a37cd4fa8aaeb048d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/c9ab9376076cedd88a374d7281d62b619634d578",
-                "reference": "c9ab9376076cedd88a374d7281d62b619634d578",
+                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/2677365f61c66fad13ff12a37cd4fa8aaeb048d2",
+                "reference": "2677365f61c66fad13ff12a37cd4fa8aaeb048d2",
                 "shasum": ""
             },
             "require": {
@@ -287,20 +339,20 @@
             ],
             "description": "The Illuminate Filesystem package.",
             "homepage": "https://laravel.com",
-            "time": "2018-04-06T13:15:37+00:00"
+            "time": "2018-07-07T14:54:27+00:00"
         },
         {
             "name": "illuminate/support",
-            "version": "v5.6.16",
+            "version": "v5.6.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "fad0669f858423679497a17f973261cc32f9a5a8"
+                "reference": "97ca44c95392ce0a41749fa47b953734d88b94b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/fad0669f858423679497a17f973261cc32f9a5a8",
-                "reference": "fad0669f858423679497a17f973261cc32f9a5a8",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/97ca44c95392ce0a41749fa47b953734d88b94b1",
+                "reference": "97ca44c95392ce0a41749fa47b953734d88b94b1",
                 "shasum": ""
             },
             "require": {
@@ -315,6 +367,7 @@
             },
             "suggest": {
                 "illuminate/filesystem": "Required to use the composer class (5.6.*).",
+                "ramsey/uuid": "Required to use Str::uuid() (^3.7).",
                 "symfony/process": "Required to use the composer class (~4.0).",
                 "symfony/var-dumper": "Required to use the dd function (~4.0)."
             },
@@ -344,20 +397,20 @@
             ],
             "description": "The Illuminate Support package.",
             "homepage": "https://laravel.com",
-            "time": "2018-04-05T21:19:22+00:00"
+            "time": "2018-07-04T01:23:57+00:00"
         },
         {
             "name": "illuminate/view",
-            "version": "v5.6.16",
+            "version": "v5.6.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/view.git",
-                "reference": "54eaf45ee7946d8f8cde13d5e89c5ea2e997040d"
+                "reference": "625c35e8942f0ecd467acb8db8daf8449390d559"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/view/zipball/54eaf45ee7946d8f8cde13d5e89c5ea2e997040d",
-                "reference": "54eaf45ee7946d8f8cde13d5e89c5ea2e997040d",
+                "url": "https://api.github.com/repos/illuminate/view/zipball/625c35e8942f0ecd467acb8db8daf8449390d559",
+                "reference": "625c35e8942f0ecd467acb8db8daf8449390d559",
                 "shasum": ""
             },
             "require": {
@@ -392,7 +445,7 @@
             ],
             "description": "The Illuminate View package.",
             "homepage": "https://laravel.com",
-            "time": "2018-04-03T12:56:35+00:00"
+            "time": "2018-07-06T14:55:12+00:00"
         },
         {
             "name": "morris/lessql",
@@ -443,17 +496,72 @@
             "time": "2018-01-27T13:18:21+00:00"
         },
         {
-            "name": "nesbot/carbon",
-            "version": "1.25.0",
+            "name": "neomerx/cors-psr7",
+            "version": "v1.0.13",
             "source": {
                 "type": "git",
-                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4"
+                "url": "https://github.com/neomerx/cors-psr7.git",
+                "reference": "2556e2013f16a55532c95928455257d5b6bbc6e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cbcf13da0b531767e39eb86e9687f5deba9857b4",
-                "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4",
+                "url": "https://api.github.com/repos/neomerx/cors-psr7/zipball/2556e2013f16a55532c95928455257d5b6bbc6e2",
+                "reference": "2556e2013f16a55532c95928455257d5b6bbc6e2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0",
+                "psr/http-message": "^1.0",
+                "psr/log": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^5.7",
+                "scrutinizer/ocular": "^1.1",
+                "squizlabs/php_codesniffer": "^3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Neomerx\\Cors\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "neomerx",
+                    "email": "info@neomerx.com"
+                }
+            ],
+            "description": "Framework agnostic (PSR-7) CORS implementation (www.w3.org/TR/cors/)",
+            "homepage": "https://github.com/neomerx/cors-psr7",
+            "keywords": [
+                "Cross Origin Resource Sharing",
+                "Cross-Origin Resource Sharing",
+                "cors",
+                "neomerx",
+                "psr-7",
+                "psr7",
+                "w3.org",
+                "www.w3.org"
+            ],
+            "time": "2018-05-23T16:10:11+00:00"
+        },
+        {
+            "name": "nesbot/carbon",
+            "version": "1.32.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/briannesbitt/Carbon.git",
+                "reference": "64563e2b9f69e4db1b82a60e81efa327a30ff343"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/64563e2b9f69e4db1b82a60e81efa327a30ff343",
+                "reference": "64563e2b9f69e4db1b82a60e81efa327a30ff343",
                 "shasum": ""
             },
             "require": {
@@ -466,13 +574,15 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.23-dev"
+                "laravel": {
+                    "providers": [
+                        "Carbon\\Laravel\\ServiceProvider"
+                    ]
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Carbon\\": "src/Carbon/"
+                    "": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -493,7 +603,7 @@
                 "datetime",
                 "time"
             ],
-            "time": "2018-03-19T15:50:49+00:00"
+            "time": "2018-07-05T06:59:26+00:00"
         },
         {
             "name": "nikic/fast-route",
@@ -780,6 +890,112 @@
             ],
             "time": "2016-08-06T14:39:51+00:00"
         },
+        {
+            "name": "psr/http-server-handler",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-server-handler.git",
+                "reference": "439d92054dc06097f2406ec074a2627839955a02"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/439d92054dc06097f2406ec074a2627839955a02",
+                "reference": "439d92054dc06097f2406ec074a2627839955a02",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Server\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP server-side request handler",
+            "keywords": [
+                "handler",
+                "http",
+                "http-interop",
+                "psr",
+                "psr-15",
+                "psr-7",
+                "request",
+                "response",
+                "server"
+            ],
+            "time": "2018-01-22T17:04:15+00:00"
+        },
+        {
+            "name": "psr/http-server-middleware",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-server-middleware.git",
+                "reference": "ea17eb1fb2c8df6db919cc578451a8013c6a0ae5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/ea17eb1fb2c8df6db919cc578451a8013c6a0ae5",
+                "reference": "ea17eb1fb2c8df6db919cc578451a8013c6a0ae5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0",
+                "psr/http-message": "^1.0",
+                "psr/http-server-handler": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Server\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP server-side middleware",
+            "keywords": [
+                "http",
+                "http-interop",
+                "middleware",
+                "psr",
+                "psr-15",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2018-01-22T17:08:31+00:00"
+        },
         {
             "name": "psr/log",
             "version": "1.0.2",
@@ -927,16 +1143,16 @@
         },
         {
             "name": "slim/slim",
-            "version": "3.9.2",
+            "version": "3.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slimphp/Slim.git",
-                "reference": "4086d0106cf5a7135c69fce4161fe355a8feb118"
+                "reference": "d8aabeacc3688b25e2f2dd2db91df91ec6fdd748"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slimphp/Slim/zipball/4086d0106cf5a7135c69fce4161fe355a8feb118",
-                "reference": "4086d0106cf5a7135c69fce4161fe355a8feb118",
+                "url": "https://api.github.com/repos/slimphp/Slim/zipball/d8aabeacc3688b25e2f2dd2db91df91ec6fdd748",
+                "reference": "d8aabeacc3688b25e2f2dd2db91df91ec6fdd748",
                 "shasum": ""
             },
             "require": {
@@ -994,20 +1210,20 @@
                 "micro",
                 "router"
             ],
-            "time": "2017-11-26T19:13:09+00:00"
+            "time": "2018-04-19T19:29:08+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v4.0.8",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "5961d02d48828671f5d8a7805e06579d692f6ede"
+                "reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/5961d02d48828671f5d8a7805e06579d692f6ede",
-                "reference": "5961d02d48828671f5d8a7805e06579d692f6ede",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
+                "reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
                 "shasum": ""
             },
             "require": {
@@ -1023,7 +1239,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -1050,20 +1266,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-03T05:24:00+00:00"
+            "time": "2018-06-08T09:39:36+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.0.8",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49"
+                "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/ca27c02b7a3fef4828c998c2ff9ba7aae1641c49",
-                "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/84714b8417d19e4ba02ea78a41a975b3efaafddb",
+                "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb",
                 "shasum": ""
             },
             "require": {
@@ -1072,7 +1288,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -1099,20 +1315,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-04T05:10:37+00:00"
+            "time": "2018-06-19T21:38:16+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.7.0",
+            "version": "v1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b"
+                "reference": "3296adf6a6454a050679cde90f95350ad604b171"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b",
-                "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
+                "reference": "3296adf6a6454a050679cde90f95350ad604b171",
                 "shasum": ""
             },
             "require": {
@@ -1124,7 +1340,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7-dev"
+                    "dev-master": "1.8-dev"
                 }
             },
             "autoload": {
@@ -1158,20 +1374,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-01-30T19:27:44+00:00"
+            "time": "2018-04-26T10:06:28+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v4.0.8",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938"
+                "reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/e20a9b7f9f62cb33a11638b345c248e7d510c938",
-                "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
+                "reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
                 "shasum": ""
             },
             "require": {
@@ -1186,20 +1402,21 @@
             "require-dev": {
                 "psr/log": "~1.0",
                 "symfony/config": "~3.4|~4.0",
+                "symfony/console": "~3.4|~4.0",
                 "symfony/dependency-injection": "~3.4|~4.0",
                 "symfony/finder": "~2.8|~3.0|~4.0",
                 "symfony/intl": "~3.4|~4.0",
                 "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
-                "psr/log": "To use logging capability in translator",
+                "psr/log-implementation": "To use logging capability in translator",
                 "symfony/config": "",
                 "symfony/yaml": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -1226,7 +1443,167 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-22T10:50:29+00:00"
+            "time": "2018-06-22T08:59:39+00:00"
+        },
+        {
+            "name": "tuupola/callable-handler",
+            "version": "0.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tuupola/callable-handler.git",
+                "reference": "5141efa1e974687a3fa53338811a988198f50662"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tuupola/callable-handler/zipball/5141efa1e974687a3fa53338811a988198f50662",
+                "reference": "5141efa1e974687a3fa53338811a988198f50662",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "psr/http-server-middleware": "^1.0"
+            },
+            "require-dev": {
+                "codedungeon/phpunit-result-printer": "^0.4.4",
+                "overtrue/phplint": "^1.0",
+                "phpunit/phpunit": "^6.5",
+                "squizlabs/php_codesniffer": "^3.2",
+                "tuupola/http-factory": "^0.3.0",
+                "zendframework/zend-diactoros": "^1.6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Tuupola\\Middleware\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mika Tuupola",
+                    "email": "tuupola@appelsiini.net",
+                    "homepage": "https://appelsiini.net/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Compatibility layer for PSR-7 double pass and PSR-15 middlewares.",
+            "homepage": "https://github.com/tuupola/callable-handler",
+            "keywords": [
+                "middleware",
+                "psr-15",
+                "psr-7"
+            ],
+            "time": "2018-01-23T04:07:25+00:00"
+        },
+        {
+            "name": "tuupola/cors-middleware",
+            "version": "0.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tuupola/cors-middleware.git",
+                "reference": "b0e2b7acacf22acae6ba029ee424fd6c073bb443"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tuupola/cors-middleware/zipball/b0e2b7acacf22acae6ba029ee424fd6c073bb443",
+                "reference": "b0e2b7acacf22acae6ba029ee424fd6c073bb443",
+                "shasum": ""
+            },
+            "require": {
+                "neomerx/cors-psr7": "^1.0",
+                "php": "^7.1",
+                "psr/http-server-middleware": "^1.0",
+                "tuupola/callable-handler": "^0.3.0",
+                "tuupola/http-factory": "^0.3.0"
+            },
+            "require-dev": {
+                "codedungeon/phpunit-result-printer": "^0.4.4",
+                "equip/dispatch": "dev-approved-psr15 as 1.0.x-dev",
+                "overtrue/phplint": "^1.0",
+                "phpunit/phpunit": "^6.5",
+                "squizlabs/php_codesniffer": "^3.2",
+                "zendframework/zend-diactoros": "^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Tuupola\\Middleware\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mika Tuupola",
+                    "email": "tuupola@appelsiini.net",
+                    "homepage": "http://www.appelsiini.net/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PSR-7 and PSR-15 CORS middleware",
+            "homepage": "https://github.com/tuupola/cors-middleware",
+            "keywords": [
+                "cors",
+                "middleware",
+                "psr-15",
+                "psr-7"
+            ],
+            "time": "2018-01-25T02:29:07+00:00"
+        },
+        {
+            "name": "tuupola/http-factory",
+            "version": "0.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tuupola/http-factory.git",
+                "reference": "57b2e19ff3f4af0bbee4e31fd282689be351f1ad"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tuupola/http-factory/zipball/57b2e19ff3f4af0bbee4e31fd282689be351f1ad",
+                "reference": "57b2e19ff3f4af0bbee4e31fd282689be351f1ad",
+                "shasum": ""
+            },
+            "require": {
+                "http-interop/http-factory": "^0.3.0"
+            },
+            "require-dev": {
+                "http-interop/http-factory-tests": "^0.3.0",
+                "overtrue/phplint": "^0.2.1",
+                "phpunit/phpunit": "^5.7",
+                "squizlabs/php_codesniffer": "^3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Tuupola\\Http\\Factory\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mika Tuupola",
+                    "email": "tuupola@appelsiini.net",
+                    "homepage": "http://www.appelsiini.net/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Lightweight autodiscovering PSR-17 HTTP factories",
+            "homepage": "https://github.com/tuupola/http-factory",
+            "keywords": [
+                "http",
+                "psr-17",
+                "psr-7"
+            ],
+            "time": "2017-07-15T22:03:15+00:00"
         }
     ],
     "packages-dev": [],
@@ -1235,6 +1612,8 @@
     "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
+    "platform": {
+        "php": ">=7.2"
+    },
     "platform-dev": []
 }

config-dist.php

@@ -1,7 +1,26 @@
 <?php
 
-define('MODE', 'production'); # Either "production" or "dev"
-define('CULTURE', 'en');
+# Login credentials
+Setting('HTTP_USER', 'admin');
+Setting('HTTP_PASSWORD', 'admin');
 
-define('HTTP_USER', 'admin');
-define('HTTP_PASSWORD', 'admin');
+# Either "production" or "dev"
+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');
+
+# The base url of your installation,
+# should be just "/" when running directly under the root of a (sub)domain
+# or for example "https:/example.com/grocy" when using a subdirectory
+Setting('BASE_URL', '/');
+
+# The plugin to use for external barcode lookups,
+# must be the filename without .php extension and must be located in /data/plugins,
+# see /data/plugins/DemoBarcodeLookupPlugin.php for an example implementation
+Setting('STOCK_BARCODE_LOOKUP_PLUGIN', 'DemoBarcodeLookupPlugin');
+
+# If, however, your webserver does not support URL rewriting,
+# set this to true
+Setting('DISABLE_URL_REWRITING', false);

controllers/BaseApiController.php

@@ -4,8 +4,25 @@ namespace Grocy\Controllers;
 
 class BaseApiController extends BaseController
 {
-	protected function ApiResponse($response)
+
+	public function __construct(\Slim\Container $container)
 	{
-		return json_encode($response);
+		parent::__construct($container);
+		$this->OpenApiSpec = json_decode(file_get_contents(__DIR__ . '/../grocy.openapi.json'));
+	}
+
+	protected $OpenApiSpec;
+
+	protected function ApiResponse($data)
+	{
+		return json_encode($data);
+	}
+
+	protected function VoidApiActionResponse($response, $success = true, $status = 200, $errorMessage = '')
+	{
+		return $response->withStatus($status)->withJson(array(
+			'success' => $success,
+			'error_message' => $errorMessage
+		));
 	}
 }

controllers/BaseController.php

@@ -9,22 +9,32 @@ use \Grocy\Services\LocalizationService;
 class BaseController
 {
 	public function __construct(\Slim\Container $container) {
-		$this->AppContainer = $container;
-
 		$databaseService = new DatabaseService();
 		$this->Database = $databaseService->GetDbConnection();
+		
+		$localizationService = new LocalizationService(CULTURE);
+		$this->LocalizationService = $localizationService;
 
 		$applicationService = new ApplicationService();
-		$container->view->set('version', $applicationService->GetInstalledVersion());
+		$versionInfo = $applicationService->GetInstalledVersion();
+		$container->view->set('version', $versionInfo->Version);
+		$container->view->set('releaseDate', $versionInfo->ReleaseDate);
+		$container->view->set('isEmbeddedInstallation', $applicationService->IsEmbeddedInstallation());
 
-		$localizationService = new LocalizationService(CULTURE);
 		$container->view->set('localizationStrings', $localizationService->GetCurrentCultureLocalizations());
 		$container->view->set('L', function($text, ...$placeholderValues) use($localizationService)
 		{
 			return $localizationService->Localize($text, ...$placeholderValues);
 		});
+		$container->view->set('U', function($relativePath, $isResource = false) use($container)
+		{
+			return $container->UrlManager->ConstructUrl($relativePath, $isResource);
+		});
+
+		$this->AppContainer = $container;
 	}
 
 	protected $AppContainer;
 	protected $Database;
+	protected $LocalizationService;
 }

controllers/BatteriesApiController.php

@@ -17,16 +17,31 @@ 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']))
+		if (isset($request->getQueryParams()['tracked_time']) && !empty($request->getQueryParams()['tracked_time']) && IsIsoDateTime($request->getQueryParams()['tracked_time']))
 		{
 			$trackedTime = $request->getQueryParams()['tracked_time'];
 		}
 
-		return $this->ApiResponse(array('success' => $this->BatteriesService->TrackChargeCycle($args['batteryId'], $trackedTime)));
+		try
+		{
+			$this->BatteriesService->TrackChargeCycle($args['batteryId'], $trackedTime);
+			return $this->VoidApiActionResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
 	}
 
 	public function BatteryDetails(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		return $this->ApiResponse($this->BatteriesService->GetBatteryDetails($args['batteryId']));
+		try
+		{
+			return $this->ApiResponse($this->BatteriesService->GetBatteryDetails($args['batteryId']));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
 	}
 }

controllers/BatteriesController.php

@@ -22,24 +22,30 @@ class BatteriesController extends BaseController
 			$nextChargeTimes[$battery->id] = $this->BatteriesService->GetNextChargeTime($battery->id);
 		}
 
+		$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(),
+			'batteries' => $this->Database->batteries()->orderBy('name'),
 			'current' => $this->BatteriesService->GetCurrent(),
-			'nextChargeTimes' => $nextChargeTimes
+			'nextChargeTimes' => $nextChargeTimes,
+			'nextXDays' => $nextXDays,
+			'countDueNextXDays' => $countDueNextXDays - $countOverdue,
+			'countOverdue' => $countOverdue
 		]);
 	}
 
 	public function TrackChargeCycle(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'batterytracking', [
-			'batteries' =>  $this->Database->batteries()
+			'batteries' =>  $this->Database->batteries()->orderBy('name')
 		]);
 	}
 
 	public function BatteriesList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'batteries', [
-			'batteries' => $this->Database->batteries()
+			'batteries' => $this->Database->batteries()->orderBy('name')
 		]);
 	}
 

controllers/GenericEntityApiController.php

@@ -6,35 +6,75 @@ class GenericEntityApiController extends BaseApiController
 {
 	public function GetObjects(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		return $this->ApiResponse($this->Database->{$args['entity']}());
+		if ($this->IsValidEntity($args['entity']))
+		{
+			return $this->ApiResponse($this->Database->{$args['entity']}());
+		}
+		else
+		{
+			return $this->VoidApiActionResponse($response, false, 400, 'Entity does not exist or is not exposed');
+		}
 	}
 
 	public function GetObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		return $this->ApiResponse($this->Database->{$args['entity']}($args['objectId']));
+		if ($this->IsValidEntity($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');
+		}
 	}
 
 	public function AddObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$newRow = $this->Database->{$args['entity']}()->createRow($request->getParsedBody());
-		$newRow->save();
-		$success = $newRow->isClean();
-		return $this->ApiResponse(array('success' => $success));
+		if ($this->IsValidEntity($args['entity']))
+		{
+			$newRow = $this->Database->{$args['entity']}()->createRow($request->getParsedBody());
+			$newRow->save();
+			$success = $newRow->isClean();
+			return $this->ApiResponse(array('success' => $success));
+		}
+		else
+		{
+			return $this->VoidApiActionResponse($response, false, 400, 'Entity does not exist or is not exposed');
+		}
 	}
 
 	public function EditObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$row = $this->Database->{$args['entity']}($args['objectId']);
-		$row->update($request->getParsedBody());
-		$success = $row->isClean();
-		return $this->ApiResponse(array('success' => $success));
+		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));
+		}
+		else
+		{
+			return $this->VoidApiActionResponse($response, false, 400, 'Entity does not exist or is not exposed');
+		}
 	}
 
 	public function DeleteObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$row = $this->Database->{$args['entity']}($args['objectId']);
-		$row->delete();
-		$success = $row->isClean();
-		return $this->ApiResponse(array('success' => $success));
+		if ($this->IsValidEntity($args['entity']))
+		{
+			$row = $this->Database->{$args['entity']}($args['objectId']);
+			$row->delete();
+			$success = $row->isClean();
+			return $this->ApiResponse(array('success' => $success));
+		}
+		else
+		{
+			return $this->VoidApiActionResponse($response, false, 400, 'Entity does not exist or is not exposed');
+		}
+	}
+
+	private function IsValidEntity($entity)
+	{
+		return in_array($entity, $this->OpenApiSpec->components->internalSchemas->ExposedEntity->enum);
 	}
 }

controllers/HabitsApiController.php

@@ -17,16 +17,31 @@ class HabitsApiController extends BaseApiController
 	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']))
+		if (isset($request->getQueryParams()['tracked_time']) && !empty($request->getQueryParams()['tracked_time']) && IsIsoDateTime($request->getQueryParams()['tracked_time']))
 		{
 			$trackedTime = $request->getQueryParams()['tracked_time'];
 		}
 
-		return $this->ApiResponse(array('success' => $this->HabitsService->TrackHabit($args['habitId'], $trackedTime)));
+		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)
 	{
-		return $this->ApiResponse($this->HabitsService->GetHabitDetails($args['habitId']));
+		try
+		{
+			return $this->ApiResponse($this->HabitsService->GetHabitDetails($args['habitId']));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
 	}
 }

controllers/HabitsController.php

@@ -22,24 +22,30 @@ class HabitsController extends BaseController
 			$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(),
+			'habits' => $this->Database->habits()->orderBy('name'),
 			'currentHabits' => $this->HabitsService->GetCurrentHabits(),
-			'nextHabitTimes' => $nextHabitTimes
+			'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()
+			'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()
+			'habits' => $this->Database->habits()->orderBy('name')
 		]);
 	}
 

controllers/LoginController.php

@@ -9,13 +9,15 @@ use \Grocy\Services\DemoDataGeneratorService;
 
 class LoginController extends BaseController
 {
-	public function __construct(\Slim\Container $container)
+	public function __construct(\Slim\Container $container, string $sessionCookieName)
 	{
 		parent::__construct($container);
 		$this->SessionService = new SessionService();
+		$this->SessionCookieName = $sessionCookieName;
 	}
 
 	protected $SessionService;
+	protected $SessionCookieName;
 
 	public function ProcessLogin(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
@@ -25,18 +27,18 @@ class LoginController extends BaseController
 			if ($postParams['username'] === HTTP_USER && $postParams['password'] === HTTP_PASSWORD)
 			{
 				$sessionKey = $this->SessionService->CreateSession();
-				setcookie('grocy_session', $sessionKey, time() + 31536000); // Cookie expires in 1 year, but session validity is up to SessionService
+				setcookie($this->SessionCookieName, $sessionKey, time() + 31536000); // Cookie expires in 1 year, but session validity is up to SessionService
 
-				return $response->withRedirect('/');
+				return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/'));
 			}
 			else
 			{
-				return $response->withRedirect('/login?invalid=true');
+				return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/login?invalid=true'));
 			}
 		}
 		else
 		{
-			return $response->withRedirect('/login?invalid=true');
+			return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/login?invalid=true'));
 		}
 	}
 
@@ -47,8 +49,8 @@ class LoginController extends BaseController
 
 	public function Logout(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$this->SessionService->RemoveSession($_COOKIE['grocy_session']);
-		return $response->withRedirect('/');
+		$this->SessionService->RemoveSession($_COOKIE[$this->SessionCookieName]);
+		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/'));
 	}
 
 	public function Root(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
@@ -64,6 +66,11 @@ class LoginController extends BaseController
 			$demoDataGeneratorService->PopulateDemoData();
 		}
 
-		return $response->withRedirect('/stockoverview');
+		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/stockoverview'));
+	}
+
+	public function GetSessionCookieName()
+	{
+		return $this->SessionCookieName;
 	}
 }

controllers/OpenApiController.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\ApplicationService;
+use \Grocy\Services\ApiKeyService;
+
+class OpenApiController extends BaseApiController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->ApiKeyService = new ApiKeyService();
+	}
+
+	protected $ApiKeyService;
+
+	public function DocumentationUi(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'openapiui');
+	}
+
+	public function DocumentationSpec(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$applicationService = new ApplicationService();
+
+		$versionInfo = $applicationService->GetInstalledVersion();
+		$this->OpenApiSpec->info->version = $versionInfo->Version;
+		$this->OpenApiSpec->info->description = str_replace('PlaceHolderManageApiKeysUrl', $this->AppContainer->UrlManager->ConstructUrl('/manageapikeys'), $this->OpenApiSpec->info->description);
+		$this->OpenApiSpec->servers[0]->url = $this->AppContainer->UrlManager->ConstructUrl('/api');
+
+		return $this->ApiResponse($this->OpenApiSpec);
+	}
+
+	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()
+		]);
+	}
+
+	public function CreateNewApiKey(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$newApiKey = $this->ApiKeyService->CreateApiKey();
+		$newApiKeyId = $this->ApiKeyService->GetApiKeyId($newApiKey);
+		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl("/manageapikeys?CreatedApiKeyId=$newApiKeyId"));
+	}
+}

controllers/RecipesApiController.php

@@ -0,0 +1,22 @@
+<?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);
+	}
+}

controllers/RecipesController.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\RecipesService;
+
+class RecipesController extends BaseController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->RecipesService = new RecipesService();
+	}
+
+	protected $RecipesService;
+
+	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$recipes = $this->Database->recipes()->orderBy('name');
+
+		$selectedRecipe = null;
+		$selectedRecipePositions = null;
+		if (isset($request->getQueryParams()['recipe']))
+		{
+			$selectedRecipe = $this->Database->recipes($request->getQueryParams()['recipe']);
+			$selectedRecipePositions = $this->Database->recipes_pos()->where('recipe_id', $request->getQueryParams()['recipe']);
+		}
+		else
+		{
+			foreach ($recipes as $recipe)
+			{
+				$selectedRecipe = $recipe;
+				$selectedRecipePositions = $this->Database->recipes_pos()->where('recipe_id', $recipe->id);
+				break;
+			}
+		}
+
+		return $this->AppContainer->view->render($response, 'recipes', [
+			'recipes' => $recipes,
+			'recipesFulfillment' => $this->RecipesService->GetRecipesFulfillment(),
+			'recipesSumFulfillment' => $this->RecipesService->GetRecipesSumFulfillment(),
+			'selectedRecipe' => $selectedRecipe,
+			'selectedRecipePositions' => $selectedRecipePositions,
+			'products' => $this->Database->products(),
+			'quantityunits' => $this->Database->quantity_units()
+		]);
+	}
+
+	public function RecipeEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$recipeId = $args['recipeId'];
+		if ($recipeId  == 'new')
+		{
+			$newRecipe = $this->Database->recipes()->createRow(array(
+				'name' => $this->LocalizationService->Localize('New recipe')
+			));
+			$newRecipe->save();
+
+			$recipeId = $this->Database->lastInsertId();
+		}
+		
+		return $this->AppContainer->view->render($response, 'recipeform', [
+			'recipe' =>  $this->Database->recipes($recipeId),
+			'recipePositions' =>  $this->Database->recipes_pos()->where('recipe_id', $recipeId),
+			'mode' => 'edit',
+			'products' => $this->Database->products(),
+			'quantityunits' => $this->Database->quantity_units(),
+			'recipesFulfillment' => $this->RecipesService->GetRecipesFulfillment(),
+			'recipesSumFulfillment' => $this->RecipesService->GetRecipesSumFulfillment()
+		]);
+	}
+
+	public function RecipePosEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['recipePosId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'recipeposform', [
+				'mode' => 'create',
+				'recipe' =>  $this->Database->recipes($args['recipeId']),
+				'products' =>  $this->Database->products()->orderBy('name')
+			]);
+		}
+		else
+		{
+			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')
+			]);
+		}
+	}
+}

controllers/StockApiController.php

@@ -16,13 +16,20 @@ class StockApiController extends BaseApiController
 
 	public function ProductDetails(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		return $this->ApiResponse($this->StockService->GetProductDetails($args['productId']));
+		try
+		{
+			return $this->ApiResponse($this->StockService->GetProductDetails($args['productId']));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $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']))
+		if (isset($request->getQueryParams()['bestbeforedate']) && !empty($request->getQueryParams()['bestbeforedate']) && IsIsoDate($request->getQueryParams()['bestbeforedate']))
 		{
 			$bestBeforeDate = $request->getQueryParams()['bestbeforedate'];
 		}
@@ -33,7 +40,15 @@ class StockApiController extends BaseApiController
 			$transactionType = $request->getQueryParams()['transactiontype'];
 		}
 
-		return $this->ApiResponse(array('success' => $this->StockService->AddProduct($args['productId'], $args['amount'], $bestBeforeDate, $transactionType)));
+		try
+		{
+			$this->StockService->AddProduct($args['productId'], $args['amount'], $bestBeforeDate, $transactionType);
+			return $this->VoidApiActionResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
 	}
 
 	public function ConsumeProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
@@ -50,18 +65,34 @@ class StockApiController extends BaseApiController
 			$transactionType = $request->getQueryParams()['transactiontype'];
 		}
 
-		return $this->ApiResponse(array('success' => $this->StockService->ConsumeProduct($args['productId'], $args['amount'], $spoiled, $transactionType)));
+		try
+		{
+			$this->StockService->ConsumeProduct($args['productId'], $args['amount'], $spoiled, $transactionType);
+			return $this->VoidApiActionResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $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']))
+		if (isset($request->getQueryParams()['bestbeforedate']) && !empty($request->getQueryParams()['bestbeforedate']) && IsIsoDate($request->getQueryParams()['bestbeforedate']))
 		{
 			$bestBeforeDate = $request->getQueryParams()['bestbeforedate'];
 		}
 
-		return $this->ApiResponse(array('success' => $this->StockService->InventoryProduct($args['productId'], $args['newAmount'], $bestBeforeDate)));
+		try
+		{
+			$this->StockService->InventoryProduct($args['productId'], $args['newAmount'], $bestBeforeDate);
+			return $this->VoidApiActionResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
 	}
 
 	public function CurrentStock(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
@@ -69,9 +100,33 @@ class StockApiController extends BaseApiController
 		return $this->ApiResponse($this->StockService->GetCurrentStock());
 	}
 
-	public function AddmissingProductsToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function AddMissingProductsToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		$this->StockService->AddMissingProductsToShoppingList();
-		return $this->ApiResponse(array('success' => true));
+		return $this->VoidApiActionResponse($response);
+	}
+
+	public function ClearShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$this->StockService->ClearShoppingList();
+		return $this->VoidApiActionResponse($response);
+	}
+
+	public function ExternalBarcodeLookup(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$addFoundProduct = false;
+			if (isset($request->getQueryParams()['add']) && ($request->getQueryParams()['add'] === 'true' || $request->getQueryParams()['add'] === 1))
+			{
+				$addFoundProduct = true;
+			}
+			
+			return $this->ApiResponse($this->StockService->ExternalBarcodeLookup($args['barcode'], $addFoundProduct));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
 	}
 }

controllers/StockController.php

@@ -17,32 +17,40 @@ class StockController extends BaseController
 
 	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')), '<'));
 		return $this->AppContainer->view->render($response, 'stockoverview', [
-			'products' => $this->Database->products(),
-			'quantityunits' => $this->Database->quantity_units(),
-			'currentStock' => $this->StockService->GetCurrentStock(),
-			'missingProducts' => $this->StockService->GetMissingProducts()
+			'products' => $this->Database->products()->orderBy('name'),
+			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
+			'locations' => $this->Database->locations()->orderBy('name'),
+			'currentStock' => $currentStock,
+			'missingProducts' => $this->StockService->GetMissingProducts(),
+			'nextXDays' => $nextXDays,
+			'countExpiringNextXDays' => $countExpiringNextXDays,
+			'countAlreadyExpired' => $countAlreadyExpired
 		]);
 	}
 
 	public function Purchase(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'purchase', [
-			'products' => $this->Database->products()
+			'products' => $this->Database->products()->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()
+			'products' => $this->Database->products()->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()
+			'products' => $this->Database->products()->orderBy('name')
 		]);
 	}
 
@@ -50,8 +58,8 @@ class StockController extends BaseController
 	{
 		return $this->AppContainer->view->render($response, 'shoppinglist', [
 			'listItems' => $this->Database->shopping_list(),
-			'products' => $this->Database->products(),
-			'quantityunits' => $this->Database->quantity_units(),
+			'products' => $this->Database->products()->orderBy('name'),
+			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
 			'missingProducts' => $this->StockService->GetMissingProducts()
 		]);
 	}
@@ -59,23 +67,23 @@ class StockController extends BaseController
 	public function ProductsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'products', [
-			'products' => $this->Database->products(),
-			'locations' => $this->Database->locations(),
-			'quantityunits' => $this->Database->quantity_units()
+			'products' => $this->Database->products()->orderBy('name'),
+			'locations' => $this->Database->locations()->orderBy('name'),
+			'quantityunits' => $this->Database->quantity_units()->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()
+			'locations' => $this->Database->locations()->orderBy('name')
 		]);
 	}
 
 	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()
+			'quantityunits' => $this->Database->quantity_units()->orderBy('name')
 		]);
 	}
 
@@ -84,8 +92,8 @@ class StockController extends BaseController
 		if ($args['productId'] == 'new')
 		{
 			return $this->AppContainer->view->render($response, 'productform', [
-				'locations' =>  $this->Database->locations(),
-				'quantityunits' =>  $this->Database->quantity_units(),
+				'locations' =>  $this->Database->locations()->orderBy('name'),
+				'quantityunits' =>  $this->Database->quantity_units()->orderBy('name'),
 				'mode' => 'create'
 			]);
 		}
@@ -93,8 +101,8 @@ class StockController extends BaseController
 		{
 			return $this->AppContainer->view->render($response, 'productform', [
 				'product' =>  $this->Database->products($args['productId']),
-				'locations' =>  $this->Database->locations(),
-				'quantityunits' =>  $this->Database->quantity_units(),
+				'locations' =>  $this->Database->locations()->orderBy('name'),
+				'quantityunits' =>  $this->Database->quantity_units()->orderBy('name'),
 				'mode' => 'edit'
 			]);
 		}
@@ -139,7 +147,7 @@ class StockController extends BaseController
 		if ($args['itemId'] == 'new')
 		{
 			return $this->AppContainer->view->render($response, 'shoppinglistform', [
-				'products' =>  $this->Database->products(),
+				'products' =>  $this->Database->products()->orderBy('name'),
 				'mode' => 'create'
 			]);
 		}
@@ -147,7 +155,7 @@ class StockController extends BaseController
 		{
 			return $this->AppContainer->view->render($response, 'shoppinglistform', [
 				'listItem' =>  $this->Database->shopping_list($args['itemId']),
-				'products' =>  $this->Database->products(),
+				'products' =>  $this->Database->products()->orderBy('name'),
 				'mode' => 'edit'
 			]);
 		}

data/.gitignore

@@ -1,3 +1,4 @@
 *
 !.gitignore
 !viewcache
+!plugins

data/plugins/.gitignore

@@ -0,0 +1,3 @@
+*
+!.gitignore
+!DemoBarcodeLookupPlugin.php

data/plugins/DemoBarcodeLookupPlugin.php

@@ -0,0 +1,78 @@
+<?php
+
+use \Grocy\Helpers\BaseBarcodeLookupPlugin;
+
+/*
+	This class must extend BaseBarcodeLookupPlugin (in namespace \Grocy\Helpers)
+*/
+class DemoBarcodeLookupPlugin extends BaseBarcodeLookupPlugin
+{
+	/*
+		To use this plugin, configure it in data/config.php like this:
+		Setting('STOCK_BARCODE_LOOKUP_PLUGIN', 'DemoBarcodeLookupPlugin');
+	*/
+
+	/*
+		To try it:
+		Call the API function at /api/stock/external-barcode-lookup/{barcode}
+
+		When you also add ?add=true as a query parameter to the API call,
+		on a successful lookup the product is added to the database and in the output
+		the new product id is included (automatically, nothing to do here in the plugin)
+	*/
+
+	/*
+		Provided references:
+
+		$this->Locations contains all locations
+		$this->QuantityUnits contains all quantity units
+	*/
+
+	/*
+		Useful hints:
+
+		Get a quantity unit by name:
+		$quantityUnit = FindObjectInArrayByPropertyValue($this->QuantityUnits, 'name', 'Piece');
+
+		Get a location by name:
+		$location = FindObjectInArrayByPropertyValue($this->Locations, 'name', 'Fridge');
+	*/
+
+	/*
+		This class must implement the protected abstract function ExecuteLookup($barcode),
+		which is called with the barcode that needs to be looked up and must return an
+		associative array of the product model or null, when nothing was found for the barcode.
+
+		The returned array must contain at least these properties:
+		array(
+			'name' => '',
+			'location_id' => 1, // A valid id of a location object, check against $this->Locations
+			'qu_id_purchase' => 1, // A valid id of quantity unit object, check against $this->QuantityUnits
+			'qu_id_stock' => 1, // A valid id of quantity unit object, check against $this->QuantityUnits
+			'qu_factor_purchase_to_stock' => 1, // Normally 1 when quantity unit stock and purchase is the same
+			'barcode' => $barcode // The barcode of the product, maybe just pass through $barcode or manipulate it if necessary
+		)
+	*/
+	protected function ExecuteLookup($barcode)
+	{
+		if ($barcode === 'x') // Demonstration when nothing is found
+		{
+			return null;
+		}
+		elseif ($barcode === 'e') // Demonstration when an error occurred
+		{
+			throw new \Exception('This is the error message from the plugin...');
+		}
+		else
+		{
+			return array(
+				'name' => 'LookedUpProduct_' . RandomString(5),
+				'location_id' => $this->Locations[0]->id,
+				'qu_id_purchase' => $this->QuantityUnits[0]->id,
+				'qu_id_stock' => $this->QuantityUnits[0]->id,
+				'qu_factor_purchase_to_stock' => 1,
+				'barcode' => $barcode
+			);
+		}
+	}
+}

extensions.php

@@ -1,63 +0,0 @@
-<?php
-
-function FindObjectInArrayByPropertyValue($array, $propertyName, $propertyValue)
-{
-	foreach($array as $object)
-	{
-		if($object->{$propertyName} == $propertyValue)
-		{
-			return $object;
-		}
-	}
-
-	return null;
-}
-
-function FindAllObjectsInArrayByPropertyValue($array, $propertyName, $propertyValue, $operator = '==')
-{
-	$returnArray = array();
-
-	foreach($array as $object)
-	{
-		switch($operator)
-		{
-			case '==':
-				if($object->{$propertyName} == $propertyValue)
-				{
-					$returnArray[] = $object;
-				}
-				break;
-			case '>':
-				if($object->{$propertyName} > $propertyValue)
-				{
-					$returnArray[] = $object;
-				}
-				break;
-			case '<':
-				if($object->{$propertyName} < $propertyValue)
-				{
-					$returnArray[] = $object;
-				}
-				break;
-		}
-	}
-
-	return $returnArray;
-}
-
-function SumArrayValue($array, $propertyName)
-{
-	$sum = 0;
-	foreach($array as $object)
-	{
-		$sum += $object->{$propertyName};
-	}
-
-	return $sum;
-}
-
-function GetClassConstants($className)
-{
-	$r = new ReflectionClass($className);
-	return $r->getConstants();
-}

helpers/BaseBarcodeLookupPlugin.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace Grocy\Helpers;
+
+abstract class BaseBarcodeLookupPlugin
+{
+	final public function __construct($locations, $quantityUnits)
+	{
+		$this->Locations = $locations;
+		$this->QuantityUnits = $quantityUnits;
+	}
+
+	protected $Locations;
+	protected $QuantityUnits;
+
+	abstract protected function ExecuteLookup($barcode);
+
+	final public function Lookup($barcode)
+	{
+		$pluginOutput = $this->ExecuteLookup($barcode);
+
+		if ($pluginOutput === null)
+		{
+			return $pluginOutput;
+		}
+
+		// Plugin must return an associative array
+		if (!is_array($pluginOutput))
+		{
+			throw new \Exception('Plugin output must be an associative array');
+		}
+		if (!IsAssociativeArray($pluginOutput)) // $pluginOutput is at least an indexed array here
+		{
+			throw new \Exception('Plugin output must be an associative array');
+		}
+
+		// Check for minimum needed properties
+		$minimunNeededProperties = array(
+			'name',
+			'location_id',
+			'qu_id_purchase',
+			'qu_id_stock',
+			'qu_factor_purchase_to_stock',
+			'barcode'
+		);
+		foreach ($minimunNeededProperties as $prop)
+		{
+			if (!array_key_exists($prop, $pluginOutput))
+			{
+				throw new \Exception("Plugin output does not provide needed property $prop");
+			}
+		}
+
+		// $pluginOutput contains all needed properties here
+
+		// Check referenced entity ids are valid
+		$locationId = $pluginOutput['location_id'];
+		if (FindObjectInArrayByPropertyValue($this->Locations, 'id', $locationId) === null)
+		{
+			throw new \Exception("Location $locationId is not a valid location id");
+		}
+		$quIdPurchase = $pluginOutput['qu_id_purchase'];
+		if (FindObjectInArrayByPropertyValue($this->QuantityUnits, 'id', $quIdPurchase) === null)
+		{
+			throw new \Exception("Location $quIdPurchase is not a valid quantity unit id");
+		}
+		$quIdStock = $pluginOutput['qu_id_stock'];
+		if (FindObjectInArrayByPropertyValue($this->QuantityUnits, 'id', $quIdStock) === null)
+		{
+			throw new \Exception("Location $quIdStock is not a valid quantity unit id");
+		}
+		$quFactor = $pluginOutput['qu_factor_purchase_to_stock'];
+		if (empty($quFactor) || !is_numeric($quFactor))
+		{
+			throw new \Exception('Quantity unit factor is empty or not a number');
+		}
+
+		return $pluginOutput;
+	}
+}

helpers/UrlManager.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Grocy\Helpers;
+
+class UrlManager
+{
+	public function __construct(string $basePath)
+	{
+		if ($basePath === '/')
+		{
+			$this->BasePath = $this->GetBaseUrl();
+		}
+		else
+		{
+			$this->BasePath = $basePath;
+		}
+	}
+
+	protected $BasePath;
+
+	public function ConstructUrl($relativePath, $isResource = false)
+	{
+		if (DISABLE_URL_REWRITING === false || $isResource === true)
+		{
+			return rtrim($this->BasePath, '/') . $relativePath;
+		}
+		else // Is not a resource and URL rewriting is disabled
+		{
+			return rtrim($this->BasePath, '/') . '/index.php' . $relativePath;
+		}
+	}
+
+	private function GetBaseUrl()
+	{
+		return (isset($_SERVER['HTTPS']) ? "https" : "http") . "://$_SERVER[HTTP_HOST]";
+	}
+}

helpers/extensions.php

@@ -0,0 +1,146 @@
+<?php
+
+function FindObjectInArrayByPropertyValue($array, $propertyName, $propertyValue)
+{
+	foreach($array as $object)
+	{
+		if($object->{$propertyName} == $propertyValue)
+		{
+			return $object;
+		}
+	}
+
+	return null;
+}
+
+function FindAllObjectsInArrayByPropertyValue($array, $propertyName, $propertyValue, $operator = '==')
+{
+	$returnArray = array();
+
+	foreach($array as $object)
+	{
+		switch($operator)
+		{
+			case '==':
+				if($object->{$propertyName} == $propertyValue)
+				{
+					$returnArray[] = $object;
+				}
+				break;
+			case '>':
+				if($object->{$propertyName} > $propertyValue)
+				{
+					$returnArray[] = $object;
+				}
+				break;
+			case '<':
+				if($object->{$propertyName} < $propertyValue)
+				{
+					$returnArray[] = $object;
+				}
+				break;
+		}
+	}
+
+	return $returnArray;
+}
+
+function FindAllItemsInArrayByValue($array, $value, $operator = '==')
+{
+	$returnArray = array();
+
+	foreach($array as $item)
+	{
+		switch($operator)
+		{
+			case '==':
+				if($item == $value)
+				{
+					$returnArray[] = $item;
+				}
+				break;
+			case '>':
+				if($item > $value)
+				{
+					$returnArray[] = $item;
+				}
+				break;
+			case '<':
+				if($item < $value)
+				{
+					$returnArray[] = $item;
+				}
+				break;
+		}
+	}
+
+	return $returnArray;
+}
+
+function SumArrayValue($array, $propertyName)
+{
+	$sum = 0;
+	foreach($array as $object)
+	{
+		$sum += $object->{$propertyName};
+	}
+
+	return $sum;
+}
+
+function GetClassConstants($className)
+{
+	$r = new ReflectionClass($className);
+	return $r->getConstants();
+}
+
+function RandomString($length, $allowedChars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
+{
+	$randomString = '';
+	for ($i = 0; $i < $length; $i++)
+	{
+		$randomString .= $allowedChars[rand(0, strlen($allowedChars) - 1)];
+	}
+
+	return $randomString;
+}
+
+function IsAssociativeArray(array $array)
+{
+	$keys = array_keys($array);
+	return array_keys($keys) !== $keys;
+}
+
+function IsIsoDate($dateString)
+{
+	$d = DateTime::createFromFormat('Y-m-d', $dateString);
+	return $d && $d->format('Y-m-d') === $dateString;
+}
+
+function IsIsoDateTime($dateTimeString)
+{
+	$d = DateTime::createFromFormat('Y-m-d H:i:s', $dateTimeString);
+	return $d && $d->format('Y-m-d H:i:s') === $dateTimeString;
+}
+
+function BoolToString(bool $bool)
+{
+	return $bool ? 'true' : 'false';
+}
+
+function Setting(string $name, $value)
+{
+	if (!defined($name))
+	{
+		// The content of a $name.txt file in /data/settingoverrides can overwrite the given setting (for embedded mode)
+		$settingOverrideFile = DATAPATH . '/settingoverrides/' . $name . '.txt';
+		if (file_exists($settingOverrideFile))
+		{
+			define($name, file_get_contents($settingOverrideFile));
+		}
+		else
+		{
+			define($name, $value);
+		}
+	}
+}

localization/de.php

@@ -88,6 +88,87 @@ return array(
 	'Username' => 'Benutzername',
 	'Password' => 'Passwort',
 	'Invalid credentials, please try again' => 'Ungültige Zugangsdaten, bitte versuche es erneut',
+	'Are you sure to delete battery "#1"?' => 'Battery "#1" wirklich löschen?',
+	'Yes' => 'Ja',
+	'No' => 'Nein',
+	'Are you sure to delete habit "#1"?' => 'Gewohnheit "#1" wirklich löschen?',
+	'"#1" could not be resolved to a product, how do you want to proceed?' => '"#1" konnte nicht zu einem Produkt aufgelöst werden, wie möchtest du weiter machen?',
+	'Create or assign product' => 'Produkt erstellen oder verknüpfen',
+	'Cancel' => 'Abbrechen',
+	'Add as new product' => 'Als neues Produkt hinzufügen',
+	'Add as barcode to existing product' => 'Barcode vorhandenem Produkt zuweisen',
+	'Add as new product and prefill barcode' => 'Neues Produkt erstellen und Barcode vorbelegen',
+	'Are you sure to delete quantity unit "#1"?' => 'Mengeneinheit "#1" wirklich löschen?',
+	'Are you sure to delete product "#1"?' => 'Produkt "#1" wirklich löschen?',
+	'Are you sure to delete location "#1"?' => 'Standort "#1" wirklich löschen?',
+	'Manage API keys' => 'API-Keys verwalten',
+    'REST API & data model documentation' => 'REST-API & Datenmodell Dokumentation',
+    'API keys' => 'API-Keys',
+    'Create new API key' => 'Neuen API-Key erstellen',
+    'API key' => 'API-Key',
+    'Expires' => 'Läuft ab',
+    'Created' => 'Erstellt',
+	'This product is not in stock' => 'Dieses Produkt ist nicht vorrätig',
+	'This means #1 will be added to stock' => 'Das bedeutet #1 wird dem Bestand hinzugefügt',
+	'This means #1 will be removed from stock' => 'Das bedeutet #1 wird aus dem Bestand entfernt',
+	'This means it is estimated that a new execution of this habit is tracked #1 days after the last was tracked' => 'Das bedeutet, dass eine erneute Ausführung der Gewohnheit #1 Tage nach der letzten Ausführung geplant wird',
+	'Removed #1 #2 of #3 from stock' => '#1 #2 #3 aus dem Bestand entfernt',
+	'About grocy' => 'Über grocy',
+	'Close' => 'Schließen',
+	'#1 batteries are due to be charged within the next #2 days' => '#1 Batterien müssen in den nächsten #2 Tagen geladen werden',
+	'#1 batteries are overdue to be charged' => '#1 Batterien sind überfällig',
+	'#1 habits are due to be done within the next #2 days' => '#1 Gewohnheiten stehen in den nächsten #2 Tagen an',
+	'#1 habits are overdue to be done' => '#1 Gewohnheiten sind überfällig',
+	'Released on' => 'Veröffentlicht am',
+	'Consume #3 #1 of #2' => 'Verbrauche #3 #1 #2',
+	'Added #1 #2 of #3 to stock' => '#1 #2 #3 dem Bestand hinzugefügt',
+	'Stock amount of #1 is now #2 #3' => 'Es sind nun #2 #3 #1 im Bestand',
+	'Tracked execution of habit #1 on #2' => 'Ausführung von #1 am #2 erfasst',
+	'Tracked charge cylce of battery #1 on #2' => 'Ladezyklus für Batterie #1 am #2 erfasst',
+	'Consume all #1 which are currently in stock' => 'Verbrauche den kompletten Bestand von #1',
+	'All' => 'Alle',
+	'Track charge cycle of battery #1' => 'Erfasse einen Ladezyklus für Batterie #1',
+	'Track execution of habit #1' => 'Erfasse eine Ausführung von #1',
+	'Filter by location' => 'Nach Standort filtern',
+	'Search' => 'Suche',
+	'Not logged in' => 'Nicht angemeldet',
+	'You have to select a product' => 'Ein Produkt muss ausgewählt werden',
+	'You have to select a habit' => 'Eine Gewohnheit muss ausgewählt werden',
+	'You have to select a battery' => 'Eine Batterie muss ausgewählt werden',
+	'A name is required' => 'Ein Name ist erforderlich',
+	'A location is required' => 'Ein Standort ist erforderlich',
+	'The amount cannot be lower than #1' => 'Die Menge darf nicht kleiner als #1 sein',
+	'This cannot be negative' => 'Dies darf nicht negativ sein',
+	'A quantity unit is required' => 'Eine Mengeneinheit muss ausgewählt werden',
+	'A period type is required' => 'Eine Periodentyp muss ausgewählt werden',
+	'A best before date is required and must be later than today' => 'Ein Mindesthaltbarkeitsdatum ist erforderlich und muss später als heute sein',
+	'Settings' => 'Einstellungen',
+	'This can only be before now' => 'Dies kann nur vor jetzt sein',
+	'Calendar' => 'Kalender',
+	'Recipes' => 'Rezepte',
+	'Edit recipe' => 'Rezept bearbeiten',
+	'New recipe' => 'Neues Rezept',
+	'Ingredients list' => 'Zutatenliste',
+	'Add recipe ingredient' => 'Rezeptzutat hinzufügen',
+	'Edit recipe ingredient' => 'Rezeptzutat bearbeiten',
+	'Are you sure to delete recipe "#1"?' => 'Rezept "#1" wirklich löschen?',
+	'Are you sure to delete recipe ingredient "#1"?' => 'Rezeptzutat "#1" wirklich löschen?',
+	'Are you sure to empty the shopping list?' => 'Sicher, dass den Einkaufszettel geleert werden soll?',
+	'Clear list' => 'Liste leeren',
+	'Requirements fulfilled' => 'Bedarf im Bestand',
+	'Put missing products on shopping list' => 'Fehlende Produkte auf den Einkaufszettel setzen',
+	'Not enough in stock, #1 ingredients missing' => 'Nicht ausreichend im Bestand, #1 Zutaten fehlen',
+	'Enough in stock' => 'Bestand reicht aus',
+	'Not enough in stock, #1 ingredients missing but already on the shopping list' => 'Bestand nicht ausreichend, #1 Zutaten fehlen, stehen aber bereits auf dem Einkaufszettel',
+	'Expand to fullscreen' => 'Auf ganzen Bildschirm vergrößern',
+	'Ingredients' => 'Zutaten',
+	'Preparation' => 'Zubereitung',
+	'Recipe' => 'Rezept',
+	'Not enough in stock, #1 missing, #2 already on shopping list' => 'Nicht ausreichend im Bestand, #1 fehlen, #2 stehen bereits auf dem Einkaufszettel',
+	'Show notes' => 'Notizen anzeigen',
+	'Put missing amount on shopping list' => 'Fehlende Menge auf den Einkaufszettel setzen',
+	'Are you sure to put all missing ingredients for recipe "#1" on the shopping list?' => 'Sicher alle fehlenden Zutaten für Rezept "#1" auf die Einkaufsliste zu setzen?',
+	'Added for recipe #1' => 'Hinzugefügt für Rezept #1',
 	
 	//Constants
 	'manually' => 'Manuell',
@@ -97,7 +178,6 @@ return array(
 	'timeago_locale' => 'de',
 	'timeago_nan' => 'vor NaN Jahren',
 	'moment_locale' => 'de',
-	'bootstrap_datepicker_locale' => 'de',
 	'datatables_localization' => '{"sEmptyTable":"Keine Daten in der Tabelle vorhanden","sInfo":"_START_ bis _END_ von _TOTAL_ Einträgen","sInfoEmpty":"Keine Daten vorhanden","sInfoFiltered":"(gefiltert von _MAX_ Einträgen)","sInfoPostFix":"","sInfoThousands":".","sLengthMenu":"_MENU_ Einträge anzeigen","sLoadingRecords":"Wird geladen ..","sProcessing":"Bitte warten ..","sSearch":"Suchen","sZeroRecords":"Keine Einträge vorhanden","oPaginate":{"sFirst":"Erste","sPrevious":"Zurück","sNext":"Nächste","sLast":"Letzte"},"oAria":{"sSortAscending":": aktivieren, um Spalte aufsteigend zu sortieren","sSortDescending":": aktivieren, um Spalte absteigend zu sortieren"},"select":{"rows":{"0":"Zum Auswählen auf eine Zeile klicken","1":"1 Zeile ausgewählt","_":"%d Zeilen ausgewählt"}},"buttons":{"print":"Drucken","colvis":"Spalten","copy":"Kopieren","copyTitle":"In Zwischenablage kopieren","copyKeys":"Taste <i>ctrl</i> oder <i>⌘</i> + <i>C</i> um Tabelle<br>in Zwischenspeicher zu kopieren.<br><br>Um abzubrechen die Nachricht anklicken oder Escape drücken.","copySuccess":{"1":"1 Spalte kopiert","_":"%d Spalten kopiert"}}}',
 	
 	//Demo data
@@ -131,5 +211,20 @@ return array(
 	'Warranty ends' => 'Garantie endet',
 	'TV remote control' => 'TV Fernbedienung',
 	'Alarm clock' => 'Wecker',
-	'Heat remote control' => 'Fernbedienung Heizung'
+	'Heat remote control' => 'Fernbedienung Heizung',
+	'Lawn mowed in the garden' => 'Rasen im Garten gemäht',
+	'Some good snacks' => 'Paar gute Snacks',
+	'Pizza dough' => 'Pizzateig',
+	'Sieved tomatoes' => 'Passierte Tomaten',
+	'Salami' => 'Salami',
+	'Toast' => 'Toast',
+	'Minced meat' => 'Hackfleisch',
+	'Pizza' => 'Pizza',
+	'Spaghetti bolognese' => 'Spaghetti Bolognese',
+	'Sandwiches' => 'Belegte Toasts',
+	'English' => 'Englisch',
+	'German' => 'Deutsch',
+	'Italian' => 'Italienisch',
+	'Demo in different language' => 'Demo in anderer Sprache',
+	'This is the note content of the recipe ingredient' => 'Dies ist der Inhalt der Notiz der Zutat'
 );

localization/en.php

@@ -9,6 +9,5 @@ return array(
 	'timeago_locale' => 'en',
 	'timeago_nan' => 'NaN years ago',
 	'moment_locale' => '',
-	'bootstrap_datepicker_locale' => '',
 	'datatables_localization' => '{"sEmptyTable":"No data available in table","sInfo":"Showing _START_ to _END_ of _TOTAL_ entries","sInfoEmpty":"Showing 0 to 0 of 0 entries","sInfoFiltered":"(filtered from _MAX_ total entries)","sInfoPostFix":"","sInfoThousands":",","sLengthMenu":"Show _MENU_ entries","sLoadingRecords":"Loading...","sProcessing":"Processing...","sSearch":"Search:","sZeroRecords":"No matching records found","oPaginate":{"sFirst":"First","sLast":"Last","sNext":"Next","sPrevious":"Previous"},"oAria":{"sSortAscending":": activate to sort column ascending","sSortDescending":": activate to sort column descending"}}'
 );

localization/it.php

@@ -0,0 +1,187 @@
+<?php
+
+return array(
+	'Stock overview' => 'Dispensa',
+	'#1 products with #2 units in stock' => '#1 prodotti stano per finire(#2 unità)',
+	'#1 products expiring within the next #2 days' => '#1 prodotti scadranno tra #2 giorni',
+	'#1 products are already expired' => '#1 prodotti scaduti',
+	'#1 products are below defined min. stock amount' => '#1 prodotti sotto il limite minimo',
+	'Product' => 'prodotto',
+	'Amount' => 'quantità',
+	'Next best before date' => 'Prossima data di scadenza',
+	'Logout' => 'Logout',
+	'Habits overview' => 'Riepilogo delle abitudini',
+	'Batteries overview' => 'Riepilogo delle batterie',
+	'Purchase' => 'Acquisti',
+	'Consume' => 'Consumi',
+	'Inventory' => 'Inventario',
+	'Shopping list' => 'Lista della spesa',
+	'Habit tracking' => 'Dati abitudini',
+	'Battery tracking' => 'Dati batterie',
+	'Products' => 'Prodotti',
+	'Locations' => 'Posizioni',
+	'Quantity units' => 'Unità di misura',
+	'Habits' => 'Abitudini',
+	'Batteries' => 'Batterie',
+	'Habit' => 'Abitudine',
+	'Next estimated tracking' => 'Prossima esecuzione',
+	'Last tracked' => 'Ultima esecuzione',
+	'Battery' => 'Batterie',
+	'Last charged' => 'Ultima ricarica',
+	'Next planned charge cycle' => 'Prossima ricarica',
+	'Best before' => 'Data di scadenza',
+	'OK' => 'OK',
+	'Product overview' => 'Riepilogo dei prodotti',
+	'Stock quantity unit' => 'Unità di misura',
+	'Stock amount' => 'Quantità',
+	'Last purchased' => 'Ultimo acquisto',
+	'Last used' => 'Ultimo utilizzo',
+	'Spoiled' => 'Scaduto',
+	'Barcode lookup is disabled' => 'I codici a barre sono disabilitati',
+	'will be added to the list of barcodes for the selected product on submit' => 'sarà aggiunto alla lista dei codici a barre per questo prodotto',
+	'New amount' => 'Nuova quantità',
+	'Note' => 'Nota',
+	'Tracked time' => 'Ora di esecuzione',
+	'Habit overview' => 'Riepilogo dell\'abitudine',
+	'Tracked count' => 'Numero di esecuzioni',
+	'Battery overview' => 'Riepilogo della batteria',
+	'Charge cycles count' => 'Numero di ricariche',
+	'Create shopping list item' => 'Aggiungi un prodotto alla lista della spesa',
+	'Edit shopping list item' => 'Modifica un\'entrata della lista della spesa',
+	'#1 units were automatically added and will apply in addition to the amount entered here' => '#1 sono state aggiunte automaticamente',
+	'Save' => 'Salva',
+	'Add' => 'Aggiungi',
+	'Name' => 'Nome',
+	'Location' => 'Posizione',
+	'Min. stock amount' => 'Quantità minima',
+	'QU purchase' => 'Unità di acquisto',
+	'QU stock' => 'Unità di dispensa',
+	'QU factor' => 'Fattore di conversione',
+	'Description' => 'Descrizione',
+	'Create product' => 'Aggiungi prodotto',
+	'Barcode(s)' => 'Codice a barre',
+	'Minimum stock amount' => 'Quantità minima',
+	'Default best before days' => 'Data di scadenza standard in giorni',
+	'Quantity unit purchase' => 'Unità di acquisto',
+	'Quantity unit stock' => 'Unità di dispensa',
+	'Factor purchase to stock quantity unit' => 'Fattore di conversione tra quantità di acquisto e di dispensa',
+	'Create location' => 'Aggiungi posizione',
+	'Create quantity unit' => 'Aggiungi unità di misura',
+	'Period type' => 'Tipo di ripetizione',
+	'Period days' => 'Periodo in giorni',
+	'Create habit' => 'Aggiungi abitudine',
+	'Used in' => 'Usato in',
+	'Create battery' => 'Aggiungi batteria',
+	'Edit battery' => 'Modifica batteria',
+	'Edit habit' => 'Modifica abitudine',
+	'Edit quantity unit' => 'Modifica unità di misura',
+	'Edit product' => 'Modifica prodotto',
+	'Edit location' => 'Modifica posizione',
+	'Record data' => 'Registra dati',
+	'Manage master data' => 'Gestisci dati',
+	'This will apply to added products' => 'Verrà applicato ai prodotti aggiunti',
+	'never' => 'mai',
+	'Add products that are below defined min. stock amount' => 'Aggiungi prodotti sotti il limite minimo',
+	'For purchases this amount of days will be added to today for the best before date suggestion' => 'Questo numero di giorni verrà aggiunto alla data di acquisto per la data di scadenza',
+	'This means 1 #1 purchased will be converted into #2 #3 in stock' => 'Questo significa che 1 #1 acquistato diventerà #2 #3 in dispensa',
+	'Login' => 'Login',
+	'Username' => 'Username',
+	'Password' => 'Password',
+	'Invalid credentials, please try again' => 'Credenziali non valide, per favore riprova',
+	'Are you sure to delete battery "#1"?' => 'Sei sicuro di voler eliminare la batteria "#1"?',
+	'Yes' => 'Si',
+	'No' => 'No',
+	'Are you sure to delete habit "#1"?' => 'Sei sicuro di voler eliminare l\'abitudine "#1"?',
+	'"#1" could not be resolved to a product, how do you want to proceed?' => '"#1" non è stato associato a nessun prodotto, vuoi procedere?',
+	'Create or assign product' => 'Aggiungi o assegna prodotto',
+	'Cancel' => 'Annulla',
+	'Add as new product' => 'Aggiungi come nuovo prodotto',
+	'Add as barcode to existing product' => 'Assegna il codice a barre ad un prodotto',
+	'Add as new product and prefill barcode' => 'Aggiungi come nuovo prodotto ed assegna il codice a barre',
+	'Are you sure to delete quantity unit "#1"?' => 'Sei sicuro di voler eliminare l\'unità di misura "#1"?',
+	'Are you sure to delete product "#1"?' => 'Sei sicuro di voler eliminare il prodotto "#1"?',
+	'Are you sure to delete location "#1"?' => 'Sei sicuro di voler eliminare la posizione "#1"?',
+	'Manage API keys' => 'Gestisci le chiavi API',
+    'REST API & data model documentation' => 'REST API & Documentazione del modello di dati',
+    'API keys' => 'Chiavi API',
+    'Create new API key' => 'Crea nuova chiave API',
+    'API key' => 'Chiave API',
+    'Expires' => 'Scade il',
+    'Created' => 'Creata il',
+	'This product is not in stock' => 'Questo prodotto non è in dispensa',
+	'This means #1 will be added to stock' => '#1 sarà aggiunto alla dispensa',
+	'This means #1 will be removed from stock' => '#1 sarà rimosso dalla dispensa',
+	'This means it is estimated that a new execution of this habit is tracked #1 days after the last was tracked' => 'L\'esecuzione dell\'abitudine è #1 giorni dopo la precedente',
+	'Removed #1 #2 of #3 from stock' => '#1 #2 su #3 rimossi dalla dispensa',
+	'About grocy' => 'Riguardo grocy',
+	'Close' => 'Chiudi',
+	'#1 batteries are due to be charged within the next #2 days' => '#1 batterie da ricaricare entro #2 giorni',
+	'#1 batteries are overdue to be charged' => '#1 batterie devono essere ricaricate',
+	'#1 habits are due to be done within the next #2 days' => '#1 abitudini da eseguire entro #2 giorni',
+	'#1 habits are overdue to be done' => '#1 abitudini da eseguire',
+	'Released on' => 'Rilasciato il',
+	'Consume #3 #1 of #2' => 'Consumati #3 #1 di #2',
+	'Added #1 #2 of #3 to stock' => 'Aggiunti #1 #2 di #3',
+	'Stock amount of #1 is now #2 #3' => 'La quantità in dispensa di #1 è ora #2 #3',
+	'Tracked execution of habit #1 on #2' => 'Esecuzione dell\'abitudine #1 registrata il #2',
+	'Tracked charge cylce of battery #1 on #2' => 'Ricarica della batteria #1 effettuata il #2',
+	'Consume all #1 which are currently in stock' => 'Consuma tutto #1 in dispensa',
+	'All' => 'Tutto',
+	'Track charge cycle of battery #1' => 'Registra la ricarica della batteria #1',
+	'Track execution of habit #1' => 'Registra l\'esecuzione dell\'abitudine #1',
+	'Filter by location' => 'Filtra per posizione',
+	'Search' => 'Cerca',
+	'Not logged in' => 'Non autenticato',
+	'You have to select a product' => 'Devi selezionare un prodotto',
+	'You have to select a habit' => 'Devi selezionare un\'abitudine',
+	'You have to select a battery' => 'Devi selezionare una batteria',
+	'A name is required' => 'Inserisci un nome',
+	'A location is required' => 'Inserisci la posizione',
+	'The amount cannot be lower than #1' => 'La quantità non può essere minore di #1',
+	'This cannot be negative' => 'Il numero non può essere negativo',
+	'A quantity unit is required' => 'Inserisci un\'unità di misura',
+	'A period type is required' => 'Seleziona un tipo di ripetizione',
+	
+	//Constants
+	'manually' => 'Manualmente',
+	'dynamic-regular' => 'Regolatore dinamico',
+	
+	//Technical component translations
+	'timeago_locale' => 'it',
+	'timeago_nan' => 'NaN anni fa',
+	'moment_locale' => 'it',
+	'datatables_localization' => '{"sEmptyTable":"Nessun dato disponibile","sInfo":"Mostrando da _START_ a _END_ di _TOTAL_ voci","sInfoEmpty":"Mostrando da 0 a 0 di 0 voci","sInfoFiltered":"(Filtrato da _MAX_ voci totali)","sInfoPostFix":"","sInfoThousands":",","sLengthMenu":"Mostra _MENU_ voci","sLoadingRecords":"Caricando...","sProcessing":"Calcolando...","sSearch":"Cerca:","sZeroRecords":"Nessun risultato trovato","oPaginate":{"sFirst":"Prima","sLast":"Ultima","sNext":"Prossima","sPrevious":"Precedente"},"oAria":{"sSortAscending":": ordine crescente","sSortDescending":": ordine decrescente"}}',
+	
+	//Demo data
+	'Cookies' => 'Biscotti',
+	'Chocolate' => 'Cioccolato',
+	'Pantry' => 'Vorratskammer',
+	'Candy cupboard' => 'Süßigkeitenschrank',
+	'Tinned food cupboard' => 'Konservenschrank',
+	'Fridge' => 'Kühlschrank',
+	'Piece' => 'Pezzo',
+	'Pack' => 'Pacco',
+	'Glass' => 'Bicchiere',
+	'Tin' => 'Scatola',
+	'Can' => 'Lattina',
+	'Bunch' => 'Cespo',
+	'Gummy bears' => 'Caramelle',
+	'Crisps' => 'Patatine',
+	'Eggs' => 'Uova',
+	'Noodles' => 'Spaghetti',
+	'Pickles' => 'Marmellata',
+	'Gulash soup' => 'Dado',
+	'Yogurt' => 'Yogurt',
+	'Cheese' => 'Parmigiano',
+	'Cold cuts' => 'Pancetta',
+	'Paprika' => 'Pepe',
+	'Cucumber' => 'Zucchine',
+	'Radish' => 'Radicchio',
+	'Tomato' => 'Pomodori',
+	'Changed towels in the bathroom' => 'Cambiare asciugamani in bagno',
+	'Cleaned the kitchen floor' => 'Pulire la cucina',
+	'Warranty ends' => 'Scadenza dalla garanzia',
+	'TV remote control' => 'Telecomando',
+	'Alarm clock' => 'Sveglia',
+	'Heat remote control' => 'Termostato'
+);

localization/no.php

@@ -0,0 +1,230 @@
+<?php
+
+return array(
+	'Stock overview' => 'Husholdning',
+	'#1 products with #2 units in stock' => '#1 Produkter med #2 i husholdningen',
+	'#1 products expiring within the next #2 days' => '#1 Produkter som går ut på dato innen de neste #2 dagene',
+	'#1 products are already expired' => '#1 Produkt som har gått ut på dato',
+	'#1 products are below defined min. stock amount' => '#1 Produkt under minimum husholdningsnivå',
+	'Product' => 'Produkt',
+	'Amount' => 'Antall',
+	'Next best before date' => 'Kommende best før dato',
+	'Logout' => 'Logg Av',
+	'Habits overview' => 'Oversikt Husoppgaver',
+	'Batteries overview' => 'Oversikt Batteri',
+	'Purchase' => 'Innkjøp',
+	'Consume' => 'Forbrukt',
+	'Inventory' => 'Endre Husholdning',
+	'Shopping list' => 'Handleliste',
+	'Habit tracking' => 'Logge Husoppgaver',
+	'Battery tracking' => 'Ladesyklus Batteri',
+	'Products' => 'Produkter',
+	'Locations' => 'Lokasjoner',
+	'Quantity units' => 'Forpakning',
+	'Habits' => 'Husoppgaver',
+	'Batteries' => 'Batterier',
+	'Habit' => 'Husoppgave',
+	'Next estimated tracking' => 'Neste handling',
+	'Last tracked' => 'Sist logget',
+	'Battery' => 'Batteri',
+	'Last charged' => 'Sist ladet',
+	'Next planned charge cycle' => 'Neste planlagte ladesyklus',
+	'Best before' => 'Best før',
+	'OK' => 'OK',
+	'Product overview' => 'Oversikt Produkt',
+	'Stock quantity unit' => 'Forpakning i husholdningen',
+	'Stock amount' => 'Husholdning',
+	'Last purchased' => 'Sist kjøpt',
+	'Last used' => 'Sist brukt',
+	'Spoiled' => 'Produkt har gått ut på dato',
+	'Barcode lookup is disabled' => 'Strekkodesøk deaktivert',
+	'will be added to the list of barcodes for the selected product on submit' => 'Blir lagt til liste over strekkoder når produkt blir lagt inn.',
+	'New amount' => 'Nytt antall',
+	'Note' => 'Info',
+	'Tracked time' => 'Tid logget',
+	'Habit overview' => 'Oversikt Husoppgave',
+	'Tracked count' => 'Logget',
+	'Battery overview' => 'Batteri Oversikt',
+	'Charge cycles count' => 'Antall ladesykluser',
+	'Create shopping list item' => 'Opprett handelisteoppføring',
+	'Edit shopping list item' => 'Endre på handlelistoppføring',
+	'#1 units were automatically added and will apply in addition to the amount entered here' => '#1 enheter ble automatisk lagt til i tillegg til hva som blir skrevet inn her',
+	'Save' => 'Lagre',
+	'Add' => 'Legg til',
+	'Name' => 'Navn',
+	'Location' => 'Lokasjon',
+	'Min. stock amount' => 'Minimums antall for husholdingen',
+	'QU purchase' => 'QU innkjøp',
+	'QU stock' => 'QU husholdning',
+	'QU factor' => 'QU faktor',
+	'Description' => 'Beskrivelse',
+	'Create product' => 'Opprett produkt',
+	'Barcode(s)' => 'Strekkode(r)',
+	'Minimum stock amount' => 'Minimums antall for husholdningen',
+	'Default best before days' => 'Standard antall dager best før',
+	'Quantity unit purchase' => 'Forpakning kjøpt',
+	'Quantity unit stock' => 'Forpakning husholdning',
+	'Factor purchase to stock quantity unit' => 'Innkjøpsfaktor for forpakning',
+	'Create location' => 'Opprett lokasjon',
+	'Create quantity unit' => 'Opprett forpakning',
+	'Period type' => 'Periodetype',
+	'Period days' => 'Dager/ Periode',
+	'Create habit' => 'Opprett husoppgave',
+	'Used in' => 'Brukt',
+	'Create battery' => 'Opprett batteri',
+	'Edit battery' => 'Endre batteri',
+	'Edit habit' => 'Endre husoppgave',
+	'Edit quantity unit' => 'Endre forpakning',
+	'Edit product' => 'Endre produkt',
+	'Edit location' => 'Endre lokasjon',
+	'Record data' => 'Logg handlinger',
+	'Manage master data' => 'Administrer masterdata',
+	'This will apply to added products' => 'Dette vil gjelde for produkt som blir lagt til',
+	'never' => 'aldri',
+	'Add products that are below defined min. stock amount' => 'Legg til produkt som er under definert minimums antall for husholdningen',
+	'For purchases this amount of days will be added to today for the best before date suggestion' => 'For innkjøp vil dette antallet dager legges til bestfør forslaget',
+	'This means 1 #1 purchased will be converted into #2 #3 in stock' => 'Dette betyr at 1 #1 innkjøp vil bli omgjort til #2 #3 husholdning',
+	'Login' => 'Logg inn',
+	'Username' => 'Brukernavn',
+	'Password' => 'Passord',
+	'Invalid credentials, please try again' => 'Feil brukernavn og/eller passord, prøv igjen',
+	'Are you sure to delete battery "#1"?' => 'Er du sikker du ønsker å slette Batteri "#1"?',
+	'Yes' => 'Ja',
+	'No' => 'Nei',
+	'Are you sure to delete habit "#1"?' => 'Er du sikker på du ønsker å slette husoppgave "#1"?',
+	'"#1" could not be resolved to a product, how do you want to proceed?' => '"#1" kunne ikke bli tildelt et produkt, hvordan ønsker du å fortsette?',
+	'Create or assign product' => 'Opprett eller tildel til produkt',
+	'Cancel' => 'Avbryt',
+	'Add as new product' => 'Legg til som nytt produkt',
+	'Add as barcode to existing product' => 'Legg til strekkode til allerede eksiterende produkt',
+	'Add as new product and prefill barcode' => 'Legg til som nytt produkt med forhåndsutfylt strekkode',
+	'Are you sure to delete quantity unit "#1"?' => 'Er du sikker du ønsker å slette forpakning "#1"?',
+	'Are you sure to delete product "#1"?' => 'Er du sikker du ønsker å slette produkt "#1"?',
+	'Are you sure to delete location "#1"?' => 'Er du sikker du ønsker å slette lokasjon "#1"?',
+	'Manage API keys' => 'Administrer API-Keys',
+    'REST API & data model documentation' => 'REST-API & Datamodell Dokumentasjon',
+    'API keys' => 'API-Keys',
+    'Create new API key' => 'Opprett ny API-Key',
+    'API key' => 'API-Key',
+    'Expires' => 'Går ut',
+    'Created' => 'Opprettet',
+	'This product is not in stock' => 'Dette produktet er ikke i husholdningen',
+	'This means #1 will be added to stock' => 'Dette betyr at #1 vil bli lagt til i husholdningen',
+	'This means #1 will be removed from stock' => 'Dette betyr at #1 vil bli fjernet fra husholdningen',
+	'This means it is estimated that a new execution of this habit is tracked #1 days after the last was tracked' => 'Dette betyr at det er estimert at den nye utførelsen av denne husoppgaven er logget #1 dag etter den sist var logget',
+	'Removed #1 #2 of #3 from stock' => 'Fjernet #1 #2 av #3 fra husholdningen',
+	'About grocy' => 'Om Grocy',
+	'Close' => 'Lukk',
+	'#1 batteries are due to be charged within the next #2 days' => '#1 Batteri må lades innen de #2 dagene',
+	'#1 batteries are overdue to be charged' => '#1 Batteri har gått over fristen for å bli ladet opp',
+	'#1 habits are due to be done within the next #2 days' => '#1 husoppgaver skal gjøres inne de #2 neste dagene',
+	'#1 habits are overdue to be done' => '#1 husoppgaver har gått over fristen for utførelse',
+	'Released on' => 'Utgitt',
+	'Consume #3 #1 of #2' => 'Forbruk #3 #1 #2',
+	'Added #1 #2 of #3 to stock' => '#1 #2 #3 lagt til i husholdningen',
+	'Stock amount of #1 is now #2 #3' => 'Husholdning antall #1 er nå #2 #3',
+	'Tracked execution of habit #1 on #2' => 'Logget utførelse av husoppgave "#1" den #2',
+	'Tracked charge cylce of battery #1 on #2' => 'Logget ladesyklus for batteri #1 og #2',
+	'Consume all #1 which are currently in stock' => 'Konsumér alle #1 som er i husholdningen',
+	'All' => 'Alle',
+	'Track charge cycle of battery #1' => 'Logg ladesyklus for batteri #1',
+	'Track execution of habit #1' => 'Logg utførelse av husoppgave #1',
+	'Filter by location' => 'Filtrér etter lokasjon',
+	'Search' => 'Søk',
+	'Not logged in' => 'Ikke logget inn',
+	'You have to select a product' => 'Du må velge et produkt',
+	'You have to select a habit' => 'Du mpå velge en husoppgaven',
+	'You have to select a battery' => 'Du må velge et batteri',
+	'A name is required' => 'Et navn kreves',
+	'A location is required' => 'En lokasjon kreves',
+	'The amount cannot be lower than #1' => 'Antallet kan ikke være lavere enn #1',
+	'This cannot be negative' => 'Dette kan ikke være negativt',
+	'A quantity unit is required' => 'Forpakning antall/størrelse kreves',
+	'A period type is required' => 'En periodetype kreves',
+	'A best before date is required and must be later than today' => 'En best før dato kreves, denne må være senere enn i dag',
+	'Settings' => 'Instillinger',
+	'This can only be before now' => 'Dette kan kun være før nå',
+        'Calendar' => 'Kalender',
+	'Recipes' => 'Oppskrifter',
+	'Edit recipe' => 'Endre oppskrift',
+	'New recipe' => 'Ny oppskrift',
+	'Ingredients list' => 'Liste over ingredienser',
+	'Add recipe ingredient' => 'Legg ingrediens til oppskrift',
+	'Edit recipe ingredient' => 'Endre ingrediens i oppskrift',
+	'Are you sure to delete recipe "#1"?' => 'Er du sikker du ønsker å slette oppskrift "#1"?',
+	'Are you sure to delete recipe ingredient "#1"?' => 'Er du sikker du ønsker å slette ingrediens "#1" fra oppskriften?',
+	'Are you sure to empty the shopping list?' => 'Er du sikker du ønsker å slette handlelisten??',
+	'Clear list' => 'Tøm liste',
+	'Requirements fulfilled' => 'Krav oppfylt',
+	'Put missing products on shopping list' => 'Legg manglende produkter til handlelisten',
+	'Not enough in stock, #1 ingredients missing' => 'Ikke nok i husholdningen, #1 ingrediens mangler',
+	'Enough in stock' => 'Nok i husholdningen',
+	'Not enough in stock, #1 ingredients missing but already on the shopping list' => 'Ikke nok i husholdningen, #1 ingrediens mangler, men lagt til i handelisten',
+	'Expand to fullscreen' => 'Full skjerm',
+	'Ingredients' => 'Ingredienser',
+	'Preparation' => 'Forberedelse',
+	'Recipe' => 'Oppskrift',
+	'Not enough in stock, #1 missing, #2 already on shopping list' => 'Ikke nok i husholdningen, #1 mangler, #2 allerede i handlisten',
+	'Show notes' => 'Vis notater',
+	'Put missing amount on shopping list' => 'Legg manglende til handlelisten',
+	'Are you sure to put all missing ingredients for recipe "#1" on the shopping list?' => 'Er du sikker du ønsker å legge alle manglende ingredienser til oppskrift "#1"?',
+	'Added for recipe #1' => 'Lagt til oppskrift #1',
+	
+	//Constants
+	'manually' => 'Manuel',
+	'dynamic-regular' => 'Dynamisk Regulering',
+	
+	//Technical component translations
+	'timeago_locale' => 'no',
+	'timeago_nan' => 'for NaN År',
+	'moment_locale' => 'nb',
+	'datatables_localization' => '{"sEmptyTable":"Det finnes ingen data i tabellen","sInfo":"_START_ fra _END_ til _TOTAL_ skriv","sInfoEmpty":"Ingen data tilgjengelign","sInfoFiltered":"(filtrert fra _MAX_ skriv)","sInfoPostFix":"","sInfoThousands":".","sLengthMenu":"_MENU_ registrer deg","sLoadingRecords":"Laster ..","sProcessing":"Vennligst vent ..","sSearch":"Søk","sZeroRecords":"Ingen oppføringer tilgjengelig","oPaginate":{"sFirst":"Første","sPrevious":"Bakover","sNext":"Neste","sLast":"Siste"},"oAria":{"sSortAscending":": Sortér stigende","sSortDescending":": Sortér synkende"},"select":{"rows":{"0":"klikk på en linje for å velge","1":"1 linje valgt","_":"%d linger valgt"}},"buttons":{"print":"Print","colvis":"Søyle","copy":"Kopi","copyTitle":"Kopier til utklippstavlen","copyKeys":"Trykk <i>ctrl</i> eller <i>⌘</i> + <i>C</i> for å kopiere tabell<br> til utklipptavlen.<br><br>For å avbryte, klikke på meldingen eller trykk på ESC.","copySuccess":{"1":"1 Kolonne kopiert","_":"%d kolonne kopiert"}}}',
+	
+	//Demo data
+	'Cookies' => 'Cookies',
+	'Chocolate' => 'Sjokolade',
+	'Pantry' => 'Spiskammers',
+	'Candy cupboard' => 'Godteriskapet',
+	'Tinned food cupboard' => 'Boksematskapet',
+	'Fridge' => 'Kjøleskapet',
+	'Piece' => 'Ett',
+	'Pack' => 'Pakke',
+	'Glass' => 'Glass',
+	'Tin' => 'Hermetikkboks',
+	'Can' => 'Boks',
+	'Bunch' => 'Klase',
+	'Gummy bears' => 'Vingummibjørner',
+	'Crisps' => 'Chips',
+	'Eggs' => 'Egg',
+	'Noodles' => 'Nuddler',
+	'Pickles' => 'Sur agurk',
+	'Gulash soup' => 'Gulasj suppe',
+	'Yogurt' => 'Yoghurt',
+	'Cheese' => 'Ost',
+	'Cold cuts' => 'Kjøttpålegg',
+	'Paprika' => 'Paprika',
+	'Cucumber' => 'Agurk',
+	'Radish' => 'Reddik',
+	'Tomato' => 'Tomat',
+	'Changed towels in the bathroom' => 'Bytt handklær på badet',
+	'Cleaned the kitchen floor' => 'Vasket kjøkkengulvet',
+	'Warranty ends' => 'Garanti utgår',
+	'TV remote control' => 'Fjernkontroll for TV',
+	'Alarm clock' => 'Alarmklokke',
+	'Heat remote control' => 'Fjernkontroll for termostat',
+        'Lawn mowed in the garden' => 'Kuttet gresse i hagen',
+	'Some good snacks' => 'Noen gode snacks',
+	'Pizza dough' => 'Pizzadeig',
+	'Sieved tomatoes' => 'Tomatpuré',
+	'Salami' => 'Salami',
+	'Toast' => 'Ristet brød',
+	'Minced meat' => 'Kjøttdeig',
+	'Pizza' => 'Pizza',
+	'Spaghetti bolognese' => 'Spaghetti Bolognese',
+	'Sandwiches' => 'Smørbrød',
+	'English' => 'Engelsk',
+	'German' => 'Tysk',
+	'Italian' => 'Italiensk',
+	'Demo in different language' => 'Demo i annet språk',
+	'This is the note content of the recipe ingredient' => 'Dette er notisen for ingrediensen i oppskriften'
+);

middleware/ApiKeyAuthMiddleware.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Grocy\Middleware;
+
+use \Grocy\Services\SessionService;
+use \Grocy\Services\ApiKeyService;
+
+class ApiKeyAuthMiddleware extends BaseMiddleware
+{
+	public function __construct(\Slim\Container $container, string $sessionCookieName, string $apiKeyHeaderName)
+	{
+		parent::__construct($container);
+		$this->SessionCookieName = $sessionCookieName;
+		$this->ApiKeyHeaderName = $apiKeyHeaderName;
+	}
+
+	protected $SessionCookieName;
+	protected $ApiKeyHeaderName;
+
+	public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, callable $next)
+	{
+		$route = $request->getAttribute('route');
+		$routeName = $route->getName();
+
+		if ($this->ApplicationService->IsDemoInstallation() || $this->ApplicationService->IsEmbeddedInstallation())
+		{
+			$response = $next($request, $response);
+		}
+		else
+		{
+			$validSession = true;
+			$validApiKey = true;
+			
+			$sessionService = new SessionService();
+			if (!isset($_COOKIE[$this->SessionCookieName]) || !$sessionService->IsValidSession($_COOKIE[$this->SessionCookieName]))
+			{
+				$validSession = false;
+			}
+
+			$apiKeyService = new ApiKeyService();
+			if (!$request->hasHeader($this->ApiKeyHeaderName) || !$apiKeyService->IsValidApiKey($request->getHeaderLine($this->ApiKeyHeaderName)))
+			{
+				$validApiKey = false;
+			}
+
+			if (!$validSession && !$validApiKey)
+			{
+				$response = $response->withStatus(401);
+			}
+			else
+			{
+				$response = $next($request, $response);
+			}
+		}
+
+		return $response;
+	}
+}

middleware/BaseMiddleware.php

@@ -2,11 +2,16 @@
 
 namespace Grocy\Middleware;
 
+use \Grocy\Services\ApplicationService;
+
 class BaseMiddleware
 {
-	public function __construct(\Slim\Container $container) {
-		$this->container = $container;
+	public function __construct(\Slim\Container $container)
+	{
+		$this->AppContainer = $container;
+		$this->ApplicationService = new ApplicationService();
 	}
 
-	protected $container;
+	protected $AppContainer;
+	protected $ApplicationService;
 }

middleware/CliMiddleware.php

@@ -13,7 +13,7 @@ class CliMiddleware extends BaseMiddleware
 		}
 		else
 		{
-			$response = $next($request, $response, $next);
+			$response = $next($request, $response);
 			return $response->withHeader('Content-Type', 'text/plain');
 		}
 	}

middleware/JsonMiddleware.php

@@ -6,7 +6,7 @@ class JsonMiddleware extends BaseMiddleware
 {
 	public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, callable $next)
 	{
-		$response = $next($request, $response, $next);
+		$response = $next($request, $response);
 		return $response->withHeader('Content-Type', 'application/json');
 	}
 }

middleware/SessionAuthMiddleware.php

@@ -6,24 +6,35 @@ use \Grocy\Services\SessionService;
 
 class SessionAuthMiddleware extends BaseMiddleware
 {
+	public function __construct(\Slim\Container $container, string $sessionCookieName)
+	{
+		parent::__construct($container);
+		$this->SessionCookieName = $sessionCookieName;
+	}
+
+	protected $SessionCookieName;
+
 	public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, callable $next)
 	{
 		$route = $request->getAttribute('route');
 		$routeName = $route->getName();
 
-		if ($routeName === 'root')
+		if ($routeName === 'root' || $this->ApplicationService->IsDemoInstallation() || $this->ApplicationService->IsEmbeddedInstallation())
 		{
+			define('AUTHENTICATED', $this->ApplicationService->IsDemoInstallation() || $this->ApplicationService->IsEmbeddedInstallation());
 			$response = $next($request, $response);
 		}
 		else
 		{
 			$sessionService = new SessionService();
-			if ((!isset($_COOKIE['grocy_session']) || !$sessionService->IsValidSession($_COOKIE['grocy_session'])) && $routeName !== 'login')
+			if ((!isset($_COOKIE[$this->SessionCookieName]) || !$sessionService->IsValidSession($_COOKIE[$this->SessionCookieName])) && $routeName !== 'login')
 			{
-				$response = $response->withRedirect('/login');
+				define('AUTHENTICATED', false);
+				$response = $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/login'));
 			}
 			else
 			{
+				define('AUTHENTICATED', $routeName !== 'login');
 				$response = $next($request, $response);
 			}
 		}

migrations/0022.sql

@@ -0,0 +1,7 @@
+CREATE TABLE api_keys (
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
+	api_key TEXT NOT NULL UNIQUE,
+	expires DATETIME,
+	last_used DATETIME,
+	row_created_timestamp DATETIME DEFAULT (datetime('now', 'localtime'))
+)

migrations/0023.sql

@@ -0,0 +1 @@
+DELETE FROM sessions

migrations/0024.sql

@@ -0,0 +1,2 @@
+ALTER TABLE sessions
+ADD COLUMN last_used DATETIME

migrations/0025.sql

@@ -0,0 +1,50 @@
+CREATE TABLE recipes (
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
+	name TEXT NOT NULL,
+	description TEXT,
+	row_created_timestamp DATETIME DEFAULT (datetime('now', 'localtime'))
+);
+
+CREATE TABLE recipes_pos (
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
+	recipe_id INTEGER NOT NULL,
+	product_id INTEGER NOT NULL,
+	amount INTEGER NOT NULL DEFAULT 0,
+	note TEXT,
+	row_created_timestamp DATETIME DEFAULT (datetime('now', 'localtime'))
+);
+
+CREATE VIEW recipes_fulfillment
+AS
+SELECT
+	r.id AS recipe_id,
+	rp.id AS recipe_pos_id,
+	rp.product_id AS product_id,
+	rp.amount AS recipe_amount,
+	IFNULL(sc.amount, 0) AS stock_amount,
+	CASE WHEN IFNULL(sc.amount, 0) >= rp.amount THEN 1 ELSE 0 END AS need_fulfilled,
+	CASE WHEN IFNULL(sc.amount, 0) - IFNULL(rp.amount, 0) < 0 THEN ABS(IFNULL(sc.amount, 0) - IFNULL(rp.amount, 0)) ELSE 0 END AS missing_amount,
+	IFNULL(sl.amount, 0) AS amount_on_shopping_list,
+	CASE WHEN IFNULL(sc.amount, 0) + IFNULL(sl.amount, 0) >= rp.amount THEN 1 ELSE 0 END AS need_fulfilled_with_shopping_list
+FROM recipes r
+JOIN recipes_pos rp
+	ON r.id = rp.recipe_id
+LEFT JOIN (
+	SELECT product_id, SUM(amount + amount_autoadded) AS amount
+	FROM shopping_list
+	GROUP BY product_id) sl
+	ON rp.product_id = sl.product_id
+LEFT JOIN stock_current sc
+	ON rp.product_id = sc.product_id;
+
+CREATE VIEW recipes_fulfillment_sum
+AS
+SELECT
+	r.id AS recipe_id,
+	IFNULL(MIN(rf.need_fulfilled), 1) AS need_fulfilled,
+	IFNULL(MIN(rf.need_fulfilled_with_shopping_list), 1) AS need_fulfilled_with_shopping_list,
+	(SELECT COUNT(*) FROM recipes_fulfillment WHERE recipe_id = rf.recipe_id AND need_fulfilled = 0 AND recipe_pos_id IS NOT NULL) AS missing_products_count
+FROM recipes r
+LEFT JOIN recipes_fulfillment rf
+	ON rf.recipe_id = r.id
+GROUP BY r.id;

package.json

@@ -0,0 +1,30 @@
+{
+	"name": "grocy",
+	"private": true,
+	"dependencies": {
+		"@danielfarrell/bootstrap-combobox": "https://github.com/pallidus-fintech/bootstrap-combobox.git#enhance/boostrap_4",
+		"@fortawesome/fontawesome-free": "^5.1.0",
+		"TagManager": "https://github.com/max-favilli/tagmanager.git#3.0.2",
+		"bootbox": "https://github.com/makeusabrew/bootbox.git#v5.x",
+		"bootstrap": "^4.1.1",
+		"bootstrap-side-navbar": "https://github.com/samrayner/bootstrap-side-navbar.git#1.0.1",
+		"datatables.net": "^1.10.19",
+		"datatables.net-bs4": "^1.10.19",
+		"datatables.net-colreorder": "^1.5.1",
+		"datatables.net-colreorder-bs4": "^1.5.1",
+		"datatables.net-responsive": "^2.2.3",
+		"datatables.net-responsive-bs4": "^2.2.3",
+		"datatables.net-select": "^1.2.7",
+		"datatables.net-select-bs4": "^1.2.7",
+		"jquery": "^3.3.1",
+		"jquery-serializejson": "^2.8.1",
+		"jquery-ui-dist": "^1.12.1",
+		"moment": "^2.22.2",
+		"startbootstrap-sb-admin": "^4.0.0",
+		"swagger-ui-dist": "^3.17.3",
+		"tagmanager": "https://github.com/max-favilli/tagmanager.git#3.0.2",
+		"tempusdominus-bootstrap-4": "^5.0.1",
+		"timeago": "^1.6.3",
+		"toastr": "^2.1.4"
+	}
+}

public/css/grocy.css

@@ -1,94 +1,26 @@
-body {
-	padding-top: 50px;
+/* Main style customizations */
+body {
 	font-family: 'Noto Sans', sans-serif;
 }
 
-.navbar-fixed-top {
-	border: 0;
+.content-text {
+	font-size: 0.85rem;
 }
 
-.sidebar {
-	display: none;
+.responsive-button {
+    white-space: normal;
 }
 
-@media (min-width: 768px) {
-	.sidebar {
-		position: fixed;
-		top: 51px;
-		bottom: 0;
-		left: 0;
-		z-index: 1000;
-		display: block;
-		padding: 20px;
-		overflow-x: hidden;
-		overflow-y: auto;
-		background-color: #e5e5e5;
-		border-right: 2px solid #d6d6d6;
-		min-width: 220px;
-		max-width: 260px;
-	}
-
-	#navbar-mobile {
-		display: none !important;
-	}
+.no-real-button {
+	pointer-events: none;
 }
 
-.nav-sidebar {
-	margin-right: -21px;
-	margin-bottom: 20px;
-	margin-left: -20px;
+.timeago-contextual {
+	font-style: italic;
+	font-size: 0.8em;
 }
 
-.nav-sidebar > li > a {
-	padding-right: 20px;
-	padding-left: 20px;
-	transition: all 0.3s;
-}
-
-.nav-sidebar > li > a:hover {
-	box-shadow: inset 5px 0 0 #337ab7;
-	transition: all 0.3s;
-}
-
-.nav-sidebar > li > a:focus {
-	box-shadow: inset 5px 0 0 #ab2230;
-	transition: all 0.3s;
-}
-
-.nav-sidebar > .active > a,
-.nav-sidebar > .active > a:hover,
-.nav-sidebar > .active > a:focus {
-	background-color: #d6d6d6;
-	box-shadow: inset 5px 0 0 #ab2230;
-	transition: all 0.3s;
-}
-
-.navbar-default {
-	background-color: #e5e5e5;
-}
-
-.main {
-	padding: 20px;
-}
-
-@media (min-width: 768px) {
-	.main {
-		padding-right: 40px;
-		padding-left: 40px;
-	}
-}
-
-.main .page-header {
-	margin-top: 0;
-}
-
-.nav-copyright {
-	color: #a7a7a7;
-	font-size: 11px;
-	text-align: center;
-}
-
-.discrete-link {
+a.discrete-link {
 	color: inherit !important;
 	transition: all 0.3s !important;
 }
@@ -96,28 +28,104 @@
 a.discrete-link:hover {
 	color: #337ab7 !important;
 	text-decoration: none !important;
-	transition: all 0.3s !important;
 }
 
 a.discrete-link:focus {
 	color: #ab2230 !important;
 	text-decoration: none !important;
+}
+
+.card {
+	border: 2px solid;
+	border-color: #d6d6d6;
+	border-radius: 0;
+}
+
+.card-header {
+	background-color: #e5e5e5;
+}
+
+.card-body {
+	flex-grow: 0;
+}
+
+.content-text .invalid-feedback {
+	font-size: 95%;
+}
+
+.fullscreen {
+	z-index: 9999; 
+	width: 100%; 
+	height: 100%; 
+	position: fixed; 
+	top: 0; 
+	left: 0; 
+ }
+
+/* Navigation style customizations */
+#mainNav {
+	background-color: #e5e5e5 !important;
+	border-bottom: 2px solid !important;
+	border-color: #d6d6d6 !important;
+}
+
+.navbar-sidenav {
+	overflow-y: auto;
+	overflow-x: hidden;
+	border-top: 2px solid !important;
+}
+
+.navbar-sidenav,
+.sidenav-second-level {
+	background-color: #e5e5e5 !important;
+	border-right: 2px solid !important;
+	border-color: #d6d6d6 !important;
+}
+
+.navbar-nav .dropdown-menu {
+	background-color: #e5e5e5 !important;
+	border: 0;
+	border-radius: 0;
+}
+
+.navbar-nav .dropdown-divider {
+	border-top: 2px solid !important;
+	border-color: #d6d6d6 !important;
+}
+
+.sidenav-toggler {
+	background-color: #d6d6d6 !important;
+	border-right: 2px solid !important;
+	border-color: #d6d6d6 !important;
+}
+
+.navbar-sidenav > li,
+.sidenav-second-level > li {
 	transition: all 0.3s !important;
 }
 
-.navbar-fixed-top {
-	border-bottom: 2px solid;
-	border-color: #d6d6d6;
+.navbar-sidenav > li:hover,
+.sidenav-second-level > li:hover,
+.navbar-nav .dropdown-item:hover {
+	box-shadow: inset 5px 0 0 #337ab7 !important;
+	background-color: #d6d6d6 !important;
 }
 
-.navbar-brand {
-	font-weight: bold;
-	letter-spacing: -5px;
-	font-size: 2.2em;
-	color: #0b024c !important;
-	margin-left: 0 !important;
-	padding-left: 5px !important;
-	
+.navbar-sidenav > li > a:focus,
+.sidenav-second-level > li > a:focus,
+.navbar-nav .dropdown-item:focus {
+	box-shadow: inset 5px 0 0 #ab2230 !important;
+	background-color: #d6d6d6 !important;
+}
+
+.active-page {
+	box-shadow: inset 5px 0 0 #ab2230 !important;
+	background-color: #d6d6d6 !important;
+}
+
+/* Third party component customizations - DataTables */
+td {
+     vertical-align: middle !important;
 }
 
 .table td.fit-content,
@@ -126,46 +134,53 @@ a.discrete-link:focus {
 	width: 1%;
 }
 
-.dataTables_info,
-.dataTables_length,
-.dataTables_filter {
-	font-style: italic;
+.dataTables_filter,
+.dataTables_info {
+	display: none;
 }
 
-.timeago-contextual {
-	font-style: italic;
-	font-size: 0.8em;
+/* Third party component customizations - toastr */
+#toast-container > div {
+	opacity: 1;
+	filter: alpha(opacity=100);
 }
 
-.disabled,
-.no-real-button {
-	pointer-events: none;
-	margin-top: 2px;
-	margin-bottom: 2px;
+.toast-success {
+	background-color: #28a745;
 }
 
-.warning-bg {
-	background-color: #fcf8e3 !important;
+.toast-error {
+	background-color: #dc3545;
 }
 
-.error-bg {
-	background-color: #f2dede !important;
+#toast-container > div {
+	box-shadow: none;
 }
 
-.info-bg {
-	background-color: #afd9ee !important;
+/* Third party component customizations - SB Admin 2 */
+#mainNav .navbar-collapse .navbar-nav > .nav-item.dropdown > .nav-link:after,
+#mainNav .navbar-collapse .navbar-sidenav .nav-link-collapse:after {
+  font-family: 'Font Awesome 5 Free';
+  font-weight: 900;
 }
 
-.discrete-content-separator {
-	padding-top: 5px;
-	padding-bottom: 5px;
+@media (max-width:992px) {
+	#mainNav .navbar-collapse .navbar-sidenav > .nav-item > .nav-link {
+		padding: 0.8em;
+	}
 }
 
-.discrete-content-separator-2x {
-	padding-top: 10px;
-	padding-bottom: 10px;
+/* Third party component customizations - Tempus Dominus */
+.date-only-datetimepicker .bootstrap-datetimepicker-widget.dropdown-menu {
+	width: auto !important;
 }
 
-.well {
+/* Third party component customizations - Popper.js */
+.tooltip .arrow {
+	display: none;
+}
+
+/* Third party component customizations - Bootstrap Combobox */
+.typeahead .active {
 	background-color: #e5e5e5;
 }

public/img/grocy_icon.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="60.000000pt" height="93.000000pt" viewBox="0 0 60.000000 93.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.15, written by Peter Selinger 2001-2017
+</metadata>
+<g transform="translate(0.000000,93.000000) scale(0.100000,-0.100000)"
+fill="#0b024c" stroke="none">
+<path d="M165 905 c-52 -18 -109 -82 -132 -148 -14 -39 -18 -82 -18 -172 0
+-104 3 -127 23 -170 43 -94 114 -144 205 -145 59 0 112 21 156 63 l33 32 -7
+-75 c-10 -96 -17 -116 -57 -140 -43 -26 -130 -26 -233 0 -43 11 -80 20 -82 20
+-2 0 -3 -30 -1 -67 l3 -68 50 -13 c28 -8 100 -14 160 -15 172 -1 255 38 304
+142 l26 56 3 353 4 352 -75 0 -75 0 -7 -40 -7 -40 -36 31 c-67 59 -150 75
+-237 44z m206 -141 c45 -23 62 -72 62 -180 1 -112 -18 -152 -79 -172 -125 -42
+-201 80 -163 260 21 96 97 135 180 92z"/>
+</g>
+</svg>

public/img/grocy_logo.svg

@@ -0,0 +1,33 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="242.000000pt" height="93.000000pt" viewBox="0 0 242.000000 93.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.15, written by Peter Selinger 2001-2017
+</metadata>
+<g transform="translate(0.000000,93.000000) scale(0.100000,-0.100000)"
+fill="#0b024c" stroke="none">
+<path d="M165 905 c-52 -18 -109 -82 -132 -148 -14 -39 -18 -82 -18 -172 0
+-104 3 -127 23 -170 43 -94 114 -144 205 -145 59 0 112 21 156 63 l33 32 -7
+-75 c-10 -96 -17 -116 -57 -140 -43 -26 -130 -26 -233 0 -43 11 -80 20 -82 20
+-2 0 -3 -30 -1 -67 l3 -68 50 -13 c28 -8 100 -14 160 -15 121 -1 183 14 244
+60 36 28 81 112 81 155 0 54 6 58 90 58 l78 0 4 193 c3 180 4 194 25 223 20
+28 99 72 110 61 2 -3 -1 -24 -6 -48 -6 -24 -11 -79 -11 -121 0 -137 53 -233
+158 -285 50 -24 69 -28 147 -28 107 0 158 20 219 83 l40 41 23 -34 c13 -20 46
+-45 80 -62 51 -25 69 -28 153 -28 68 0 108 5 143 18 l47 19 0 74 0 74 -42 -21
+c-58 -30 -154 -37 -197 -15 -85 44 -98 250 -21 328 24 24 36 28 84 28 99 0 92
+9 200 -260 l97 -242 -23 -46 c-32 -65 -67 -87 -134 -87 l-54 0 0 -66 0 -67 45
+-6 c108 -17 215 34 269 128 20 33 296 754 296 771 0 3 -40 5 -89 5 l-90 0 -64
+-197 c-35 -109 -69 -214 -75 -233 -10 -34 -10 -34 -11 -7 -1 16 -31 120 -68
+232 l-66 202 -143 8 c-116 5 -154 4 -197 -9 -61 -18 -126 -61 -145 -98 l-14
+-25 -52 53 c-40 39 -67 56 -106 68 -87 26 -181 19 -272 -19 -14 -5 -18 -2 -18
+14 0 19 -6 21 -52 21 -64 0 -129 -30 -164 -76 -15 -19 -30 -34 -34 -34 -4 0
+-13 23 -20 50 l-12 50 -133 0 -133 0 -7 -40 -7 -40 -36 31 c-67 59 -150 75
+-237 44z m206 -141 c45 -23 62 -72 62 -180 1 -112 -18 -152 -79 -172 -125 -42
+-201 80 -163 260 21 96 97 135 180 92z m888 -10 c40 -33 54 -89 49 -184 -7
+-118 -41 -160 -131 -160 -87 0 -121 53 -121 185 0 135 34 185 125 185 36 0 55
+-6 78 -26z"/>
+</g>
+</svg>

public/js/grocy.js

@@ -14,18 +14,73 @@
 	return localizedText;
 }
 
+U = function(relativePath)
+{
+	return Grocy.BaseUrl.replace(/\/$/, '') + relativePath;
+}
+
 if (!Grocy.ActiveNav.isEmpty())
 {
-	var menuItem = $('.nav').find("[data-nav-for-page='" + Grocy.ActiveNav + "']");
-	menuItem.addClass('active');
-}	
+	var menuItem = $('#sidebarResponsive').find("[data-nav-for-page='" + Grocy.ActiveNav + "']");
+	menuItem.addClass('active-page');
+
+	var parentMenuSelector = menuItem.data("sub-menu-of");
+	if (typeof parentMenuSelector !== "undefined")
+	{
+		$(parentMenuSelector).collapse("show");
+		$(parentMenuSelector).prev(".nav-link-collapse").addClass("active-page");
+	}
+}
+
+var observer = new MutationObserver(function(mutations)
+{
+	mutations.forEach(function(mutation)
+	{
+		if (mutation.attributeName === "class")
+		{
+			var attributeValue = $(mutation.target).prop(mutation.attributeName);
+			if (attributeValue.contains("sidenav-toggled"))
+			{
+				window.localStorage.setItem("sidebar_state", "collapsed");
+			}
+			else
+			{
+				window.localStorage.setItem("sidebar_state", "expanded");
+			}
+		}
+	});
+});
+observer.observe(document.body, {
+	attributes: true
+});
+if (window.localStorage.getItem("sidebar_state") === "collapsed")
+{
+	$("#sidenavToggler").click();
+}
 
 $.timeago.settings.allowFuture = true;
-$('time.timeago').timeago();
+RefreshContextualTimeago = function()
+{	
+	$('time.timeago').timeago();
+}
+RefreshContextualTimeago();
 
-Grocy.FetchJson = function(url, success, error)
+toastr.options = {
+	toastClass: 'alert',
+	closeButton: true,
+	timeOut: 20000,
+	extendedTimeOut: 5000
+};
+
+window.FontAwesomeConfig = {
+	searchPseudoElements: true
+}
+
+Grocy.Api = { };
+Grocy.Api.Get = function(apiFunction, success, error)
 {
 	var xhr = new XMLHttpRequest();
+	var url = U('/api/' + apiFunction);
 
 	xhr.onreadystatechange = function()
 	{
@@ -52,9 +107,10 @@ Grocy.FetchJson = function(url, success, error)
 	xhr.send();
 };
 
-Grocy.PostJson = function(url, jsonData, success, error)
+Grocy.Api.Post = function(apiFunction, jsonData, success, error)
 {
 	var xhr = new XMLHttpRequest();
+	var url = U('/api/' + apiFunction);
 
 	xhr.onreadystatechange = function()
 	{
@@ -81,3 +137,19 @@ Grocy.PostJson = function(url, jsonData, success, error)
 	xhr.setRequestHeader('Content-type', 'application/json');
 	xhr.send(JSON.stringify(jsonData));
 };
+
+Grocy.FrontendHelpers = { };
+Grocy.FrontendHelpers.ValidateForm = function(formId)
+{
+	var form = document.getElementById(formId);
+	if (form.checkValidity() === true)
+	{
+		$(form).find(':submit').removeClass('disabled');
+	}
+	else
+	{
+		$(form).find(':submit').addClass('disabled');
+	}
+
+	$(form).addClass('was-validated');
+}

public/viewjs/batteries.js

@@ -1,14 +1,40 @@
-$(document).on('click', '.battery-delete-button', function(e)
+var batteriesTable = $('#batteries-table').DataTable({
+	'paginate': false,
+	'order': [[1, 'asc']],
+	'columnDefs': [
+		{ 'orderable': false, 'targets': 0 }
+	],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true
+});
+
+$("#search").on("keyup", function()
 {
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	batteriesTable.search(value).draw();
+});
+
+$(document).on('click', '.battery-delete-button', function (e)
+{
+	var objectName = $(e.currentTarget).attr('data-battery-name');
+	var objectId = $(e.currentTarget).attr('data-battery-id');
+
 	bootbox.confirm({
-		message: 'Delete battery <strong>' + $(e.target).attr('data-battery-name') + '</strong>?',
+		message: L('Are you sure to delete battery "#1"?', objectName),
 		buttons: {
 			confirm: {
-				label: 'Yes',
+				label: L('Yes'),
 				className: 'btn-success'
 			},
 			cancel: {
-				label: 'No',
+				label: L('No'),
 				className: 'btn-danger'
 			}
 		},
@@ -16,10 +42,10 @@
 		{
 			if (result === true)
 			{
-				Grocy.FetchJson('/api/delete-object/batteries/' + $(e.target).attr('data-battery-id'),
+				Grocy.Api.Get('delete-object/batteries/' + objectId,
 					function(result)
 					{
-						window.location.href = '/batteries';
+						window.location.href = U('/batteries');
 					},
 					function(xhr)
 					{
@@ -30,12 +56,3 @@
 		}
 	});
 });
-
-$('#batteries-table').DataTable({
-	'pageLength': 50,
-	'order': [[1, 'asc']],
-	'columnDefs': [
-		{ 'orderable': false, 'targets': 0 }
-	],
-	'language': JSON.parse(L('datatables_localization'))
-});

public/viewjs/batteriesoverview.js

@@ -1,5 +1,47 @@
-$('#batteries-overview-table').DataTable({
-	'pageLength': 50,
-	'order': [[1, 'desc']],
-	'language': JSON.parse(L('datatables_localization'))
+var batteriesOverviewTable = $('#batteries-overview-table').DataTable({
+	'paginate': false,
+	'order': [[2, 'desc']],
+	'columnDefs': [
+		{ 'orderable': false, 'targets': 0 }
+	],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true
+});
+
+$("#search").on("keyup", function()
+{
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	batteriesOverviewTable.search(value).draw();
+});
+
+$(document).on('click', '.track-charge-cycle-button', function(e)
+{
+	var batteryId = $(e.currentTarget).attr('data-battery-id');
+	var batteryName = $(e.currentTarget).attr('data-battery-name');
+	var trackedTime = moment().format('YYYY-MM-DD HH:mm:ss');
+
+	Grocy.Api.Get('batteries/track-charge-cycle/' + batteryId + '?tracked_time=' + trackedTime,
+		function(result)
+		{
+			$('#battery-' + batteryId + '-last-tracked-time').parent().effect('highlight', {}, 500);
+			$('#battery-' + batteryId + '-last-tracked-time').fadeOut(500, function () {
+				$(this).text(trackedTime).fadeIn(500);
+			});
+			$('#battery-' + batteryId + '-last-tracked-time-timeago').attr('datetime', trackedTime);
+			RefreshContextualTimeago();
+
+			toastr.success(L('Tracked charge cylce of battery #1 on #2', batteryName, trackedTime));
+		},
+		function(xhr)
+		{
+			console.error(xhr);
+		}
+	);
 });

public/viewjs/batteryform.js

@@ -4,10 +4,10 @@
 
 	if (Grocy.EditMode === 'create')
 	{
-		Grocy.PostJson('/api/add-object/batteries', $('#battery-form').serializeJSON(),
+		Grocy.Api.Post('add-object/batteries', $('#battery-form').serializeJSON(),
 			function(result)
 			{
-				window.location.href = '/batteries';
+				window.location.href = U('/batteries');
 			},
 			function(xhr)
 			{
@@ -17,10 +17,10 @@
 	}
 	else
 	{
-		Grocy.PostJson('/api/edit-object/batteries/' + Grocy.EditObjectId, $('#battery-form').serializeJSON(),
+		Grocy.Api.Post('edit-object/batteries/' + Grocy.EditObjectId, $('#battery-form').serializeJSON(),
 			function(result)
 			{
-				window.location.href = '/batteries';
+				window.location.href = U('/batteries');
 			},
 			function(xhr)
 			{
@@ -30,6 +30,26 @@
 	}
 });
 
+$('#battery-form input').keyup(function(event)
+{
+	Grocy.FrontendHelpers.ValidateForm('battery-form');
+});
+
+$('#battery-form input').keydown(function(event)
+{
+	if (event.keyCode === 13) //Enter
+	{
+		if (document.getElementById('battery-form').checkValidity() === false) //There is at least one validation error
+		{
+			event.preventDefault();
+			return false;
+		}
+		else
+		{
+			$('#save-battery-button').click();
+		}
+	}
+});
+
 $('#name').focus();
-$('#battery-form').validator();
-$('#battery-form').validator('validate');
+Grocy.FrontendHelpers.ValidateForm('battery-form');

public/viewjs/batterytracking.js

@@ -4,21 +4,21 @@
 
 	var jsonForm = $('#batterytracking-form').serializeJSON();
 
-	Grocy.FetchJson('/api/batteries/get-battery-details/' + jsonForm.battery_id,
+	Grocy.Api.Get('batteries/get-battery-details/' + jsonForm.battery_id,
 		function (batteryDetails)
 		{
-			Grocy.FetchJson('/api/batteries/track-charge-cycle/' + jsonForm.battery_id + '?tracked_time=' + $('#tracked_time').val(),
+			Grocy.Api.Get('batteries/track-charge-cycle/' + jsonForm.battery_id + '?tracked_time=' + $('#tracked_time').find('input').val(),
 				function(result)
 				{
-					toastr.success('Tracked charge cylce of battery ' + batteryDetails.battery.name + ' on ' + $('#tracked_time').val());
+					toastr.success(L('Tracked charge cylce of battery #1 on #2', batteryDetails.battery.name, $('#tracked_time').find('input').val()));
 
 					$('#battery_id').val('');
 					$('#battery_id_text_input').focus();
 					$('#battery_id_text_input').val('');
-					$('#tracked_time').val(moment().format('YYYY-MM-DD HH:mm:ss'));
-					$('#tracked_time').trigger('change');
+					$('#tracked_time').find('input').val(moment().format('YYYY-MM-DD HH:mm:ss'));
+					$('#tracked_time').find('input').trigger('change');
 					$('#battery_id_text_input').trigger('change');
-					$('#batterytracking-form').validator('validate');
+					Grocy.FrontendHelpers.ValidateForm('batterytracking-form');
 				},
 				function(xhr)
 				{
@@ -35,31 +35,15 @@
 
 $('#battery_id').on('change', function(e)
 {
-	var batteryId = $(e.target).val();
+	var input = $('#battery_id_text_input').val().toString();
+	$('#battery_id_text_input').val(input);
+	$('#battery_id').data('combobox').refresh();
 
+	var batteryId = $(e.target).val();
 	if (batteryId)
 	{
 		Grocy.Components.BatteryCard.Refresh(batteryId);
-		$('#tracked_time').focus();
-	}
-});
-
-$('.datetimepicker').datetimepicker(
-{
-	format: 'YYYY-MM-DD HH:mm:ss',
-	showTodayButton: true,
-	calendarWeeks: true,
-	maxDate: moment()
-});
-
-$('#tracked_time').val(moment().format('YYYY-MM-DD HH:mm:ss'));
-$('#tracked_time').trigger('change');
-
-$('#tracked_time').on('focus', function(e)
-{
-	if ($('#battery_id_text_input').val().length === 0)
-	{
-		$('#battery_id_text_input').focus();
+		$('#tracked_time').find('input').focus();
 	}
 });
 
@@ -71,79 +55,31 @@ $('#battery_id').val('');
 $('#battery_id_text_input').focus();
 $('#battery_id_text_input').val('');
 $('#battery_id_text_input').trigger('change');
+Grocy.FrontendHelpers.ValidateForm('batterytracking-form');
 
-$('#batterytracking-form').validator();
-$('#batterytracking-form').validator('validate');
+$('#batterytracking-form input').keyup(function (event)
+{
+	Grocy.FrontendHelpers.ValidateForm('batterytracking-form');
+});
 
 $('#batterytracking-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
-		if ($('#batterytracking-form').validator('validate').has('.has-error').length !== 0) //There is at least one validation error
+		if (document.getElementById('batterytracking-form').checkValidity() === false) //There is at least one validation error
 		{
 			event.preventDefault();
 			return false;
 		}
+		else
+		{
+			$('#save-batterytracking-button').click();
+		}
 	}
 });
 
-$('#tracked_time').on('change', function(e)
+$('#tracked_time').find('input').on('keypress', function (e)
 {
-	var value = $('#tracked_time').val();
-	var now = new Date();
-	var centuryStart = Number.parseInt(now.getFullYear().toString().substring(0, 2) + '00');
-	var centuryEnd = Number.parseInt(now.getFullYear().toString().substring(0, 2) + '99');
-
-	if (value === 'x' || value === 'X') {
-		value = '29991231';
-	}
-
-	if (value.length === 4 && !(Number.parseInt(value) > centuryStart && Number.parseInt(value) < centuryEnd))
-	{
-		value = (new Date()).getFullYear().toString() + value;
-	}
-
-	if (value.length === 8 && $.isNumeric(value))
-	{
-		value = value.replace(/(\d{4})(\d{2})(\d{2})/, '$1-$2-$3');
-		$('#tracked_time').val(value);
-		$('#batterytracking-form').validator('validate');
-	}
+	Grocy.FrontendHelpers.ValidateForm('batterytracking-form');
 });
 
-$('#tracked_time').on('keypress', function(e)
-{
-	var element = $(e.target);
-	var value = element.val();
-	var dateObj = moment(element.val(), 'YYYY-MM-DD', true);
-
-	$('.datepicker').datepicker('hide');
-
-	//If input is empty and any arrow key is pressed, set date to today
-	if (value.length === 0 && (e.keyCode === 38 || e.keyCode === 40 || e.keyCode === 37 || e.keyCode === 39))
-	{
-		dateObj = moment(new Date(), 'YYYY-MM-DD', true);
-	}
-
-	if (dateObj.isValid())
-	{
-		if (e.keyCode === 38) //Up
-		{
-			element.val(dateObj.add(-1, 'days').format('YYYY-MM-DD'));
-		}
-		else if (e.keyCode === 40) //Down
-		{
-			element.val(dateObj.add(1, 'days').format('YYYY-MM-DD'));
-		}
-		else if (e.keyCode === 37) //Left
-		{
-			element.val(dateObj.add(-1, 'weeks').format('YYYY-MM-DD'));
-		}
-		else if (e.keyCode === 39) //Right
-		{
-			element.val(dateObj.add(1, 'weeks').format('YYYY-MM-DD'));
-		}
-	}
-
-	$('#batterytracking-form').validator('validate');
-});

public/viewjs/components/batterycard.js

@@ -2,7 +2,7 @@ Grocy.Components.BatteryCard = { };
 
 Grocy.Components.BatteryCard.Refresh = function(batteryId)
 {
-	Grocy.FetchJson('/api/batteries/get-battery-details/' + batteryId,
+	Grocy.Api.Get('batteries/get-battery-details/' + batteryId,
 		function(batteryDetails)
 		{
 			$('#batterycard-battery-name').text(batteryDetails.battery.name);

public/viewjs/components/calendarcard.js

@@ -0,0 +1,40 @@
+$('#calendar').datetimepicker(
+{
+	format: 'L',
+	buttons: {
+		showToday: true,
+		showClose: false
+	},
+	calendarWeeks: true,
+	locale: moment.locale(),
+	icons: {
+		time: 'far fa-clock',
+		date: 'far fa-calendar',
+		up: 'fas fa-arrow-up',
+		down: 'fas fa-arrow-down',
+		previous: 'fas fa-chevron-left',
+		next: 'fas fa-chevron-right',
+		today: 'fas fa-calendar-check',
+		clear: 'far fa-trash-alt',
+		close: 'far fa-times-circle'
+	},
+	keepOpen: true,
+	inline: true,
+	keyBinds: {
+		up: function(widget) { },
+		down: function(widget) { },
+		'control up': function(widget) { },
+		'control down': function(widget) { },
+		left: function(widget) { },
+		right: function(widget) { },
+		pageUp: function(widget) { },
+		pageDown: function(widget) { },
+		enter: function(widget) { },
+		escape: function(widget) { },
+		'control space': function(widget) { },
+		t: function(widget) { },
+		'delete': function(widget) { }
+	}
+});
+
+$('#calendar').datetimepicker('show');

public/viewjs/components/datepicker.js

@@ -1,92 +0,0 @@
-$(function()
-{
-	$('.datepicker').datepicker(
-	{
-		format: 'yyyy-mm-dd',
-		startDate: '+0d',
-		todayHighlight: true,
-		autoclose: true,
-		calendarWeeks: true,
-		orientation: 'bottom auto',
-		weekStart: 1,
-		showOnFocus: false,
-		language: L('bootstrap_datepicker_locale')
-	});
-	$('.datepicker').trigger('change');
-
-	EmptyElementWhenMatches('#datepicker-timeago', L('timeago_nan'));
-});
-
-$('.datepicker').on('keydown', function(e)
-{
-	if (e.keyCode === 13) //Enter
-	{
-		$('.datepicker').trigger('change');
-	}
-});
-
-$('.datepicker').on('keypress', function(e)
-{
-	var element = $(e.target);
-	var value = element.val();
-	var dateObj = moment(element.val(), 'YYYY-MM-DD', true);
-
-	$('.datepicker').datepicker('hide');
-
-	//If input is empty and any arrow key is pressed, set date to today
-	if (value.length === 0 && (e.keyCode === 38 || e.keyCode === 40 || e.keyCode === 37 || e.keyCode === 39))
-	{
-		dateObj = moment(new Date(), 'YYYY-MM-DD', true);
-	}
-
-	if (dateObj.isValid())
-	{
-		if (e.keyCode === 38) //Up
-		{
-			element.val(dateObj.add(-1, 'days').format('YYYY-MM-DD'));
-		}
-		else if (e.keyCode === 40) //Down
-		{
-			element.val(dateObj.add(1, 'days').format('YYYY-MM-DD'));
-		}
-		else if (e.keyCode === 37) //Left
-		{
-			element.val(dateObj.add(-1, 'weeks').format('YYYY-MM-DD'));
-		}
-		else if (e.keyCode === 39) //Right
-		{
-			element.val(dateObj.add(1, 'weeks').format('YYYY-MM-DD'));
-		}
-	}
-});
-
-$('.datepicker').on('change', function(e)
-{
-	var value = $('.datepicker').val();
-	var now = new Date();
-	var centuryStart = Number.parseInt(now.getFullYear().toString().substring(0, 2) + '00');
-	var centuryEnd = Number.parseInt(now.getFullYear().toString().substring(0, 2) + '99');
-
-	if (value === 'x' || value === 'X') {
-		value = '29991231';
-	}
-
-	if (value.length === 4 && !(Number.parseInt(value) > centuryStart && Number.parseInt(value) < centuryEnd))
-	{
-		value = (new Date()).getFullYear().toString() + value;
-	}
-
-	if (value.length === 8 && $.isNumeric(value))
-	{
-		value = value.replace(/(\d{4})(\d{2})(\d{2})/, '$1-$2-$3');
-		$('.datepicker').val(value);
-	}
-
-	$('#datepicker-timeago').text($.timeago($('.datepicker').val()));
-	EmptyElementWhenMatches('#datepicker-timeago', L('timeago_nan'));
-});
-
-$('#datepicker-button').on('click', function(e)
-{
-	$('.datepicker').datepicker('show');
-});

public/viewjs/components/datetimepicker.js

@@ -1,11 +1,173 @@
-$(function()
+Grocy.Components.DateTimePicker = { };
+
+Grocy.Components.DateTimePicker.GetInputElement = function()
 {
-	$('.datetimepicker').datetimepicker(
-	{
-		format: 'YYYY-MM-DD HH:mm:ss',
-		showTodayButton: true,
-		calendarWeeks: true,
-		maxDate: moment(),
-		locale: moment.locale('de')
-	});
+	return $('.datetimepicker').find('input');
+}
+
+Grocy.Components.DateTimePicker.GetValue = function()
+{
+	return Grocy.Components.DateTimePicker.GetInputElement().val();
+}
+
+Grocy.Components.DateTimePicker.SetValue = function(value)
+{
+	Grocy.Components.DateTimePicker.GetInputElement().val(value);
+	Grocy.Components.DateTimePicker.GetInputElement().trigger('change');
+}
+
+var startDate = null;
+if (Grocy.Components.DateTimePicker.GetInputElement().data('init-with-now') === true)
+{
+	startDate = moment().format(Grocy.Components.DateTimePicker.GetInputElement().data('format'));
+}
+
+var limitDate = moment('2999-12-31 23:59:59');
+if (Grocy.Components.DateTimePicker.GetInputElement().data('limit-end-to-now') === true)
+{
+	limitDate = moment();
+}
+
+$('.datetimepicker').datetimepicker(
+{
+	format: Grocy.Components.DateTimePicker.GetInputElement().data('format'),
+	buttons: {
+		showToday: true,
+		showClose: true
+	},
+	calendarWeeks: true,
+	maxDate: limitDate,
+	locale: moment.locale(),
+	defaultDate: startDate,
+	useCurrent: false,
+	icons: {
+		time: 'far fa-clock',
+		date: 'far fa-calendar',
+		up: 'fas fa-arrow-up',
+		down: 'fas fa-arrow-down',
+		previous: 'fas fa-chevron-left',
+		next: 'fas fa-chevron-right',
+		today: 'fas fa-calendar-check',
+		clear: 'far fa-trash-alt',
+		close: 'far fa-times-circle'
+	},
+	sideBySide: true,
+	keyBinds: {
+		up: function(widget) { },
+		down: function(widget) { },
+		'control up': function(widget) { },
+		'control down': function(widget) { },
+		left: function(widget) { },
+		right: function(widget) { },
+		pageUp: function(widget) { },
+		pageDown: function(widget) { },
+		enter: function(widget) { },
+		escape: function(widget) { },
+		'control space': function(widget) { },
+		t: function(widget) { },
+		'delete': function(widget) { }
+	}
+});
+
+Grocy.Components.DateTimePicker.GetInputElement().on('keyup', function(e)
+{
+	$('.datetimepicker').datetimepicker('hide');
+
+	var value = Grocy.Components.DateTimePicker.GetValue();
+	var now = new Date();
+	var centuryStart = Number.parseInt(now.getFullYear().toString().substring(0, 2) + '00');
+	var centuryEnd = Number.parseInt(now.getFullYear().toString().substring(0, 2) + '99');
+	var format = Grocy.Components.DateTimePicker.GetInputElement().data('format');
+	var nextInputElement = $(Grocy.Components.DateTimePicker.GetInputElement().data('next-input-selector'));
+	
+	//If input is empty and any arrow key is pressed, set date to today
+	if (value.length === 0 && (e.keyCode === 38 || e.keyCode === 40 || e.keyCode === 37 || e.keyCode === 39))
+	{
+		Grocy.Components.DateTimePicker.SetValue(moment(new Date(), format, true).format(format));
+		nextInputElement.focus();
+	}
+	else if (value === 'x' || value === 'X')
+	{
+		Grocy.Components.DateTimePicker.SetValue(moment('2999-12-31 23:59:59').format(format));
+		nextInputElement.focus();
+	}
+	else if (value.length === 4 && !(Number.parseInt(value) > centuryStart && Number.parseInt(value) < centuryEnd))
+	{
+		var date = moment((new Date()).getFullYear().toString() + value);
+		if (date.isBefore(moment()))
+		{
+			date.add(1, "year");
+		}
+		Grocy.Components.DateTimePicker.SetValue(date.format(format));
+		nextInputElement.focus();
+	}
+	else if (value.length === 8 && $.isNumeric(value))
+	{
+		Grocy.Components.DateTimePicker.SetValue(value.replace(/(\d{4})(\d{2})(\d{2})/, '$1-$2-$3'));
+		nextInputElement.focus();
+	}
+	else if (value.length === 7 && $.isNumeric(value.substring(0, 6)) && (value.substring(6, 7).toLowerCase() === "e" || value.substring(6, 7).toLowerCase() === "+"))
+	{
+		var date = moment(value.substring(0, 4) + "-" + value.substring(4, 6) + "-01").endOf("month");
+		Grocy.Components.DateTimePicker.SetValue(date.format(format));
+		nextInputElement.focus();
+	}
+	else
+	{
+		var dateObj = moment(value, format, true);
+		if (dateObj.isValid())
+		{
+			if (e.keyCode === 38) //Up
+			{
+				Grocy.Components.DateTimePicker.SetValue(dateObj.add(-1, 'days').format(format));
+			}
+			else if (e.keyCode === 40) //Down
+			{
+				Grocy.Components.DateTimePicker.SetValue(dateObj.add(1, 'days').format(format));
+			}
+			else if (e.keyCode === 37) //Left
+			{
+				Grocy.Components.DateTimePicker.SetValue(dateObj.add(-1, 'weeks').format(format));
+			}
+			else if (e.keyCode === 39) //Right
+			{
+				Grocy.Components.DateTimePicker.SetValue(dateObj.add(1, 'weeks').format(format));
+			}
+		}
+	}
+
+	//Custom validation
+	value = Grocy.Components.DateTimePicker.GetValue();
+	dateObj = moment(value, format, true);
+	var element = Grocy.Components.DateTimePicker.GetInputElement()[0];
+	if (!dateObj.isValid())
+	{
+		element.setCustomValidity("error");
+	}
+	else
+	{
+		if (Grocy.Components.DateTimePicker.GetInputElement().data('limit-end-to-now') === true && dateObj.isAfter(moment()))
+		{
+			element.setCustomValidity("error");
+		}
+		else if (Grocy.Components.DateTimePicker.GetInputElement().data('limit-start-to-now') === true && dateObj.isBefore(moment()))
+		{
+			element.setCustomValidity("error");
+		}
+		else
+		{
+			element.setCustomValidity("");
+		}
+	}
+});
+
+Grocy.Components.DateTimePicker.GetInputElement().on('input', function(e)
+{
+	$('#datetimepicker-timeago').text($.timeago(Grocy.Components.DateTimePicker.GetValue()));
+	EmptyElementWhenMatches('#datetimepicker-timeago', L('timeago_nan'));
+});
+
+$('.datetimepicker').on('update.datetimepicker', function(e)
+{
+	Grocy.Components.DateTimePicker.GetInputElement().trigger('input');
 });

public/viewjs/components/habitcard.js

@@ -1,8 +1,8 @@
 Grocy.Components.HabitCard = { };
 
-Grocy.Components.HabitCard.Refresh = function (habitId)
+Grocy.Components.HabitCard.Refresh = function(habitId)
 {
-	Grocy.FetchJson('/api/habits/get-habit-details/' + habitId,
+	Grocy.Api.Get('habits/get-habit-details/' + habitId,
 		function(habitDetails)
 		{
 			$('#habitcard-habit-name').text(habitDetails.habit.name);

public/viewjs/components/productcard.js

@@ -2,7 +2,7 @@ Grocy.Components.ProductCard = { };
 
 Grocy.Components.ProductCard.Refresh = function(productId)
 {
-	Grocy.FetchJson('/api/stock/get-product-details/' + productId,
+	Grocy.Api.Get('stock/get-product-details/' + productId,
 		function(productDetails)
 		{
 			$('#productcard-product-name').text(productDetails.product.name);

public/viewjs/components/productpicker.js

@@ -0,0 +1,160 @@
+Grocy.Components.ProductPicker = { };
+
+Grocy.Components.ProductPicker.GetPicker = function ()
+{
+	return $('#product_id');
+}
+
+Grocy.Components.ProductPicker.GetInputElement = function()
+{
+	return $('#product_id_text_input');
+}
+
+Grocy.Components.ProductPicker.GetValue = function()
+{
+	return $('#product_id').val();
+}
+
+Grocy.Components.ProductPicker.SetValue = function(value)
+{
+	Grocy.Components.ProductPicker.GetInputElement().val(value);
+	Grocy.Components.ProductPicker.GetInputElement().trigger('change');
+}
+
+Grocy.Components.ProductPicker.InProductAddWorkflow = function()
+{
+	return typeof GetUriParam('createdproduct') !== "undefined";
+}
+
+Grocy.Components.ProductPicker.InProductModifyWorkflow = function()
+{
+	return typeof GetUriParam('addbarcodetoselection') !== "undefined";
+}
+
+Grocy.Components.ProductPicker.ShowCustomError = function(text)
+{
+	var element = $("#custom-productpicker-error");
+	element.text(text);
+	element.removeClass("d-none");
+}
+
+Grocy.Components.ProductPicker.HideCustomError = function()
+{
+	$("#custom-productpicker-error").addClass("d-none");
+}
+
+$('.combobox').combobox({
+	appendId: '_text_input',
+	bsVersion: '4'
+});
+
+var prefillProduct = GetUriParam('createdproduct');
+var prefillProduct2 = Grocy.Components.ProductPicker.GetPicker().parent().data('prefill-by-name').toString();
+if (!prefillProduct2.isEmpty())
+{
+	prefillProduct = prefillProduct2;
+}
+if (typeof prefillProduct !== "undefined")
+{
+	var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + prefillProduct + "']").first();
+	if (possibleOptionElement.length === 0)
+	{
+		possibleOptionElement = $("#product_id option:contains('" + prefillProduct + "')").first();
+	}
+
+	if (possibleOptionElement.length > 0)
+	{
+		$('#product_id').val(possibleOptionElement.val());
+		$('#product_id').data('combobox').refresh();
+		$('#product_id').trigger('change');
+
+		var nextInputElement = $(Grocy.Components.ProductPicker.GetPicker().parent().data('next-input-selector').toString());
+		nextInputElement.focus();
+	}
+}
+
+var addBarcode = GetUriParam('addbarcodetoselection');
+if (addBarcode !== undefined)
+{
+	$('#addbarcodetoselection').text(addBarcode);
+	$('#flow-info-addbarcodetoselection').removeClass('d-none');
+	$('#barcode-lookup-disabled-hint').removeClass('d-none');
+}
+
+$('#product_id_text_input').on('change', function(e)
+{
+	var input = $('#product_id_text_input').val().toString();
+	var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + input + "']").first();
+	
+	if (GetUriParam('addbarcodetoselection') === undefined && possibleOptionElement.length > 0)
+	{
+		$('#product_id').val(possibleOptionElement.val());
+		$('#product_id').data('combobox').refresh();
+		$('#product_id').trigger('change');
+	}
+	else
+	{
+		var optionElement = $("#product_id option:contains('" + input + "')").first();
+		if (input.length > 0 && optionElement.length === 0 && typeof GetUriParam('addbarcodetoselection') === "undefined")
+		{
+			var addProductWorkflowsAdditionalCssClasses = "";
+			if (Grocy.Components.ProductPicker.GetPicker().parent().data('disallow-add-product-workflows').toString() === "true")
+			{
+				addProductWorkflowsAdditionalCssClasses = "d-none";
+			}
+
+			bootbox.dialog({
+				message: L('"#1" could not be resolved to a product, how do you want to proceed?', input),
+				title: L('Create or assign product'),
+				onEscape: function() { },
+				size: 'large',
+				backdrop: true,
+				buttons: {
+					cancel: {
+						label: 'Cancel',
+						className: 'btn-default responsive-button',
+						callback: function() { }
+					},
+					addnewproduct: {
+						label: '<strong>P</strong> ' + L('Add as new product'),
+						className: 'btn-success add-new-product-dialog-button responsive-button ' + addProductWorkflowsAdditionalCssClasses,
+						callback: function()
+						{
+							window.location.href = U('/product/new?prefillname=' + encodeURIComponent(input) + '&returnto=' + encodeURIComponent(window.location.pathname));
+						}
+					},
+					addbarcode: {
+						label: '<strong>B</strong> ' + L('Add as barcode to existing product'),
+						className: 'btn-info add-new-barcode-dialog-button responsive-button',
+						callback: function()
+						{
+							window.location.href = U(window.location.pathname + '?addbarcodetoselection=' + encodeURIComponent(input));
+						}
+					},
+					addnewproductwithbarcode: {
+						label: '<strong>A</strong> ' + L('Add as new product and prefill barcode'),
+						className: 'btn-warning add-new-product-with-barcode-dialog-button responsive-button ' + addProductWorkflowsAdditionalCssClasses,
+						callback: function()
+						{
+							window.location.href = U('/product/new?prefillbarcode=' + encodeURIComponent(input) + '&returnto=' + encodeURIComponent(window.location.pathname));
+						}
+					}
+				}
+			}).on('keypress', function(e)
+			{
+				if (e.key === 'B' || e.key === 'b')
+				{
+					$('.add-new-barcode-dialog-button').not(".d-none").click();
+				}
+				if (e.key === 'p' || e.key === 'P')
+				{
+					$('.add-new-product-dialog-button').not(".d-none").click();
+				}
+				if (e.key === 'a' || e.key === 'A')
+				{
+					$('.add-new-product-with-barcode-dialog-button').not(".d-none").click();
+				}
+			});
+		}
+	}
+});

public/viewjs/consume.js

@@ -10,20 +10,18 @@
 		spoiled = 1;
 	}
 
-	Grocy.FetchJson('/api/stock/get-product-details/' + jsonForm.product_id,
+	Grocy.Api.Get('stock/get-product-details/' + jsonForm.product_id,
 		function (productDetails)
 		{
-			Grocy.FetchJson('/api/stock/consume-product/' + jsonForm.product_id + '/' + jsonForm.amount + '?spoiled=' + spoiled,
+			Grocy.Api.Get('stock/consume-product/' + jsonForm.product_id + '/' + jsonForm.amount + '?spoiled=' + spoiled,
 				function(result)
 				{
-					toastr.success('Removed ' + jsonForm.amount + ' ' + productDetails.quantity_unit_stock.name + ' of ' + productDetails.product.name + ' from stock');
+					toastr.success(L('Removed #1 #2 of #3 from stock', jsonForm.amount, productDetails.quantity_unit_stock.name, productDetails.product.name));
 
 					$('#amount').val(1);
-					$('#product_id').val('');
-					$('#product_id_text_input').focus();
-					$('#product_id_text_input').val('');
-					$('#product_id_text_input').trigger('change');
-					$('#consume-form').validator('validate');
+					Grocy.Components.ProductPicker.SetValue('');
+					Grocy.Components.ProductPicker.GetInputElement().focus();
+					Grocy.FrontendHelpers.ValidateForm('consume-form');
 				},
 				function(xhr)
 				{
@@ -38,7 +36,7 @@
 	);
 });
 
-$('#product_id').on('change', function(e)
+Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 {
 	var productId = $(e.target).val();
 
@@ -46,30 +44,23 @@ $('#product_id').on('change', function(e)
 	{
 		Grocy.Components.ProductCard.Refresh(productId);
 
-		Grocy.FetchJson('/api/stock/get-product-details/' + productId,
+		Grocy.Api.Get('stock/get-product-details/' + productId,
 			function (productDetails)
 			{
 				$('#amount').attr('max', productDetails.stock_amount);
-				$('#consume-form').validator('update');
 				$('#amount_qu_unit').text(productDetails.quantity_unit_stock.name);
 
 				if ((productDetails.stock_amount || 0) === 0)
 				{
-					$('#product_id').val('');
-					$('#product_id_text_input').val('');
-					$('#product_id_text_input').addClass('has-error');
-					$('#product_id_text_input').parent('.input-group').addClass('has-error');
-					$('#product_id_text_input').closest('.form-group').addClass('has-error');
-					$('#product-error').text('This product is not in stock.');
-					$('#product-error').show();
-					$('#product_id_text_input').focus();
+					Grocy.Components.ProductPicker.SetValue('');
+					Grocy.FrontendHelpers.ValidateForm('consume-form');
+					Grocy.Components.ProductPicker.ShowCustomError(L('This product is not in stock'));
+					Grocy.Components.ProductPicker.GetInputElement().focus();
 				}
 				else
 				{
-					$('#product_id_text_input').removeClass('has-error');
-					$('#product_id_text_input').parent('.input-group').removeClass('has-error');
-					$('#product_id_text_input').closest('.form-group').removeClass('has-error');
-					$('#product-error').hide();
+					Grocy.Components.ProductPicker.HideCustomError();
+					Grocy.FrontendHelpers.ValidateForm('consume-form');
 					$('#amount').focus();
 				}
 			},
@@ -81,52 +72,32 @@ $('#product_id').on('change', function(e)
 	}
 });
 
-$('.combobox').combobox({
-	appendId: '_text_input'
-});
-
-$('#product_id_text_input').on('change', function(e)
-{
-	var input = $('#product_id_text_input').val().toString();
-	var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + input + "']").first();
-	
-	if (possibleOptionElement.length > 0)
-	{
-		$('#product_id').val(possibleOptionElement.val());
-		$('#product_id').data('combobox').refresh();
-		$('#product_id').trigger('change');
-	}
-});
-
 $('#amount').val(1);
-$('#product_id').val('');
-$('#product_id_text_input').focus();
-$('#product_id_text_input').val('');
-$('#product_id_text_input').trigger('change');
-
-$('#consume-form').validator();
-$('#consume-form').validator('validate');
+Grocy.Components.ProductPicker.GetInputElement().focus();
+Grocy.FrontendHelpers.ValidateForm('consume-form');
 
 $('#amount').on('focus', function(e)
 {
-	if ($('#product_id_text_input').val().length === 0)
-	{
-		$('#product_id_text_input').focus();
-	}
-	else
-	{
-		$(this).select();
-	}
+	$(this).select();
+});
+
+$('#consume-form input').keyup(function (event)
+{
+	Grocy.FrontendHelpers.ValidateForm('consume-form');
 });
 
 $('#consume-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
-		if ($('#consume-form').validator('validate').has('.has-error').length !== 0) //There is at least one validation error
+		if (document.getElementById('consume-form').checkValidity() === false) //There is at least one validation error
 		{
 			event.preventDefault();
 			return false;
 		}
+		else
+		{
+			$('#save-consume-button').click();
+		}
 	}
 });

public/viewjs/habitform.js

@@ -4,10 +4,10 @@
 
 	if (Grocy.EditMode === 'create')
 	{
-		Grocy.PostJson('/api/add-object/habits', $('#habit-form').serializeJSON(),
+		Grocy.Api.Post('add-object/habits', $('#habit-form').serializeJSON(),
 			function(result)
 			{
-				window.location.href = '/habits';
+				window.location.href = U('/habits');
 			},
 			function(xhr)
 			{
@@ -17,10 +17,10 @@
 	}
 	else
 	{
-		Grocy.PostJson('/api/edit-object/habits/' + Grocy.EditObjectId, $('#habit-form').serializeJSON(),
+		Grocy.Api.Post('edit-object/habits/' + Grocy.EditObjectId, $('#habit-form').serializeJSON(),
 			function(result)
 			{
-				window.location.href = '/habits';
+				window.location.href = U('/habits');
 			},
 			function(xhr)
 			{
@@ -30,9 +30,29 @@
 	}
 });
 
+$('#habit-form input').keyup(function(event)
+{
+	Grocy.FrontendHelpers.ValidateForm('habit-form');
+});
+
+$('#habit-form input').keydown(function(event)
+{
+	if (event.keyCode === 13) //Enter
+	{
+		if (document.getElementById('habit-form').checkValidity() === false) //There is at least one validation error
+		{
+			event.preventDefault();
+			return false;
+		}
+		else
+		{
+			$('#save-habit-button').click();
+		}
+	}
+});
+
 $('#name').focus();
-$('#habit-form').validator();
-$('#habit-form').validator('validate');
+Grocy.FrontendHelpers.ValidateForm('habit-form');
 
 $('.input-group-habit-period-type').on('change', function(e)
 {
@@ -41,11 +61,11 @@ $('.input-group-habit-period-type').on('change', function(e)
 
 	if (periodType === 'dynamic-regular')
 	{
-		$('#habit-period-type-info').text('This means it is estimated that a new "execution" of this habit is tracked ' + periodDays.toString() + ' days after the last was tracked.');
-		$('#habit-period-type-info').show();
+		$('#habit-period-type-info').text(L('This means it is estimated that a new execution of this habit is tracked #1 days after the last was tracked', periodDays.toString()));
+		$('#habit-period-type-info').removeClass('d-none');
 	}
 	else
 	{
-		$('#habit-period-type-info').hide();
+		$('#habit-period-type-info').addClass('d-none');
 	}
 });

public/viewjs/habits.js

@@ -1,14 +1,40 @@
-$(document).on('click', '.habit-delete-button', function(e)
+var habitsTable  = $('#habits-table').DataTable({
+	'paginate': false,
+	'order': [[1, 'asc']],
+	'columnDefs': [
+		{ 'orderable': false, 'targets': 0 }
+	],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true
+});
+
+$("#search").on("keyup", function()
 {
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	habitsTable.search(value).draw();
+});
+
+$(document).on('click', '.habit-delete-button', function (e)
+{
+	var objectName = $(e.currentTarget).attr('data-habit-name');
+	var objectId = $(e.currentTarget).attr('data-habit-id');
+
 	bootbox.confirm({
-		message: 'Delete habit <strong>' + $(e.target).attr('data-habit-name') + '</strong>?',
+		message: L('Are you sure to delete habit "#1"?', objectName),
 		buttons: {
 			confirm: {
-				label: 'Yes',
+				label: L('Yes'),
 				className: 'btn-success'
 			},
 			cancel: {
-				label: 'No',
+				label: L('No'),
 				className: 'btn-danger'
 			}
 		},
@@ -16,10 +42,10 @@
 		{
 			if (result === true)
 			{
-				Grocy.FetchJson('/api/delete-object/habits/' + $(e.target).attr('data-habit-id'),
+				Grocy.Api.Get('delete-object/habits/' + objectId,
 					function(result)
 					{
-						window.location.href = '/habits';
+						window.location.href = U('/habits');
 					},
 					function(xhr)
 					{
@@ -30,12 +56,3 @@
 		}
 	});
 });
-
-$('#habits-table').DataTable({
-	'pageLength': 50,
-	'order': [[1, 'asc']],
-	'columnDefs': [
-		{ 'orderable': false, 'targets': 0 }
-	],
-	'language': JSON.parse(L('datatables_localization'))
-});

public/viewjs/habitsoverview.js

@@ -1,5 +1,47 @@
-$('#habits-overview-table').DataTable({
-	'pageLength': 50,
-	'order': [[1, 'desc']],
-	'language': JSON.parse(L('datatables_localization'))
+var habitsOverviewTable = $('#habits-overview-table').DataTable({
+	'paginate': false,
+	'order': [[2, 'desc']],
+	'columnDefs': [
+		{ 'orderable': false, 'targets': 0 }
+	],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true
+});
+
+$("#search").on("keyup", function()
+{
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	habitsOverviewTable.search(value).draw();
+});
+
+$(document).on('click', '.track-habit-button', function(e)
+{
+	var habitId = $(e.currentTarget).attr('data-habit-id');
+	var habitName = $(e.currentTarget).attr('data-habit-name');
+	var trackedTime = moment().format('YYYY-MM-DD HH:mm:ss');
+
+	Grocy.Api.Get('habits/track-habit-execution/' + habitId + '?tracked_time=' + trackedTime,
+		function(result)
+		{
+			$('#habit-' + habitId + '-last-tracked-time').parent().effect('highlight', {}, 500);
+			$('#habit-' + habitId + '-last-tracked-time').fadeOut(500, function () {
+				$(this).text(trackedTime).fadeIn(500);
+			});
+			$('#habit-' + habitId + '-last-tracked-time-timeago').attr('datetime', trackedTime);
+			RefreshContextualTimeago();
+
+			toastr.success(L('Tracked execution of habit #1 on #2', habitName, trackedTime));
+		},
+		function(xhr)
+		{
+			console.error(xhr);
+		}
+	);
 });

public/viewjs/habittracking.js

@@ -4,21 +4,20 @@
 
 	var jsonForm = $('#habittracking-form').serializeJSON();
 
-	Grocy.FetchJson('/api/habits/get-habit-details/' + jsonForm.habit_id,
+	Grocy.Api.Get('habits/get-habit-details/' + jsonForm.habit_id,
 		function (habitDetails)
 		{
-			Grocy.FetchJson('/api/habits/track-habit-execution/' + jsonForm.habit_id + '?tracked_time=' + $('#tracked_time').val(),
+			Grocy.Api.Get('habits/track-habit-execution/' + jsonForm.habit_id + '?tracked_time=' + Grocy.Components.DateTimePicker.GetValue(),
 				function(result)
 				{
-					toastr.success('Tracked execution of habit ' + habitDetails.habit.name + ' on ' + $('#tracked_time').val());
+					toastr.success(L('Tracked execution of habit #1 on #2', habitDetails.habit.name, Grocy.Components.DateTimePicker.GetValue()));
 
 					$('#habit_id').val('');
 					$('#habit_id_text_input').focus();
 					$('#habit_id_text_input').val('');
-					$('#tracked_time').val(moment().format('YYYY-MM-DD HH:mm:ss'));
-					$('#tracked_time').trigger('change');
+					Grocy.Components.DateTimePicker.SetValue(moment().format('YYYY-MM-DD HH:mm:ss'));
 					$('#habit_id_text_input').trigger('change');
-					$('#habittracking-form').validator('validate');
+					Grocy.FrontendHelpers.ValidateForm('habittracking-form');
 				},
 				function(xhr)
 				{
@@ -35,23 +34,15 @@
 
 $('#habit_id').on('change', function(e)
 {
-	var habitId = $(e.target).val();
+	var input = $('#habit_id_text_input').val().toString();
+	$('#habit_id_text_input').val(input);
+	$('#habit_id').data('combobox').refresh();
 
+	var habitId = $(e.target).val();
 	if (habitId)
 	{
 		Grocy.Components.HabitCard.Refresh(habitId);
-		$('#tracked_time').focus();
-	}
-});
-
-$('#tracked_time').val(moment().format('YYYY-MM-DD HH:mm:ss'));
-$('#tracked_time').trigger('change');
-
-$('#tracked_time').on('focus', function(e)
-{
-	if ($('#habit_id_text_input').val().length === 0)
-	{
-		$('#habit_id_text_input').focus();
+		Grocy.Components.DateTimePicker.GetInputElement().focus();
 	}
 });
 
@@ -59,27 +50,32 @@ $('.combobox').combobox({
 	appendId: '_text_input'
 });
 
-$('#habit_id').val('');
 $('#habit_id_text_input').focus();
-$('#habit_id_text_input').val('');
 $('#habit_id_text_input').trigger('change');
+Grocy.FrontendHelpers.ValidateForm('habittracking-form');
 
-$('#habittracking-form').validator();
-$('#habittracking-form').validator('validate');
+$('#habittracking-form input').keyup(function (event)
+{
+	Grocy.FrontendHelpers.ValidateForm('habittracking-form');
+});
 
 $('#habittracking-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
-		if ($('#habittracking-form').validator('validate').has('.has-error').length !== 0) //There is at least one validation error
+		if (document.getElementById('habittracking-form').checkValidity() === false) //There is at least one validation error
 		{
 			event.preventDefault();
 			return false;
 		}
+		else
+		{
+			$('#save-habittracking-button').click();
+		}
 	}
 });
 
-$('#tracked_time').on('keypress', function(e)
+Grocy.Components.DateTimePicker.GetInputElement().on('keypress', function(e)
 {
-	$('#habittracking-form').validator('validate');
+	Grocy.FrontendHelpers.ValidateForm('habittracking-form');
 });

public/viewjs/inventory.js

@@ -4,10 +4,10 @@
 
 	var jsonForm = $('#inventory-form').serializeJSON();
 
-	Grocy.FetchJson('/api/stock/get-product-details/' + jsonForm.product_id,
+	Grocy.Api.Get('stock/get-product-details/' + jsonForm.product_id,
 		function (productDetails)
 		{
-			Grocy.FetchJson('/api/stock/inventory-product/' + jsonForm.product_id + '/' + jsonForm.new_amount + '?bestbeforedate=' + $('#best_before_date').val(),
+			Grocy.Api.Get('stock/inventory-product/' + jsonForm.product_id + '/' + jsonForm.new_amount + '?bestbeforedate=' + Grocy.Components.DateTimePicker.GetValue(),
 				function(result)
 				{
 					var addBarcode = GetUriParam('addbarcodetoselection');
@@ -23,7 +23,7 @@
 							productDetails.product.barcode += ',' + addBarcode;
 						}
 
-						Grocy.PostJson('/api/edit-object/products/' + productDetails.product.id, productDetails.product,
+						Grocy.Api.Get('edit-object/products/' + productDetails.product.id, productDetails.product,
 							function (result) { },
 							function(xhr)
 							{
@@ -32,22 +32,20 @@
 						);
 					}
 
-					toastr.success('Stock amount of ' + productDetails.product.name  + ' is now ' + jsonForm.new_amount.toString() + ' ' + productDetails.quantity_unit_stock.name);
+					toastr.success(L('Stock amount of #1 is now #2 #3', productDetails.product.name, jsonForm.new_amount, productDetails.quantity_unit_stock.name));
 
 					if (addBarcode !== undefined)
 					{
-						window.location.href = '/inventory';
+						window.location.href = U('/inventory');
 					}
 					else
 					{
-						$('#inventory-change-info').hide();
+						$('#inventory-change-info').addClass('d-none');
 						$('#new_amount').val('');
-						$('#best_before_date').val('');
-						$('#product_id').val('');
-						$('#product_id_text_input').focus();
-						$('#product_id_text_input').val('');
-						$('#product_id_text_input').trigger('change');
-						$('#inventory-form').validator('validate');
+						Grocy.Components.DateTimePicker.SetValue('');
+						Grocy.Components.ProductPicker.SetValue('');
+						Grocy.Components.ProductPicker.GetInputElement().focus();
+						Grocy.FrontendHelpers.ValidateForm('inventory-form');
 					}
 				},
 				function(xhr)
@@ -63,7 +61,7 @@
 	);
 });
 
-$('#product_id').on('change', function(e)
+Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 {
 	var productId = $(e.target).val();
 
@@ -71,7 +69,7 @@ $('#product_id').on('change', function(e)
 	{
 		Grocy.Components.ProductCard.Refresh(productId);
 
-		Grocy.FetchJson('/api/stock/get-product-details/' + productId,
+		Grocy.Api.Get('stock/get-product-details/' + productId,
 			function(productDetails)
 			{
 				$('#new_amount').attr('not-equal', productDetails.stock_amount);
@@ -87,121 +85,23 @@ $('#product_id').on('change', function(e)
 	}
 });
 
-$('.combobox').combobox({
-	appendId: '_text_input'
-});
-
-$('#product_id_text_input').on('change', function(e)
-{
-	var input = $('#product_id_text_input').val().toString();
-	var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + input + "']").first();
-	
-	if (GetUriParam('addbarcodetoselection') === undefined && possibleOptionElement.length > 0)
-	{
-		$('#product_id').val(possibleOptionElement.val());
-		$('#product_id').data('combobox').refresh();
-		$('#product_id').trigger('change');
-	}
-	else
-	{
-		var optionElement = $("#product_id option:contains('" + input + "')").first();
-		if (input.length > 0 && optionElement.length === 0 && GetUriParam('addbarcodetoselection') === undefined	)
-		{
-			bootbox.dialog({
-				message: '<strong>' + input + '</strong> could not be resolved to a product, how do you want to proceed?',
-				title: 'Create or assign product',
-				onEscape: function() { },
-				size: 'large',
-				backdrop: true,
-				buttons: {
-					cancel: {
-						label: 'Cancel',
-						className: 'btn-default',
-						callback: function() { }
-					},
-					addnewproduct: {
-						label: 'Add as new <u><strong>p</strong></u>roduct',
-						className: 'btn-success add-new-product-dialog-button',
-						callback: function()
-						{
-							window.location.href = '/product/new?prefillname=' + encodeURIComponent(input) + '&returnto=' + encodeURIComponent(window.location.pathname);
-						}
-					},
-					addbarcode: {
-						label: 'Add as <u><strong>b</strong></u>arcode to existing product',
-						className: 'btn-info add-new-barcode-dialog-button',
-						callback: function()
-						{
-							window.location.href = '/inventory?addbarcodetoselection=' + encodeURIComponent(input);
-						}
-					},
-					addnewproductwithbarcode: {
-						label: '<u><strong>A</strong></u>dd as new product + prefill barcode',
-						className: 'btn-warning add-new-product-with-barcode-dialog-button',
-						callback: function()
-						{
-							window.location.href = '/product/new?prefillbarcode=' + encodeURIComponent(input) + '&returnto=' + encodeURIComponent(window.location.pathname);
-						}
-					}
-				}
-			}).on('keypress', function(e)
-			{
-				if (e.key === 'B' || e.key === 'b')
-				{
-					$('.add-new-barcode-dialog-button').click();
-				}
-				if (e.key === 'p' || e.key === 'P')
-				{
-					$('.add-new-product-dialog-button').click();
-				}
-				if (e.key === 'a' || e.key === 'A')
-				{
-					$('.add-new-product-with-barcode-dialog-button').click();
-				}
-			});
-		}
-	}
-});
-
 $('#new_amount').val('');
-$('#best_before_date').val('');
-$('#product_id').val('');
-$('#product_id_text_input').focus();
-$('#product_id_text_input').val('');
-$('#product_id_text_input').trigger('change');
+Grocy.FrontendHelpers.ValidateForm('inventory-form');
 
-$('#inventory-form').validator({
-	custom: {
-		'isodate': function($el)
-		{
-			if ($el.val().length !== 0 && !moment($el.val(), 'YYYY-MM-DD', true).isValid())
-			{
-				return 'Wrong date format, needs to be YYYY-MM-DD';
-			}
-			else if (moment($el.val()).isValid())
-			{
-				if (moment($el.val()).isBefore(moment(), 'day'))
-				{
-					return 'This value cannot be before today.';
-				}
-			}
-		},
-		'notequal': function($el)
-		{
-			if ($el.val().length !== 0 && $el.val().toString() === $el.attr('not-equal').toString())
-			{
-				return 'This value cannot be equal to ' + $el.attr('not-equal').toString();
-			}
-		}
-	}
-});
-$('#inventory-form').validator('validate');
+if (Grocy.Components.ProductPicker.InProductAddWorkflow() === false)
+{
+	Grocy.Components.ProductPicker.GetInputElement().focus();
+}
+else
+{
+	Grocy.Components.ProductPicker.GetPicker().trigger('change');
+}
 
 $('#new_amount').on('focus', function(e)
 {
-	if ($('#product_id_text_input').val().length === 0)
+	if (Grocy.Components.ProductPicker.GetValue().length === 0)
 	{
-		$('#product_id_text_input').focus();
+		Grocy.Components.ProductPicker.GetInputElement().focus();
 	}
 	else
 	{
@@ -209,106 +109,74 @@ $('#new_amount').on('focus', function(e)
 	}
 });
 
+$('#inventory-form input').keyup(function (event)
+{
+	Grocy.FrontendHelpers.ValidateForm('inventory-form');
+});
+
 $('#inventory-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
-		if ($('#inventory-form').validator('validate').has('.has-error').length !== 0) //There is at least one validation error
+		if (document.getElementById('inventory-form').checkValidity() === false) //There is at least one validation error
 		{
 			event.preventDefault();
 			return false;
 		}
+		else
+		{
+			$('#save-inventory-button').click();
+		}
 	}
 });
 
-var prefillProduct = GetUriParam('createdproduct');
-if (prefillProduct !== undefined)
-{
-	var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + prefillProduct + "']").first();
-	if (possibleOptionElement.length === 0)
-	{
-		possibleOptionElement = $("#product_id option:contains('" + prefillProduct + "')").first();
-	}
-
-	if (possibleOptionElement.length > 0)
-	{
-		$('#product_id').val(possibleOptionElement.val());
-		$('#product_id').data('combobox').refresh();
-		$('#product_id').trigger('change');
-		$('#new_amount').focus();
-	}
-}
-
-var addBarcode = GetUriParam('addbarcodetoselection');
-if (addBarcode !== undefined)
-{
-	$('#addbarcodetoselection').text(addBarcode);
-	$('#flow-info-addbarcodetoselection').removeClass('hide');
-	$('#barcode-lookup-disabled-hint').removeClass('hide');
-}
-
 $('#new_amount').on('keypress', function(e)
 {
 	$('#new_amount').trigger('change');
 });
 	
-$('#best_before_date').on('change', function(e)
+Grocy.Components.DateTimePicker.GetInputElement().on('change', function(e)
 {
-	$('#inventory-form').validator('validate');
+	Grocy.FrontendHelpers.ValidateForm('inventory-form');
 });
 
-$('#best_before_date').on('keypress', function(e)
+Grocy.Components.DateTimePicker.GetInputElement().on('keypress', function(e)
 {
-	$('#inventory-form').validator('validate');
+	Grocy.FrontendHelpers.ValidateForm('inventory-form');
 });
 
-$('#best_before_date').on('keydown', function(e)
+$('#new_amount').on('keyup', function(e)
 {
-	if (e.keyCode === 13) //Enter
-	{
-		$('#best_before_date').trigger('change');
-	}
-});	
-
-$('#new_amount').on('change', function(e)
-{
-	if ($('#product_id').parent().hasClass('has-error'))
-	{
-		$('#inventory-change-info').hide();
-		return;
-	}
-
-	var productId = $('#product_id').val();
-	var newAmount = $('#new_amount').val();
-
+	var productId = Grocy.Components.ProductPicker.GetValue();
+	var newAmount = parseInt($('#new_amount').val());
+	
 	if (productId)
 	{
-		Grocy.FetchJson('/api/stock/get-product-details/' + productId,
+		Grocy.Api.Get('stock/get-product-details/' + productId,
 			function(productDetails)
 			{
-				var productStockAmount = productDetails.stock_amount || '0';
-
+				var productStockAmount = parseInt(productDetails.stock_amount || '0');
+				
 				if (newAmount > productStockAmount)
 				{
 					var amountToAdd = newAmount - productDetails.stock_amount;
-					$('#inventory-change-info').text('This means ' + amountToAdd.toString() + ' ' + productDetails.quantity_unit_stock.name + ' will be added to stock');
-					$('#inventory-change-info').show();
-					$('#best_before_date').attr('required', 'required');
+					$('#inventory-change-info').text(L('This means #1 will be added to stock', amountToAdd.toString() + ' ' + productDetails.quantity_unit_stock.name));
+					$('#inventory-change-info').removeClass('d-none');
+					Grocy.Components.DateTimePicker.GetInputElement().attr('required', '');
 				}
 				else if (newAmount < productStockAmount)
 				{
 					var amountToRemove = productStockAmount - newAmount;
-					$('#inventory-change-info').text('This means ' + amountToRemove.toString() + ' ' + productDetails.quantity_unit_stock.name + ' will be removed from stock');
-					$('#inventory-change-info').show();
-					$('#best_before_date').removeAttr('required');
+					$('#inventory-change-info').text(L('This means #1 will be removed from stock', amountToRemove.toString() + ' ' + productDetails.quantity_unit_stock.name));
+					$('#inventory-change-info').removeClass('d-none');
+					Grocy.Components.DateTimePicker.GetInputElement().removeAttr('required');
 				}
 				else
 				{
-					$('#inventory-change-info').hide();
+					$('#inventory-change-info').addClass('d-none');
 				}
 
-				$('#inventory-form').validator('update');
-				$('#inventory-form').validator('validate');
+				Grocy.FrontendHelpers.ValidateForm('inventory-form');
 			},
 			function(xhr)
 			{

public/viewjs/locationform.js

@@ -4,10 +4,10 @@
 
 	if (Grocy.EditMode === 'create')
 	{
-		Grocy.PostJson('/api/add-object/locations', $('#location-form').serializeJSON(),
+		Grocy.Api.Post('add-object/locations', $('#location-form').serializeJSON(),
 			function(result)
 			{
-				window.location.href = '/locations';
+				window.location.href = U('/locations');
 			},
 			function(xhr)
 			{
@@ -17,10 +17,10 @@
 	}
 	else
 	{
-		Grocy.PostJson('/api/edit-object/locations/' + Grocy.EditObjectId, $('#location-form').serializeJSON(),
+		Grocy.Api.Post('edit-object/locations/' + Grocy.EditObjectId, $('#location-form').serializeJSON(),
 			function(result)
 			{
-				window.location.href = '/locations';
+				window.location.href = U('/locations');
 			},
 			function(xhr)
 			{
@@ -30,6 +30,26 @@
 	}
 });
 
+$('#location-form input').keyup(function (event)
+{
+	Grocy.FrontendHelpers.ValidateForm('location-form');
+});
+
+$('#location-form input').keydown(function (event)
+{
+	if (event.keyCode === 13) //Enter
+	{
+		if (document.getElementById('location-form').checkValidity() === false) //There is at least one validation error
+		{
+			event.preventDefault();
+			return false;
+		}
+		else
+		{
+			$('#save-location-button').click();
+		}
+	}
+});
+
 $('#name').focus();
-$('#location-form').validator();
-$('#location-form').validator('validate');
+Grocy.FrontendHelpers.ValidateForm('location-form');

public/viewjs/locations.js

@@ -1,14 +1,40 @@
-$(document).on('click', '.location-delete-button', function(e)
+var locationsTable = $('#locations-table').DataTable({
+	'paginate': false,
+	'order': [[1, 'asc']],
+	'columnDefs': [
+		{ 'orderable': false, 'targets': 0 }
+	],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true
+});
+
+$("#search").on("keyup", function()
 {
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	locationsTable.search(value).draw();
+});
+
+$(document).on('click', '.location-delete-button', function (e)
+{
+	var objectName = $(e.currentTarget).attr('data-location-name');
+	var objectId = $(e.currentTarget).attr('data-location-id');
+
 	bootbox.confirm({
-		message: 'Delete location <strong>' + $(e.target).attr('data-location-name') + '</strong>?',
+		message: L('Are you sure to delete location "#1"?', objectName),
 		buttons: {
 			confirm: {
-				label: 'Yes',
+				label: L('Yes'),
 				className: 'btn-success'
 			},
 			cancel: {
-				label: 'No',
+				label: L('No'),
 				className: 'btn-danger'
 			}
 		},
@@ -16,10 +42,10 @@
 		{
 			if (result === true)
 			{
-				Grocy.FetchJson('/api/delete-object/locations/' + $(e.target).attr('data-location-id'),
+				Grocy.Api.Get('delete-object/locations/' + objectId,
 					function(result)
 					{
-						window.location.href = '/locations';
+						window.location.href = U('/locations');
 					},
 					function(xhr)
 					{
@@ -30,12 +56,3 @@
 		}
 	});
 });
-
-$('#locations-table').DataTable({
-	'pageLength': 50,
-	'order': [[1, 'asc']],
-	'columnDefs': [
-		{ 'orderable': false, 'targets': 0 }
-	],
-	'language': JSON.parse(L('datatables_localization'))
-});

public/viewjs/login.js

@@ -1,9 +1,7 @@
-$('.logout-button').hide();
-
-$('#username').focus();
+$('#username').focus();
 
 if (GetUriParam('invalid') === 'true')
 {
 	$('#login-error').text(L('Invalid credentials, please try again'));
-	$('#login-error').show();
+	$('#login-error').removeClass('d-none');
 }

public/viewjs/manageapikeys.js

@@ -0,0 +1,64 @@
+var apiKeysTable = $('#apikeys-table').DataTable({
+	'paginate': false,
+	'order': [[4, 'desc']],
+	'columnDefs': [
+		{ 'orderable': false, 'targets': 0 }
+	],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true
+});
+
+var createdApiKeyId = GetUriParam('CreatedApiKeyId');
+if (createdApiKeyId !== undefined)
+{
+	$('#apiKeyRow_' + createdApiKeyId).effect('highlight', {}, 3000);
+}
+
+$("#search").on("keyup", function()
+{
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	apiKeysTable.search(value).draw();
+});
+
+$(document).on('click', '.apikey-delete-button', function (e)
+{
+	var objectName = $(e.currentTarget).attr('data-apikey-apikey');
+	var objectId = $(e.currentTarget).attr('data-apikey-id');
+
+	bootbox.confirm({
+		message: L('Are you sure to delete API key "#1"?', objectName),
+		buttons: {
+			confirm: {
+				label: L('Yes'),
+				className: 'btn-success'
+			},
+			cancel: {
+				label: L('No'),
+				className: 'btn-danger'
+			}
+		},
+		callback: function(result)
+		{
+			if (result === true)
+			{
+				Grocy.Api.Get('delete-object/api_keys/' + objectId,
+					function(result)
+					{
+						window.location.href = U('/manageapikeys');
+					},
+					function(xhr)
+					{
+						console.error(xhr);
+					}
+				);
+			}
+		}
+	});
+});

public/viewjs/openapiui.js

@@ -0,0 +1,26 @@
+function HideTopbarPlugin()
+{
+	return {
+		components: {
+			Topbar: function () { return null }
+		}
+	}
+}
+
+const swaggerUi = SwaggerUIBundle({
+	url: Grocy.OpenApi.SpecUrl,
+	dom_id: '#swagger-ui',
+	deepLinking: true,
+	presets: [
+		SwaggerUIBundle.presets.apis,
+		SwaggerUIStandalonePreset
+	],
+	plugins: [
+		SwaggerUIBundle.plugins.DownloadUrl,
+		HideTopbarPlugin
+	],
+	layout: 'StandaloneLayout',
+	docExpansion: "list"
+});
+
+window.ui = swaggerUi;

public/viewjs/productform.js

@@ -2,7 +2,7 @@
 {
 	e.preventDefault();
 
-	var redirectDestination = '/products';
+	var redirectDestination = U('/products');
 	var returnTo = GetUriParam('returnto');
 	if (returnTo !== undefined)
 	{
@@ -11,7 +11,7 @@
 
 	if (Grocy.EditMode === 'create')
 	{
-		Grocy.PostJson('/api/add-object/products', $('#product-form').serializeJSON(),
+		Grocy.Api.Post('add-object/products', $('#product-form').serializeJSON(),
 			function(result)
 			{
 				window.location.href = redirectDestination;
@@ -24,7 +24,7 @@
 	}
 	else
 	{
-		Grocy.PostJson('/api/edit-object/products/' + Grocy.EditObjectId, $('#product-form').serializeJSON(),
+		Grocy.Api.Post('edit-object/products/' + Grocy.EditObjectId, $('#product-form').serializeJSON(),
 			function(result)
 			{
 				window.location.href = redirectDestination;
@@ -44,7 +44,7 @@ $('#barcode-taginput').tagsManager({
 
 if (Grocy.EditMode === 'edit')
 {
-	Grocy.FetchJson('/api/get-object/products/' + Grocy.EditObjectId,
+	Grocy.Api.Get('get-object/products/' + Grocy.EditObjectId,
 		function (product)
 		{
 			if (product.barcode !== null && product.barcode.length > 0)
@@ -82,15 +82,35 @@ $('.input-group-qu').on('change', function(e)
 	if (factor > 1)
 	{
 		$('#qu-conversion-info').text(L('This means 1 #1 purchased will be converted into #2 #3 in stock', $("#qu_id_purchase option:selected").text(), (1 * factor).toString(), $("#qu_id_stock option:selected").text()));
-		$('#qu-conversion-info').show();
+		$('#qu-conversion-info').removeClass('d-none');
 	}
 	else
 	{
-		$('#qu-conversion-info').hide();
+		$('#qu-conversion-info').addClass('d-none');
+	}
+});
+
+$('#product-form input').keyup(function(event)
+{
+	Grocy.FrontendHelpers.ValidateForm('product-form');
+});
+
+$('#product-form input').keydown(function(event)
+{
+	if (event.keyCode === 13) //Enter
+	{
+		if (document.getElementById('product-form').checkValidity() === false) //There is at least one validation error
+		{
+			event.preventDefault();
+			return false;
+		}
+		else
+		{
+			$('#save-product-button').click();
+		}
 	}
 });
 
 $('#name').focus();
-$('#product-form').validator();
-$('#product-form').validator('validate');
 $('.input-group-qu').trigger('change');
+Grocy.FrontendHelpers.ValidateForm('product-form');

public/viewjs/products.js

@@ -1,14 +1,40 @@
-$(document).on('click', '.product-delete-button', function(e)
+var productsTable = $('#products-table').DataTable({
+	'paginate': false,
+	'order': [[1, 'asc']],
+	'columnDefs': [
+		{ 'orderable': false, 'targets': 0 }
+	],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true
+});
+
+$("#search").on("keyup", function()
 {
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	productsTable.search(value).draw();
+});
+
+$(document).on('click', '.product-delete-button', function (e)
+{
+	var objectName = $(e.currentTarget).attr('data-product-name');
+	var objectId = $(e.currentTarget).attr('data-product-id');
+
 	bootbox.confirm({
-		message: 'Delete product <strong>' + $(e.target).attr('data-product-name') + '</strong>?',
+		message: L('Are you sure to delete product "#1"?', objectName),
 		buttons: {
 			confirm: {
-				label: 'Yes',
+				label: L('Yes'),
 				className: 'btn-success'
 			},
 			cancel: {
-				label: 'No',
+				label: L('No'),
 				className: 'btn-danger'
 			}
 		},
@@ -16,10 +42,10 @@
 		{
 			if (result === true)
 			{
-				Grocy.FetchJson('/api/delete-object/products/' + $(e.target).attr('data-product-id'),
+				Grocy.Api.Get('delete-object/products/' + objectId,
 					function(result)
 					{
-						window.location.href = '/products';
+						window.location.href = U('/products');
 					},
 					function(xhr)
 					{
@@ -30,12 +56,3 @@
 		}
 	});
 });
-
-$('#products-table').DataTable({
-	'pageLength': 50,
-	'order': [[1, 'asc']],
-	'columnDefs': [
-		{ 'orderable': false, 'targets': 0 }
-	],
-	'language': JSON.parse(L('datatables_localization'))
-});

public/viewjs/purchase.js

@@ -4,12 +4,12 @@
 
 	var jsonForm = $('#purchase-form').serializeJSON();
 
-	Grocy.FetchJson('/api/stock/get-product-details/' + jsonForm.product_id,
+	Grocy.Api.Get('stock/get-product-details/' + jsonForm.product_id,
 		function (productDetails)
 		{
 			var amount = jsonForm.amount * productDetails.product.qu_factor_purchase_to_stock;
 
-			Grocy.FetchJson('/api/stock/add-product/' + jsonForm.product_id + '/' + amount + '?bestbeforedate=' + $('#best_before_date').val(),
+			Grocy.Api.Get('stock/add-product/' + jsonForm.product_id + '/' + amount + '?bestbeforedate=' + Grocy.Components.DateTimePicker.GetValue(),
 				function(result)
 				{
 					var addBarcode = GetUriParam('addbarcodetoselection');
@@ -25,7 +25,7 @@
 							productDetails.product.barcode += ',' + addBarcode;
 						}
 
-						Grocy.PostJson('/api/edit-object/products/' + productDetails.product.id, productDetails.product,
+						Grocy.Api.Post('edit-object/products/' + productDetails.product.id, productDetails.product,
 							function (result) { },
 							function(xhr)
 							{
@@ -34,21 +34,19 @@
 						);
 					}
 
-					toastr.success('Added ' + amount + ' ' + productDetails.quantity_unit_stock.name + ' of ' + productDetails.product.name + ' to stock');
+					toastr.success(L('Added #1 #2 of #3 to stock', amount, productDetails.quantity_unit_stock.name, productDetails.product.name));
 
 					if (addBarcode !== undefined)
 					{
-						window.location.href = '/purchase';
+						window.location.href = U('/purchase');
 					}
 					else
 					{
 						$('#amount').val(0);
-						$('#best_before_date').val('');
-						$('#product_id').val('');
-						$('#product_id_text_input').focus();
-						$('#product_id_text_input').val('');
-						$('#product_id_text_input').trigger('change');
-						$('#purchase-form').validator('validate');
+						Grocy.Components.DateTimePicker.SetValue('');
+						Grocy.Components.ProductPicker.SetValue('');
+						Grocy.Components.ProductPicker.GetInputElement().focus();
+						Grocy.FrontendHelpers.ValidateForm('purchase-form');
 					}
 				},
 				function(xhr)
@@ -64,7 +62,7 @@
 	);
 });
 
-$('#product_id').on('change', function(e)
+Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 {
 	var productId = $(e.target).val();
 
@@ -72,20 +70,19 @@ $('#product_id').on('change', function(e)
 	{
 		Grocy.Components.ProductCard.Refresh(productId);
 
-		Grocy.FetchJson('/api/stock/get-product-details/' + productId,
+		Grocy.Api.Get('stock/get-product-details/' + productId,
 			function(productDetails)
 			{
 				$('#amount_qu_unit').text(productDetails.quantity_unit_purchase.name);
 				
 				if (productDetails.product.default_best_before_days.toString() !== '0')
 				{
-					$('#best_before_date').val(moment().add(productDetails.product.default_best_before_days, 'days').format('YYYY-MM-DD'));
-					$('#best_before_date').trigger('change');
+					Grocy.Components.DateTimePicker.SetValue(moment().add(productDetails.product.default_best_before_days, 'days').format('YYYY-MM-DD'));
 					$('#amount').focus();
 				}
 				else
 				{
-					$('#best_before_date').focus();
+					Grocy.Components.DateTimePicker.GetInputElement().focus();
 				}
 			},
 			function(xhr)
@@ -96,122 +93,23 @@ $('#product_id').on('change', function(e)
 	}
 });
 
-$('.combobox').combobox({
-	appendId: '_text_input'
-});
-
-$('#product_id_text_input').on('change', function(e)
-{
-	var input = $('#product_id_text_input').val().toString();
-	var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + input + "']").first();
-	
-	if (GetUriParam('addbarcodetoselection') === undefined && possibleOptionElement.length > 0)
-	{
-		$('#product_id').val(possibleOptionElement.val());
-		$('#product_id').data('combobox').refresh();
-		$('#product_id').trigger('change');
-	}
-	else
-	{
-		var optionElement = $("#product_id option:contains('" + input + "')").first();
-		if (input.length > 0 && optionElement.length === 0 && GetUriParam('addbarcodetoselection') === undefined	)
-		{
-			bootbox.dialog({
-				message: '<strong>' + input + '</strong> could not be resolved to a product, how do you want to proceed?',
-				title: 'Create or assign product',
-				onEscape: function() { },
-				size: 'large',
-				backdrop: true,
-				buttons: {
-					cancel: {
-						label: 'Cancel',
-						className: 'btn-default',
-						callback: function() { }
-					},
-					addnewproduct: {
-						label: 'Add as new <u><strong>p</strong></u>roduct',
-						className: 'btn-success add-new-product-dialog-button',
-						callback: function()
-						{
-							window.location.href = '/product/new?prefillname=' + encodeURIComponent(input) + '&returnto=' + encodeURIComponent(window.location.pathname);
-						}
-					},
-					addbarcode: {
-						label: 'Add as <u><strong>b</strong></u>arcode to existing product',
-						className: 'btn-info add-new-barcode-dialog-button',
-						callback: function()
-						{
-							window.location.href = '/purchase?addbarcodetoselection=' + encodeURIComponent(input);
-						}
-					},
-					addnewproductwithbarcode: {
-						label: '<u><strong>A</strong></u>dd as new product + prefill barcode',
-						className: 'btn-warning add-new-product-with-barcode-dialog-button',
-						callback: function()
-						{
-							window.location.href = '/product/new?prefillbarcode=' + encodeURIComponent(input) + '&returnto=' + encodeURIComponent(window.location.pathname);
-						}
-					}
-				}
-			}).on('keypress', function(e)
-			{
-				if (e.key === 'B' || e.key === 'b')
-				{
-					$('.add-new-barcode-dialog-button').click();
-				}
-				if (e.key === 'p' || e.key === 'P')
-				{
-					$('.add-new-product-dialog-button').click();
-				}
-				if (e.key === 'a' || e.key === 'A')
-				{
-					$('.add-new-product-with-barcode-dialog-button').click();
-				}
-			});
-		}
-	}
-});
-
 $('#amount').val(0);
-$('#best_before_date').val('');
-$('#product_id').val('');
-$('#product_id_text_input').focus();
-$('#product_id_text_input').val('');
-$('#product_id_text_input').trigger('change');
+Grocy.FrontendHelpers.ValidateForm('purchase-form');
 
-$('#purchase-form').validator({
-	custom: {
-		'isodate': function($el)
-		{
-			if ($el.val().length !== 0 && !moment($el.val(), 'YYYY-MM-DD', true).isValid())
-			{
-				return 'Wrong date format, needs to be YYYY-MM-DD';
-			}
-			else if (moment($el.val()).isValid())
-			{
-				if (moment($el.val()).isBefore(moment(), 'day'))
-				{
-					return 'This value cannot be before today.';
-				}
-			}
-		}
-	}
-});
-$('#purchase-form').validator('validate');
-
-$('#best_before_date').on('focus', function(e)
+if (Grocy.Components.ProductPicker.InProductAddWorkflow() === false)
 {
-	if ($('#product_id_text_input').val().length === 0)
-	{
-		$('#product_id_text_input').focus();
-	}
-});
+	Grocy.Components.ProductPicker.GetInputElement().focus();
+}
+else
+{
+	Grocy.Components.ProductPicker.GetPicker().trigger('change');
+}
 
 $('#amount').on('focus', function(e)
 {
-	if ($('#product_id_text_input').val().length === 0)
+	if (Grocy.Components.ProductPicker.GetValue().length === 0)
 	{
-		$('#product_id_text_input').focus();
+		Grocy.Components.ProductPicker.GetInputElement().focus();
 	}
 	else
 	{
@@ -219,50 +117,38 @@ $('#amount').on('focus', function(e)
 	}
 });
 
+$('#purchase-form input').keyup(function(event)
+{
+	Grocy.FrontendHelpers.ValidateForm('purchase-form');
+});
+
 $('#purchase-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
-		if ($('#purchase-form').validator('validate').has('.has-error').length !== 0) //There is at least one validation error
+		if (document.getElementById('purchase-form').checkValidity() === false) //There is at least one validation error
 		{
 			event.preventDefault();
 			return false;
 		}
+		else
+		{
+			$('#save-purchase-button').click();
+		}
 	}
 });
 
-var prefillProduct = GetUriParam('createdproduct');
-if (prefillProduct !== undefined)
+Grocy.Components.DateTimePicker.GetInputElement().on('change', function(e)
 {
-	var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + prefillProduct + "']").first();
-	if (possibleOptionElement.length === 0)
-	{
-		possibleOptionElement = $("#product_id option:contains('" + prefillProduct + "')").first();
-	}
-
-	if (possibleOptionElement.length > 0)
-	{
-		$('#product_id').val(possibleOptionElement.val());
-		$('#product_id').data('combobox').refresh();
-		$('#product_id').trigger('change');
-		$('#best_before_date').focus();
-	}
-}
-
-var addBarcode = GetUriParam('addbarcodetoselection');
-if (addBarcode !== undefined)
-{
-	$('#addbarcodetoselection').text(addBarcode);
-	$('#flow-info-addbarcodetoselection').removeClass('hide');
-	$('#barcode-lookup-disabled-hint').removeClass('hide');
-}
-
-$('#best_before_date').on('change', function(e)
-{
-	$('#purchase-form').validator('validate');
+	Grocy.FrontendHelpers.ValidateForm('purchase-form');
 });
 
-$('#best_before_date').on('keypress', function(e)
+Grocy.Components.DateTimePicker.GetInputElement().on('keypress', function(e)
 {
-	$('#purchase-form').validator('validate');
+	Grocy.FrontendHelpers.ValidateForm('purchase-form');
+});
+
+$('#amount').on('change', function (e)
+{
+	Grocy.FrontendHelpers.ValidateForm('purchase-form');
 });

public/viewjs/quantityunitform.js

@@ -4,10 +4,10 @@
 
 	if (Grocy.EditMode === 'create')
 	{
-		Grocy.PostJson('/api/add-object/quantity_units', $('#quantityunit-form').serializeJSON(),
+		Grocy.Api.Post('add-object/quantity_units', $('#quantityunit-form').serializeJSON(),
 			function(result)
 			{
-				window.location.href = '/quantityunits';
+				window.location.href = U('/quantityunits');
 			},
 			function(xhr)
 			{
@@ -17,10 +17,10 @@
 	}
 	else
 	{
-		Grocy.PostJson('/api/edit-object/quantity_units/' + Grocy.EditObjectId, $('#quantityunit-form').serializeJSON(),
+		Grocy.Api.Post('edit-object/quantity_units/' + Grocy.EditObjectId, $('#quantityunit-form').serializeJSON(),
 			function(result)
 			{
-				window.location.href = '/quantityunits';
+				window.location.href = U('/quantityunits');
 			},
 			function(xhr)
 			{
@@ -30,6 +30,26 @@
 	}
 });
 
+$('#quantityunit-form input').keyup(function(event)
+{
+	Grocy.FrontendHelpers.ValidateForm('quantityunit-form');
+});
+
+$('#quantityunit-form input').keydown(function(event)
+{
+	if (event.keyCode === 13) //Enter
+	{
+		if (document.getElementById('quantityunit-form').checkValidity() === false) //There is at least one validation error
+		{
+			event.preventDefault();
+			return false;
+		}
+		else
+		{
+			$('#save-quantityunit-button').click();
+		}
+	}
+});
+
 $('#name').focus();
-$('#quantityunit-form').validator();
-$('#quantityunit-form').validator('validate');
+Grocy.FrontendHelpers.ValidateForm('quantityunit-form');

public/viewjs/quantityunits.js

@@ -1,7 +1,33 @@
-$(document).on('click', '.quantityunit-delete-button', function(e)
+var quantityUnitsTable = $('#quantityunits-table').DataTable({
+	'paginate': false,
+	'order': [[1, 'asc']],
+	'columnDefs': [
+		{ 'orderable': false, 'targets': 0 }
+	],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true
+});
+
+$("#search").on("keyup", function()
 {
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	quantityUnitsTable.search(value).draw();
+});
+
+$(document).on('click', '.quantityunit-delete-button', function (e)
+{
+	var objectName = $(e.currentTarget).attr('data-quantityunit-name');
+	var objectId = $(e.currentTarget).attr('data-quantityunit-id');
+
 	bootbox.confirm({
-		message: 'Delete quantity unit <strong>' + $(e.target).attr('data-quantityunit-name') + '</strong>?',
+		message: L('Are you sure to delete quantity unit "#1"?', objectName),
 		buttons: {
 			confirm: {
 				label: 'Yes',
@@ -16,10 +42,10 @@
 		{
 			if (result === true)
 			{
-				Grocy.FetchJson('/api/delete-object/quantity_units/' + $(e.target).attr('data-quantityunit-id'),
+				Grocy.Api.Get('delete-object/quantity_units/' + objectId,
 					function(result)
 					{
-						window.location.href = '/quantityunits';
+						window.location.href = U('/quantityunits');
 					},
 					function(xhr)
 					{
@@ -30,12 +56,3 @@
 		}
 	});
 });
-
-$('#quantityunits-table').DataTable({
-	'pageLength': 50,
-	'order': [[1, 'asc']],
-	'columnDefs': [
-		{ 'orderable': false, 'targets': 0 }
-	],
-	'language': JSON.parse(L('datatables_localization'))
-});

public/viewjs/recipeform.js

@@ -0,0 +1,161 @@
+$('#save-recipe-button').on('click', function(e)
+{
+	e.preventDefault();
+
+	Grocy.Api.Post('edit-object/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(),
+		function(result)
+		{
+			window.location.href = U('/recipes');
+		},
+		function(xhr)
+		{
+			console.error(xhr);
+		}
+	);
+});
+
+var recipesPosTables = $('#recipes-pos-table').DataTable({
+	'paginate': false,
+	'order': [[1, 'asc']],
+	'columnDefs': [
+		{ 'orderable': false, 'targets': 0 }
+	],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true
+});
+
+$("#search").on("keyup", function ()
+{
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+
+	recipesPosTables.search(value).draw();
+});
+
+Grocy.FrontendHelpers.ValidateForm('recipe-form');
+$("#name").focus();
+
+$('#recipe-form input').keyup(function (event)
+{
+	Grocy.FrontendHelpers.ValidateForm('recipe-form');
+});
+
+$('#recipe-form input').keydown(function (event)
+{
+	if (event.keyCode === 13) //Enter
+	{
+		if (document.getElementById('recipe-form').checkValidity() === false) //There is at least one validation error
+		{
+			event.preventDefault();
+			return false;
+		}
+		else
+		{
+			$('#save-recipe-button').click();
+		}
+	}
+});
+
+$(document).on('click', '.recipe-pos-delete-button', function(e)
+{
+	var objectName = $(e.currentTarget).attr('data-recipe-pos-name');
+	var objectId = $(e.currentTarget).attr('data-recipe-pos-id');
+
+	bootbox.confirm({
+		message: L('Are you sure to delete recipe ingredient "#1"?', objectName),
+		buttons: {
+			confirm: {
+				label: L('Yes'),
+				className: 'btn-success'
+			},
+			cancel: {
+				label: L('No'),
+				className: 'btn-danger'
+			}
+		},
+		callback: function(result)
+		{
+			if (result === true)
+			{
+				Grocy.Api.Post('edit-object/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(), function() { }, function() { });
+				Grocy.Api.Get('delete-object/recipes_pos/' + objectId,
+					function(result)
+					{
+						window.location.href = U('/recipe/' + Grocy.EditObjectId);
+					},
+					function(xhr)
+					{
+						console.error(xhr);
+					}
+				);
+			}
+		}
+	});
+});
+
+$(document).on('click', '.recipe-pos-order-missing-button', function(e)
+{
+	var productName = $(e.currentTarget).attr('data-product-name');
+	var productId = $(e.currentTarget).attr('data-product-id');
+	var productAmount = $(e.currentTarget).attr('data-product-amount');
+	var recipeName = $(e.currentTarget).attr('data-recipe-name');
+
+	var jsonData = {};
+	jsonData.product_id = productId;
+	jsonData.amount = productAmount;
+	jsonData.note = L('Added for recipe #1', recipeName);
+
+	Grocy.Api.Post('add-object/shopping_list', jsonData,
+		function(result)
+		{
+			Grocy.Api.Post('edit-object/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(), function () { }, function () { });
+			window.location.href = U('/recipe/' + Grocy.EditObjectId);
+		},
+		function(xhr)
+		{
+			console.error(xhr);
+		}
+	);
+});
+
+$(document).on('click', '.recipe-pos-show-note-button', function(e)
+{
+	var note = $(e.currentTarget).attr('data-recipe-pos-note');
+
+	bootbox.alert(note);
+});
+
+$(document).on('click', '.recipe-pos-edit-button', function (e)
+{
+	var recipePosId = $(e.currentTarget).attr('data-recipe-pos-id');
+
+	Grocy.Api.Post('edit-object/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(),
+		function(result)
+		{
+			window.location.href = U('/recipe/' + Grocy.EditObjectId + '/pos/' + recipePosId);
+		},
+		function(xhr)
+		{
+			console.error(xhr);
+		}
+	);
+});
+
+$("#recipe-pos-add-button").on("click", function(e)
+{
+	Grocy.Api.Post('edit-object/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(),
+		function(result)
+		{
+			window.location.href = U('/recipe/' + Grocy.EditObjectId + '/pos/new');
+		},
+		function(xhr)
+		{
+			console.error(xhr);
+		}
+	);
+});

public/viewjs/recipeposform.js

@@ -0,0 +1,98 @@
+$('#save-recipe-pos-button').on('click', function(e)
+{
+	e.preventDefault();
+
+	var jsonData = $('#recipe-pos-form').serializeJSON();
+	jsonData.recipe_id = Grocy.EditObjectParentId;
+	console.log(jsonData);
+	if (Grocy.EditMode === 'create')
+	{
+		Grocy.Api.Post('add-object/recipes_pos', jsonData,
+			function(result)
+			{
+				window.location.href = U('/recipe/' + Grocy.EditObjectParentId);
+			},
+			function(xhr)
+			{
+				console.error(xhr);
+			}
+		);
+	}
+	else
+	{
+		Grocy.Api.Post('edit-object/recipes_pos/' + Grocy.EditObjectId, jsonData,
+			function(result)
+			{
+				window.location.href = U('/recipe/' + Grocy.EditObjectParentId);
+			},
+			function(xhr)
+			{
+				console.error(xhr);
+			}
+		);
+	}
+});
+
+Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
+{
+	var productId = $(e.target).val();
+
+	if (productId)
+	{
+		Grocy.Components.ProductCard.Refresh(productId);
+		
+		Grocy.Api.Get('stock/get-product-details/' + productId,
+			function (productDetails)
+			{
+				$('#amount_qu_unit').text(productDetails.quantity_unit_purchase.name);
+				$('#amount').focus();
+				Grocy.FrontendHelpers.ValidateForm('recipe-pos-form');
+			},
+			function(xhr)
+			{
+				console.error(xhr);
+			}
+		);
+	}
+});
+
+Grocy.FrontendHelpers.ValidateForm('recipe-pos-form');
+
+if (Grocy.Components.ProductPicker.InProductAddWorkflow() === false)
+{
+	Grocy.Components.ProductPicker.GetInputElement().focus();
+}
+Grocy.Components.ProductPicker.GetPicker().trigger('change');
+
+$('#amount').on('focus', function(e)
+{
+	if (Grocy.Components.ProductPicker.GetValue().length === 0)
+	{
+		Grocy.Components.ProductPicker.GetInputElement().focus();
+	}
+	else
+	{
+		$(this).select();
+	}
+});
+
+$('#recipe-pos-form input').keyup(function (event)
+{
+	Grocy.FrontendHelpers.ValidateForm('recipe-pos-form');
+});
+
+$('#recipe-pos-form input').keydown(function (event)
+{
+	if (event.keyCode === 13) //Enter
+	{
+		if (document.getElementById('recipe-pos-form').checkValidity() === false) //There is at least one validation error
+		{
+			event.preventDefault();
+			return false;
+		}
+		else
+		{
+			$('#save-recipe-pos-button').click();
+		}
+	}
+});

public/viewjs/recipes.js

@@ -0,0 +1,119 @@
+var recipesTables = $('#recipes-table').DataTable({
+	'paginate': false,
+	'order': [[1, 'asc']],
+	'columnDefs': [
+		{ 'orderable': false, 'targets': 0 }
+	],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true,
+	'select': 'single',
+	'initComplete': function()
+	{
+		this.api().row({ order: 'current' }, 0).select();
+	}
+});
+
+var rowSelect = GetUriParam("row");
+if (typeof rowSelect !== "undefined")
+{
+	recipesTables.row(rowSelect).select();
+}
+
+$("#search").on("keyup", function()
+{
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	recipesTables.search(value).draw();
+});
+
+$(document).on('click', '.recipe-delete-button', function(e)
+{
+	var objectName = $(e.currentTarget).attr('data-recipe-name');
+	var objectId = $(e.currentTarget).attr('data-recipe-id');
+
+	bootbox.confirm({
+		message: L('Are you sure to delete recipe "#1"?', objectName),
+		buttons: {
+			confirm: {
+				label: L('Yes'),
+				className: 'btn-success'
+			},
+			cancel: {
+				label: L('No'),
+				className: 'btn-danger'
+			}
+		},
+		callback: function(result)
+		{
+			if (result === true)
+			{
+				Grocy.Api.Get('delete-object/recipes/' + objectId,
+					function(result)
+					{
+						window.location.href = U('/recipes');
+					},
+					function(xhr)
+					{
+						console.error(xhr);
+					}
+				);
+			}
+		}
+	});
+});
+
+$(document).on('click', '.recipe-order-missing-button', function(e)
+{
+	var objectName = $(e.currentTarget).attr('data-recipe-name');
+	var objectId = $(e.currentTarget).attr('data-recipe-id');
+
+	bootbox.confirm({
+		message: L('Are you sure to put all missing ingredients for recipe "#1" on the shopping list?', objectName),
+		buttons: {
+			confirm: {
+				label: L('Yes'),
+				className: 'btn-success'
+			},
+			cancel: {
+				label: L('No'),
+				className: 'btn-danger'
+			}
+		},
+		callback: function(result)
+		{
+			if (result === true)
+			{
+				Grocy.Api.Get('recipes/add-not-fulfilled-products-to-shopping-list/' + objectId,
+					function(result)
+					{
+						window.location.href = U('/recipes');
+					},
+					function(xhr)
+					{
+						console.error(xhr);
+					}
+				);
+			}
+		}
+	});
+});
+
+recipesTables.on('select', function(e, dt, type, indexes)
+{
+	if (type === 'row')
+	{
+		var selectedRecipeId = $(recipesTables.row(indexes[0]).node()).data("recipe-id");
+		window.location.href = U('/recipes?recipe=' + selectedRecipeId.toString() + "&row=" + indexes[0].toString());
+	}
+});
+
+$("#selectedRecipeToggleFullscreenButton").on('click', function(e)
+{
+	$("#selectedRecipeCard").toggleClass("fullscreen");
+});

public/viewjs/shoppinglist.js

@@ -1,9 +1,32 @@
-$(document).on('click', '.shoppinglist-delete-button', function(e)
+var shoppingListTable = $('#shoppinglist-table').DataTable({
+	'paginate': false,
+	'order': [[1, 'asc']],
+	'columnDefs': [
+		{ 'orderable': false, 'targets': 0 }
+	],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true
+});
+
+$("#search").on("keyup", function()
 {
-	Grocy.FetchJson('/api/delete-object/shopping_list/' + $(e.target).attr('data-shoppinglist-id'),
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	shoppingListTable.search(value).draw();
+});
+
+$(document).on('click', '.shoppinglist-delete-button', function (e)
+{
+	Grocy.Api.Get('delete-object/shopping_list/' + $(e.currentTarget).attr('data-shoppinglist-id'),
 		function(result)
 		{
-			window.location.href = '/shoppinglist';
+			window.location.href = U('/shoppinglist');
 		},
 		function(xhr)
 		{
@@ -14,10 +37,10 @@
 
 $(document).on('click', '#add-products-below-min-stock-amount', function(e)
 {
-	Grocy.FetchJson('/api/stock/add-missing-products-to-shoppinglist',
+	Grocy.Api.Get('stock/add-missing-products-to-shoppinglist',
 		function(result)
 		{
-			window.location.href = '/shoppinglist';
+			window.location.href = U('/shoppinglist');
 		},
 		function(xhr)
 		{
@@ -26,11 +49,35 @@ $(document).on('click', '#add-products-below-min-stock-amount', function(e)
 	);
 });
 
-$('#shoppinglist-table').DataTable({
-	'pageLength': 50,
-	'order': [[1, 'asc']],
-	'columnDefs': [
-		{ 'orderable': false, 'targets': 0 }
-	],
-	'language': JSON.parse(L('datatables_localization'))
+$(document).on('click', '#clear-shopping-list', function(e)
+{
+	bootbox.confirm({
+		message: L('Are you sure to empty the shopping list?'),
+		buttons: {
+			confirm: {
+				label: L('Yes'),
+				className: 'btn-success'
+			},
+			cancel: {
+				label: L('No'),
+				className: 'btn-danger'
+			}
+		},
+		callback: function(result)
+		{
+			if (result === true)
+			{
+				Grocy.Api.Get('stock/clear-shopping-list',
+					function(result)
+					{
+						window.location.href = U('/shoppinglist');
+					},
+					function(xhr)
+					{
+						console.error(xhr);
+					}
+				);
+			}
+		}
+	});
 });

public/viewjs/shoppinglistform.js

@@ -4,10 +4,10 @@
 
 	if (Grocy.EditMode === 'create')
 	{
-		Grocy.PostJson('/api/add-object/shopping_list', $('#shoppinglist-form').serializeJSON(),
+		Grocy.Api.Post('add-object/shopping_list', $('#shoppinglist-form').serializeJSON(),
 			function(result)
 			{
-				window.location.href = '/shoppinglist';
+				window.location.href = U('/shoppinglist');
 			},
 			function(xhr)
 			{
@@ -17,10 +17,10 @@
 	}
 	else
 	{
-		Grocy.PostJson('/api/edit-object/shopping_list/' + Grocy.EditObjectId, $('#shoppinglist-form').serializeJSON(),
+		Grocy.Api.Post('edit-object/shopping_list/' + Grocy.EditObjectId, $('#shoppinglist-form').serializeJSON(),
 			function(result)
 			{
-				window.location.href = '/shoppinglist';
+				window.location.href = U('/shoppinglist');
 			},
 			function(xhr)
 			{
@@ -30,7 +30,7 @@
 	}
 });
 
-$('#product_id').on('change', function(e)
+Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 {
 	var productId = $(e.target).val();
 
@@ -38,47 +38,12 @@ $('#product_id').on('change', function(e)
 	{
 		Grocy.Components.ProductCard.Refresh(productId);
 		
-		Grocy.FetchJson('/api/stock/get-product-details/' + productId,
+		Grocy.Api.Get('stock/get-product-details/' + productId,
 			function (productDetails)
 			{
 				$('#amount_qu_unit').text(productDetails.quantity_unit_purchase.name);
-
-				if ($('#product_id').hasClass('suppress-next-custom-validate-event'))
-				{
-					$('#product_id').removeClass('suppress-next-custom-validate-event');
-				}
-				else
-				{
-					Grocy.FetchJson('/api/get-objects/shopping_list',
-						function (currentShoppingListItems)
-						{
-							if (currentShoppingListItems.filter(function (e) { return e.product_id === productId; }).length > 0)
-							{
-								$('#product_id').val('');
-								$('#product_id_text_input').val('');
-								$('#product_id_text_input').addClass('has-error');
-								$('#product_id_text_input').parent('.input-group').addClass('has-error');
-								$('#product_id_text_input').closest('.form-group').addClass('has-error');
-								$('#product-error').text('This product is already on the shopping list.');
-								$('#product-error').show();
-								$('#product_id_text_input').focus();
-							}
-							else
-							{
-								$('#product_id_text_input').removeClass('has-error');
-								$('#product_id_text_input').parent('.input-group').removeClass('has-error');
-								$('#product_id_text_input').closest('.form-group').removeClass('has-error');
-								$('#product-error').hide();
-
-								$('#amount').focus();
-							}
-						},
-						function(xhr)
-						{
-							console.error(xhr);
-						}
-					);
-				}
+				$('#amount').focus();
+				Grocy.FrontendHelpers.ValidateForm('shoppinglist-form');
 			},
 			function(xhr)
 			{
@@ -88,50 +53,46 @@ $('#product_id').on('change', function(e)
 	}
 });
 
-$('.combobox').combobox({
-	appendId: '_text_input'
-});
+Grocy.FrontendHelpers.ValidateForm('shoppinglist-form');
 
-$('#product_id_text_input').on('change', function(e)
+if (Grocy.Components.ProductPicker.InProductAddWorkflow() === false)
 {
-	var input = $('#product_id_text_input').val().toString();
-	var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + input + "']").first();
-
-	if (possibleOptionElement.length > 0 && possibleOptionElement.text().length > 0) {
-		$('#product_id').val(possibleOptionElement.val());
-		$('#product_id').data('combobox').refresh();
-		$('#product_id').trigger('change');
-	}
-});
-
-$('#product_id_text_input').focus();
-$('#product_id_text_input').trigger('change');
-
-if (Grocy.EditMode === 'edit')
-{
-	$('#product_id').addClass('suppress-next-custom-validate-event');
-	$('#product_id').trigger('change');
+	Grocy.Components.ProductPicker.GetInputElement().focus();
+}
+else
+{
+	Grocy.Components.ProductPicker.GetPicker().trigger('change');
 }
-
-$('#shoppinglist-form').validator();
-$('#shoppinglist-form').validator('validate');
 
 $('#amount').on('focus', function(e)
 {
-	if ($('#product_id_text_input').val().length === 0)
+	if (Grocy.Components.ProductPicker.GetValue().length === 0)
 	{
-		$('#product_id_text_input').focus();
+		Grocy.Components.ProductPicker.GetInputElement().focus();
+	}
+	else
+	{
+		$(this).select();
 	}
 });
 
-$('#shoppinglist-form input').keydown(function(event)
+$('#shoppinglist-form input').keyup(function (event)
+{
+	Grocy.FrontendHelpers.ValidateForm('shoppinglist-form');
+});
+
+$('#shoppinglist-form input').keydown(function (event)
 {
 	if (event.keyCode === 13) //Enter
 	{
-		if ($('#shoppinglist-form').validator('validate').has('.has-error').length !== 0) //There is at least one validation error
+		if (document.getElementById('shoppinglist-form').checkValidity() === false) //There is at least one validation error
 		{
 			event.preventDefault();
 			return false;
 		}
+		else
+		{
+			$('#save-shoppinglist-button').click();
+		}
 	}
 });

public/viewjs/stockoverview.js

@@ -1,5 +1,72 @@
-$('#stock-overview-table').DataTable({
-	'pageLength': 50,
-	'order': [[2, 'asc']],
-	'language': JSON.parse(L('datatables_localization'))
+var stockOverviewTable = $('#stock-overview-table').DataTable({
+	'paginate': false,
+	'order': [[3, 'asc']],
+	'columnDefs': [
+		{ 'orderable': false, 'targets': 0 },
+		{ 'visible': false, 'targets': 4 }
+	],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true
+});
+
+$("#location-filter").on("change", function()
+{
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	stockOverviewTable.column(4).search(value).draw();
+});
+
+$("#search").on("keyup", function()
+{
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	stockOverviewTable.search(value).draw();
+});
+
+$(document).on('click', '.product-consume-button', function(e)
+{
+	var productId = $(e.currentTarget).attr('data-product-id');
+	var productName = $(e.currentTarget).attr('data-product-name');
+	var productQuName = $(e.currentTarget).attr('data-product-qu-name');
+	var consumeAmount = $(e.currentTarget).attr('data-consume-amount');
+
+	Grocy.Api.Get('stock/consume-product/' + productId + '/' + consumeAmount,
+		function(result)
+		{
+			var oldAmount = parseInt($('#product-' + productId + '-amount').text());
+			var newAmount = oldAmount - consumeAmount;
+			if (newAmount === 0)
+			{
+				$('#product-' + productId + '-row').fadeOut(500, function()
+				{
+					$(this).remove();
+				});
+			}	
+			else
+			{
+				$('#product-' + productId + '-amount').parent().effect('highlight', { }, 500);
+				$('#product-' + productId + '-amount').fadeOut(500, function()
+				{
+					$(this).text(newAmount).fadeIn(500);
+				});
+				$('#product-' + productId + '-consume-all-button').attr('data-consume-amount', newAmount);
+			}	
+
+			toastr.success(L('Removed #1 #2 of #3 from stock', consumeAmount, productQuName, productName));
+		},
+		function(xhr)
+		{
+			console.error(xhr);
+		}
+	);
 });

routes.php

@@ -2,51 +2,67 @@
 
 use \Grocy\Middleware\JsonMiddleware;
 use \Grocy\Middleware\CliMiddleware;
+use \Grocy\Middleware\SessionAuthMiddleware;
+use \Grocy\Middleware\ApiKeyAuthMiddleware;
+use \Tuupola\Middleware\CorsMiddleware;
 
-// Base route
-$app->get('/', 'Grocy\Controllers\LoginController:Root')->setName('root');
+$app->group('', function()
+{
+	// Base route
+	$this->get('/', 'LoginControllerInstance:Root')->setName('root');
 
-// Login routes
-$app->get('/login', 'Grocy\Controllers\LoginController:LoginPage')->setName('login');
-$app->post('/login', 'Grocy\Controllers\LoginController:ProcessLogin')->setName('login');
-$app->get('/logout', 'Grocy\Controllers\LoginController:Logout');
+	// Login routes
+	$this->get('/login', 'LoginControllerInstance:LoginPage')->setName('login');
+	$this->post('/login', 'LoginControllerInstance:ProcessLogin')->setName('login');
+	$this->get('/logout', 'LoginControllerInstance:Logout');
 
-// Stock routes
-$app->get('/stockoverview', 'Grocy\Controllers\StockController:Overview');
-$app->get('/purchase', 'Grocy\Controllers\StockController:Purchase');
-$app->get('/consume', 'Grocy\Controllers\StockController:Consume');
-$app->get('/inventory', 'Grocy\Controllers\StockController:Inventory');
+	// Stock routes
+	$this->get('/stockoverview', 'Grocy\Controllers\StockController:Overview');
+	$this->get('/purchase', 'Grocy\Controllers\StockController:Purchase');
+	$this->get('/consume', 'Grocy\Controllers\StockController:Consume');
+	$this->get('/inventory', 'Grocy\Controllers\StockController:Inventory');
 
-$app->get('/products', 'Grocy\Controllers\StockController:ProductsList');
-$app->get('/product/{productId}', 'Grocy\Controllers\StockController:ProductEditForm');
+	$this->get('/products', 'Grocy\Controllers\StockController:ProductsList');
+	$this->get('/product/{productId}', 'Grocy\Controllers\StockController:ProductEditForm');
 
-$app->get('/locations', 'Grocy\Controllers\StockController:LocationsList');
-$app->get('/location/{locationId}', 'Grocy\Controllers\StockController:LocationEditForm');
+	$this->get('/locations', 'Grocy\Controllers\StockController:LocationsList');
+	$this->get('/location/{locationId}', 'Grocy\Controllers\StockController:LocationEditForm');
 
-$app->get('/quantityunits', 'Grocy\Controllers\StockController:QuantityUnitsList');
-$app->get('/quantityunit/{quantityunitId}', 'Grocy\Controllers\StockController:QuantityUnitEditForm');
+	$this->get('/quantityunits', 'Grocy\Controllers\StockController:QuantityUnitsList');
+	$this->get('/quantityunit/{quantityunitId}', 'Grocy\Controllers\StockController:QuantityUnitEditForm');
 
-$app->get('/shoppinglist', 'Grocy\Controllers\StockController:ShoppingList');
-$app->get('/shoppinglistitem/{itemId}', 'Grocy\Controllers\StockController:ShoppingListItemEditForm');
+	$this->get('/shoppinglist', 'Grocy\Controllers\StockController:ShoppingList');
+	$this->get('/shoppinglistitem/{itemId}', 'Grocy\Controllers\StockController:ShoppingListItemEditForm');
 
+	// Recipe routes
+	$this->get('/recipes', 'Grocy\Controllers\RecipesController:Overview');
+	$this->get('/recipe/{recipeId}', 'Grocy\Controllers\RecipesController:RecipeEditForm');
+	$this->get('/recipe/{recipeId}/pos/{recipePosId}', 'Grocy\Controllers\RecipesController:RecipePosEditForm');
 
-// Habit routes
-$app->get('/habitsoverview', 'Grocy\Controllers\HabitsController:Overview');
-$app->get('/habittracking', 'Grocy\Controllers\HabitsController:TrackHabitExecution');
+	// Habit routes
+	$this->get('/habitsoverview', 'Grocy\Controllers\HabitsController:Overview');
+	$this->get('/habittracking', 'Grocy\Controllers\HabitsController:TrackHabitExecution');
 
-$app->get('/habits', 'Grocy\Controllers\HabitsController:HabitsList');
-$app->get('/habit/{habitId}', 'Grocy\Controllers\HabitsController:HabitEditForm');
+	$this->get('/habits', 'Grocy\Controllers\HabitsController:HabitsList');
+	$this->get('/habit/{habitId}', 'Grocy\Controllers\HabitsController:HabitEditForm');
 
-// Batterry routes
-$app->get('/batteriesoverview', 'Grocy\Controllers\BatteriesController:Overview');
-$app->get('/batterytracking', 'Grocy\Controllers\BatteriesController:TrackChargeCycle');
+	// Battery routes
+	$this->get('/batteriesoverview', 'Grocy\Controllers\BatteriesController:Overview');
+	$this->get('/batterytracking', 'Grocy\Controllers\BatteriesController:TrackChargeCycle');
 
-$app->get('/batteries', 'Grocy\Controllers\BatteriesController:BatteriesList');
-$app->get('/battery/{batteryId}', 'Grocy\Controllers\BatteriesController:BatteryEditForm');
+	$this->get('/batteries', 'Grocy\Controllers\BatteriesController:BatteriesList');
+	$this->get('/battery/{batteryId}', 'Grocy\Controllers\BatteriesController:BatteryEditForm');
 
+	// Other routes
+	$this->get('/api', 'Grocy\Controllers\OpenApiController:DocumentationUi');
+	$this->get('/manageapikeys', 'Grocy\Controllers\OpenApiController:ApiKeysList');
+	$this->get('/manageapikeys/new', 'Grocy\Controllers\OpenApiController:CreateNewApiKey');
+})->add(new SessionAuthMiddleware($appContainer, $appContainer->LoginControllerInstance->GetSessionCookieName()));
 
 $app->group('/api', function()
 {
+	$this->get('/get-openapi-specification', 'Grocy\Controllers\OpenApiController:DocumentationSpec');
+
 	$this->get('/get-objects/{entity}', 'Grocy\Controllers\GenericEntityApiController:GetObjects');
 	$this->get('/get-object/{entity}/{objectId}', 'Grocy\Controllers\GenericEntityApiController:GetObject');
 	$this->post('/add-object/{entity}', 'Grocy\Controllers\GenericEntityApiController:AddObject');
@@ -59,13 +75,26 @@ $app->group('/api', function()
 	$this->get('/stock/get-product-details/{productId}', 'Grocy\Controllers\StockApiController:ProductDetails');
 	$this->get('/stock/get-current-stock', 'Grocy\Controllers\StockApiController:CurrentStock');
 	$this->get('/stock/add-missing-products-to-shoppinglist', 'Grocy\Controllers\StockApiController:AddMissingProductsToShoppingList');
+	$this->get('/stock/clear-shopping-list', 'Grocy\Controllers\StockApiController:ClearShoppingList');
+	$this->get('/stock/external-barcode-lookup/{barcode}', 'Grocy\Controllers\StockApiController:ExternalBarcodeLookup');
+
+	$this->get('/recipes/add-not-fulfilled-products-to-shopping-list/{recipeId}', 'Grocy\Controllers\RecipesApiController:AddNotFulfilledProductsToShoppingList');
 
 	$this->get('/habits/track-habit-execution/{habitId}', 'Grocy\Controllers\HabitsApiController:TrackHabitExecution');
 	$this->get('/habits/get-habit-details/{habitId}', 'Grocy\Controllers\HabitsApiController:HabitDetails');
 	
 	$this->get('/batteries/track-charge-cycle/{batteryId}', 'Grocy\Controllers\BatteriesApiController:TrackChargeCycle');
 	$this->get('/batteries/get-battery-details/{batteryId}', 'Grocy\Controllers\BatteriesApiController:BatteryDetails');
-})->add(JsonMiddleware::class);
+})->add(new ApiKeyAuthMiddleware($appContainer, $appContainer->LoginControllerInstance->GetSessionCookieName(), $appContainer->ApiKeyHeaderName))
+->add(JsonMiddleware::class)
+->add(new CorsMiddleware([
+	'origin' => ["*"],
+	'methods' => ["GET", "POST"],
+	'headers.allow' => [ $appContainer->ApiKeyHeaderName ],
+	'headers.expose' => [ ],
+	'credentials' => false,
+	'cache' => 0,
+]));
 
 $app->group('/cli', function()
 {

services/ApiKeyService.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace Grocy\Services;
+
+class ApiKeyService extends BaseService
+{
+	/**
+	 * @return boolean
+	 */
+	public function IsValidApiKey($apiKey)
+	{
+		if ($apiKey === null || empty($apiKey))
+		{
+			return false;
+		}
+		else
+		{
+			$apiKeyRow = $this->Database->api_keys()->where('api_key = :1 AND expires > :2', $apiKey, date('Y-m-d H:i:s', time()))->fetch();
+			if ($apiKeyRow !== null)
+			{
+				$apiKeyRow->update(array(
+					'last_used' => date('Y-m-d H:i:s', time())
+				));
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function CreateApiKey()
+	{
+		$newApiKey = $this->GenerateApiKey();
+		
+		$apiKeyRow = $this->Database->api_keys()->createRow(array(
+			'api_key' => $newApiKey,
+			'expires' => '2999-12-31 23:59:59' // Default is that API keys expire never
+		));
+		$apiKeyRow->save();
+
+		return $newApiKey;
+	}
+
+	public function RemoveApiKey($apiKey)
+	{
+		$this->Database->api_keys()->where('api_key', $apiKey)->delete();
+	}
+
+	public function GetApiKeyId($apiKey)
+	{
+		$apiKey = $this->Database->api_keys()->where('api_key', $apiKey)->fetch();
+		return $apiKey->id;
+	}
+
+	private function GenerateApiKey()
+	{
+		return RandomString(50);
+	}
+}

services/ApplicationService.php

@@ -9,18 +9,23 @@ class ApplicationService extends BaseService
 	 */
 	public function IsDemoInstallation()
 	{
-		return file_exists(__DIR__ . '/../data/demo.txt');
+		return file_exists(DATAPATH . '/demo.txt');
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function IsEmbeddedInstallation()
+	{
+		return file_exists(__DIR__ . '/../embedded.txt');
 	}
 
 	private $InstalledVersion;
-	/**
-	 * @return string
-	 */
 	public function GetInstalledVersion()
 	{
 		if ($this->InstalledVersion == null)
 		{
-			$this->InstalledVersion = preg_replace("/\r|\n/", '', file_get_contents(__DIR__ . '/../version.txt'));
+			$this->InstalledVersion = json_decode(file_get_contents(__DIR__ . '/../version.json'));
 		}
 
 		return $this->InstalledVersion;

services/BaseService.php

@@ -3,14 +3,19 @@
 namespace Grocy\Services;
 
 use \Grocy\Services\DatabaseService;
+use \Grocy\Services\LocalizationService;
 
 class BaseService
 {
 	public function __construct() {
 		$this->DatabaseService = new DatabaseService();
 		$this->Database = $this->DatabaseService->GetDbConnection();
+
+		$localizationService = new LocalizationService(CULTURE);
+		$this->LocalizationService = $localizationService;
 	}
 
 	protected $DatabaseService;
 	protected $Database;
+	protected $LocalizationService;
 }

services/BatteriesService.php

@@ -12,6 +12,11 @@ class BatteriesService extends BaseService
 
 	public function GetNextChargeTime(int $batteryId)
 	{
+		if (!$this->BatteryExists($batteryId))
+		{
+			throw new \Exception('Battery does not exist');
+		}
+		
 		$battery = $this->Database->batteries($batteryId);
 		$batteryLastLogRow = $this->DatabaseService->ExecuteDbQuery("SELECT * from batteries_current WHERE battery_id = $batteryId LIMIT 1")->fetch(\PDO::FETCH_OBJ);
 
@@ -21,7 +26,7 @@ class BatteriesService extends BaseService
 		}
 		else
 		{
-			return date('Y-m-d H:i:s');
+			return date('2999-12-31 23:59:59');
 		}
 
 		return null;
@@ -29,6 +34,11 @@ class BatteriesService extends BaseService
 
 	public function GetBatteryDetails(int $batteryId)
 	{
+		if (!$this->BatteryExists($batteryId))
+		{
+			throw new \Exception('Battery does not exist');
+		}
+
 		$battery = $this->Database->batteries($batteryId);
 		$batteryChargeCylcesCount = $this->Database->battery_charge_cycles()->where('battery_id', $batteryId)->count();
 		$batteryLastChargedTime = $this->Database->battery_charge_cycles()->where('battery_id', $batteryId)->max('tracked_time');
@@ -42,6 +52,11 @@ class BatteriesService extends BaseService
 
 	public function TrackChargeCycle(int $batteryId, string $trackedTime)
 	{
+		if (!$this->BatteryExists($batteryId))
+		{
+			throw new \Exception('Battery does not exist');
+		}
+
 		$logRow = $this->Database->battery_charge_cycles()->createRow(array(
 			'battery_id' => $batteryId,
 			'tracked_time' => $trackedTime
@@ -50,4 +65,10 @@ class BatteriesService extends BaseService
 
 		return true;
 	}
+
+	private function BatteryExists($batteryId)
+	{
+		$batteryRow = $this->Database->batteries()->where('id = :1', $batteryId)->fetch();
+		return $batteryRow !== null;
+	}
 }

services/DatabaseService.php

@@ -14,7 +14,7 @@ class DatabaseService
 	{
 		if ($this->DbConnectionRaw == null)
 		{
-			$pdo = new \PDO('sqlite:' . __DIR__ . '/../data/grocy.db');
+			$pdo = new \PDO('sqlite:' . DATAPATH . '/grocy.db');
 			$pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
 			$this->DbConnectionRaw = $pdo;
 		}

services/DemoDataGeneratorService.php

@@ -13,6 +13,8 @@ class DemoDataGeneratorService extends BaseService
 		$rowCount = $this->DatabaseService->ExecuteDbQuery('SELECT COUNT(*) FROM migrations WHERE migration = -1')->fetchColumn();
 		if (intval($rowCount) === 0)
 		{
+			$loremIpsum = 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.';
+
 			$sql = "
 				INSERT INTO locations (name) VALUES ('{$localizationService->Localize('Pantry')}'); --2
 				INSERT INTO locations (name) VALUES ('{$localizationService->Localize('Candy cupboard')}'); --3
@@ -26,6 +28,7 @@ class DemoDataGeneratorService extends BaseService
 				INSERT INTO quantity_units (name) VALUES ('{$localizationService->Localize('Can')}'); --6
 				INSERT INTO quantity_units (name) VALUES ('{$localizationService->Localize('Bunch')}'); --7
 
+				DELETE FROM sqlite_sequence WHERE name = 'products'; --Just to keep IDs in order as mentioned here...
 				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock, min_stock_amount) VALUES ('{$localizationService->Localize('Cookies')}', 3, 3, 3, 1, 8); --1
 				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock, min_stock_amount) VALUES ('{$localizationService->Localize('Chocolate')}', 3, 3, 3, 1, 8); --2
 				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock, min_stock_amount) VALUES ('{$localizationService->Localize('Gummy bears')}', 3, 3, 3, 1, 8); --3
@@ -41,13 +44,39 @@ class DemoDataGeneratorService extends BaseService
 				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('{$localizationService->Localize('Cucumber')}', 5, 2, 2, 1); --13
 				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('{$localizationService->Localize('Radish')}', 5, 7, 7, 1); --14
 				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('{$localizationService->Localize('Tomato')}', 5, 2, 2, 1); --15
+				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('{$localizationService->Localize('Pizza dough')}', 3, 3, 3, 1); --16
+				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('{$localizationService->Localize('Sieved tomatoes')}', 4, 5, 5, 1); --17
+				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('{$localizationService->Localize('Salami')}', 5, 3, 3, 1); --18
+				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('{$localizationService->Localize('Toast')}', 4, 5, 5, 1); --19
+				INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('{$localizationService->Localize('Minced meat')}', 5, 3, 3, 1); --20
+
+				INSERT INTO shopping_list (note, amount) VALUES ('{$localizationService->Localize('Some good snacks')}', 1);
+				INSERT INTO shopping_list (product_id, amount) VALUES (20, 1);
+				INSERT INTO shopping_list (product_id, amount) VALUES (17, 1);
+
+				INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Pizza')}', '{$loremIpsum}'); --1
+				INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Spaghetti bolognese')}', '{$loremIpsum}'); --2
+				INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Sandwiches')}', '{$loremIpsum}'); --3
+
+				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 16, 1);
+				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 17, 1);
+				INSERT INTO recipes_pos (recipe_id, product_id, amount, note) VALUES (1, 18, 1, '{$localizationService->Localize('This is the note content of the recipe ingredient')}');
+				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 10, 1);
+				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (2, 6, 1);
+				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (2, 10, 1);
+				INSERT INTO recipes_pos (recipe_id, product_id, amount, note) VALUES (2, 17, 1, '{$localizationService->Localize('This is the note content of the recipe ingredient')}');
+				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (2, 20, 1);
+				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (3, 10, 1);
+				INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (3, 11, 1);
 
 				INSERT INTO habits (name, period_type, period_days) VALUES ('{$localizationService->Localize('Changed towels in the bathroom')}', 'manually', 5); --1
 				INSERT INTO habits (name, period_type, period_days) VALUES ('{$localizationService->Localize('Cleaned the kitchen floor')}', 'dynamic-regular', 7); --2
+				INSERT INTO habits (name, period_type, period_days) VALUES ('{$localizationService->Localize('Lawn mowed in the garden')}', 'dynamic-regular', 21); --3
 
 				INSERT INTO batteries (name, description, used_in) VALUES ('{$localizationService->Localize('Battery')}1', '{$localizationService->Localize('Warranty ends')} 2023', '{$localizationService->Localize('TV remote control')}'); --1
 				INSERT INTO batteries (name, description, used_in) VALUES ('{$localizationService->Localize('Battery')}2', '{$localizationService->Localize('Warranty ends')} 2022', '{$localizationService->Localize('Alarm clock')}'); --2
 				INSERT INTO batteries (name, description, used_in, charge_interval_days) VALUES ('{$localizationService->Localize('Battery')}3', '{$localizationService->Localize('Warranty ends')} 2022', '{$localizationService->Localize('Heat remote control')}', 60); --3
+				INSERT INTO batteries (name, description, used_in, charge_interval_days) VALUES ('{$localizationService->Localize('Battery')}4', '{$localizationService->Localize('Warranty ends')} 2028', '{$localizationService->Localize('Heat remote control')}', 60); --4
 
 				INSERT INTO migrations (migration) VALUES (-1);
 			";
@@ -76,6 +105,7 @@ class DemoDataGeneratorService extends BaseService
 			$habitsService->TrackHabit(1, date('Y-m-d H:i:s', strtotime('-15 days')));
 			$habitsService->TrackHabit(2, date('Y-m-d H:i:s', strtotime('-10 days')));
 			$habitsService->TrackHabit(2, date('Y-m-d H:i:s', strtotime('-20 days')));
+			$habitsService->TrackHabit(3, date('Y-m-d H:i:s', strtotime('-17 days')));
 
 			$batteriesService = new BatteriesService();
 			$batteriesService->TrackChargeCycle(1, date('Y-m-d H:i:s', strtotime('-200 days')));
@@ -87,12 +117,13 @@ class DemoDataGeneratorService extends BaseService
 			$batteriesService->TrackChargeCycle(2, date('Y-m-d H:i:s', strtotime('-100 days')));
 			$batteriesService->TrackChargeCycle(2, date('Y-m-d H:i:s', strtotime('-50 days')));
 			$batteriesService->TrackChargeCycle(3, date('Y-m-d H:i:s', strtotime('-65 days')));
+			$batteriesService->TrackChargeCycle(4, date('Y-m-d H:i:s', strtotime('-56 days')));
 		}
 	}
 
 	public function RecreateDemo()
 	{
-		unlink(__DIR__ . '/../data/grocy.db');
+		unlink(DATAPATH . '/grocy.db');
 		$this->PopulateDemoData();
 	}
 }

services/HabitsService.php

@@ -15,13 +15,18 @@ class HabitsService extends BaseService
 
 	public function GetNextHabitTime(int $habitId)
 	{
+		if (!$this->HabitExists($habitId))
+		{
+			throw new \Exception('Habit does not exist');
+		}
+
 		$habit = $this->Database->habits($habitId);
 		$habitLastLogRow = $this->DatabaseService->ExecuteDbQuery("SELECT * from habits_current WHERE habit_id = $habitId LIMIT 1")->fetch(\PDO::FETCH_OBJ);
 
 		switch($habit->period_type)
 		{
 			case self::HABIT_TYPE_MANUALLY:
-				return date('Y-m-d H:i:s');
+				return date('2999-12-31 23:59:59');
 			case self::HABIT_TYPE_DYNAMIC_REGULAR:
 				return date('Y-m-d H:i:s', strtotime('+' . $habit->period_days . ' day', strtotime($habitLastLogRow->last_tracked_time)));
 		}
@@ -31,6 +36,11 @@ class HabitsService extends BaseService
 
 	public function GetHabitDetails(int $habitId)
 	{
+		if (!$this->HabitExists($habitId))
+		{
+			throw new \Exception('Habit does not exist');
+		}
+
 		$habit = $this->Database->habits($habitId);
 		$habitTrackedCount = $this->Database->habits_log()->where('habit_id', $habitId)->count();
 		$habitLastTrackedTime = $this->Database->habits_log()->where('habit_id', $habitId)->max('tracked_time');
@@ -44,6 +54,11 @@ class HabitsService extends BaseService
 
 	public function TrackHabit(int $habitId, string $trackedTime)
 	{
+		if (!$this->HabitExists($habitId))
+		{
+			throw new \Exception('Habit does not exist');
+		}
+		
 		$logRow = $this->Database->habits_log()->createRow(array(
 			'habit_id' => $habitId,
 			'tracked_time' => $trackedTime
@@ -52,4 +67,10 @@ class HabitsService extends BaseService
 
 		return true;
 	}
+
+	private function HabitExists($habitId)
+	{
+		$habitRow = $this->Database->habits()->where('id = :1', $habitId)->fetch();
+		return $habitRow !== null;
+	}
 }

services/LocalizationService.php

@@ -2,14 +2,12 @@
 
 namespace Grocy\Services;
 
-class LocalizationService extends BaseService
+class LocalizationService
 {
 	const DEFAULT_CULTURE = 'en';
 
 	public function __construct(string $culture)
 	{
-		parent::__construct();
-
 		$this->Culture = $culture;
 
 		$this->StringsDefaultCulture = $this->LoadLocalizationFile(self::DEFAULT_CULTURE);
@@ -38,7 +36,7 @@ class LocalizationService extends BaseService
 
 	private function LogMissingLocalization(string $culture, string $text)
 	{
-		$file = __DIR__ . "/../data/missing_translations_$culture.json";
+		$file = DATAPATH . "/missing_translations_$culture.json";
 
 		$missingTranslations = array();
 		if (file_exists($file))

services/RecipesService.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Grocy\Services;
+
+class RecipesService extends BaseService
+{
+	public function GetRecipesFulfillment()
+	{
+		$sql = 'SELECT * from recipes_fulfillment';
+		return $this->DatabaseService->ExecuteDbQuery($sql)->fetchAll(\PDO::FETCH_OBJ);
+	}
+
+	public function GetRecipesSumFulfillment()
+	{
+		$sql = 'SELECT * from recipes_fulfillment_sum';
+		return $this->DatabaseService->ExecuteDbQuery($sql)->fetchAll(\PDO::FETCH_OBJ);
+	}
+
+	public function AddNotFulfilledProductsToShoppingList($recipeId)
+	{
+		$recipe = $this->Database->recipes($recipeId);
+
+		$recipePositions = $this->GetRecipesFulfillment();
+		foreach ($recipePositions as $recipePosition)
+		{
+			if($recipePosition->recipe_id == $recipeId)
+			{
+				$toOrderAmount = $recipePosition->missing_amount - $recipePosition->amount_on_shopping_list;
+				if($toOrderAmount > 0)
+				{
+					$shoppinglistRow = $this->Database->shopping_list()->createRow(array(
+						'product_id' => $recipePosition->product_id,
+						'amount' => $toOrderAmount,
+						'note' => $this->LocalizationService->Localize('Added for recipe #1', $recipe->name)
+					));
+					$shoppinglistRow->save();
+				}
+			}
+		}
+	}
+}

services/SessionService.php

@@ -15,7 +15,18 @@ class SessionService extends BaseService
 		}
 		else
 		{
-			return $this->Database->sessions()->where('session_key = :1 AND expires > :2', $sessionKey, time())->count() === 1;
+			$sessionRow = $this->Database->sessions()->where('session_key = :1 AND expires > :2', $sessionKey, date('Y-m-d H:i:s', time()))->fetch();
+			if ($sessionRow !== null)
+			{
+				$sessionRow->update(array(
+					'last_used' => date('Y-m-d H:i:s', time())
+				));
+				return true;
+			}
+			else
+			{
+				return false;
+			}
 		}
 	}
 
@@ -24,11 +35,11 @@ class SessionService extends BaseService
 	 */
 	public function CreateSession()
 	{
-		$newSessionKey = uniqid() . uniqid() . uniqid();
+		$newSessionKey = $this->GenerateSessionKey();
 		
 		$sessionRow = $this->Database->sessions()->createRow(array(
 			'session_key' => $newSessionKey,
-			'expires' => time() + 2592000 //30 days
+			'expires' => date('Y-m-d H:i:s', time() + 2592000) // Default is that sessions expire in 30 days
 		));
 		$sessionRow->save();
 
@@ -39,4 +50,9 @@ class SessionService extends BaseService
 	{
 		$this->Database->sessions()->where('session_key', $sessionKey)->delete();
 	}
+
+	private function GenerateSessionKey()
+	{
+		return RandomString(50);
+	}
 }

services/StockService.php

@@ -22,6 +22,11 @@ class StockService extends BaseService
 
 	public function GetProductDetails(int $productId)
 	{
+		if (!$this->ProductExists($productId))
+		{
+			throw new \Exception('Product does not exist');
+		}
+
 		$product = $this->Database->products($productId);
 		$productStockAmount = $this->Database->stock()->where('product_id', $productId)->sum('amount');
 		$productLastPurchased = $this->Database->stock_log()->where('product_id', $productId)->where('transaction_type', self::TRANSACTION_TYPE_PURCHASE)->max('purchased_date');
@@ -41,6 +46,11 @@ class StockService extends BaseService
 
 	public function AddProduct(int $productId, int $amount, string $bestBeforeDate, $transactionType)
 	{
+		if (!$this->ProductExists($productId))
+		{
+			throw new \Exception('Product does not exist');
+		}
+
 		if ($transactionType === self::TRANSACTION_TYPE_CONSUME || $transactionType === self::TRANSACTION_TYPE_PURCHASE || $transactionType === self::TRANSACTION_TYPE_INVENTORY_CORRECTION)
 		{
 			$stockId = uniqid();
@@ -68,12 +78,17 @@ class StockService extends BaseService
 		}
 		else
 		{
-			throw new Exception("Transaction type $transactionType is not valid (StockService.AddProduct)");
+			throw new \Exception("Transaction type $transactionType is not valid (StockService.AddProduct)");
 		}
 	}
 
 	public function ConsumeProduct(int $productId, int $amount, bool $spoiled, $transactionType)
 	{
+		if (!$this->ProductExists($productId))
+		{
+			throw new \Exception('Product does not exist');
+		}
+
 		if ($transactionType === self::TRANSACTION_TYPE_CONSUME || $transactionType === self::TRANSACTION_TYPE_PURCHASE || $transactionType === self::TRANSACTION_TYPE_INVENTORY_CORRECTION)
 		{
 			$productStockAmount = $this->Database->stock()->where('product_id', $productId)->sum('amount');
@@ -141,6 +156,11 @@ class StockService extends BaseService
 
 	public function InventoryProduct(int $productId, int $newAmount, string $bestBeforeDate)
 	{
+		if (!$this->ProductExists($productId))
+		{
+			throw new \Exception('Product does not exist');
+		}
+		
 		$productStockAmount = $this->Database->stock()->where('product_id', $productId)->sum('amount');
 
 		if ($newAmount > $productStockAmount)
@@ -182,4 +202,55 @@ class StockService extends BaseService
 			}
 		}
 	}
+
+	public function ClearShoppingList()
+	{
+		$this->Database->shopping_list()->delete();
+	}
+
+	private function ProductExists($productId)
+	{
+		$productRow = $this->Database->products()->where('id = :1', $productId)->fetch();
+		return $productRow !== null;
+	}
+
+	private function LoadBarcodeLookupPlugin()
+	{
+		$pluginName = defined('STOCK_BARCODE_LOOKUP_PLUGIN') ? STOCK_BARCODE_LOOKUP_PLUGIN : '';
+		if (empty($pluginName))
+		{
+			throw new \Exception('No barcode lookup plugin defined');
+		}
+
+		$path = DATAPATH . "/plugins/$pluginName.php";
+		if (file_exists($path))
+		{
+			require_once $path;
+			return new $pluginName($this->Database->locations()->fetchAll(), $this->Database->quantity_units()->fetchAll());
+		}
+		else
+		{
+			throw new \Exception("Plugin $pluginName was not found");
+		}
+	}
+
+	public function ExternalBarcodeLookup($barcode, $addFoundProduct)
+	{
+		$plugin = $this->LoadBarcodeLookupPlugin();
+		$pluginOutput = $plugin->Lookup($barcode);
+
+		if ($pluginOutput !== null) // Lookup was successful
+		{
+			if ($addFoundProduct === true)
+			{
+				// Add product to database and include new product id in output
+				$newRow = $this->Database->products()->createRow($pluginOutput);
+				$newRow->save();
+
+				$pluginOutput['id'] = $newRow->id;
+			}
+		}
+
+		return $pluginOutput;
+	}
 }

version.json

@@ -0,0 +1,4 @@
+{
+	"Version": "1.15.0",
+	"ReleaseDate": "2018-07-22"
+}