Compare commits

...

2169 Commits

Author SHA1 Message Date
Bernd Bestel
dedbee3181 Allow user editing in embedded (+ disabled authentication) mode (closes grocy/grocy-desktop#47) 2023-08-19 08:48:52 +02:00
Bernd Bestel
16f686deb8 Prepared next release 2023-08-19 08:24:52 +02:00
Bernd Bestel
973e4226b6 Pulled translations from Transifex 2023-08-19 08:18:36 +02:00
Bernd Bestel
6e22d3b100 Updated dependencies 2023-08-19 08:15:33 +02:00
Bernd Bestel
9b119da8e0 Merged the by @alkuzman contributed new quantity_unit_conversions_resolved view (closes #2297) 2023-08-19 08:13:34 +02:00
Bernd Bestel
03f9ba45ea Fixed initial product QU conversion handling (fixes #2312) 2023-08-16 17:05:18 +02:00
Bernd Bestel
a965d01fb9 Optimized server error display handling when consuming a recipe (closes #2310) 2023-08-15 18:51:40 +02:00
Bernd Bestel
a123535b0a Optimized locale number display handling (fixes #2309) 2023-08-15 09:35:40 +02:00
Bernd Bestel
3a2929c016 stockreports/spendings: Support grouping by store (closes #2308) 2023-08-14 18:12:40 +02:00
Bernd Bestel
106f25cc6b Fixed stock entry open button amount on /stockentries (fixes #2303) 2023-08-13 08:27:02 +02:00
Bernd Bestel
d6cc87ac86 More optimizations around edited stock entries handling (references #2292) 2023-08-13 00:27:37 +02:00
Bernd Bestel
a47bccab3f Added some comments to newest changed SQL views (references #2292) 2023-08-12 20:16:44 +02:00
Bernd Bestel
393a312186 More fixes regarding edited stock entries and calculating the products average price + price history (fixes #2292) 2023-08-12 18:08:12 +02:00
Bernd Bestel
7f21e2de34 Switched back to original gettext/gettext package
References https://github.com/php-gettext/Gettext/pull/289
2023-08-10 16:58:40 +02:00
Bernd Bestel
82ac996b3a Fixed typo 2023-08-09 22:36:50 +02:00
Bernd Bestel
827134c972 Changelog wording improvements 2023-08-09 22:34:30 +02:00
Bernd Bestel
787d5f11e0 Fixed dynamic manifest didn't work with enabled authentication 2023-08-09 21:00:35 +02:00
Bernd Bestel
2d2039f988 Fixed recipe cost/energy calculation (fixes #2301) 2023-08-08 17:59:10 +02:00
Bernd Bestel
268f0d8a50 Fixed typo 2023-08-08 09:43:17 +02:00
Bernd Bestel
9dde46d419 Changelog wording improvements 2023-08-07 22:13:47 +02:00
Bernd Bestel
162ba267a1 Changelog wording improvements 2023-08-07 22:12:00 +02:00
Bernd Bestel
4691b45510 Removed unnecessary calculation step in view uihelper_shopping_list (closes #2298) 2023-08-07 21:57:12 +02:00
Bernd Bestel
e2ebc037f2 Prepared next release 2023-08-06 15:29:28 +02:00
Bernd Bestel
550aa5565b Pulled translations from Transifex 2023-08-06 15:17:38 +02:00
Bernd Bestel
c105ebc979 Enabled Composer optimize-autoloader 2023-08-06 15:11:27 +02:00
Bernd Bestel
7ef744a995 Relate prices on the shopping to the there selected QU (closes #2294) 2023-08-06 14:31:38 +02:00
Bernd Bestel
ee4a082c74 Fixed handling of edited stock entries when calculating a product's average price (references #2292) 2023-08-06 14:05:35 +02:00
Bernd Bestel
1d7f7b2992 Cache expensive stock data calculations 2023-08-06 13:28:14 +02:00
Bernd Bestel
7689356a57 Changed manifest title 2023-08-06 09:28:41 +02:00
Bernd Bestel
1401ed5c00 Updated dependencies 2023-08-06 09:27:41 +02:00
Bernd Bestel
bae4a7f04c Added missing semicolon 2023-08-05 21:51:13 +02:00
Bernd Bestel
a44d746176 Fixed stock_edited_entries view (references #2292) 2023-08-05 21:44:22 +02:00
Bernd Bestel
3afb9643c4 Fix handling when there are no single edited stock entries at all (references #2292) 2023-08-05 18:28:49 +02:00
Bernd Bestel
61a3a4329b Unified edited stock transactions handling (fixes #2292) 2023-08-05 09:58:21 +02:00
Bernd Bestel
491ad8c791 Optimized indentation 2023-08-04 15:44:14 +02:00
Bernd Bestel
339a1ebffc Mention supported browsers in README 2023-08-04 15:41:44 +02:00
Bernd Bestel
1c35fecc85 Added the possibility to skip demo data generation in dev/demo/prerelease mode 2023-08-02 21:10:03 +02:00
Bernd Bestel
d006436d49 Upgraded PHP-CS-Fixer / applied optimized rules 2023-08-02 18:44:30 +02:00
Bernd Bestel
6c4cc00fd5 Added PHP 8.2 support 2023-08-01 21:23:59 +02:00
Bernd Bestel
847337443d Optimized /shoppinglist performance 2023-08-01 20:47:47 +02:00
Bernd Bestel
b74fbddd94 Use a dynamic (title / URL) manifest 2023-08-01 17:12:35 +02:00
Bernd Bestel
8b444a03e5 Simplified initial /mealplan start date handling (fixes #2286) 2023-07-31 21:29:28 +02:00
Bernd Bestel
e946ec79d5 Fixed typo 2023-07-31 18:27:53 +02:00
Bernd Bestel
ca740e8cee Improved product average shelf life calculation (references #2283) 2023-07-31 17:41:36 +02:00
Bernd Bestel
5d48b02b37 Added the possibility to log executed SQL statements (DEV mode only) 2023-07-31 17:08:55 +02:00
Bernd Bestel
73ad9d39ab Workaround for crap product specific QU conversions for migration 0207 (fixes #2285) 2023-07-31 16:58:41 +02:00
Bernd Bestel
fd7e24b7d1 Optimized StockService->GetProductDetails performance (fixes #2283) 2023-07-31 16:54:58 +02:00
Bernd Bestel
57ccb8645e Updated screenshots 2023-07-30 17:18:59 +02:00
Bernd Bestel
e8d6d455f4 grocy-desktop => Grocy Desktop 2023-07-29 21:17:59 +02:00
Bernd Bestel
f7c22ec384 Prepared next release 2023-07-29 14:44:48 +02:00
Bernd Bestel
98768bd846 Upgraded package swagger-ui-dist 2023-07-29 14:12:18 +02:00
Bernd Bestel
e52b1c5f60 Upgraded package php-di/php-di 2023-07-29 14:02:56 +02:00
Bernd Bestel
c263aba6a5 Updated dependencies 2023-07-29 14:00:24 +02:00
Bernd Bestel
edca302b71 Pulled translations from Transifex 2023-07-29 13:55:18 +02:00
Bernd Bestel
f6d6e933e3 Recalculate chore assignments when undoing an execution (fixes #2278) 2023-07-29 13:49:14 +02:00
Bernd Bestel
78e4e918c6 Added Estonian translation 2023-07-22 11:16:06 +02:00
Bernd Bestel
fa35d933e0 Pulled translations from Transifex 2023-07-22 11:00:45 +02:00
Bernd Bestel
9ae7c72e87 Unified calendar time format (closes #2266) 2023-07-05 21:30:00 +02:00
Bernd Bestel
c415e2f8da Fixed a (theoretical, not practically relevant for the target use case of Grocy) SQL injection possibility (closes #2259) 2023-06-22 15:07:47 +02:00
Bernd Bestel
297cc57244 Expose recipes_pos_resolved via the API (read only) (closes #2258) 2023-06-21 22:06:46 +02:00
Bernd Bestel
1496a58673 Show sidebar scroll bar only on hover (closes #2255) 2023-06-17 10:39:26 +02:00
Bernd Bestel
d05038e311 Exclude products with hide_on_stock_overview enabled in current stock info on /stockoverview (fixes #2250) 2023-06-08 22:15:33 +02:00
Bernd Bestel
de4c6e8b60 Renamed third party packages directories 2023-06-03 17:36:01 +02:00
Bernd Bestel
70bb014c9f Removed pre-release special version handling 2023-05-24 20:32:48 +02:00
Bernd Bestel
8c033ff6c8 Revert "Cache StockService->GetCurrentStock result"
This (partly) reverts commit bc5051351a.
2023-05-23 21:26:53 +02:00
Bernd Bestel
8c79cc4f8e Fixed new API key modal 2023-05-23 21:22:54 +02:00
Bernd Bestel
89c6d6683a Remove unused frontend package on /manageapikeys 2023-05-23 20:34:24 +02:00
Bernd Bestel
d0e0102752 API keys can now have a description 2023-05-23 20:31:51 +02:00
Bernd Bestel
bc5051351a Cache StockService->GetCurrentStock result 2023-05-23 17:34:38 +02:00
Bernd Bestel
08c1efa0ad Unified product-/chore-/battery-card modal handling 2023-05-23 17:32:54 +02:00
Bernd Bestel
2633d3d1a5 Fixed stock entry label info handling when the corresponding feature flag is disabled 2023-05-22 22:33:36 +02:00
Bernd Bestel
aec71bd408 Fixed typo 2023-05-22 22:09:20 +02:00
Bernd Bestel
10661706b9 Updated README 2023-05-22 22:08:32 +02:00
Bernd Bestel
2c0a71078f Fixed productcard opened amount display 2023-05-22 21:53:15 +02:00
Bernd Bestel
02fe3f2119 Show to amount of "Label per unit" stock entry labels (closes #2241) 2023-05-22 21:23:19 +02:00
Bernd Bestel
55adc140b2 Updated README 2023-05-21 20:41:06 +02:00
Bernd Bestel
04f362b723 Added a product context menu on /stockjournal (the same as on /stockoverview) (closes #2239) 2023-05-21 18:40:59 +02:00
Bernd Bestel
979c67b44c Various JS optimizations 2023-05-21 18:01:47 +02:00
Bernd Bestel
825321593b Optimized content spacing with collapsed sidebar 2023-05-21 17:33:40 +02:00
Bernd Bestel
99db10a490 Fixed <select> style 2023-05-21 14:47:37 +02:00
Bernd Bestel
2cba3ce7e9 Updated dependencies 2023-05-21 14:41:00 +02:00
Bernd Bestel
b53cdd4c42 Use minified files of packages (where available) 2023-05-21 14:29:19 +02:00
Bernd Bestel
cd7139c6cf Optmized imports 2023-05-21 14:19:01 +02:00
Bernd Bestel
c3dd1c4187 Cache routes 2023-05-21 14:13:05 +02:00
Bernd Bestel
89761ac141 Fixed syntax error 2023-05-21 14:12:43 +02:00
Bernd Bestel
f427849e89 Load all frontend packages conditionally 2023-05-21 10:56:38 +02:00
Bernd Bestel
d16d976d0b Simplified viewjs / active page handling 2023-05-20 18:20:30 +02:00
Bernd Bestel
ddf0ff0aef Various small layout adjustments 2023-05-20 11:03:13 +02:00
Bernd Bestel
fb57d9ef13 Fixed frontend translation with numbered arguments did not work (after upgrading gettext-translator) 2023-05-20 09:58:33 +02:00
Bernd Bestel
c43fe24e47 Changed font 2023-05-20 09:31:03 +02:00
Bernd Bestel
6ab5bc3a29 Optimized sidebar collapsed state / active nav handling 2023-05-19 21:14:57 +02:00
Bernd Bestel
ecb9f53bb4 Declare logo width 2023-05-19 20:59:03 +02:00
Bernd Bestel
6e3182884a Changed app icon background color 2023-05-19 19:23:50 +02:00
Bernd Bestel
ceb50774dc Adjusted README logo height 2023-05-19 18:12:50 +02:00
Bernd Bestel
5f65f2abd0 New logo 2023-05-19 18:08:26 +02:00
Bernd Bestel
49daed6c2b Upgraded some frontend dependencies 2023-05-19 17:23:32 +02:00
Bernd Bestel
628e779902 Moved sidebar / menu layout into own (customized) component 2023-05-19 15:12:11 +02:00
Bernd Bestel
99546815f9 Remove unneeded meta tags 2023-05-19 14:19:14 +02:00
Bernd Bestel
7ceba3c0c1 Updated README 2023-05-18 17:55:46 +02:00
Bernd Bestel
d03175f75a Added a separate QU for displaying prices (closes #2225) 2023-05-18 13:37:13 +02:00
Bernd Bestel
f4639c9bb2 Stream files directly from disk (instead of loading them completely in memory first) 2023-05-18 10:51:14 +02:00
Bernd Bestel
f6d77ac8d7 Pulled translations from Transifex 2023-05-18 10:44:17 +02:00
Bernd Bestel
d43f59d9a9 Updated README 2023-05-18 10:43:40 +02:00
Bernd Bestel
631f03e62c Optimized DataTables fixedOrder handling (fixes #2235) 2023-05-17 22:44:42 +02:00
Bernd Bestel
778cf847d3 Fixed more missing fields when copying a product (fixes #2231) 2023-05-17 21:10:14 +02:00
Shamshid
02a71a5edb fix syntax error (#2230) 2023-05-17 21:04:39 +02:00
Bernd Bestel
629333e1ab Fixed QU conversion factor selection (API) 2023-05-14 17:05:28 +02:00
Bernd Bestel
dd5bd3852a Optimized imports 2023-05-13 14:43:51 +02:00
Bernd Bestel
491412807c Fixed table column visibility selection 2023-05-13 14:28:50 +02:00
Bernd Bestel
9cdb0908d6 Make it possible to hide locations/stores/QUs/product_groups/task_categories (closes #2222) 2023-05-13 14:24:52 +02:00
Bernd Bestel
b5d3e68d68 Added a "today button" to the calendar (closes #2218) 2023-05-12 20:53:04 +02:00
Bernd Bestel
48564b5286 Fixed that default_consume_location_id wasn't copied on copying a product (fixes #2223) 2023-05-12 20:48:44 +02:00
Bernd Bestel
8bdb74a8e0 Optimized button click tooltip hide handling (fixes #2206) 2023-05-03 08:32:49 +02:00
Bernd Bestel
5ab31f726a Support dynamic "today" for MEAL_PLAN_FIRST_DAY_OF_WEEK (closes #2205) 2023-05-01 14:49:02 +02:00
Bernd Bestel
7ee79ec56c Fixed permission check when deleting API keys (fixes #2204) 2023-04-30 22:32:08 +02:00
Bernd Bestel
df4907f5d4 Fixed a theoretical (not relevant for SQLite) SQL injection possibility (references #2201) 2023-04-29 08:57:05 +02:00
Bernd Bestel
a4992ff602 Optimized purchase/inventory price hint / last price suggestion decimals handling 2023-04-24 18:17:39 +02:00
Bernd Bestel
f4874ed8d0 Prefill barcode note on /purchase and /inventory (closes #2193) 2023-04-17 19:54:24 +02:00
Bernd Bestel
84bd74a1bc Show the product card also on /products (closes #2185) 2023-04-13 20:36:21 +02:00
Bernd Bestel
16011b91c6 Added a filter option to only show currently out-of-stock products on /products (closes #2192) 2023-04-13 20:28:28 +02:00
Bernd Bestel
2bce428339 Fixed missing plural localization strings.pot
(Report from a translator on Transifex)
2023-04-12 09:06:39 +02:00
Bernd Bestel
a56de30268 Fixed /stockoverview "Min. stock amount" column sorting (fixes #2189) 2023-04-03 18:35:38 +02:00
Bernd Bestel
71d44edb8c Optimized week recipe handling in mealplan (fixes #2168) 2023-04-01 22:04:30 +02:00
Bernd Bestel
cc6b01de08 Added changelog for #2135 (also references #64) 2023-04-01 17:12:03 +02:00
Travis Raup
340832c361 Feature: Stock Purchase Metrics (#2135)
* Feature: Stock Purchase Metrics

* chart update

* Refactor to chartjs

* More suggestion edits

- locale in javascript
- global translations
- commit migrations sql file

* Rename 0215.sql to 0216.sql

Fixed merge conflict

* Fixed merge conflict

* Applied code style

* Added missing demo data translations

* Removed unused package "canvasjs"

* Don't include daterangepicker globally when only needed on a single page / fixed view section imports

* Rename this to "Spendings" / name it more generically "Stock reports"

* Reuse the existing product_price_history view

* Final cleanup

* Whitespace fix

---------

Co-authored-by: Travis Raup <travis.raup@platform.sh>
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2023-04-01 17:05:41 +02:00
Bernd Bestel
98469248eb Optimized tracking button handling on /choresoverview (closes #2186) 2023-03-31 20:12:06 +02:00
Bernd Bestel
3d01854fa1 Don't use double quotes for SQL string literals (references #2170) 2023-03-16 21:16:27 +01:00
Bernd Bestel
756133a9eb Removed shopping list table fixed order (fixes #2167) 2023-03-16 18:52:41 +01:00
Bernd Bestel
1090f070c9 Optimized shopping list done items filter handling (fixes #2169) 2023-03-16 18:47:01 +01:00
Bernd Bestel
6857796ef0 Fixed produces product amount handling when consuming meal plan shadow recipes (references #2160) 2023-03-12 22:45:04 +01:00
Bernd Bestel
792c710bdc Fixed produces product handling when consuming meal plan shadow recipes (fixes #2160) 2023-03-12 16:35:18 +01:00
Bernd Bestel
7336693ca2 Optimized stock_missing_products view (fixes #2154) 2023-03-02 19:36:57 +01:00
Bernd Bestel
91700e7dae Fixed JS syntax error 2023-02-06 20:42:11 +01:00
Bernd Bestel
c9c0baefeb Optimized datetime Userfields handling (fixes #2108) 2023-02-06 20:36:26 +01:00
Bernd Bestel
b18bd2ff87 Fixed table dropdown menu overflow handling when columns are reordered (fixes #2130) 2023-02-06 20:25:51 +01:00
Bernd Bestel
d9667b4534 Removed type conversions where no longer needed
PHP 8.1 PDO SQLite now returns native data types
2023-02-06 20:22:10 +01:00
Bernd Bestel
d8d3c3ef0b Split the quick consume and open amount product option (closes #2127) 2023-02-05 20:37:39 +01:00
Bernd Bestel
b64d726c42 Added a new config option for energy unit display (closes #2109) 2023-02-05 15:55:45 +01:00
Bernd Bestel
0bd698c968 Print stock entry labels when consuming a "Produces product" recipe (closes #2123) 2023-02-05 15:24:28 +01:00
Bernd Bestel
9ef5045c9b Added changelog for #2118 2023-02-05 15:09:13 +01:00
Webysther Sperandio
902cb20710 Add Sub feature flag FEATURE_FLAG_RECIPES_MEALPLAN (#2118)
* Update routes.php

Added sub feature FEATURE_FLAG_RECIPES_MEALPLAN

* Update default.blade.php

Added sub feature flag FEATURE_FLAG_RECIPES_MEALPLAN

* Update SystemController.php

Added Sub feature flags FEATURE_FLAG_RECIPES_MEALPLAN

* Update config-dist.php

Sub feature flags FEATURE_FLAG_RECIPES_MEALPLAN

* Update routes.php

TYPO

* Code formatting / structure

---------

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2023-02-05 15:06:59 +01:00
Bernd Bestel
1e9a4d9590 Added Romanian translation 2023-02-05 14:55:23 +01:00
Bernd Bestel
5d7efebd40 Pulled translations from Transifex 2023-02-05 14:43:15 +01:00
Bernd Bestel
b9c58423a9 Updated dependencies 2023-02-05 14:40:25 +01:00
Bernd Bestel
efc7b999bb Fixed product average price/last price/price history chart handling regarding empty/0 prices (fixes #2106) 2023-01-13 13:19:22 +01:00
Bernd Bestel
995df64054 Support OFFSET without LIMIT in API query filters (closes #2105) 2023-01-12 13:32:12 +01:00
Bernd Bestel
a5788511e3 Optimized productform sticky footer spacing (fixes #2104) 2023-01-11 16:25:06 +01:00
Bernd Bestel
4e56dee6f0 Finalized "Auto reprint stock entry label" (closes #2092) 2023-01-05 20:12:15 +01:00
Bernd Bestel
3b160659f3 Typo 2023-01-05 18:28:57 +01:00
Bernd Bestel
83fa02d8ad Added an option to reprint stock entry labels when editing them (closes #2092) 2023-01-05 18:15:21 +01:00
Bernd Bestel
daf5ad33c7 Show recipe ingredients/preparation side by side in fullscreen mode (closes #2051) 2023-01-05 17:44:07 +01:00
Bernd Bestel
597abe236d AddMissingProductsToShoppingList also on adding/editing products (references #2094) 2023-01-04 22:54:12 +01:00
Bernd Bestel
0c8e8cab97 Revert "Refresh product/chore/battery card only when actually visible"
This reverts commit c934bfb7b3.
2023-01-04 20:06:19 +01:00
Bernd Bestel
f057ae7e06 Add note to barcode created by the workflow InplaceAddBarcodeToExistingProduct on /purchase and /inventory (closes #2093) 2023-01-04 19:56:55 +01:00
Bernd Bestel
c0fbc4adaf Fixed /stockoverview value column sort format (fixes #2088) 2023-01-01 20:33:08 +01:00
Bernd Bestel
efae0b193d Add amount to barcode created by the workflow InplaceAddBarcodeToExistingProduct on /purchase (closes #2085) 2022-12-29 11:21:33 +01:00
Bernd Bestel
c934bfb7b3 Refresh product/chore/battery card only when actually visible 2022-12-26 20:22:38 +01:00
Bernd Bestel
76500c57bd Optimize recipe ingredient costs/calories calculation when only_check_single_unit_in_stock is used (closes #780) 2022-12-26 19:48:26 +01:00
Bernd Bestel
3f2ad17460 Make it possible to add recipes from /recipes to the meal plan (closes #2003) 2022-12-26 14:25:33 +01:00
Luís Neto
c60a1783da Fix typo (conume -> consume) in 3.3.2 changelog (#2083) 2022-12-26 13:43:46 +01:00
Bernd Bestel
0585e80c70 Implemented "Default quantity unit consume" (closes #1845) 2022-12-26 11:11:55 +01:00
Bernd Bestel
39d1f49431 Fixed demo data generation 2022-12-26 10:12:29 +01:00
Bernd Bestel
2d62f8ddeb Automatically create a default (product specific 1 to 1) QU conversion when a product with qu_stock != qu_purchase was created and when no default QU conversion applies 2022-12-26 09:28:18 +01:00
Bernd Bestel
b76abf54ab Simplified qu_factor_purchase_to_stock handling 2022-12-26 09:20:41 +01:00
Bernd Bestel
337cbb73ee Added new .devtools script 2022-12-26 09:11:49 +01:00
Daniel Albert
79590cd5ac Add migration for improved quantity_unit_conversions_resolved view (#2082) 2022-12-26 09:06:17 +01:00
Bernd Bestel
383ac49919 Added note in README and Changelog about better performance when using a more recent SQLite version (references #2056) 2022-12-26 08:46:44 +01:00
Bernd Bestel
15f7ac3da0 Fixed required SQLite version in PrerequisiteChecker 2022-12-25 20:53:49 +01:00
Bernd Bestel
46c4cdb81a Return numbers as numbers on all API endpoints 2022-12-25 20:49:11 +01:00
Bernd Bestel
639ef0da5b Fixed PHP 8.1 deprecation notice 2022-12-25 20:35:25 +01:00
Bernd Bestel
0229d187ae Removed qu_factor_purchase_to_stock (migrated existing factors to normal product specific QU conversions) 2022-12-25 19:48:22 +01:00
Bernd Bestel
dea6f3f820 Replace also the unit when displaying a recipe ingredient with a variable amount (closes #2080) 2022-12-24 13:06:27 +01:00
Bernd Bestel
dd409b4bf9 Fixed consume amount calculation when consuming multiple substituted subproducts at once and when multiple/different conversion factors were involved (fixes #2076) 2022-12-21 21:00:49 +01:00
Bernd Bestel
407344e86a Fixed recipe ingredient costs/calories calculation when product substitution and unit conversions is involved at the same time (fixes #2075) 2022-12-21 20:16:22 +01:00
Bernd Bestel
f6e0ff11f1 Fixed column visibility handling when there is a shadow rowgroup column (fixes #2074) 2022-12-20 22:11:35 +01:00
Bernd Bestel
2ebb9b2cd9 Show product group Userfields on the shopping list (closes #2069) 2022-12-18 20:56:02 +01:00
Bernd Bestel
38a4ad8ec4 Upgraded to PHP 8.1 2022-12-10 15:19:11 +01:00
Bernd Bestel
84e3707f4f Optimized .devtools 2022-12-06 20:41:09 +01:00
Bernd Bestel
fce6458df6 Optimized modal dialog sizing 2022-12-04 21:59:20 +01:00
Bernd Bestel
018449c648 Added more demo QU conversions 2022-12-04 20:39:16 +01:00
Bernd Bestel
8175b1bcfe Simplified product specific QU display/edit and added more demo QU conversions 2022-12-04 20:25:33 +01:00
Bernd Bestel
c1dea5c254 Optimized /quantityunitconversionsresolved view 2022-12-04 19:52:48 +01:00
Bernd Bestel
50fac692ad Added a dialog to show product related resolved QU conversions (references #2056 and #1360) 2022-12-04 19:02:15 +01:00
Daniel Albert
d889e9d3ad Fix quantity_unit_conversions_resolved view (#2057)
This change makes the view work for products to which only default
conversions apply.
Before, they would not have appeared in the results.
2022-12-04 18:39:33 +01:00
Bernd Bestel
4be447fc60 Expose quantity_unit_conversions_resolved via the API (read only) (references #2056 and #1360) 2022-12-04 13:41:44 +01:00
Bernd Bestel
daa0a59c5f Support transitive QU conversions on the frontend (references #2056, closes #1360) 2022-12-04 13:12:01 +01:00
Bernd Bestel
df39f94fca Added changelog for #2056 2022-12-04 12:37:50 +01:00
Bernd Bestel
46313e2c75 Applied code formatting rules for #2056 2022-12-04 12:33:12 +01:00
Daniel Albert
541c0be6be Add support for transitive unit conversions (#2056)
* Add support for transitive unit conversions

* Rewrite quantity_unit_conversions_resolved view
2022-12-04 12:18:18 +01:00
Bernd Bestel
3b3212d101 Updated README + Changelog regarding supported PHP runtime info 2022-11-29 20:03:40 +01:00
Bernd Bestel
f03bb5eeee Optimized default consume location empty check (references #2053) 2022-11-28 17:58:30 +01:00
Bernd Bestel
6affa01f81 Added a "Clear done items" button to the shopping list (closes #1999) 2022-11-19 19:45:00 +01:00
Bernd Bestel
605ceb1b19 Fixed typos 2022-11-19 19:35:10 +01:00
Bernd Bestel
7d4a9602ab Return the battery object in endpoint /batteries (closes #2045) 2022-11-19 19:33:50 +01:00
Bernd Bestel
eb370dad1e Fixed changelog typo 2022-11-13 14:22:29 +01:00
Bernd Bestel
8676b86575 Prepared next release 2022-11-12 18:24:01 +01:00
Bernd Bestel
6036786153 Fix/Workaround for DataTables ColReorder bug with data-order attributes (fixes #2019) 2022-11-12 18:10:32 +01:00
Bernd Bestel
88950f00d5 Pulled translations from Transifex 2022-11-12 17:31:17 +01:00
Bernd Bestel
f90ced5a39 Updated dependencies 2022-11-12 17:29:04 +01:00
Bernd Bestel
2b2dd0568b Move back again to original tempusdominus-bootstrap-4 package (references #143 and #2036) 2022-11-12 17:25:09 +01:00
Bernd Bestel
3f60a2b5fa Move back again to own forked tempusdominus-bootstrap-4 package (fixes #2036, references #143) 2022-11-10 11:42:28 +01:00
Bernd Bestel
3070448555 Fixed granular user permission checking in GenericEntityApiController (fixes #2025) 2022-10-17 21:00:10 +02:00
Bernd Bestel
80a873da3e Removed old products.barcode field in grocy.openapi.json (references #2023) 2022-10-12 21:07:03 +02:00
Bernd Bestel
e8f76e5694 Prevent adding recipe ingredients with a unit for which no conversion exists (closes #2013)
Wasn't a problem of the web frontend, only possible by externally/manually using the API and not thinking about that that's bullshit.
2022-09-30 12:32:39 +02:00
Bernd Bestel
fa49b449dd Allow img style attribute in HTML filter (fixes #2011) 2022-09-28 21:04:41 +02:00
Bernd Bestel
121050960c Fixed conflicting php-cs-fixer VSCode setting 2022-09-28 11:17:03 +02:00
Bernd Bestel
bb0cc50ffc Added Ukrainian translation (closes #2008) 2022-09-26 13:31:35 +02:00
Bernd Bestel
e1967bd603 Allow chevrons in HTML filter (fixes #2007) 2022-09-25 22:39:06 +02:00
Bernd Bestel
a5c2157320 Fixed more chore form validation edge cases (fixes #2001) 2022-09-20 15:02:24 +02:00
Bernd Bestel
ff056f8d81 Raise minimum SQLite version in PrerequisiteChecker as mentioned in #1939 2022-09-03 19:13:40 +02:00
Bernd Bestel
af4715e17f Fixed product average price rounding 2022-08-29 20:56:15 +02:00
Bernd Bestel
68aad90a59 Optimize SQLite database file after migrations have run 2022-08-28 20:45:22 +02:00
Bernd Bestel
24c9247663 Make it possible to edit a user without necessarily updating the users password (closes #1942) 2022-08-27 14:54:52 +02:00
Bernd Bestel
7e2f30396f Fixed consume recipe product_id handling /w parent/child products (closes #1982) 2022-08-27 14:25:55 +02:00
Bernd Bestel
e8dc334758 Always allow move_on_open (closes #1983) 2022-08-27 11:27:49 +02:00
Bernd Bestel
f1bc2cc40f Fixed that consuming partially fulfilled recipes was possible (fixes #1981) 2022-08-27 00:08:23 +02:00
Bernd Bestel
c0d0b8fc90 Fixed default consume rule ORDER BY handling related to stock_next_use (fixes #1979) 2022-08-26 11:15:15 +02:00
Bernd Bestel
d883474f03 Fixed LABEL_PRINTER_HOOK_JSON check was missing when running label printer WebHooks client side (fixes #1978) 2022-08-25 18:46:49 +02:00
Bernd Bestel
c396c2a84c Also update from_qu_id and to_qu_id of inverse unit conversions automatically (closes #1977) 2022-08-24 21:10:22 +02:00
Bernd Bestel
52e2c6d480 Fixed qu_id_stock change handling related to product_barcode amounts (fixes #1976) 2022-08-22 23:58:34 +02:00
Bernd Bestel
2fbd559105 Fixed qu_id_stock change handling related to the products own amount properties (fixes #1975) 2022-08-22 23:46:47 +02:00
Bernd Bestel
58c6b72d77 Fixed qu_id_stock change handling when needed conversion is only defined by the products qu_factor_purchase_to_stock (fixes #1973) 2022-08-22 20:11:57 +02:00
Bernd Bestel
dfe9868a48 Fixed qu_id_stock change handling when needed conversion is only defined globally (fixes #1974) 2022-08-22 19:53:58 +02:00
Bernd Bestel
06968ac289 Fixed stock entry Userfield edit handling (fixes #1969) 2022-08-18 21:29:19 +02:00
Bernd Bestel
9b52168b94 Fixed /userfields/{entity}* endpoints OpenAPI definition (fixes #1967) 2022-08-14 23:09:27 +02:00
Bernd Bestel
54d91b8b76 Added changelog for #1962 2022-08-06 17:38:43 +02:00
Akosh Pinter
312dd8a200 Fixes for losing Stock Note field content #1961 (#1962)
* Fixed losing Note field content #1961

Fixed losing Note field content when splitting stock entries #1961

* Applied code formatting rules

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2022-08-06 17:35:11 +02:00
Bernd Bestel
57d70851c8 Fixed stock overview page status button counters related to the product option "Never show on stock overview" (fixes #1956) 2022-07-24 21:36:29 +02:00
Bernd Bestel
5b53175ed6 Handle null Userfield values in userfieldsform component (fixes #1953) 2022-07-22 16:47:23 +02:00
Bernd Bestel
721a0ce417 Move back to original tempusdominus-bootstrap-4 package (references #143) 2022-07-19 16:40:12 +02:00
Bernd Bestel
0b532f7624 Fixed StockService->ConsumeProduct $productStockAmount check (fixes #1949) 2022-07-18 17:35:35 +02:00
Bernd Bestel
e64df711e2 Optimized dynamic leading zeros rounding in productamountpicker (fixes #1943) 2022-07-14 17:01:12 +02:00
Bernd Bestel
8cb9157c73 Fixed shopping list item form product barcode scan handling (fixes #1940) 2022-07-12 19:00:40 +02:00
Bernd Bestel
b57ba59243 Fixed unreproducible edge case JS error when rescheduling chores (references #1938) 2022-07-09 09:00:15 +02:00
Bernd Bestel
a85af22d6a Allow h1-h6 tags in HTMLPurifier (fixes #1932) 2022-07-03 08:24:32 +02:00
Bernd Bestel
9b2c96c085 Added Lithuanian translation 2022-07-02 16:46:46 +02:00
Bernd Bestel
a80e048c2d Optimized product_barcodes handling (references #1928) 2022-06-30 13:38:30 +02:00
Bernd Bestel
bef261d869 Fixed average shelf life (productcard) for edited stock entries (fixes #1924) 2022-06-27 20:26:32 +02:00
Bernd Bestel
dbf660f953 Fix stock_auto_decimal_separator_prices input value handling (references #1917) 2022-06-11 13:51:19 +02:00
Bernd Bestel
2de87eb446 Only apply stock_auto_decimal_separator_prices when value is not empty and not already contains a decimal separator (fixes #1917) 2022-06-11 13:25:52 +02:00
Bernd Bestel
9498dd9c67 Improve /purchase tab order handling (closes #1915) 2022-06-11 12:48:20 +02:00
Bernd Bestel
7cb19f2c66 Prepared next release 2022-06-10 18:13:01 +02:00
Bernd Bestel
8faa76e965 Pulled translations from Transifex 2022-06-10 18:12:30 +02:00
Bernd Bestel
264ed3887a Updated dependencies 2022-06-10 17:53:53 +02:00
Bernd Bestel
fe92caaed4 Fixed price history chart data parsing (fixes #1914) 2022-06-09 22:14:00 +02:00
Bernd Bestel
48e9467a99 Fixed that rescheduling of "Track date only"-chores for today was not possible (fixes #1908) 2022-06-05 23:48:52 +02:00
Bernd Bestel
27582611c1 Split user setting stock_decimal_places_prices into separate settings for input/display (closes #1893) 2022-06-04 14:09:35 +02:00
Bernd Bestel
337ca7d4ba Pulled translations from Transifex 2022-06-04 13:48:20 +02:00
Bernd Bestel
1ef64025c5 Fixed potential JS error when copying product with empty but not null description 2022-06-04 13:32:31 +02:00
Bernd Bestel
cd41c27ee1 Fixed plural form missing handling (references #1878 and #1903) 2022-06-01 22:33:13 +02:00
Bernd Bestel
fd7a4e02be Fixed chore form validation edge case (fixes #1905) 2022-06-01 20:59:57 +02:00
Bernd Bestel
3d3e4bac75 Fixed edit shopping list item QU initialisation 2022-06-01 20:43:42 +02:00
Bernd Bestel
3b8944d61b Fixed recipes_pos_resolved.missing_amount calculation (references #1903) 2022-06-01 20:32:31 +02:00
Bernd Bestel
6da637ab66 Fixed API filter >= and <= comparison (fixes #1904) 2022-05-30 17:20:15 +02:00
Bernd Bestel
e757cab0da Fixed recipe ingredient costs/calories when using substituted product with unit conversions (fixes #1903) 2022-05-29 22:48:48 +02:00
Bernd Bestel
aeae1b0db3 Added changelog for #1891 2022-05-29 17:08:03 +02:00
Thomas Johanns
dd966fd198 Handle stock_id in OpenProductByBarcode (#1891)
* Handle stock_id in OpenProductByBarcode

* Code formatting

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2022-05-29 17:05:41 +02:00
Bernd Bestel
dfdf45fa56 Fixed meal plan product/note calendar items links (fixes #1897) 2022-05-23 22:28:45 +02:00
Bernd Bestel
af7de61c43 Typo 2022-05-14 17:11:40 +02:00
Bernd Bestel
5406448be0 Use singular localization form when plural form is not provided (closes #1878) 2022-05-14 17:10:48 +02:00
Bernd Bestel
e21875bf2a Updated changelog 2022-05-14 17:04:19 +02:00
Bernd Bestel
a5e3442602 Don't enforce first/last name when creating users (closes #1888) 2022-05-14 16:59:11 +02:00
Bernd Bestel
9c1fd176c0 Fixed shopping_list_to_stock_workflow_auto_submit_when_prefilled user settings control initialization (fixes #1875) 2022-04-29 11:46:50 +02:00
Bernd Bestel
8ab511361a Do "auto add missing products to shopping list" also on product open actions (fixes #1873) 2022-04-27 22:50:20 +02:00
Bernd Bestel
845e69fb96 Escape HTML when displaying recipes on /mealplan (references #1868) 2022-04-21 21:32:28 +02:00
Bernd Bestel
c4388a6f8f Fixed product edit page stock journal button link (fixes #1867) 2022-04-21 19:34:08 +02:00
Bernd Bestel
6ad761e067 Optimized LDAP error handling (references #1865) 2022-04-19 16:56:48 +02:00
Bernd Bestel
900a49a36a Fixed JS / display errors on refreshing a row on /stockentries 2022-04-18 18:42:40 +02:00
Bernd Bestel
44c6865ba1 Added changelog for #1863 2022-04-18 18:32:28 +02:00
Rosemary Orchard
5e30e89737 Add support for "Move on Open" (#1863)
* Add functionality to move a product when it is opened

* Update the API to support this (and some other new fields)

* Remove console, update move on open when either the default or the consume location change

* Fix conflict from fridge

* Ignore .DS_STORE from macOS

* Fix the migration conflict

* Fix the default location not appending properly

* Revert changes no longer needed

* Fix the checkbox disable logic, and call the function on page load

* Simplify the transfer to use the existing function (which also adds logs)

* Only move it if it's moving

* Code formatting / naming

* Clarify help text (it's not always about one unit, but about the corresponding amount opened)

* Handle splitted stock entries + optimized/unified product property checks

* Added UI feedback on auto moving

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2022-04-18 18:25:08 +02:00
Bernd Bestel
0152f1c69d Fixed typo 2022-04-17 21:32:54 +02:00
Bernd Bestel
00ac935367 Enforce a conversion factor of 1 between QU stock/purchase when they are the same (references #1862) 2022-04-17 21:28:58 +02:00
Bernd Bestel
d4bd6b2fb3 Fixed /stock/products/{productId}/add request body parameter validation (fixes #1860) 2022-04-15 15:40:55 +02:00
Bernd Bestel
f7eb8cc127 Optimized stock entry form initial input field focus 2022-04-12 22:54:12 +02:00
Bernd Bestel
c0a727fcfc Fixed recipe ingredient stock fulfillment icon for nested recipes (fixes #1851) 2022-04-09 22:07:56 +02:00
Bernd Bestel
e9421e9102 Prepared next release 2022-04-08 17:31:25 +02:00
Bernd Bestel
04d6496c05 Pulled translations from Transifex 2022-04-08 17:28:33 +02:00
Bernd Bestel
893cfe13cd Set proper HTTP status when redirecting to /login 2022-04-08 17:06:51 +02:00
Bernd Bestel
150cfba455 Don't show invisible columns in table options 2022-04-07 19:46:13 +02:00
Bernd Bestel
632db0d8d1 Fixed new user settings naming 2022-04-07 19:25:27 +02:00
Bernd Bestel
e0c72c05c2 Reviewed changelog 2022-04-07 18:33:39 +02:00
Bernd Bestel
01a43f59ca Pulled translations from Transifex 2022-04-07 18:13:57 +02:00
Bernd Bestel
e1928a7265 Updated dependencies 2022-04-07 18:13:10 +02:00
Bernd Bestel
73e539604f Don't show relative time for invalid dates 2022-04-07 18:12:49 +02:00
Bernd Bestel
35474f2466 Improved QU conversion validation messages (references #1844) 2022-04-07 18:12:02 +02:00
Bernd Bestel
ca77ba6d19 Improved QU conversion validation messages (references #1844) 2022-04-07 07:26:06 +02:00
Bernd Bestel
6ecf94073d Automatically create/update/delete inverse QU conversions (closes #1844) 2022-04-06 22:21:21 +02:00
Bernd Bestel
cefc1b7b9c Fixed shopping list item form initial input field focus 2022-04-06 21:32:35 +02:00
Bernd Bestel
cab34df2d6 Related the price on /inventory to the selected QU instead of QU stock (closes #1346) 2022-04-06 21:27:47 +02:00
Bernd Bestel
e91fa02974 Optimized shopping list item form success message handling 2022-04-06 20:58:16 +02:00
Bernd Bestel
59277c898a Fixed shopping list item form initial input field focus 2022-04-06 20:54:42 +02:00
Bernd Bestel
36b8309943 Unified purchase / stock entry form field order 2022-04-06 20:50:51 +02:00
Bernd Bestel
76d6342156 Show stock userfields on the stock entry edit form 2022-04-06 19:08:17 +02:00
Bernd Bestel
4da546fc80 Don't compact stock entries with userfields 2022-04-06 19:07:33 +02:00
Bernd Bestel
af4dd446ab Fixed QU conversion form from_qu_id initialisation (references #1843) 2022-04-05 20:57:46 +02:00
Bernd Bestel
5df81a74c6 Fixed QU conversion form from_qu_id initialisation (fixes #1843) 2022-04-05 20:50:19 +02:00
Bernd Bestel
03bba4b9e5 Fixed "Search for recipes containing this product" (fixes #1842) 2022-04-05 18:21:25 +02:00
Bernd Bestel
adaa54ba8b Only load night mode stylesheet when night mode is actually on 2022-04-05 18:18:38 +02:00
Bernd Bestel
4d4ae9812b Make it more clear that QU stock = QU purchase means always a conversion factor of 1 (references #1841) 2022-04-05 00:08:27 +02:00
Bernd Bestel
59cd071512 Fixed localization string 2022-04-04 22:45:57 +02:00
Bernd Bestel
a676e06c65 Optimized clear filter buttons 2022-04-04 22:42:10 +02:00
Bernd Bestel
bbaaf4c17d Font Awesome 6 upgrade fixes 2022-04-04 21:17:46 +02:00
Bernd Bestel
efbb0ebf6a Removed debug statement 2022-04-04 21:10:35 +02:00
Bernd Bestel
6f5eb42f2a Updated issue templates 2022-04-04 21:08:50 +02:00
Bernd Bestel
cca35a302c Make clear filter buttons more compact 2022-04-04 21:07:14 +02:00
Bernd Bestel
e336f24225 Upgraded Font Awesome to v6 2022-04-04 20:27:51 +02:00
Bernd Bestel
d871fe7aa8 Unified settings pages 2022-04-04 20:02:42 +02:00
Bernd Bestel
b6d7ef403c Some night mode style refinements 2022-04-04 18:34:22 +02:00
Bernd Bestel
7ddfe83ffa Removed unused localization strings 2022-04-04 18:33:50 +02:00
Bernd Bestel
70f5e616c1 Optimized datetimepicker (references #1478) 2022-04-03 22:32:25 +02:00
Bernd Bestel
61ed756dd0 Implemented "default consume location" handling (closes #1365) 2022-04-03 21:15:05 +02:00
Bernd Bestel
e69e7a9a9a Added a location filter to the stock entries page 2022-04-03 19:28:59 +02:00
Bernd Bestel
5c6f84a68e General code review 2022-04-03 19:14:54 +02:00
Bernd Bestel
3091a06194 Optimized meal plan entry add/edit dialog titles 2022-04-03 19:08:36 +02:00
Bernd Bestel
49a2b8232f Removed unused localization strings 2022-04-03 17:07:13 +02:00
Bernd Bestel
d4eb5f07db Make the meal plan entry day editable (closes #775) 2022-04-03 17:03:23 +02:00
Bernd Bestel
97626b4a59 Added userfield default values for userfield types date & datetime (closes #1166) 2022-04-03 14:32:31 +02:00
Bernd Bestel
3efecb8bed Make it possible to manually re-assign chores (closes #1492, references #1830) 2022-04-03 13:56:14 +02:00
Bernd Bestel
a5294262e6 Added a user setting to automatically add missing products to the shopping list (closes #1266) 2022-04-03 13:00:14 +02:00
Bernd Bestel
34859ada02 Make new barcode added via productpicker InplaceAddBarcodeToExistingProduct flow immediately searchable (closes #839) 2022-04-03 12:33:22 +02:00
Bernd Bestel
35ed7299af Removed unnecessary user setting checks regarding night mode (references #1334) 2022-04-02 19:31:54 +02:00
Bernd Bestel
2042db29ee Use prefers-color-scheme for night mode by default (closes #1334) 2022-04-02 19:26:55 +02:00
Bernd Bestel
3e4f2eaf5d Delete userfield values when deleting a product/chore/battery/userfield (closes #1632) 2022-04-02 18:05:54 +02:00
Bernd Bestel
6a50f74a14 Optimizations regarding displaying prices (closes #1743) 2022-04-02 17:49:35 +02:00
Bernd Bestel
7ad979cba9 Also convert prices when changing a products stock QU (references #1326) 2022-04-02 16:00:47 +02:00
Bernd Bestel
a5ff947936 Show the substituted product for parent product ingredients currently not in-stock (closes #1797) 2022-04-02 11:54:07 +02:00
Bernd Bestel
05485b3a4c Make it possible to add multiple files / PDFs to equipment by using Userfields (closes #978) 2022-04-02 10:37:53 +02:00
Bernd Bestel
8c1deefebf Show a little optional checkbox to mark recipe ingredients as done (closes #1606) 2022-04-01 22:43:49 +02:00
Bernd Bestel
ba289d6e6a Optimized location content sheet layout / don't show empty locations 2022-04-01 22:10:24 +02:00
Bernd Bestel
f7c33a4579 Optionally show out of stock products on the location content sheet (closes #1641) 2022-04-01 21:55:06 +02:00
Bernd Bestel
ebfc55064e Prevent adding "Disable own stock"-products to stock (references #564) 2022-04-01 19:52:43 +02:00
Bernd Bestel
ccc59dfc8b Added a new product option "Disable own stock" (closes #564) 2022-04-01 18:49:17 +02:00
Bernd Bestel
b53d1a076f Reviewed latest changes regarding price handling views 2022-04-01 17:04:09 +02:00
Bernd Bestel
cd60c239af Squashed commit
Improved locale number display on stockoverview page
Fixed choresoverview chore execution color highlighting
Highlight recipe ingredients based on the new due score (references #1813)
Reworked current price handling views (mostly needed for recipes)
2022-03-31 22:52:38 +02:00
Bernd Bestel
fbb84277bf Unified form validation handling 2022-03-30 18:00:28 +02:00
Bernd Bestel
77d75d16df Added missing chore field in grocy.openapi.json 2022-03-30 17:48:22 +02:00
Bernd Bestel
62fcc89ddc Fixed recipes status search (references #1813) 2022-03-30 17:39:26 +02:00
Bernd Bestel
d3a39270de Implemented notes and Userfields for stock entries (closes #443) 2022-03-30 17:32:53 +02:00
Bernd Bestel
2983687f34 Fixed changelog typo 2022-03-29 20:40:08 +02:00
Bernd Bestel
8e68477a78 Implemented a "recipes due score" (closes #1813) 2022-03-29 20:38:26 +02:00
Bernd Bestel
91b984d52d Make user settings available in SQLite (needed for #1813) 2022-03-29 19:44:01 +02:00
Bernd Bestel
acebed5aae Clear manually rescheduled date on chore execution (references #1830) 2022-03-27 16:11:16 +02:00
Bernd Bestel
f41a219760 Optimized chores and tasks demo data 2022-03-27 14:48:19 +02:00
Bernd Bestel
fa07b861ad Optimized reschedule-chore-modal (references #1830) 2022-03-26 20:25:17 +01:00
Bernd Bestel
d65734c896 Added the possibility to manually reschedule chores (closes #1830) 2022-03-26 18:30:26 +01:00
Bernd Bestel
033cd306c1 Improved products/chore merge dialogs form validation 2022-03-26 11:17:08 +01:00
Bernd Bestel
585ec1212d Fixed chore tracking page skip button disabled handling (references #1836) 2022-03-26 11:06:03 +01:00
Bernd Bestel
7c3e7daa56 Typo 2022-03-26 10:35:15 +01:00
Bernd Bestel
81b54182de Improved form validation handling (closes #1836) 2022-03-26 10:34:00 +01:00
Bernd Bestel
6aae97de73 Fixed number input page reload behavior (fixes #1835) 2022-03-25 18:17:20 +01:00
Bernd Bestel
f0db2a7709 Fixed that tasks without a due date were highlighted in red (fixes #1833) 2022-03-23 19:35:48 +01:00
Bernd Bestel
9db66048d1 Fixed chore skip handling via /choresoverview (references #1830) 2022-03-23 18:22:50 +01:00
Bernd Bestel
5dc745f301 Use the given time when skipping chores via /choretracking (references #1830) 2022-03-23 17:51:05 +01:00
Bernd Bestel
00466972e2 Typo 2022-03-23 17:36:36 +01:00
Bernd Bestel
bda230537a Fixed purchase/consume page handling when FEATURE_FLAG_STOCK_LOCATION_TRACKING is disabled (fixes #1829) 2022-03-23 17:35:06 +01:00
Bernd Bestel
dce14b8999 Fixed chore upgrade handling when having nonsensical user data (fixes #1826) 2022-03-23 17:17:39 +01:00
Bernd Bestel
23f285c3fb Fixed recipes gallery view search (fixes #1825) 2022-03-22 13:21:09 +01:00
Bernd Bestel
790368cdf4 Added changelog for #1819 2022-03-14 22:49:28 +01:00
miguelangel-nubla
e2c1d2e226 fix: can't print in landscape (#1819)
* fix: can't print in landscape

Layout settings are hidden in the print dialog when printing a page like the mealplan.Bootstrap 4 bug https://github.com/twbs/bootstrap/issues/25629

* Moved @page rule to @media print section

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2022-03-14 22:47:12 +01:00
Bernd Bestel
a4b1a80cdc Fixed meal plan note item edit button tooltip (fixes #1821) 2022-03-14 22:43:07 +01:00
Bernd Bestel
0ba1a82e01 Show the products grocycode as a (hidden by default) column on /products (closes #1820) 2022-03-14 22:39:35 +01:00
Bernd Bestel
7ea9984fd3 Make it possible to change a products stock QU after it was once added to stock (closes #1326) 2022-03-13 17:09:07 +01:00
Bernd Bestel
7532626123 Optimized datetimepicker relative time display handling 2022-03-07 17:57:14 +01:00
Bernd Bestel
632a542236 Fixed stock overview numeric sorting of value columns (fixes #1811) 2022-03-06 09:31:47 +01:00
Bernd Bestel
1a82d0599c Use child product substitution on consuming during chore execution (fixes #1807) 2022-03-05 09:03:57 +01:00
Bernd Bestel
620f938065 Fixed multi-nested recipe serving amount calculation (fixes #1806) 2022-03-03 17:38:51 +01:00
Bernd Bestel
54a8c331c2 Prefill default QU conversion factor for qu_factor_purchase_to_stock for new products (closes #1803) 2022-03-01 18:03:01 +01:00
Bernd Bestel
45d1c87975 Fixed "Treat opened as out of stock" missing stock amount handling (fixes #1804) 2022-03-01 18:02:04 +01:00
Bernd Bestel
cc2a137783 Fixed calories locale number display (fixes #1802) 2022-02-28 20:59:58 +01:00
Bernd Bestel
bab0e1d5fb Fixed battery charge cycle undo handling (fixes #1800) 2022-02-26 17:38:58 +01:00
Bernd Bestel
a027077211 Enforce stock QU on /purchase for tare weight handling enabled products (fixes #1795) 2022-02-20 19:33:55 +01:00
Bernd Bestel
5bfdddd52b Delete QU conversions when deleting QU (theoretical problem, closes #1796) 2022-02-20 19:18:10 +01:00
Bernd Bestel
777fcbae77 Use products stock QU for product_barcodes when empty (references #1794) 2022-02-20 17:07:22 +01:00
Bernd Bestel
8abb55b058 Updated changelog 2022-02-20 16:11:17 +01:00
Bernd Bestel
823088b9cd Updated changelog 2022-02-20 16:08:42 +01:00
Bernd Bestel
1aa7db9c2a Added an daily-same-time chore period type (closes #1793) 2022-02-20 16:03:50 +01:00
Bernd Bestel
e220b3e9f3 Fixed products product stock entry price (fixes #1791) 2022-02-19 09:03:42 +01:00
Bernd Bestel
01c7d4e49a Added changelog for #1788 2022-02-16 08:45:15 +01:00
Bernd Bestel
486a58909d Merge pull request #1788 from andreheuer/master
Fixed battery label printing
2022-02-16 08:42:49 +01:00
André Heuer
db43a4bf3a Fixed battery label printing 2022-02-15 23:02:07 +01:00
Bernd Bestel
424bfa9313 Fixed formatting 2022-02-15 18:43:02 +01:00
Bernd Bestel
926b7d8aea Table options: Only allow columns to be grouped for which it makes sense (closes #1535) 2022-02-15 18:40:42 +01:00
Bernd Bestel
e9a7b10730 Make recipe card buttons a little bigger 2022-02-15 18:39:38 +01:00
Bernd Bestel
8338421912 Update issue templates 2022-02-15 18:38:58 +01:00
Bernd Bestel
21d5952950 Fixed batteries stock overview page was broken when having any Userfield (fixes #1786) 2022-02-14 17:52:24 +01:00
Bernd Bestel
c5b47badad Typo 2022-02-13 20:38:21 +01:00
Bernd Bestel
66bd3f0d59 Added a new API endpoint to get all stock entries per location
References https://www.reddit.com/r/grocy/comments/srfwfs
2022-02-13 20:34:49 +01:00
Bernd Bestel
2457c2c2fd Optimized returnto-links handling (fixes #1785) 2022-02-13 20:07:29 +01:00
Bernd Bestel
d38a5efb3d New Transifex command-line client compatibility 2022-02-13 18:25:42 +01:00
Bernd Bestel
6aa3dcc44a Removed accidentally added localization strings 2022-02-13 18:04:13 +01:00
Bernd Bestel
37744822d8 Handle not having any QU in LocalizationService (fixes #1783) 2022-02-12 22:31:35 +01:00
Bernd Bestel
1344e84534 Fixed recipe consume stock fulfillment checking (frontend and API) (fixes #1781) 2022-02-12 22:08:10 +01:00
Bernd Bestel
8e3a9d6c04 Updated some screenshots 2022-02-11 19:56:12 +01:00
Bernd Bestel
9b2a551ee4 Updated screenshots 2022-02-11 19:35:13 +01:00
Bernd Bestel
f52b8e11bb Support camera barcode scanning in recipepicker (references #1562) 2022-02-11 18:18:17 +01:00
Bernd Bestel
79b2dc3ed8 Prepared next release 2022-02-11 17:51:53 +01:00
Bernd Bestel
222c518a5f Added grocycode for recipes (closes #1562) 2022-02-11 17:49:30 +01:00
Bernd Bestel
51fdefaede Removed unused properties 2022-02-11 17:48:44 +01:00
Bernd Bestel
a5a53d1d1e Optimized print layout 2022-02-11 17:47:35 +01:00
Bernd Bestel
8e033d035a Reviewed config-dist.php 2022-02-11 17:46:40 +01:00
Bernd Bestel
88452a187c Fixed column selection of ix_chores_log_performance1 index 2022-02-11 17:46:17 +01:00
Bernd Bestel
cfaf2838d4 Pulled translations from Transifex 2022-02-11 17:45:30 +01:00
Bernd Bestel
107f51f4ae Update bug report issue template 2022-02-11 17:41:19 +01:00
Bernd Bestel
c304578443 Updated issue templates 2022-02-11 17:39:10 +01:00
Bernd Bestel
84476ad093 Updated SECURITY.md 2022-02-10 21:51:03 +01:00
Bernd Bestel
0f7d57d0a0 Added https://grocy.info/#say-thanks as GitHub sponsors link (references #1714) 2022-02-10 21:44:01 +01:00
Bernd Bestel
b2b04c843d Reviewed changelog 2022-02-10 20:33:03 +01:00
Bernd Bestel
296897d91a Pulled translations from Transifex 2022-02-10 20:27:51 +01:00
Bernd Bestel
a7cc867cf0 Updated dependencies 2022-02-10 20:01:55 +01:00
Bernd Bestel
69a7ea6057 Added a new "adaptive" chore period type (closes #1495) 2022-02-10 18:06:33 +01:00
Bernd Bestel
091a93ff4e Reviewed README 2022-02-10 18:04:33 +01:00
Bernd Bestel
f88bad4bde Remove period_days for old dynamic-regular chores on migration 2022-02-09 20:28:03 +01:00
Bernd Bestel
7d4c9fefa9 Removed the dynamic regular chore period type (since it's the same as daily) 2022-02-09 20:25:16 +01:00
Bernd Bestel
10d7d44825 Added new hourly chore period type (closes #266) 2022-02-09 20:02:11 +01:00
Bernd Bestel
c9a2041fae Optimized chore schedule help text 2022-02-09 19:52:19 +01:00
Bernd Bestel
0d1f2ad09d Squashed commit
Optimized new chore start date handling (references #1612)
Change yearly chore schedule to be on the same day each year (closes #817)
Use the last price for out of stock ingredients (closes #779)
Make it optionally possible to show the recipes list full-width (closes #1772)
2022-02-09 17:48:21 +01:00
Bernd Bestel
aaf248c1b3 Added missing localization string 2022-02-08 21:21:19 +01:00
Bernd Bestel
ce74062a9f Added new chore property to API schema definition (references #1612) 2022-02-08 20:39:36 +01:00
Bernd Bestel
61a1b1428a Added a chore start date option (closes #1612) 2022-02-08 20:35:47 +01:00
Bernd Bestel
411dbabc90 Show the meal plan section for a meal plan entry types on the calendar (references #1582) 2022-02-08 19:09:17 +01:00
Bernd Bestel
66cf7e4ffa Squashed commit
Updated dependencies
Added the possibility to skip chore schedules (closes #1486)
Show the meal plan section on the corresponding calendar events (closes #1582)
Make it possible to define a time for meal plan sections and use that time for the corresponding calendar events (references #1582)
Added a changelog template
Make it possible to toggle the meal plan calendar view on bigger screens (closes #1678)
2022-02-08 18:08:26 +01:00
Bernd Bestel
4279bf6445 Prefill the stock entry amount when using a stock entry grocycode on /consume (closes #1736) 2022-02-07 20:48:17 +01:00
Bernd Bestel
dd36301460 Use same plural definition for QU translator (references #1705) 2022-02-07 20:42:54 +01:00
Bernd Bestel
d1d52aea44 Move FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT to per product option (closes #1753) 2022-02-07 19:12:31 +01:00
Bernd Bestel
12e5377c40 Split application translation strings and QU strings (fixes #1705) 2022-02-06 21:09:34 +01:00
Bernd Bestel
28f7700dac Fixed recipe ingredient stock fulfillment shopping list amount comparison (fixes #1717) 2022-02-06 20:02:19 +01:00
Bernd Bestel
9eb46df517 Added a button to quickly create multiple tasks without having to close/reopen the dialog (closes #1776) 2022-02-06 18:35:19 +01:00
Bernd Bestel
e6a6d7ae42 Added new relative date input shorthand (closes #1773) 2022-02-06 18:13:25 +01:00
Bernd Bestel
da54b945da Fixed task edit page initial due date (fixes #1774) 2022-02-06 17:49:04 +01:00
Bernd Bestel
7e6efb4a14 Optimized no-sidebar pages spacing / centering (closes #1760) 2022-01-24 21:17:45 +01:00
Bernd Bestel
fa3e705673 Show chore description on chorecard (closes #1759) 2022-01-23 20:02:16 +01:00
Bernd Bestel
cf52e5ec96 Make it possible to disable chores/tasks/batteries due soon filters/highlighting (closes #1485) 2022-01-23 19:20:23 +01:00
Bernd Bestel
04a3069294 Added workarounds to make Summernote embeds responsive (closes #1758) 2022-01-23 18:28:50 +01:00
Bernd Bestel
8f7f88c8ad Added missing plural translations for new strings 2022-01-23 17:51:51 +01:00
Bernd Bestel
aef646e9df Highlight chores/tasks/batteries due today in a separate color + status filter (closes #1740) 2022-01-23 17:42:55 +01:00
Bernd Bestel
dfd6262f4a Fixed missing recipe ingredient amount when "Only check if any amount is in stock" is enabled and when there are unit conversions (fixes #1718) 2022-01-23 13:56:41 +01:00
Bernd Bestel
49f44d241b Fixed meal plan edit product entry initial amount 2022-01-23 12:53:21 +01:00
Bernd Bestel
f6c750a1ea Fixed meal plan calories display (fixes #1757) 2022-01-23 12:43:16 +01:00
Bernd Bestel
1950e4b513 Added changelog for #1750 2022-01-16 16:21:21 +01:00
Bernd Bestel
c190002ebb More recipes page performance optimizations (references #1750) 2022-01-16 16:08:57 +01:00
Bernd Bestel
3b3f079754 Recipes page performance optimizations (references #1750) 2022-01-16 15:48:49 +01:00
Bernd Bestel
dfc274643f Optimized user settings save handling (fixes #1747) 2022-01-16 14:58:42 +01:00
Bernd Bestel
e3808c71b9 Added changelog for #1746 2022-01-16 14:49:10 +01:00
Marc Ole Bulling
187654d8b3 Added support for reading auth header from env variable (#1746)
* Added support for reading auth header from env variable

* Check if variable is set, more accurate error description

* Formatting

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2022-01-16 14:46:04 +01:00
Bernd Bestel
8ec0d9319b Exclude tasks without an due date from the iCal export (fixes #1745) 2022-01-11 20:54:23 +01:00
Bernd Bestel
ec75779bf3 Streamlined integer/number format declarations 2022-01-11 20:48:53 +01:00
Bernd Bestel
894568d2ee Added an missing API endpoint parameter (references #1741) 2022-01-11 20:32:53 +01:00
Bernd Bestel
c1952e98bc Show stock journal entries of deleted users / fixed default user handling (fixes #1725) 2022-01-06 15:14:32 +01:00
Bernd Bestel
789e6a5291 Don't crash the recipes page when the amount contains user-desired (and manually edited) bullshit (fixes #1691) 2022-01-06 14:36:35 +01:00
Bernd Bestel
ae5fad290f Sort entities on the /api page 2022-01-06 14:17:02 +01:00
Bernd Bestel
003a416b74 Expose products_last_purchased and products_average_price (read only, closes #1732) 2022-01-06 14:16:23 +01:00
Bernd Bestel
3a6f04f770 Optionally remove only done shopping list items (/stock/shoppinglist/clear API endpoint, closes #1730) 2022-01-06 14:07:29 +01:00
Bernd Bestel
0b36d02aa1 Fixed prefilled consume page initialization (fixes #1716) 2022-01-06 13:54:42 +01:00
Bernd Bestel
5f8299cf4a Also show the logout button when using externally managed auth (fixes #1709) 2022-01-06 13:46:20 +01:00
Bernd Bestel
ad0dbdfc22 Lookup product barcodes case insensitive (fixes #1734) 2022-01-06 13:42:38 +01:00
Bernd Bestel
8455b5a64a Allow HTML tags for the product description column on the stock overview page (fixes #1735) 2022-01-06 13:38:00 +01:00
Bernd Bestel
a711bbd8f6 Print stock entry labels also on inventory when adding products (closes #1713) 2021-12-09 18:32:59 +01:00
Bernd Bestel
3e20c2cc3d Added changelog for #1710 2021-12-06 22:25:27 +01:00
FloSet
1e8a1d7ffb Update LdapAuthMiddleware.php (#1710) 2021-12-06 22:22:10 +01:00
Graham Christensen
c8c63bea5d Label printing: include the model number for the label paper (#1701) 2021-11-30 08:45:25 +01:00
Bernd Bestel
4ea20ce076 Added changelog for #1695 2021-11-25 19:10:08 +01:00
JOKer
b2eec2b111 Improve sorting for stock entries view (#1695)
In the stockentries view the ordering by expiration date, amount, price
and purchase date did not work as expected. b5fc64cf already addressed a
similar issue for other views. This commit now does the same: set
DataTables types on the specific columns.

Since the units being part of the "amount" column break numeric sorting,
this commit adds a "data-order" field for that column, so numeric
sorting can still work. This is done in aligment with the stockoverview
page, that already contains such an entry to facilitate proper sorting.
2021-11-25 19:08:53 +01:00
Bernd Bestel
8876c6cf95 Added changelog for #1687 2021-11-15 20:09:04 +01:00
Tallyrald
98bf36dbc8 Replace Timeago with momentjs (#1687)
* Replaced timeago with moment.fromNow

* Fixed datetime when best_before_date is empty

* Removed the now unnecessary timeago package

* Removed not longer localization strings

* Check for empty instead of string comparison

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-11-15 20:05:10 +01:00
Bernd Bestel
b83e4f53b1 Don't print stock entry labels when not desired (server side WebHook execution) (references #1686) 2021-11-15 09:06:19 +01:00
Bernd Bestel
33ca6070f4 Fixed typo 2021-11-14 19:39:27 +01:00
Bernd Bestel
c2b675eb06 Deleted empty changelog file 2021-11-14 16:36:20 +01:00
Bernd Bestel
e552f4b730 Updated dependencies 2021-11-14 16:31:34 +01:00
Bernd Bestel
12f6296c75 Reviewed changelog 2021-11-14 16:30:19 +01:00
Bernd Bestel
3842f05ce9 Pulled translations from Transifex 2021-11-14 16:27:37 +01:00
Bernd Bestel
4d21668265 Added the possibility to merge chores 2021-11-14 16:19:52 +01:00
Bernd Bestel
693dcc1020 Prepared next release 2021-11-14 15:59:58 +01:00
Bernd Bestel
f5562602f0 Always show the add item button on the shopping list on mobile (closes #1645) 2021-11-14 15:50:48 +01:00
Bernd Bestel
86aa8f19f7 Fixed typos 2021-11-14 15:37:10 +01:00
Bernd Bestel
43ba3b4920 Added missing API changelog (references #1676) 2021-11-14 15:33:13 +01:00
Bernd Bestel
6070507b04 Fixed per unit stock grocycodes weren't unique per unit (fixes #1676) 2021-11-14 15:26:38 +01:00
Bernd Bestel
fc413a05d1 Simplified stock entry label printing options (on purchase) (references #1647) 2021-11-13 18:26:01 +01:00
Bernd Bestel
89b87156de Added changelog for #1672 2021-11-13 17:41:51 +01:00
Graham Christensen
a7f3f64d89 StockService: Set the product's bestBeforeDate to the freezer date if it is being purchased to a freezer (#1672)
* StockService: Set the product's bestBeforeDate to the freezer date if it is being purchased to a freezer

* Formatting / feature flag checks / proper data type comparision

* Prefill due date also on location change

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-11-13 17:41:04 +01:00
Bernd Bestel
10bd5ce900 Added a new "Presets for new products" stock setting for the "Default due days" option of new products (closes #1552) 2021-11-13 17:05:23 +01:00
Bernd Bestel
a6ffe8480a Show stock QU hint also for the energy field on the product edit page (closes #1682) 2021-11-13 16:45:55 +01:00
Bernd Bestel
2a2335c8f4 Use original column index when accessing data table columns (fixes #1684) 2021-11-12 18:26:19 +01:00
Bernd Bestel
4338ccc132 Restore the original due date when undoing a product opened transaction (fixes #1659) 2021-11-12 18:12:34 +01:00
Bernd Bestel
f2bef554a4 Fixed track date only chores next_estimated_tracking time comparision (fixes #1655) 2021-11-12 18:02:46 +01:00
Bernd Bestel
ab53a157e4 Allow backslashes in API query filters (fixes #1649) 2021-11-12 17:52:32 +01:00
Bernd Bestel
beae32ef23 Added the products average price as a hidden by default column on the stock overview page (closes #1677) 2021-11-09 19:39:32 +01:00
Bernd Bestel
787c885ccf Fixed addnewproduct productpicker flow shopping list selection on return (fixes #1646) 2021-11-08 22:09:48 +01:00
Bernd Bestel
286351b6d2 Fixed modal dialogs / iframes initial input focus (fixes #1665) 2021-11-08 21:59:02 +01:00
Bernd Bestel
29371163ad Fixed night mode over midnight time range check (fixes #1673) 2021-11-08 21:38:19 +01:00
Bernd Bestel
3f88b8dfa2 Fixed issue templates 2021-11-08 17:39:33 +01:00
Bernd Bestel
1c161b2b29 Added changelog for #1664 2021-11-08 17:36:29 +01:00
Bernd Bestel
5ea8ec2dda Update issue templates 2021-11-08 17:36:16 +01:00
Corbo
eb8c9848eb dark bg was missing in dropdown, text was dark on dark bg in product ellipsis (#1664)
Signed-off-by: corbolais <corbolais@gmail.com>
2021-11-08 17:29:34 +01:00
Bernd Bestel
2b97ac7c1c Added buttons to the products stock entries/journal on the product edit page (like on the productcard) (closes #1670) 2021-11-08 17:21:15 +01:00
Bernd Bestel
3c656ba618 Allow renaming the default shopping list (closes #1667) 2021-11-08 17:08:37 +01:00
Bernd Bestel
edddfe234c Include duesoon/overdue/expired products for the belowminstockamount filter on the stock overview page (closes #1666) 2021-11-08 17:06:20 +01:00
Bernd Bestel
8105dea17f Added changelog for #1661 2021-11-03 21:50:44 +01:00
Dmitri Iouchtchenko
dc1954cb05 Add name to stay_logged_in checkbox (#1661)
The attribute was dropped in 9942a2d.
2021-11-03 21:47:35 +01:00
Bernd Bestel
ea63246a12 Apply timezone for iCalendar events (closes #1637) 2021-10-05 20:55:29 +02:00
Bernd Bestel
196bdbe246 Added SECURITIY.md (references #1643) 2021-10-05 15:36:57 +02:00
Bernd Bestel
01ddeb4dfd Added data_generation_scripts 2021-10-02 17:39:36 +02:00
Bernd Bestel
282168f92c Potentially fix a type mismatch problem (fixes #1629) 2021-09-29 09:21:45 +02:00
Bernd Bestel
3c74d92eb0 Prepared next release 2021-09-27 18:21:28 +02:00
Bernd Bestel
fe622cacb2 Updated dependencies 2021-09-27 18:19:04 +02:00
Bernd Bestel
5ddb438134 Pulled translations from Transifex 2021-09-27 18:18:09 +02:00
Bernd Bestel
35469c3d98 Fixed QU resolve priority (fixes #1616) 2021-09-27 18:09:30 +02:00
Bernd Bestel
b32a26cf7e Typo 2021-09-27 17:50:38 +02:00
Bernd Bestel
bed7965989 Fixed undo consume stock transaction location handling (references #1602) 2021-09-27 17:50:19 +02:00
Bernd Bestel
19ff782c00 Fixed consume transaction journal location handling (fixes #1602) 2021-09-27 17:46:42 +02:00
Bernd Bestel
cebb368a28 Enforce min_stock_amount for child products where the parent has cumulate_min_stock_amount_of_sub_products enabled (fixes #1595) 2021-09-27 17:39:00 +02:00
Bernd Bestel
038917b030 Don't show battery grocycode when not available 2021-09-27 17:20:52 +02:00
Bernd Bestel
04d826943c Don't include events without a start time in iCal export (fixes #1625) 2021-09-24 13:22:24 +02:00
Bernd Bestel
e0735ce2e4 Hide stock value on productcard when FEATURE_FLAG_STOCK_PRICE_TRACKING is disabled 2021-09-24 13:13:38 +02:00
Bernd Bestel
849c281912 Allow spaces in API filter values (fixes #1624) 2021-09-22 10:12:57 +02:00
Bernd Bestel
c06bb7784a Include OS and client information in easy error info copy/paste and on the about dialog 2021-09-20 20:16:41 +02:00
Bernd Bestel
b9fff4954a Fixed modal backdrop z-index (references #1589) 2021-09-19 16:20:06 +02:00
Bernd Bestel
7aa9e5748e Allow to add a product picture on product creation (closes #1620) 2021-09-19 16:06:16 +02:00
Bernd Bestel
6175afa6be Don't apply the barocde qu_id if empty (fixes #1619) 2021-09-19 10:07:25 +02:00
Sebastian Ecker
5563e7ed4c StockLogEntry Property is date instead of date-time (#1617) 2021-09-17 16:22:26 +02:00
Bernd Bestel
305f846dbf Implemented bottom-sticky save buttons for product and chore edit forms (closes #1589) 2021-09-15 14:59:11 +02:00
Bernd Bestel
3f850c540b Fixed stock overview context menu item disabled handling (fixes #1609) 2021-09-15 14:24:50 +02:00
Bernd Bestel
2c3af45f5c Added missing changelog 2021-09-15 14:14:24 +02:00
Bernd Bestel
230901a28a Added changelog for #1599 2021-09-15 14:11:44 +02:00
Travis Howse
30e1a5c9b0 Store the list of buttons at the workflow start and iterate over that as the workflow progresses. (#1599) 2021-09-15 14:08:23 +02:00
Bernd Bestel
616e1dd5d7 Fixed negative number plural form handling (fixes #1601) 2021-09-06 22:26:31 +02:00
Bernd Bestel
a323bca9ec Added check for mbstring PHP extension (required by eluceo/ical, references #1603) 2021-09-06 22:19:36 +02:00
Bernd Bestel
14bb04d285 Allow any letters in API filter values (fixes #1591) 2021-08-27 21:05:46 +02:00
Bernd Bestel
edd372f8c4 Optimized chore/battery tracking input focus handling 2021-08-27 20:54:27 +02:00
Bernd Bestel
b4a7642af5 Reload shopping list page on list clearing 2021-08-27 20:39:47 +02:00
Bernd Bestel
580f49e69f Update README.md 2021-08-27 20:30:09 +02:00
Bernd Bestel
22db124624 Optimized ReverseProxyAuthMiddleware error message 2021-08-22 12:55:09 +02:00
Bernd Bestel
e88294eb40 Strikethrough reverted changes 2021-08-21 22:16:44 +02:00
Bernd Bestel
ae3bacf8fe Fixed changelog typos 2021-08-21 22:12:41 +02:00
Bernd Bestel
90305ca8d7 Prepared next release 2021-08-21 20:24:18 +02:00
Bernd Bestel
3967b28481 Fixed stock overview dynamic < min. stock amount background handling 2021-08-21 20:20:16 +02:00
Bernd Bestel
2d67adedd7 Updated dependencies 2021-08-21 20:11:45 +02:00
Bernd Bestel
ef271c6247 Pulled translations from Transifex 2021-08-21 20:10:28 +02:00
Bernd Bestel
2c0b6368e1 Revert "Return numbers as numbers on all API endpoints" (14cd6ca3bf, fixes #1564) 2021-08-20 21:45:56 +02:00
Bernd Bestel
1d5ca5ed64 Fixed external barcode lookup (plugin) add product handling related to barcodes (fixes #1568) 2021-08-19 19:56:43 +02:00
Bernd Bestel
4d0c5502a1 Added changelog for #1584 2021-08-19 19:48:00 +02:00
David Mott
a0cf58b974 fix: make stockentry grocycodes consume the actual stock entry not the product in general (#1584)
* fix: make stockentry grocycodes consume the actual stock entry not the product in general

if the stock_entry_id is in the request body use this instead of the stockentry grocycode
this may not be the correct way to interpret this but one of them has to win

* Undo formatting changes

* fix: add variable definition and reorder args used in ConsumeProduct

* Simplify

* Fix this also for transferring a product

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-08-19 19:44:39 +02:00
Bernd Bestel
61a58ddef0 Fixed Userfield value assignment handling (/objects/{entity} API endpoint) (fixes #1572) 2021-08-17 18:23:06 +02:00
Bernd Bestel
3608eec8fb Fixed FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS clear shopping list confirm message handling (fixes #1315) 2021-08-17 18:05:32 +02:00
Bernd Bestel
cebf7a3e54 Don't consider inactive products to be missing (fixes #1578) 2021-08-17 18:00:33 +02:00
Bernd Bestel
23be96b5d6 Restore the rest of "orderFixed" (DataTables rowgroup option) (again closes #1534) 2021-08-17 17:52:28 +02:00
Bernd Bestel
7f70f0ec07 Fixed chore/battery camera barcode scanning blur event handling (fixes #1585) 2021-08-17 17:48:45 +02:00
Bernd Bestel
8e552f1146 Added changelog for #1581 2021-08-15 10:46:37 +02:00
David Mott
95cb9ffb90 fix: confirm grocycode is of PRODUCT type in GetProductIdFromBarcode (#1581)
* fix: confirm grocycode is of PRODUCT type in GetProductIdFromBarcode

* Fixed formatting

* Don't output the given input (for security reasons)

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-08-15 10:45:05 +02:00
Bernd Bestel
d23f730a0b Added changelog for #1559 2021-08-06 20:20:00 +02:00
Kris
b539c93319 Hide elements when printing (#1559)
* Hide elements when printing

* Hide elements when printing

* Also hide the title menu collapse button

* Added a print button

All print-optimized pages have that

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-08-06 20:18:43 +02:00
Kris
eecb321086 Change PHP Dependency from >= to ^ (#1566)
* Change PHP Dependency from >= to ^

* Remove name, description, license
2021-08-06 15:49:14 +02:00
Bernd Bestel
1891bc6f32 Restore fixed order for grouped column (fixes #1534) 2021-08-04 17:41:20 +02:00
Daniel Tihanyi
10c1ccd6e4 Extend REQUIRED_PHP_EXTENSIONS check about core extensions (#1540)
* Extend Grocy REQUIRED_PHP_EXTENSIONS

After installing Grocy on FreeBSD, even with all extensions installed that are listed in REQUIRED_PHP_EXTENSIONS, Grocy still couldn't start. The added 3 PHP Extensions are also needed to run Grocy.

* Added note about core extensions

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-08-04 17:25:24 +02:00
Bernd Bestel
12af9a944b Added changelog for #1561 2021-08-04 17:08:38 +02:00
Akosh Pinter
1fafd32aaf Possible fix for the chore & battery dropdown clearing issue - #1560 (#1561)
* Possible fix for the chore & battery dropdown clearing issue - #1560

* Revert formatting changes - #1560

Co-authored-by: Akos Pinter <akos.pinter@mhp.com>
2021-08-04 17:06:40 +02:00
Bernd Bestel
9f9b9d864e Added changelog for #1557 2021-08-04 16:37:08 +02:00
Lars van Erp
a79247a30c Fixed the bug where grocy would return "Not a grocycode" all the time (#1557) 2021-08-04 16:35:26 +02:00
Bernd Bestel
53e405c4f8 Fixed migration when having unsupported parent/child product nesting levels (fixes #1542) 2021-07-25 20:22:10 +02:00
Bernd Bestel
cf382bb47f Also note how to apply database migrations in "How to update" section
References #1548 and all the other same questions arising after each release multiple times
2021-07-25 13:03:19 +02:00
Bernd Bestel
8225215e39 Fixed that the calendar iCal export was broken when having "Track date only" chores (fixes #1547) 2021-07-24 10:24:21 +02:00
Bernd Bestel
f47ca963ab Fixed duplicate barcode migration error (fixes #1546) 2021-07-23 16:37:45 +02:00
Bernd Bestel
d871ed7b53 Updated README.md 2021-07-17 20:17:02 +02:00
Bernd Bestel
3e31450532 Typo 2021-07-17 00:26:26 +02:00
Bernd Bestel
5478bec2c7 Optimized "auto decimal separator for price inputs" (references #1345) 2021-07-17 00:21:48 +02:00
Bernd Bestel
edfa404ed6 Squashed commit
Always execute migration 9999 (can be used to fix things manually)
Optimized meal plan navigation / date range filtering
Prepared next release
Pulled translations from Transifex
Various code optimizations
2021-07-16 17:32:08 +02:00
Bernd Bestel
2d1d5d46f6 Updated screenshots 2021-07-15 21:04:52 +02:00
Bernd Bestel
45fe6a6362 Updated create_release_package.bat 2021-07-15 20:58:01 +02:00
Bernd Bestel
23f697f812 Pulled translations from Transifex 2021-07-15 20:53:12 +02:00
Bernd Bestel
263181baa0 Updated dependencies 2021-07-15 20:48:27 +02:00
Bernd Bestel
9132e222fe Upgraded bwip-js 2021-07-15 20:34:22 +02:00
Bernd Bestel
2bc108fe3e Only init meal plan menu entry when feature flag is enabled 2021-07-15 20:19:04 +02:00
Bernd Bestel
02d0121f4d Fixed meal plan note adding 2021-07-15 20:11:49 +02:00
Bernd Bestel
b5acb4c49b Settings menu order == sidebar menu order 2021-07-15 20:09:33 +02:00
Bernd Bestel
cd05a95a0f Fix meal plan section title in (some) foreign languages 2021-07-15 20:07:31 +02:00
Bernd Bestel
2d2700cacb Implemented meal plan sections (closes #370) 2021-07-15 17:54:48 +02:00
Bernd Bestel
1bacd8e13d Typo / added missing changelog 2021-07-14 18:15:02 +02:00
Bernd Bestel
f6986fac18 Fixed cost/calories calculation for nested recipes (references #1264) 2021-07-14 16:27:03 +02:00
Bernd Bestel
8b6f882edc Fixed missing FEATURE_FLAG_SHOPPINGLIST handling on /stockoverview, /mealplan and /stockentries pages (references #322) 2021-07-13 21:24:08 +02:00
Bernd Bestel
91d8eaeb74 Squashed commit
Improve journal pages loading time (new date range filter)
Various small style adjustments (meal plan page and others)
Pulled German translations from Transifex
Show the shopping list total value (closes #1309)
Make it possible to copy recipes (closes #714)
Implemented optional "auto decimal separator for price inputs" (closes #1345)
Removed table grouped column fixed order restriction (closes #1402)
Don't filter out style, class, id attributes of html text (closes #1298)
Added product picture as column on the stock overview page (closes #1283)
Added grocycodes also for chores and batteries (+ camera barcode scanning for /choretracking and /batterytracking, this now closes #221)
2021-07-13 19:29:23 +02:00
Bernd Bestel
8d2c3ae584 Partly reverted b856911f0f
Loading localization strings async for the fronted currently doesn't work in all cases...
2021-07-12 21:20:39 +02:00
Bernd Bestel
18e8fc8293 Added missing localization string 2021-07-12 20:48:14 +02:00
Bernd Bestel
e1c702f3d0 Typo 2021-07-12 20:45:30 +02:00
Bernd Bestel
71cede74a3 Make it possible to copy meal plan days (closes #573) 2021-07-12 20:44:42 +02:00
Bernd Bestel
7b0bc9e472 Fixed stock entries page missing columns 2021-07-12 19:55:53 +02:00
Bernd Bestel
8cb8611b4f Added a new product option "Should not be frozen" (closes #1320) 2021-07-12 19:27:21 +02:00
Bernd Bestel
c048f403e6 Check for missing localization strings also client side (dev mode only) 2021-07-12 19:10:07 +02:00
Bernd Bestel
4aee175105 Keep the newest instead of the oldest on campacting stock entries 2021-07-12 18:58:49 +02:00
Bernd Bestel
cf8604e984 Show row_created_timestamp on the stock entries page (closes #1063) 2021-07-12 18:25:07 +02:00
Bernd Bestel
cdf6ac78e2 Optimized product edit page default button handling (closes #1276) 2021-07-12 18:15:57 +02:00
Bernd Bestel
70433aace5 Added an status filter to only show in-stock products on the stock overview page (closes #1263) 2021-07-12 18:02:57 +02:00
Bernd Bestel
247221950d Never extend the original due date on when opening a product which has default_best_before_days (closes #1342) 2021-07-12 17:56:09 +02:00
Bernd Bestel
866d6647d2 Small meal plan page adjustments 2021-07-12 17:43:30 +02:00
Bernd Bestel
f1da3ef5e8 Optimized clean response handling 2021-07-12 17:08:59 +02:00
Bernd Bestel
2cc4f4d382 Make sure to clean the response before returning files
Was a problemw when returning images and there were leading empty lines in config.php which seem to get added to the response always...
2021-07-12 15:34:26 +02:00
Bernd Bestel
6659a5cd08 Add an option to make Userfields mandatory (closes #1339) 2021-07-11 22:05:08 +02:00
Bernd Bestel
21c221b520 Improved recipe page / group by fulfillment status 2021-07-11 21:32:24 +02:00
Bernd Bestel
55807bfc94 Auto-compact stock entries (closes #1343) 2021-07-11 21:06:05 +02:00
Bernd Bestel
696e9b3e28 Typo 2021-07-11 19:47:27 +02:00
Bernd Bestel
198216f38b Make it possible to track any information on chore execution (by using Userfields, closes #825) 2021-07-11 19:44:06 +02:00
Bernd Bestel
27b46e1abf Optimized meal plan week navigation 2021-07-11 18:44:04 +02:00
Bernd Bestel
7380175093 Make it possible to mark meal plan entries as done (closes #924) 2021-07-11 18:32:26 +02:00
Bernd Bestel
1ad0360e42 Fixed untranslated string 2021-07-11 10:55:29 +02:00
Bernd Bestel
2503590463 config-dist.php formatting 2021-07-11 10:34:46 +02:00
Bernd Bestel
40e16db01f Fixed consume amount validation when consuming a parent product (fixes #1306)
More a workaround for now, the max constraint is just removed when the product has child products,
but the amount to be consumed is checked by StockService anyway, so should not be a problem...
2021-07-11 10:21:36 +02:00
Bernd Bestel
684aef0a42 Made migration path faster (references #695) 2021-07-11 10:06:31 +02:00
Bernd Bestel
dd9cae5482 Fixed migration path (references #695) 2021-07-11 09:58:39 +02:00
Bernd Bestel
7ee15946c7 Improved page loading time of /recipes and /mealplan when having a big meal plan (closes #695) 2021-07-10 22:56:39 +02:00
Bernd Bestel
6660e1ff73 Fixed mealplan-shadow recipe handling when removing an meal plan entry (references #1391) 2021-07-10 20:51:20 +02:00
Bernd Bestel
2847908523 Some small recipe page adjustments 2021-07-10 20:35:38 +02:00
Bernd Bestel
9b37c450ed Fixed API error when adding missing products to the shopping list from a meal plan entry (references #b0d38b87de) 2021-07-10 19:56:35 +02:00
Bernd Bestel
003aea6047 Removed unnecessary migration (references #1264) 2021-07-10 19:15:17 +02:00
Bernd Bestel
9d1440fb45 Typo... 2021-07-10 18:30:50 +02:00
Bernd Bestel
832d83dfde Fixed indirect QU conversion factors (fixes #1264) 2021-07-10 18:28:19 +02:00
Bernd Bestel
90a0caf1dc Fixed meal plan recipe servings stock fulfillment checking (fixes #1391) 2021-07-10 12:32:29 +02:00
Bernd Bestel
d3c134e13f Fixed nested recipe ingredient amount calculation (fixes #1252) 2021-07-10 11:16:51 +02:00
Bernd Bestel
269ae34db3 Fixed battery_charge_cycles.battery_id data type
Kind of, doesn't really matter for SQLite; doesn't change anything practically
2021-07-10 09:33:10 +02:00
Bernd Bestel
8ff8c1ac5d Made the used grocycode barcode type configurable
DataMatrix reading via Quagga2 doesn't work currently, so default to an supported 1D barcode (=> Code128)
2021-07-09 23:08:47 +02:00
Bernd Bestel
2638bce851 Improve handling of not in-stock but valid manually entered products on the consume and transfer page (references #1429) 2021-07-09 22:16:08 +02:00
Bernd Bestel
72e6ed76bf Fixed an error when adding object and there are no Userfields (references b0d38b87de) 2021-07-09 21:30:35 +02:00
Bernd Bestel
8348438148 Workaround for file upload problem when the file name contains Umlaute (seems to be a Linux only issue, fixes #1382) 2021-07-09 21:23:04 +02:00
Bernd Bestel
338a5016cf Allow cyrillic letters in API filter values (fixes #1296) 2021-07-09 20:23:30 +02:00
Bernd Bestel
11b71e3af2 Issue template update 2021-07-08 20:52:28 +02:00
Bernd Bestel
8c5c12cb47 Added new columns on the stock overview page (closes #1351) 2021-07-08 20:42:07 +02:00
Bernd Bestel
8b977644f7 Added the product descrption as a column on the stock overview page (closes #1362) 2021-07-08 20:22:51 +02:00
Bernd Bestel
7595d640f5 Return empty Userfields empty (closes #1412) 2021-07-08 20:12:58 +02:00
Bernd Bestel
14cd6ca3bf Return numbers as numbers on all API endpoints 2021-07-08 19:34:16 +02:00
Bernd Bestel
633b26bf7e Add recipe ingredient notes to the corresponding shopping list item (closes #1397) 2021-07-06 20:19:50 +02:00
Bernd Bestel
1ead23cb87 Added on option to only show in-stock products on the /products page (closes #1388) 2021-07-06 20:08:02 +02:00
Bernd Bestel
6530d0f9df Clarify that "Group by product group" (printing a shopping list) works only for the list layout type (closes #1405) 2021-07-06 19:48:55 +02:00
Bernd Bestel
135ac118b0 Added a filter for only done items on the /shoppinglist page (closes #1406) 2021-07-06 19:40:26 +02:00
Bernd Bestel
70d51c757b Only show in-stock products on the /consume page (closes #1429) 2021-07-06 19:31:55 +02:00
Bernd Bestel
ffad8bfa7f Make it possible to search on the stock overview page for product barcodes (closes #1443) 2021-07-06 19:25:34 +02:00
Bernd Bestel
ffc5ba013f Added new API things related to #1494 and #1493 to grocy.openapi.json 2021-07-06 19:17:43 +02:00
Bernd Bestel
aaa054e0a5 Also return the next_execution_assigned_user for the /chores API endpoint (closes #1493)
Include the user and category object for the /tasks API endpoint (closes #1494)
2021-07-06 19:07:45 +02:00
Bernd Bestel
54bf7ed659 Produce a schema-valid OpenAPI specification (closes #1457) 2021-07-05 23:23:59 +02:00
Bernd Bestel
6462dd8af6 Removed legacy error suppression 2021-07-05 22:51:02 +02:00
Bernd Bestel
079437384e Use the now available @once directive instead of the legacy hack to only include component scripts once 2021-07-05 22:49:51 +02:00
Bernd Bestel
10fcd9177c Define error reporting 2021-07-05 22:40:01 +02:00
Bernd Bestel
b0d38b87de PHP 8 support 2021-07-05 17:48:34 +02:00
Bernd Bestel
d9470cb377 Added .devtools scripts to package.json 2021-07-05 17:47:47 +02:00
Bernd Bestel
b4ce0555d9 Upgraded/Replaced rubellum/slim-blade-view to support Laravel Blade Templates v8 2021-07-05 17:13:01 +02:00
Bernd Bestel
9ba7ee54a7 Invalidate browser cache on language change 2021-07-04 21:54:58 +02:00
Bernd Bestel
cb24a7149f Revert "Upgraded gettext/gettext (+ JS-Translator)"
This reverts commit 9abb92763d.
2021-07-04 21:47:55 +02:00
Bernd Bestel
9abb92763d Upgraded gettext/gettext (+ JS-Translator) 2021-07-04 21:47:10 +02:00
Bernd Bestel
54d4c90ec4 Upgraded morris/lessql 2021-07-04 20:06:49 +02:00
Bernd Bestel
76037d1f4e Upgraded gumlet/php-image-resize 2021-07-04 20:05:00 +02:00
Bernd Bestel
735743047f Upgraded eluceo/ical 2021-07-04 20:02:04 +02:00
Bernd Bestel
82c474d0ae Allow hyphens in API filter value (fixes #1333) 2021-07-04 17:48:58 +02:00
Bernd Bestel
0dc37fb361 Don't allow a min. stock amount for child products when the parent has "Accumulate sub products min. stock amount" set (references #1409) 2021-07-04 17:36:44 +02:00
Bernd Bestel
734e174442 Fixed the "Add as barcode to existing product" productpicker workflow from the /shoppinglistitem page (fixes #1262) 2021-07-04 15:46:19 +02:00
Bernd Bestel
4086a63ebd Improved tables horizontally scrollbar appearance (fixes #1476) 2021-07-04 15:34:39 +02:00
Bernd Bestel
f2a0b7cded Pulled translations from Transifex 2021-07-04 12:31:17 +02:00
Bernd Bestel
bda40dfbb9 Updated dependencies 2021-07-04 12:26:14 +02:00
Bernd Bestel
fbb0064505 Consider selected QU for calories calculation for "Only check if any amount is in stock" recipe ingredients (fixes #1338) 2021-07-03 20:01:49 +02:00
Bernd Bestel
4b02ac8f35 Fixed shopping list setting initialization (fixes #1344) 2021-07-03 19:43:32 +02:00
Bernd Bestel
47c936e026 Reworked authentication related menu item handling (fixes #1462) 2021-07-03 19:40:42 +02:00
Bernd Bestel
bcf963ac49 Fixed self production amount was wrong for tare weight handling enabled products (fixes #1431) 2021-07-03 18:30:53 +02:00
Bernd Bestel
765ba77621 Fixed shopping list unit/total price QU handling (fixes #1460) 2021-07-03 18:15:30 +02:00
Bernd Bestel
0f88eed08c Upgraded to PHP-CS-Fixer v3 2021-07-03 17:46:47 +02:00
Bernd Bestel
766eae5a7a Remove accidentally committed debug statement 2021-07-02 22:19:54 +02:00
Bernd Bestel
90b8ea15ff Also delete downscaled image files when deleting an image (closes #1499) 2021-07-02 20:50:52 +02:00
Bernd Bestel
34ffb96ae3 Enforce file groups 2021-07-02 20:29:53 +02:00
Bernd Bestel
74d745cfc4 Typo 2021-07-02 20:29:25 +02:00
Bernd Bestel
cc9345136c Use exact search for product filter on /stockjournal and /stockjournalsummary (fixes #1353) 2021-07-02 18:24:08 +02:00
Bernd Bestel
5ba9bbbcd1 Fixed mssing-recipe-ingredients-to-shopping-list checkbox inner-click (fixes #1383) 2021-07-02 18:04:20 +02:00
Bernd Bestel
cae924eb81 Fixed shopping list QU handling (fixes #1385, fixes #1384) 2021-07-02 17:37:06 +02:00
Bernd Bestel
187d48f93d Use stock_log location instead of product location for stock journal (fixes #1381) 2021-07-02 17:04:40 +02:00
Bernd Bestel
9f833b9bd5 Prvent potentially duplicate stock items in drodpown on /consume and /transfer page (fixes #1368) 2021-07-02 16:59:37 +02:00
Bernd Bestel
b856911f0f Browser-cache localization strings (+ new API endpoint to get them) 2021-06-29 20:24:02 +02:00
Bernd Bestel
d18a8d8b56 Added changelog for #1527 2021-06-29 17:43:13 +02:00
André Heuer
416c138017 Added support for Code 39 (#1527) 2021-06-29 17:40:28 +02:00
Bernd Bestel
76cfe7fece Fixed productcard spoil rate (fixes #1319) 2021-06-28 19:43:08 +02:00
Bernd Bestel
7587ead732 Fixed /tasks group by category (fixes #1274) 2021-06-28 19:31:27 +02:00
Bernd Bestel
69f8c237ff Fixed /stockentries group by purchased_date (fixes #1419) 2021-06-28 19:14:15 +02:00
Bernd Bestel
b8e15b990b Typo 2021-06-28 18:39:08 +02:00
Bernd Bestel
35fb87ab1e Squashed commit
Use managed fonts
Include userentities dynamically in grocy.openapi.json for /userfields/{entity}/{objectId} endpoints (closes #1218)
Fixed userfieldsform load / save (for products and recipes) handling (fixes #1302)
Fixed PUT/DELETE /objects/{entity}/{objectId} when the given object id was invalid (fixes #1396)
Allow arrays in HTMLPurifier (fixes #1407)
2021-06-28 17:00:16 +02:00
Bernd Bestel
acb81187d9 Fixed missing shopping_location_id on stock transfer actions (fixes #1408) 2021-06-27 20:55:38 +02:00
Bernd Bestel
5153818b4e Fixed shopping_list_id when adding products from /stockoverview to the shopping list (fixes #1442) 2021-06-27 20:46:21 +02:00
Bernd Bestel
5c3809aa33 Exclude inactive products from recipe ingredient edit page (fixes #1448) 2021-06-27 20:34:18 +02:00
Bernd Bestel
95d212a076 Added missing shopping_list_id for ShoppingListItem in grocy.openapi.json (fixes #1451) 2021-06-27 20:30:05 +02:00
Bernd Bestel
7133c85deb Persist filters on reload (recipe selection change) on the /recipes page (fixes #1455) 2021-06-27 20:28:12 +02:00
Bernd Bestel
7ab59273da Allow links and iframes in HTMLPurifier (fixes #1461) 2021-06-27 20:13:24 +02:00
Bernd Bestel
33ea1e56cf Trigger help-tooltips also by click (instead of only hover, which is Bootstraps default) (fixes #1468) 2021-06-27 19:34:28 +02:00
Bernd Bestel
b7a6b91039 Fixed stock QU change restriction / include undone stock transactions (fixes #1473) 2021-06-27 19:11:45 +02:00
Bernd Bestel
e646dd9332 Fixed barcode QU was not saved for single QU products (fixes #1504) 2021-06-27 19:04:09 +02:00
Bernd Bestel
30e5cc3bc3 Fixed filter clearing on /quantityunits (fixes #1511) 2021-06-27 18:42:15 +02:00
Bernd Bestel
e44f4802d5 Fixed filter clearing on /products (fixes #1512) 2021-06-27 18:41:07 +02:00
Bernd Bestel
9ef48e79cd Remove user request parameter when clearing filter on /choresoverview (fixes #1513) 2021-06-27 18:39:29 +02:00
Bernd Bestel
3acad5056a Fixed inventory action hint when entered amount equals current stock amount (fixes #1522) 2021-06-27 18:37:18 +02:00
Bernd Bestel
44d6173569 Also disable generic consume context menu item on /stockoverview when the item is not in stock (fixes #1523) 2021-06-27 18:34:58 +02:00
Bernd Bestel
9a0cad079c Fixed undoing consume/open from notification on /stockentries (fixes #1524) 2021-06-27 18:32:22 +02:00
Katharina Bogad
f5da53a761 Migrated bootstrap3 col-xs-* to bootstrap4 col-* classes (#1521) 2021-06-24 22:46:47 +02:00
Bernd Bestel
f8fa5db3e7 Fixed multiple datetimepicker contextual timeago (references #1520) 2021-06-24 07:46:32 +02:00
Bernd Bestel
5e189c8a4a Fixed multi instace date/time Userfields (fixes #1520) 2021-06-23 22:13:54 +02:00
Bernd Bestel
9e3c68982b Added changelog for #1380 2021-06-20 13:27:16 +02:00
tank0226
b3ed80d186 Improved support for other LDAP servers (#1380)
Co-authored-by: kuanhong <>
2021-06-20 13:22:18 +02:00
Bernd Bestel
a4f7aac963 Mention newly required PHP extensions in changelog (references #1273) 2021-06-20 13:19:09 +02:00
Bernd Bestel
c45034e6b1 Fixed composer.lock merge conflict (references #1273) 2021-06-18 20:58:51 +02:00
Bernd Bestel
5ad4d9f421 Added changelog for #1273 2021-06-18 20:57:08 +02:00
Marc Ole Bulling
eb135aee39 Add support for printing shoppinglist with thermal printer (#1273)
* Added escpos-php library

* Added button to shoppinglist print menu

* Added to translation

* Added basic printing logic and API call

* Working implementation for printing with the API

* Added openapi json

* Correctly parsing boolean parameter

* Working button in UI

* Change to grocy formatting

* Add Date

* Only show thermal print button when Feature Flag is set

* Fixed API call and added error message parsing

* Undo translation

* Add flag to print quantities as well

* Added printing notes

* Added quantity conversion

* Increse feed

* Fixed that checkbox was undefined, as dialog was already closed

* Added padding

* Formatting

* Added note about user permission

* Fixed error when using notes instead of products

* Review

- Default FEATURE_FLAG_THERMAL_PRINTER to disabled
- Added missing localization strings (and slightly adjusted one)

* Fixed merge conflicts

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-06-18 20:45:42 +02:00
Bernd Bestel
fe59fac1c3 Fixed client side webhook runner (references #1500) 2021-06-13 08:40:16 +02:00
Bernd Bestel
26979a4321 Set HTMLPurifier cache path (fixes #1497) 2021-06-12 20:56:58 +02:00
Kendell R
a0e5f45da3 More night mode improvements (#1336)
* More night mode improvements

* Update grocy_night_mode.css

* Update extensions.js

* Update grocy_night_mode.css

* Update public/css/grocy_night_mode.css
2021-06-12 20:39:08 +02:00
Bernd Bestel
739379fabb Fixed stock entry grocycode download (references #1500) 2021-06-12 20:15:48 +02:00
Bernd Bestel
96fff2e5f4 Added changelog for #1500 2021-06-12 17:21:48 +02:00
Katharina Bogad
2471e78188 Grocycode, label printing (#1500)
* Grocycode: Productpicker, StockService

* Grocycode: Datamatrix generation

* Grocycode: Display in UI, make Images downloadable

* Grocycode: Do not show on product card

* Grocycode: Stockentry Label view

* Grocycode: Webhooks & Labelprinter Feature

* Grocycode: Manual Label printing

* Grocycode: Print Label from product form

* Quagga2: use zxing for DataMatrix recognition

* Grocycode: Default settings for label printing

* Prepare merge of master

* Grocycode: docs

* Docs: label printing webhook

* Review

- "grocy" is currently written lower-case everywhere, so let's do this also for "grocycode"
- Unified phrases / capitalization
- Minor UI adjustments (mainly context menu item ordering / ordering/spacing on product edit page)
- Documented API changes for Swagger UI (grocy.openapi.json)
- Reverted German localizations (those are managed via Transifex; would cause conflicts when manually edited - will import them later there)
- Reverted a somehow messed up localization string (productform/help text for `cumulate_min_stock_amount_of_sub_products`)
- Suppress deprecation warnings when generating Datamatrix PNG (otherwise the PNG is invalid, https://github.com/jucksearm/php-barcode/issues/3)
- Default `FEATURE_FLAG_LABELPRINTER` to disabled

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-06-12 17:21:12 +02:00
Bernd Bestel
d23fda245e Fixed that the number picker up/down buttons did not work when the input field was empty or contained an invalid number 2021-03-31 22:26:27 +02:00
Bernd Bestel
791a17fcad Default shopping list item amount to 1 2021-03-31 22:22:28 +02:00
Bernd Bestel
dabc48fed3 Typo 2021-03-31 22:15:41 +02:00
rozgonik
980778e599 Fix untranslateable hint values (#1435) 2021-03-31 22:14:42 +02:00
Kai
68c5fd0617 Update README.md (#1432) 2021-03-31 22:14:05 +02:00
Edward Betts
7bbcec91aa Correct spelling (#1420) 2021-03-31 22:12:51 +02:00
Bernd Bestel
c483c34598 Display calories always per single serving (fixes #1359) 2021-02-21 20:57:34 +01:00
Bernd Bestel
906a9db628 Fixed embedded /transfer from /stockentries (fixes #1303) 2021-02-21 19:36:37 +01:00
Bernd Bestel
5583074001 Don't initialise numeric Userfields with 1.0 (fixes #1312) 2021-02-21 19:14:49 +01:00
Bernd Bestel
e4c8f6b023 Don't require 1 to be in stock for "Only check if any amount is in stock" 2021-02-21 19:10:10 +01:00
Bernd Bestel
4555bf3b63 Enforce product barcodes to be unique (references #1205) 2021-02-21 18:55:48 +01:00
Bernd Bestel
2aca551692 Fixed product page QU conversion hint pluralisation (fixes #1352) 2021-02-21 18:24:04 +01:00
Bernd Bestel
f5eff8ab49 Include due_type = "Expiration date" products in /stock/volatile API endpoint (fixes #1372) 2021-02-21 18:18:34 +01:00
Bernd Bestel
36f5fb23e9 Added changelog for #1347 2021-02-21 18:13:16 +01:00
Lauri Niskanen
33dcd17fbd Fix rounding error on total value calculation (#1347)
* Fix rounding error on total value calculation

* Remove unused 'amountSum' calculation
2021-02-21 18:10:41 +01:00
Bernd Bestel
3d82c9abbd Disabled platform-check (references #1285) 2021-02-18 12:14:57 +01:00
Bernd Bestel
779ac31ffe Added changelog for #1332 2021-02-14 12:56:21 +01:00
Lauri Niskanen
0a6c7d73a7 Hide unsuitable fields from printed recipe pages (#1332)
* Hide unsuitable fields from printed recipe pages

Resolves #1330.

* Use proper total energy label in the recipe page
2021-02-14 12:55:01 +01:00
Bernd Bestel
fc05044353 Added changelog for #1331 2021-02-14 12:51:40 +01:00
Kendell R
55ac768521 Night mode improvements (#1331)
* Night mode readability improvements

* Update grocy_night_mode.css

* Update grocy_night_mode.css
2021-02-14 12:49:44 +01:00
Bernd Bestel
a455a01204 Fixed print layout display handling (fixes #1272) 2021-01-30 13:11:40 +01:00
Bernd Bestel
8b963ae0f1 Merge branch 'master' of https://github.com/grocy/grocy 2021-01-30 13:07:16 +01:00
Bernd Bestel
a1adc80c29 Fixed consuming Scan Mode timing (fixes #1292) 2021-01-30 13:06:44 +01:00
Marius Boro
760914bf82 Update grocy_night_mode.css (#1269)
Night mode updates for Grocy 3
2021-01-30 12:49:51 +01:00
Bernd Bestel
42689ecefe Added changelog for #1297 2021-01-30 12:49:17 +01:00
Marc Ole Bulling
c889416c0a Fix for #1289 and #1261 (#1297) 2021-01-30 12:47:12 +01:00
Bernd Bestel
bfb5525ec1 Added changelog for #1286 2021-01-30 12:41:09 +01:00
Marc Ole Bulling
20380faeb3 Fix for #1271 (#1286) 2021-01-30 12:39:10 +01:00
Bernd Bestel
5ecd3a585e Added changelog for #1269 2021-01-12 18:14:32 +01:00
Bernd Bestel
bfa3347a20 Fixed that editing stock entries was not possible (fixes #1268) 2021-01-12 18:04:20 +01:00
Bernd Bestel
e42f4b405d Fixed PHP warning (fixes #1267) 2021-01-12 10:40:14 +01:00
Bernd Bestel
27169e1428 Fixed constant typo (fixes #1260) 2021-01-06 09:31:36 +01:00
Bernd Bestel
4a4d9c451f Prepared next release 2021-01-05 10:54:32 +01:00
Bernd Bestel
ced709bbf9 Auto create the data/viewcache folder if it doesn't exist (however) 2021-01-05 10:52:23 +01:00
Bernd Bestel
4a8d4120e1 Updated dependencies 2021-01-05 10:48:28 +01:00
Bernd Bestel
8f877dc716 Pulled translations from Transifex 2021-01-05 10:45:09 +01:00
Bernd Bestel
45abc99a77 Use barcode amounts also for Consume/Transfer/Inventory (closes #1254) 2021-01-04 21:59:19 +01:00
Bernd Bestel
d78e156609 Use barcode defaults also for scan mode (fixes #1253) 2021-01-04 21:15:22 +01:00
Bernd Bestel
030939e013 Typo 2021-01-03 22:42:16 +01:00
Bernd Bestel
a646f2c6bd Fixed included recipe missing amount resolving (references #1252) 2021-01-03 22:40:33 +01:00
Bernd Bestel
4e1531e4ee Merge branch 'master' of https://github.com/grocy/grocy 2021-01-03 22:26:24 +01:00
Bernd Bestel
7d07b382fd Fixed included recipe amount resolving (fixes #1252) 2021-01-03 22:26:08 +01:00
Bernd Bestel
621bbf79ab Update issue templates 2021-01-03 17:42:31 +01:00
Bernd Bestel
65f0253307 Fixed product form min tare weight 2021-01-03 16:22:58 +01:00
Bernd Bestel
fdeb4fd4d7 Validate product form once presets are prefilled (fixes #1250) 2021-01-03 16:22:35 +01:00
Bernd Bestel
97fdb0553c Fixed shopping list to stock worfklow skip button (fixes #1248) 2021-01-02 20:54:31 +01:00
Bernd Bestel
bd21e3a8d6 Don't filter ampersands (fixes #1247) 2021-01-02 20:08:13 +01:00
Bernd Bestel
966211b71a Fixed shopping list product userfields (fixes #1246) 2021-01-02 17:30:28 +01:00
Bernd Bestel
fe665ac766 Fixed potential problem mentioned in https://github.com/grocy/grocy/issues/882#issuecomment-753357049 2021-01-01 20:00:24 +01:00
Bernd Bestel
43ef9b793b Fixed chore form weekly day selection labels (fixes #1242) 2021-01-01 14:31:49 +01:00
Bernd Bestel
8c0ff04caa Fixed consume stock amount check for product substitution (fixes #1240) 2021-01-01 13:27:57 +01:00
Bernd Bestel
c57e554369 Updated changelog 2020-12-31 13:52:09 +01:00
Bernd Bestel
c65f375a68 Only change the current number input by arrow keys (fixes #1232) 2020-12-31 13:48:36 +01:00
Bernd Bestel
1459f8c441 Prevent form submit when any combobox-dropdown is open (fixes #1236) 2020-12-31 13:45:14 +01:00
Bernd Bestel
1e27f6c127 Fixed product opening success message (fixes #1237) 2020-12-31 13:11:51 +01:00
Bernd Bestel
97b93f23bd Fixed/unified shopping list item button tooltips (fixes #1239) 2020-12-31 13:09:55 +01:00
Bernd Bestel
5cd3fb092a Improved initial DataTables sorting (fixes #1235) 2020-12-30 13:55:01 +01:00
Bernd Bestel
200964edff Use numberpicker up/down buttons for up/down keys (fixes #1232) 2020-12-30 08:29:11 +01:00
Bernd Bestel
17a4d04053 Fixed store picker validation (fixes #1233) 2020-12-30 08:22:43 +01:00
Bernd Bestel
d79adc4660 Optimized embedded productpicker workflows (references #1226) 2020-12-29 21:18:51 +01:00
Bernd Bestel
9f1692e31f Improved shopping list item form validation (closes #1226) 2020-12-29 21:06:31 +01:00
Bernd Bestel
d9e42331f9 Allow some HTML tags in API request body (needed at least for HTML editor fields) (fixes #1228) 2020-12-29 19:19:04 +01:00
Bernd Bestel
87754830f7 Fix initial consume form validation (fixes #1230) 2020-12-29 18:11:45 +01:00
Bernd Bestel
278a5f004a Fix consuming when FEATURE_FLAG_STOCK_LOCATION_TRACKING is disabled (fixes #1229) 2020-12-29 18:06:56 +01:00
Bernd Bestel
b6139a6991 Optimized filter_var checks 2020-12-28 22:14:59 +01:00
Bernd Bestel
6263715c53 Fixed shopping list item form load handling (fixes #1222) 2020-12-28 19:59:18 +01:00
Bernd Bestel
b7349e287e Added changelog for #1223 2020-12-28 19:40:52 +01:00
Marc Ole Bulling
7e8f460dad Added /system/time API call (#1223)
* Inital structure for /system/time API call

* Parse arguments for offset

* Correctly parsing parameters

* Fixed implimentation, added to openapi.json

* Modified DOC

* Added Sqlite3 time to output

* Fixed error with negative offset

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-12-28 19:39:24 +01:00
Bernd Bestel
6fcc0636e8 Optimized textarea heights 2020-12-27 09:38:31 +01:00
Bernd Bestel
447b86b27f Merge branch 'master' of https://github.com/grocy/grocy 2020-12-24 15:07:31 +01:00
Bernd Bestel
590cbd2460 Support indirect QU conversions (fixes #1217) 2020-12-24 15:07:04 +01:00
Bernd Bestel
d8069c569e Typo... 2020-12-24 10:01:58 +01:00
Bernd Bestel
4766c81580 Allow API keys in ReverseProxyAuthMiddleware (closes #1216) 2020-12-24 10:00:51 +01:00
Bernd Bestel
2e3c237648 Fixed zero decimals handling (fixes #1213) 2020-12-23 19:56:37 +01:00
Bernd Bestel
bd185cfa32 Added changelog for #1215 2020-12-23 17:38:43 +01:00
Marc Ole Bulling
80acc7deea Added configuration validator class (#1215)
* Added configuration validator class

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-12-23 17:37:05 +01:00
Bernd Bestel
2f8207ab5f Fixed (again) purchase success message when FEATURE_FLAG_STOCK_PRICE_TRACKING is disabled (references #1214) 2020-12-23 15:58:05 +01:00
Bernd Bestel
c9f40782de Update SQLite requirement info (references #1209) 2020-12-23 14:56:10 +01:00
Bernd Bestel
904848d09a Fixed purchase success message when FEATURE_FLAG_STOCK_PRICE_TRACKING is disabled (fixes #1214) 2020-12-23 14:37:02 +01:00
Bernd Bestel
97b95803b8 Fix potential problem (again) when running/upgrading grocy v3.0.0 with SQLite > 3.8.3 < 3.9.0 (references #1209) 2020-12-23 11:54:39 +01:00
Bernd Bestel
f1efd08bc6 Raise minimum/tested runtime requirements (references #1209) 2020-12-22 21:54:49 +01:00
Bernd Bestel
5f09d4def1 Fix potential problem when running/upgrading grocy v3.0.0 with SQLite > 3.8.3 < 3.9.0 (references #1209) 2020-12-22 21:19:55 +01:00
Bernd Bestel
cf05be35fe Fix default for product option "Never show on stock overview" (fixes #1212) 2020-12-22 19:10:02 +01:00
Bernd Bestel
937bd6b702 Fixed camera scanning targets (fixes #1210) 2020-12-22 19:06:41 +01:00
Bernd Bestel
159ab253dd Fixed typo 2020-12-22 17:02:21 +01:00
Bernd Bestel
b42bcaaa44 Hide price decimals setting when FEATURE_FLAG_STOCK_PRICE_TRACKING is disabled 2020-12-22 16:24:13 +01:00
Bernd Bestel
2afa0c304d Merge remote-tracking branch 'remotes/origin/release' 2020-12-22 15:20:58 +01:00
Bernd Bestel
affe7de842 Fixed typo (references #1208) 2020-12-22 15:16:16 +01:00
Bernd Bestel
c54ae89212 Added changelog for #1208 2020-12-22 15:11:24 +01:00
Marc Ole Bulling
7ba48d5160 Added ctype requirement to PrerequisiteChecker (#1208) 2020-12-22 15:07:34 +01:00
Bernd Bestel
9d76859469 Added a note about that's better to have a valid currency code set in config.php (references #1206) 2020-12-22 12:27:30 +01:00
Bernd Bestel
e3504464e5 Don't enforce barcodes to be unique (fixes #1205) 2020-12-22 11:32:26 +01:00
Bernd Bestel
94e4ee0659 Pulled translations from Transifex 2020-12-22 10:31:06 +01:00
Bernd Bestel
f1ddd4a57e Fixed JS error 2020-12-22 10:23:26 +01:00
Bernd Bestel
5c8ed05f68 Use dynamic barcode types (references #1133) 2020-12-22 10:20:31 +01:00
Bernd Bestel
a333ccbb78 Optimizes demo data 2020-12-22 10:12:37 +01:00
Bernd Bestel
00c8934046 Use better confirm dialog 2020-12-22 10:05:06 +01:00
Bernd Bestel
efb5f97ed4 Optimized README formatting 2020-12-22 09:58:36 +01:00
Bernd Bestel
ab29233f07 Added a head line on the shopping list print options dialog 2020-12-21 21:42:21 +01:00
Bernd Bestel
c1dd145b81 Clarified that database migrations are supposed to work between releases 2020-12-21 21:29:52 +01:00
Bernd Bestel
c1ac9e8a45 Optimized/clarified new "Hide product from stock overview" option (references #906) 2020-12-21 20:43:10 +01:00
Bernd Bestel
694b78f72a Optimized GROCY_FEATURE_FLAG_STOCK handling (closes #966) 2020-12-21 20:13:49 +01:00
Bernd Bestel
7478d9bb38 Removed RTL CSS handling (not needed until we have full RTL support) 2020-12-21 19:36:20 +01:00
Bernd Bestel
e866035f05 Removed unused code 2020-12-21 19:27:04 +01:00
Bernd Bestel
cf299a3d0b Optimized file save/delete handling 2020-12-21 19:16:14 +01:00
Bernd Bestel
5953e42d70 Updated icons 2020-12-21 19:04:48 +01:00
Bernd Bestel
d83271655c Fixed purchase success message amount 2020-12-21 18:27:12 +01:00
Bernd Bestel
bb5bcb9cbe Changelog wording 2020-12-21 18:09:03 +01:00
Bernd Bestel
431a2ab9f7 Added new Userfield type "Link (with title)" (closes #790) 2020-12-21 17:57:48 +01:00
Bernd Bestel
e97fccd03a Optimized shopping list header 2020-12-21 16:29:39 +01:00
Bernd Bestel
f0d99a5714 Fixed API key deletion was not possible (fixes #1203) 2020-12-21 16:20:12 +01:00
Bernd Bestel
e62994eb4a Fixed not required field initialization when GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING is disabled (references #1202 ) 2020-12-21 10:52:40 +01:00
Bernd Bestel
01306bc1ae Fixed product barcodes table display when FEATURE_FLAG_STOCK_PRICE_TRACKING is disabled (fixes #1202) 2020-12-21 09:54:20 +01:00
Bernd Bestel
360f25ec44 Make the new user picture a little bigger (references #1158) 2020-12-21 09:49:40 +01:00
Bernd Bestel
3b1f8cba70 Moved the new copy/merge products buttons in a dropdown menu 2020-12-21 09:30:19 +01:00
Bernd Bestel
2b13102299 Implemented Userfields for users (closes #1159) 2020-12-20 22:16:58 +01:00
Bernd Bestel
8f1ce607f7 Implemented user pictures (closes #1158) 2020-12-20 22:08:50 +01:00
Bernd Bestel
3f718eab60 Remove accidentally added localization strings 2020-12-20 21:00:48 +01:00
Bernd Bestel
c9b5e14473 Make it possible to merge products (closes #243) 2020-12-20 20:58:22 +01:00
Bernd Bestel
dadf93a94c Merge used libraries for Barcode/QR-Code generation 2020-12-20 19:53:28 +01:00
Bernd Bestel
1d16021404 Show barcode as barcode-image on shopping list (closes #1133) 2020-12-20 19:31:12 +01:00
Bernd Bestel
b2f555400c Fixed database migration error handling
(Error page was not shown properly)
2020-12-20 16:52:13 +01:00
Robert Resch
6ec3743d12 fix missing > (#1201) 2020-12-20 16:02:33 +01:00
Bernd Bestel
df7653f4e5 Optimized barcode concatenation handling 2020-12-20 16:00:14 +01:00
Bernd Bestel
3fb55b706b Refresh chore-/batterycard after tracking 2020-12-20 15:04:46 +01:00
Bernd Bestel
6eaee0c6f9 Fixed number display for quick consume buttons 2020-12-20 15:02:22 +01:00
Bernd Bestel
580598b817 Fixed max consume amount was not set 2020-12-20 15:01:59 +01:00
Bernd Bestel
a5326aa95c Improve API stock action endpoint response (closes #769) 2020-12-20 14:43:07 +01:00
Bernd Bestel
cef3086a63 Pulled translations from Transifex 2020-12-20 13:03:06 +01:00
Bernd Bestel
b2d7003335 Performance optimizations 2020-12-20 10:44:19 +01:00
Bernd Bestel
76e4a1578c Added Default store as a column to the shopping list (closes #957) 2020-12-20 10:26:02 +01:00
Bernd Bestel
268b8e87d7 Make it possible to hide chores/batteries (closes #1069) 2020-12-20 10:19:44 +01:00
Bernd Bestel
31dbb95c58 Typo 2020-12-20 00:04:44 +01:00
Bernd Bestel
832141a718 Made the shopping list print view configurable (closes #740) 2020-12-19 23:57:33 +01:00
Bernd Bestel
77e842a736 Fixed shopping list print button when FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS was disabled (references #1199) 2020-12-19 23:00:07 +01:00
Bernd Bestel
f5e0709913 Added columns for last price on shopping list (closes #410) 2020-12-19 17:55:49 +01:00
Bernd Bestel
7f24ffc484 Clarify string 2020-12-19 17:38:04 +01:00
Bernd Bestel
250b308d5d Support -1 for "Default due days after freezing" (closes #846) 2020-12-19 17:32:47 +01:00
Bernd Bestel
362b3f8508 Added min. stock amount column to stock overview (closes #856) 2020-12-19 17:25:13 +01:00
Bernd Bestel
3ad5f2cac5 Added a note field to product barcodes (closes #962) 2020-12-19 17:20:54 +01:00
Bernd Bestel
5421dfb6b2 Make the chore assignment type "Random" more random (closes #674) 2020-12-19 17:15:18 +01:00
Bernd Bestel
9d7ca55109 Typo 2020-12-19 17:09:48 +01:00
Bernd Bestel
1b864f990b Updated screenshots 2020-12-19 17:08:08 +01:00
Bernd Bestel
17d0821bae Typo 2020-12-19 15:42:39 +01:00
Bernd Bestel
cd57b00a18 Prepared next release 2020-12-19 15:32:32 +01:00
Bernd Bestel
1da51cde67 Reviewed config-dist.php 2020-12-19 15:00:31 +01:00
Bernd Bestel
063e4c214b Reviewed README 2020-12-19 14:53:51 +01:00
Bernd Bestel
ea888fffb7 Updated unmanaged dependencies 2020-12-19 14:28:32 +01:00
Bernd Bestel
796e35d60b Removed unneeded dependency 2020-12-19 14:19:26 +01:00
Bernd Bestel
b53f3bcef1 Updated dependencies 2020-12-19 14:18:01 +01:00
Bernd Bestel
574d17fa52 General UI review/test 2020-12-19 14:03:28 +01:00
Bernd Bestel
7ef5bc6f77 Add some more columns (hidden by default) (references https://github.com/grocy/grocy/issues/1058#issuecomment-744059155) 2020-12-19 10:51:07 +01:00
Bernd Bestel
eb4a748da3 Consume opened products first (closes #1183) 2020-12-19 10:28:35 +01:00
Bernd Bestel
44cdd42062 he_IL localization can't be released before #984 is done 2020-12-17 17:42:27 +01:00
Bernd Bestel
cc2ea93313 Make DataTable row groups collapsible everywhere (references #1189) 2020-12-17 17:41:31 +01:00
Bernd Bestel
b5fc64cf5d Fixed DataTables numeric/datetime sorting (fixes #1085) 2020-12-17 17:33:24 +01:00
Bernd Bestel
bbad049880 Forgot to save... 2020-12-17 16:54:26 +01:00
Bernd Bestel
9572652a8a Fixed total price for tare weight handling enabled products (fixes #1196) 2020-12-17 16:50:15 +01:00
Bernd Bestel
bb6ef5511d Fixed API equals/not equals filter comparison (fixes #1182) 2020-12-16 21:52:24 +01:00
Bernd Bestel
13b18ef410 Removed unused localization string 2020-12-16 21:40:12 +01:00
Bernd Bestel
0bd9a1dc4b Added changelog for #1189 2020-12-16 18:21:21 +01:00
Robert Resch
07ff28da39 Add row group customization (#1189)
* Add row group customization

* fix rowGroup state loading

* activate rowGroup for all datatables

* add reset button

* reload page done on success callback

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-12-16 18:18:03 +01:00
Bernd Bestel
d9a3c5169e Fixed product copy source / default value prefilling handling (fixes #1179) 2020-12-16 17:51:05 +01:00
Bernd Bestel
1567b9d9d9 Added missing localization strings 2020-12-16 17:48:30 +01:00
Bernd Bestel
25f5f98b75 Fixed undoing a consume transaction of an opened item added it back to stock unopened (fixes #1191) 2020-12-16 17:44:51 +01:00
Bernd Bestel
2e01ecbe58 Enforce product nesting level also for the API 2020-12-16 17:37:44 +01:00
Bernd Bestel
4c7318acd7 Added changelog for #1190 2020-12-16 17:28:39 +01:00
PhyberApex
596a7ccd36 Removing of resize event (#1190)
* Removing of resize event

Hey,

I removed that resize event as it get's thrown every time you scroll on a mobile device. Which prevented me from actually viewing the list view of the calender on mobile devices.

Let me know if you think it is still needed tho!

~Cheers

* Update calendar.js

Now it only get's called once :)

* Update mealplan.js

Same thing here as in calendar.js

* Update calendar.js

Removed redundant variable
2020-12-16 17:26:39 +01:00
Dominic Zedler
54e4d3217c Correct typo in changelog (#1177) 2020-12-12 15:52:44 +01:00
Bernd Bestel
bfbaa7e9d5 Expose stock and stock_current_locations also via generic entity interaction API endpoints (no edit) (closes #1147) 2020-12-12 10:59:36 +01:00
Bernd Bestel
59aad1c180 Added REGEXP operator for API query filter (closes #1174) 2020-12-12 10:44:27 +01:00
Bernd Bestel
d3883ba93a Reorganized API exposed entities 2020-12-12 10:10:21 +01:00
Bernd Bestel
f07a21b00b Added missing API query filter info 2020-12-11 19:36:29 +01:00
Bernd Bestel
51a95814e0 Handle null in API filter (closes #1173) 2020-12-11 19:32:08 +01:00
dependabot[bot]
24c9f31caf Bump ini from 1.3.5 to 1.3.7 (#1172)
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-11 18:18:44 +01:00
Bernd Bestel
672c4d33bf Added basic RTL support (reference #984) 2020-12-11 18:06:32 +01:00
Bernd Bestel
9e824a7afc Pulled translations from Transifex 2020-12-11 17:41:55 +01:00
Bernd Bestel
4b1766ead0 Return default user setting if not configured for API endpoint /user/settings/{settingKey} (fixes #1169) 2020-12-10 18:02:24 +01:00
Bernd Bestel
48aa9fd138 Added an API endpoint to get the authenticated user (closes #1165) 2020-12-09 21:16:49 +01:00
Bernd Bestel
fda8411ab3 Support descending ordering in generic API filter (closes #1167) 2020-12-09 21:04:04 +01:00
Bernd Bestel
19802bc122 Fixed localization string 2020-12-07 19:55:31 +01:00
Bernd Bestel
cf34df5e3f Squashed commit
Fixed some localization strings
Reviewed/optimized product deletion handling
Add option to hide products from the stock overview page (closes #906)
Prefill default_due_days also on the inventory page (closes #591)
Added DataTables accent chinese-string plugin (closes #872)
Show costs and calories per recipe ingredient (closes #1072)
Fixed user permission saving (fixes #1099)
User permissions should not have an effect for demo mode (closes #972)
Handle QU conversion when consuming a substituation (child) product (fixes #1118)
Consume/open any child product when the parent product is not in stock (closes #899)
Added a retry camera barcode scanning button to product picker workflow (closes #736)
2020-12-07 19:48:33 +01:00
Bernd Bestel
2bdb6ab2d4 Use the products "Quick consume amount" optionally also on the consume page (closes #1148) 2020-12-04 18:16:58 +01:00
Bernd Bestel
8ec7e9923c Fixed productcard aggregated amount was in wrong line 2020-11-19 18:41:09 +01:00
Bernd Bestel
166748788b Added an include_sub_products parameter to the API endpoint /stock/products/{productId}/locations 2020-11-19 18:37:16 +01:00
Bernd Bestel
211239a5d3 Fixed /stock/products/{productId}/entries endpoint query parameter include_sub_products did not work (however) 2020-11-19 18:28:16 +01:00
Bernd Bestel
631831e1e4 Use custom demo DB path suffix also for storage (references #395) 2020-11-19 12:24:26 +01:00
Bernd Bestel
f9d566c55c Support custom DB path suffixes for demo mode (closes #395) 2020-11-18 19:42:05 +01:00
Bernd Bestel
bbdc372dcf Use total price for product_barcodes.last_price (references #1131) 2020-11-17 22:06:52 +01:00
Bernd Bestel
2b4d8a7cc5 Load userobject forms in dialogs 2020-11-17 21:18:05 +01:00
Bernd Bestel
639ffe13f5 Reverted 41067b23bb because that's not needed (references #1049 and #958) 2020-11-17 21:10:26 +01:00
Bernd Bestel
7ef970a09f Forgot to save... 2020-11-17 21:05:55 +01:00
Bernd Bestel
604629ed5e Added a button to download equipment instruction manuals (closes #833) 2020-11-17 21:01:45 +01:00
Bernd Bestel
d2d09cf928 Removed dragscroll dependency (fixes #1135, references #1115) 2020-11-17 20:50:04 +01:00
Bernd Bestel
e32d12699e Properly initialize sort_number on the Userfield edit form (references #1134) 2020-11-17 20:28:26 +01:00
Bernd Bestel
5634abed82 Use transactions for database migrations 2020-11-17 20:22:38 +01:00
Bernd Bestel
6270f39688 Make Userfields reorderable (closes #1134) 2020-11-17 20:12:45 +01:00
Bernd Bestel
887526c727 Squashed commit
Fixed number input min/max amount handling
Only (auto) save valid user inputs
More filters on the stock journal pages
Save the last price per used barcode and preselect that as a total price on purchase if not empty (closes #1131)
Don't apply conversions for only_check_single_unit_in_stock ingredients (fixes #1120)
Render shopping list userfields (closes #1052)
Fixed Focus when adding included recipes (closes #1019)
Order all base objects with NOCASE (closes #1086)
2020-11-17 19:11:02 +01:00
Bernd Bestel
1316c1f25f Don't colorize validated custom checkboxes/radios 2020-11-16 22:33:24 +01:00
Bernd Bestel
8733ae17e7 Forgot to save before last commit... 2020-11-16 22:30:51 +01:00
Bernd Bestel
512ef745da Don't expose uihelper views via the API / allow to get stock_log via generic entity interaction endpoints (no edit) 2020-11-16 22:18:37 +01:00
Bernd Bestel
e85b21384f Remove "Allow partial units in stock" product option / unify number input validation messages 2020-11-16 17:10:41 +01:00
Bernd Bestel
95fc6a6faa Fixed RefreshLocaleNumberInput 2020-11-15 23:03:12 +01:00
Bernd Bestel
7b4edf3147 Adapt shopping list add expired products for #851 2020-11-15 22:38:21 +01:00
Bernd Bestel
1bbd7787d8 More proper number formatting 2020-11-15 22:29:47 +01:00
Bernd Bestel
293880c874 Typo 2020-11-15 20:30:50 +01:00
Bernd Bestel
948bf0a9c4 Removed unused localization string 2020-11-15 20:08:45 +01:00
Bernd Bestel
c62fa8c203 Changelog formatting fixes 2020-11-15 20:05:10 +01:00
Bernd Bestel
b393998601 Distinguish expiry/best before dates (closes #851) 2020-11-15 19:53:44 +01:00
Bernd Bestel
1d50d5dd22 Rmove unique constraint on tasks.name (closes #1001) 2020-11-15 16:19:55 +01:00
Bernd Bestel
9a7196b761 Make it possible to copy products (closes #571) 2020-11-15 16:05:25 +01:00
Bernd Bestel
7d7f9bf07a Changed default label of dialog close button 2020-11-15 15:28:50 +01:00
Bernd Bestel
3fc3bdd34c Make the help icons a little not so prominent 2020-11-15 15:23:47 +01:00
Bernd Bestel
6eef19dfc6 Fixed DataTables state load when there are no settings saved 2020-11-15 15:20:50 +01:00
Bernd Bestel
9942a2dbab Use new style also on the login page 2020-11-15 15:17:13 +01:00
Bernd Bestel
3568fd9dcb Added a "error info copy & paste" text box on the 500 error page 2020-11-15 15:12:15 +01:00
Bernd Bestel
22e9e4e311 Forgot to save... 2020-11-15 14:59:54 +01:00
Bernd Bestel
dd8fa5ff66 Save DataTable states server side 2020-11-15 14:58:35 +01:00
Bernd Bestel
6866109b97 Add clear filter button to stock entries page + mobile view optimizations (this now closes #1129) 2020-11-15 14:48:48 +01:00
Bernd Bestel
7bf973dd32 Fix stock entries page dropdown menu overflow (references #1129) 2020-11-15 14:30:00 +01:00
Bernd Bestel
4b342dbd43 Improved number input initial value decimal handling 2020-11-15 14:15:09 +01:00
Bernd Bestel
1d1642b464 Make the quick consume buttons on the stock overview page configurable per product (closes #613) 2020-11-15 09:57:45 +01:00
Bernd Bestel
17ae7e3d0c Added a tooltip what scan mode is 2020-11-15 09:27:07 +01:00
Bernd Bestel
3b73df57e5 Unify tooltips 2020-11-15 09:22:05 +01:00
Bernd Bestel
185627af7d Fixed table filters 2020-11-15 09:21:54 +01:00
Bernd Bestel
d1846b76ff Fixed parent product selection (fixes #1128) 2020-11-15 09:12:14 +01:00
Bernd Bestel
f85b89d4fa Show a warning on purchase when purchased best before date is < in stock (closes #948) 2020-11-14 23:15:34 +01:00
Bernd Bestel
db5c9ce3e8 stockentryform amount doesn't need to handle tare weight 2020-11-14 22:54:29 +01:00
Bernd Bestel
28276191cc Don't allow tare weight handling enabled products to be opened (closes #770) 2020-11-14 22:51:06 +01:00
Bernd Bestel
62c9c285ba Document API changes in grocy.openapi.json (closes #969) 2020-11-14 21:26:16 +01:00
fipwmaqzufheoxq92ebc
491b74efa8 Fix is_aggregate_amount always 0 on stock_current (#1127)
* Fix is_aggregate_amount always 0

* Restore performance indexes from #927

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-11-14 16:41:45 +01:00
Bernd Bestel
1d6e279b07 Added missing changelog (references #801) 2020-11-14 12:44:50 +01:00
Bernd Bestel
6e867cafbd Unify/remove used icons 2020-11-14 11:59:49 +01:00
Bernd Bestel
bb985c09ba Fixed purchase/inventory embedded mode initial input focus handling 2020-11-14 11:53:35 +01:00
Bernd Bestel
1fbda392c2 Fixed product edit page returnto handling 2020-11-14 11:49:46 +01:00
Bernd Bestel
c00411da81 Prevent qu_id_stock change after first purchase also via a trigger (for the API) (references #801) 2020-11-14 11:37:01 +01:00
Bernd Bestel
62997d39bc Removde the /objects/{entity}/search API endpoint, added the new filter capabilities to /objects/{entity} (references #985) 2020-11-14 11:27:13 +01:00
Bernd Bestel
16b17b25a4 Reordered input fields 2020-11-14 11:07:36 +01:00
Bernd Bestel
b267295e86 Fixed product picker workflows 2020-11-14 11:05:36 +01:00
Bernd Bestel
71f6b38cb2 Fixed chore edit page QU hint 2020-11-13 19:03:25 +01:00
Bernd Bestel
c45e5d1794 Trigger cascade_change_qu_id_stock is not longer needed 2020-11-13 19:01:01 +01:00
Bernd Bestel
ed2239c1f6 Wording correction 2020-11-13 17:58:46 +01:00
Bernd Bestel
96b86c230c Use sensible decimal amounts 2020-11-13 17:45:09 +01:00
Bernd Bestel
42f70b04e7 Also show the price hint for single unit prices when purchase QU != stock QU 2020-11-13 17:43:28 +01:00
Bernd Bestel
b0b3322266 Also relate the shopping list amount to QU stock 2020-11-13 17:30:57 +01:00
Bernd Bestel
ab68a51ba7 Recipe edit page fixes 2020-11-13 15:46:44 +01:00
Bernd Bestel
fa3a4ed688 Fixed productamountpicker initial converted amount was undefined 2020-11-12 22:47:00 +01:00
Bernd Bestel
1056252117 Typo 2020-11-12 21:41:21 +01:00
Bernd Bestel
c360cbec4c UI strings/tooltips/basic handling review/optimizations 2020-11-12 21:35:10 +01:00
Bernd Bestel
c121c0483a Fixed missing error message when trying to create a duplicate product 2020-11-12 13:09:46 +01:00
Bernd Bestel
ea9722bfa4 Fixed undefined variable warnings on product edit page 2020-11-12 13:08:50 +01:00
Bernd Bestel
6f3a3f62af Typo 2020-11-11 22:39:24 +01:00
Bernd Bestel
0c8b6c55c1 Added total calories as a column to stock overview (references #1058) 2020-11-11 22:38:01 +01:00
Bernd Bestel
0a600d3277 Fix hide/view columns dialog did not work on pages with more than 1 table (references #1058) 2020-11-11 22:28:05 +01:00
Bernd Bestel
c3e59d21b9 Only number picker help hint when not empty 2020-11-11 22:17:01 +01:00
Bernd Bestel
11f65629e3 Fixed number picker help hint 2020-11-11 22:09:26 +01:00
Bernd Bestel
7c8a17ce78 Add calories as a column to stock overview (references #1058) 2020-11-11 22:06:01 +01:00
Bernd Bestel
e7491fd8d1 Restored missing trigger after products table reorg (references #801) 2020-11-11 21:44:03 +01:00
Bernd Bestel
0245a925b7 Make it possible to hide columns (closes #1058)
Hide new overview page columns by default
2020-11-11 21:11:17 +01:00
Bernd Bestel
b15740bded Fixed dropdown menu in tables overflow 2020-11-11 20:14:16 +01:00
Bernd Bestel
e3ab943fe7 Use the custom-file-pickers also for the new file and image userfields 2020-11-11 18:49:08 +01:00
Bernd Bestel
9c81fc890b Simplified "checkboxUncheckedValue" handling 2020-11-11 17:34:37 +01:00
Bernd Bestel
9949f30c2b Unify hint texts 2020-11-10 22:01:23 +01:00
Bernd Bestel
06f345324f Fied wrong/missing product picker hint on product edit page 2020-11-10 21:59:19 +01:00
Bernd Bestel
8c8a51c06e Typo 2020-11-10 21:51:45 +01:00
Bernd Bestel
d816be6908 Use the proper plural QU form in productamountpicker 2020-11-10 21:41:12 +01:00
Bernd Bestel
d863e33343 Made the sidebar items a little smaller 2020-11-10 21:35:01 +01:00
Bernd Bestel
7f600bd8d9 Don't add the destination QU multiple time in productamountpicker 2020-11-10 21:19:51 +01:00
Bernd Bestel
4959e9e732 Fixed purchase page initial amount validation 2020-11-10 21:19:28 +01:00
Bernd Bestel
3831cb37b3 Fixed DateTimePicker2 contextual time 2020-11-10 20:57:49 +01:00
Bernd Bestel
0c17666cef Fixed default consume/purchase amount behaviour 2020-11-10 20:53:16 +01:00
Bernd Bestel
8c54131921 Fix is_aggregated_amount of stock_current did not work anymore 2020-11-10 20:11:43 +01:00
Bernd Bestel
62e8d88adb Reviewed changelog 2020-11-10 18:50:04 +01:00
Bernd Bestel
5d4aab063f Removed unused localization strings 2020-11-10 18:17:28 +01:00
Bernd Bestel
68eeb07e5f Test/review/rework (and hopefully finalized) new price handling 2020-11-10 18:11:33 +01:00
Bernd Bestel
33a6a28208 Also use the productamountpicker on the shopping list item page (refernces #1015) 2020-11-09 22:15:25 +01:00
Bernd Bestel
8400175f1d Improved productamountpicker stock amount display 2020-11-09 21:55:49 +01:00
Bernd Bestel
b6f4cfa851 Also use the productamountpicker for inventory (refernces #1015) 2020-11-09 21:51:55 +01:00
Bernd Bestel
ad3b91ef98 Improved form spacing 2020-11-09 21:30:22 +01:00
Bernd Bestel
44eb74ca52 Updated changelog 2020-11-09 19:28:58 +01:00
Bernd Bestel
8bd157ca9d Use producamountpicker "everywhere" (closes #1015) 2020-11-09 19:25:46 +01:00
Bernd Bestel
5f920e2cc6 Start product picker workflows also by TAB 2020-11-08 22:36:55 +01:00
Bernd Bestel
40283609b5 Product / QU form refinements 2020-11-08 22:13:36 +01:00
Bernd Bestel
4c399392eb Fixed recipes page when there are no recipes 2020-11-08 21:44:39 +01:00
Bernd Bestel
0134535a5e Fix/workaround for undfined constant GROCY_LOCALE 2020-11-08 21:37:43 +01:00
Bernd Bestel
ea5b3dcd51 UI test/review 2020-11-08 19:51:56 +01:00
Bernd Bestel
3e3321bf11 UI test/review 2020-11-08 19:00:12 +01:00
Bernd Bestel
d82fd09fba UI test/review 2020-11-08 15:09:10 +01:00
Bernd Bestel
7d237867b5 Updated changelog about the new clear filter button 2020-11-07 15:01:10 +01:00
Bernd Bestel
7324c14516 Added changelog for #1115 2020-11-07 14:59:09 +01:00
4lloyd
76cbf796b6 [WIP] Simplified overviews on mobile (#1115)
* Simplified stock overview on mobile.

* Stock table horizontally scrollable

* Use the new mobile views for all pages (except the shopping list page, use the existing special handling there for now)
And add a clear filter button to all pages

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-11-07 14:53:45 +01:00
Bernd Bestel
9aa9bd1cc7 Typo 2020-10-31 20:25:04 +01:00
Bernd Bestel
ec12b50cde Use GitHub issue templates 2020-10-31 20:23:44 +01:00
Bernd Bestel
2d4db25308 Use GitHub issue templates 2020-10-31 20:18:02 +01:00
Bernd Bestel
7b32d1d8a4 More compact page headers / streamlined new page design for all pages 2020-10-31 18:37:10 +01:00
Bernd Bestel
18617dc9fb Fixed undefined variable warning 2020-10-31 16:29:12 +01:00
Bernd Bestel
eec203700a Added changelog for #1111 2020-10-31 16:26:30 +01:00
kriddles
de85cb9e04 limit to normal recipes (#1111) 2020-10-31 16:25:33 +01:00
kriddles
cb3978cdbd AddProduct Fix (#1110) 2020-10-31 16:24:49 +01:00
Bernd Bestel
fca4b3bb10 Added changelog for #1109 2020-10-31 16:22:51 +01:00
Benoit Anastay
5303952be1 Unit stock name in the mealplan (#1109)
Stock name instead of purchase name
2020-10-31 16:15:26 +01:00
kriddles
af0a7dc2be delete double (#1108) 2020-10-29 21:37:54 +01:00
Bernd Bestel
7d175563ca Fixed stock overview status filter (fixes #1080) 2020-10-29 17:32:21 +01:00
Bernd Bestel
351e236353 Fixed initial state of user permission checkbox tree (fixes #1099) 2020-10-29 17:19:48 +01:00
Bernd Bestel
286c326768 Added missing localization string 2020-10-29 17:11:49 +01:00
Bernd Bestel
fb032ef721 Added changelog for #1103 2020-10-29 17:11:24 +01:00
kriddles
64a2f5b25e dialogs for shopping list (#1103) 2020-10-29 17:09:35 +01:00
Bernd Bestel
1563870021 Added changelog for #1102 2020-10-29 17:05:29 +01:00
kriddles
9bbcdafab9 Add purchased date to inventory (#1102)
* Add purchased date to inventory

* Clarify stock settings label

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-29 17:04:34 +01:00
kriddles
fb17c57dd3 inventory fix for quFactorPurchaseToStock - defaults to product details (#1081) 2020-10-26 10:10:10 +01:00
fipwmaqzufheoxq92ebc
7ef9ffe041 Fixes #1092: Repair QR-Codes for API-Keys (#1093) 2020-10-25 08:42:58 +01:00
Bernd Bestel
be18d59735 Fixed minimum for two number inputs (fixes 1083#) 2020-10-21 18:14:24 +02:00
Bernd Bestel
31fcdf377a Implemented LDAP authentication support (closes #305) 2020-10-20 21:43:58 +02:00
Bernd Bestel
def61eee6e Typo 2020-10-20 20:38:19 +02:00
Bernd Bestel
45236b2af2 Added changelog/new translation strings for #1078 and #1079 2020-10-20 20:16:57 +02:00
kriddles
ff254f8db2 stock entries button on product card (#1079) 2020-10-20 20:14:25 +02:00
kriddles
57aa6499eb display productCard when clicking item on shopping list (#1078) 2020-10-20 20:14:11 +02:00
Bernd Bestel
438cc08b98 Added changelog/new translation strings for #1077 2020-10-20 20:12:04 +02:00
kriddles
46e8123477 Allow price up to 4 decimals instead of 2 (#1077)
* Allow price to be 4 decimals

* remove logging

* Finalize custom decimal places by user setting

* Typo

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-20 20:08:54 +02:00
Bernd Bestel
9e982979c3 Allow 4 decimals for all amount inputs (this now closes #998) 2020-10-19 20:25:42 +02:00
Bernd Bestel
80beff2cae Fixed price input decimals, started reviewing all number inputs (fixes #1076, references #998) 2020-10-19 20:03:26 +02:00
Bernd Bestel
6e1e90984f Typo 2020-10-19 18:41:16 +02:00
Bernd Bestel
94214b867a More authentication refactoring to also provide "plugable" credentials handling (references #921, needed for #305) 2020-10-19 18:38:12 +02:00
Bernd Bestel
9f88dd3af3 Fixed login did not work 2020-10-19 17:19:13 +02:00
Bernd Bestel
a2b2f26628 Delete stock_log rows for not existing products in migration 0103 (fixes #1002) 2020-10-18 15:52:52 +02:00
Bernd Bestel
f93261404b Fixed by PHP-CS-Fixer broken formattings 2020-10-18 15:08:09 +02:00
Bernd Bestel
9115645e19 Fixed consuming tare weight handling enabled products on the stock entries page (fixes #988) 2020-10-18 14:51:32 +02:00
Bernd Bestel
196d304de6 Disable opening of tare weight handling enabled products also on the stock entries page (same as for the stock overview page, references #988) 2020-10-18 14:48:21 +02:00
Bernd Bestel
80cf68aeaa Allow no product for shopping list items & always in-/decrement by 1 when using the number input arrow buttons (fixes #964) 2020-10-18 14:27:23 +02:00
Bernd Bestel
7e08224c75 Fixed tooltip/model z-index (fixes #1065) 2020-10-18 14:13:39 +02:00
Bernd Bestel
ccd2caa44c Fixed GetProductIdFromBarcode returned wrong id & use default qu_factor_purchase_to_stock when not provided when adding products to stock (fixes #1068) 2020-10-18 14:09:54 +02:00
kriddles
f7a1634442 typo (#1062) 2020-10-18 13:57:10 +02:00
John M. Harris, Jr
2958ccfc14 Fix night mode (#1067)
This fixes a few lines of white when in night mode.

This change was done from a tablet, I can redo this commit properly on a computer when I get back home if needed. This just really annoyed me ;)
2020-10-18 13:54:33 +02:00
Bernd Bestel
ab1611081e Typo 2020-10-17 11:25:56 +02:00
Bernd Bestel
5ed7a0ca53 Don't strip boolean values (references #996, fixes #1055) 2020-10-17 11:15:31 +02:00
Bernd Bestel
e24f3143b5 Changelog/little naming changes/fixes/new translations strings for #1056 2020-10-17 11:03:47 +02:00
kriddles
cd65195532 add purchased date to purchase (#1056) 2020-10-17 10:54:10 +02:00
Bernd Bestel
235b96d17f Fixed recipe ingredient initial QU (fixes #1060) 2020-10-17 10:52:25 +02:00
kriddles
758a8d9708 fix for price and total price (#1057)
* fix for price and total price

* product card clarity
2020-10-15 19:55:58 +02:00
Bernd Bestel
17d296d173 Added changelog for #1045 2020-10-15 19:48:25 +02:00
kriddles
5ae36e6ba8 Value information (#1045)
* viewjs stockoverview: add total value to stock overview

* view stockoverview.blade: add Value column

* refresh stockOverview value column

* Removed the total units info

* Properly format the total stock value number

* Added new localization strings

* Resolved merge conflict

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-15 19:46:27 +02:00
Bernd Bestel
56d79d7db8 Added changelog for #996 2020-10-14 23:11:00 +02:00
kriddles
96c6faf208 fix expiring filter (#1051) 2020-10-14 22:59:58 +02:00
Bernd Bestel
08644f95bf Revert "Excape HTML (where needed, for bootbox) (references #996)"
This reverts commit 0df2590de2.

Revert "Excape shopping list item notes (references #996)"

This reverts commit 0624b0df59.
2020-10-14 22:58:26 +02:00
Bernd Bestel
c11001467b Sanitize user input on all API routes (references #996) 2020-10-14 22:49:29 +02:00
Bernd Bestel
7b8438bfa2 Added new localization strings for #1049 2020-10-14 18:03:49 +02:00
Bernd Bestel
1420952f29 Added changelog for #1049 2020-10-14 18:03:27 +02:00
fipwmaqzufheoxq92ebc
a85998dd40 Improvements (#1049)
* Fixes #1035: Check available amount after filtering by stock_entry_id

* Fixes #1036: Remove stock-related buttons/options from Shopping-list  if FEATURE_FLAG_STOCK is disabled

* Fixes #1010: Repair recipe-picture upload.

* Fixes #958: Disable auto-reload of equipments-page.

* Fix uncaught exception in locationpicker.js

* Fixes #761 and #762: Add "Remove exact amount" for products with tare weight handling and use it for recipe-consumption.

* Fixes #1048: Repair product-group-filter on "Master Data"/Products

* Renamed variable

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-14 17:48:37 +02:00
Bernd Bestel
a66a4d0c22 Fix missing property warnings (references #1025) 2020-10-12 17:50:33 +02:00
Bernd Bestel
e91bc0b01b Revert "Make sure that the view products_last_purchased always returns a row per product, also for not in stock items (references #801)"
This reverts commit 0a3e85dab4.

Revert "Make sure that the views products_average_price and products_oldest_stock_unit_price always returns a row per product, also for not in stock items (references #801)"

This reverts commit 939b98e470.
2020-10-12 17:31:38 +02:00
Bernd Bestel
9c92ec4748 Added changelog for #1026 2020-10-04 15:25:18 +02:00
Bernd Bestel
e60ef77b7b Applied formatting rules for by #1026 changed files 2020-10-04 15:22:51 +02:00
SourceFactory.at
617b25bda8 added button to add expired products to shoppinglist (#1026)
* added button to add expired products to shoppinglist

* Localizations are managed via Transifex

Revert "added button to add expired products to shoppinglist"

This reverts commit ad1ab5d6a0.

* Revert unnecessary change

* Reuse existing function (GetExpiringProducts) to get expired products

Co-authored-by: Mario Klug <mario.klug@sourcefactory.at>
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-04 15:20:34 +02:00
Bernd Bestel
49588508bb Added changelog for #1018 2020-10-04 15:03:27 +02:00
Bernd Bestel
931e4b7e9a Applied formatting rules for by #1018 changed files 2020-10-04 15:02:08 +02:00
fipwmaqzufheoxq92ebc
b03e43b708 Ui fixes (#1018)
* Fixes #1005. Recipes: filter by stock-status in gallery

* Fixes #1017. Productform: Remove "Store"-Header from barcode-table if FEATURE_FLAG_STOCK_PRICE_TRACKING is not set.

* Fixed typo

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-04 15:00:34 +02:00
Bernd Bestel
4b5b7bcb19 Applied formatting rules for by #1000 changed files 2020-09-14 11:20:29 +02:00
Bernd Bestel
64c050fc0d Added changelog for #1000 2020-09-14 11:16:44 +02:00
fipwmaqzufheoxq92ebc
5056ca9397 Some bug fixes. (#1000)
* Fix #997. Remove datetimepicker if FEATURE_FLAG_STOCK_BEST_BEFORE_DATE is not set.

* datetimepicker: Fix that SetValue did not set the value if "shortcut-checkbox" (e.g. "never expires") was checked.

* Use parent div as clickable area for checkboxes in dropdowns

* Fix nightmode-enable

* Fix possibly undefined variables in CalendarService.php

* Fix undefined variable in GenericEntityApiController.php

* Fix "Trying to access property barcodes on non-object" in productpicker

* Fix undefined "hintId" in shoppinglocationpicker

* Fix undefined variables in locationpicker.blade.php
2020-09-14 11:15:11 +02:00
Bernd Bestel
0624b0df59 Excape shopping list item notes (references #996) 2020-09-08 18:25:42 +02:00
Bernd Bestel
0df2590de2 Excape HTML (where needed, for bootbox) (references #996) 2020-09-08 18:10:30 +02:00
Bernd Bestel
22434c85f0 Applied formatting rules for by #995 changed files 2020-09-08 17:52:35 +02:00
Bernd Bestel
61cfddb1e7 Added changelog for #995 2020-09-08 17:50:49 +02:00
Maximilian Bosch
34ffdb2b4b Adds a few small frontend fixes (#995)
* Add a few instructions to the readme on how to get `grocy` running locally

* Fix toggle for header-clock

I'm not 100% sure why, but with this change, the listener which calls
`CheckHeaderClockEnabled` will be invoked *before* the listener which
persists the setting.

If the setting is persisted before that, the clock doesn't show up when
enabling it in the settings-menu and appears/disappears in the exact
opposite way the setting is true/false.

* Allow replacing a product picture when removing it at first

Right now, a preview image of a product doesn't get updated when
pressing the delete-button at first and adding a new image the
upload-form which can be quite confusing for an end-user.

This patch allows to delete an image and add a new one in one go.

* Add `Save & return` button to product form

Same concept as for recipes: when pressing this button, the user will
stay at the form's site after saving.

* Removed unneeded class

* Revert "Add a few instructions to the readme on how to get `grocy` running locally"

This reverts commit 6ffad1d3c7.

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-08 17:46:37 +02:00
Bernd Bestel
38bb205a55 Fixed error when starting fresh / without existing database file (references #976) 2020-09-07 08:32:04 +02:00
Bernd Bestel
5b05254816 Fixed iCal sharing API route was always unauthenticated (fixes #993, references #921) 2020-09-07 08:30:08 +02:00
Bernd Bestel
3f1135713a Fixed string concat (fixes #994, references #985) 2020-09-07 08:16:05 +02:00
Bernd Bestel
6adac0588a Applied formatting rules for by #989 changed files 2020-09-06 13:31:54 +02:00
Bernd Bestel
f68e96a235 Added changelog for #989 2020-09-06 13:26:36 +02:00
fipwmaqzufheoxq92ebc
0454c128f0 Stock-Journal: API, Summary, Done By (#989)
* Stockjournal: Add "Done by"

* Add API for Stock-Journal

* Add "Journal-Summary"

* Use ALTER TABLE

* Moved the "Jounral summary" button to the stock journal page

* Changed icon & context menu position for new stock journal summary page

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-06 13:18:51 +02:00
Bernd Bestel
7498d8f13d Applied formatting rules for by #986 changed files 2020-09-06 10:10:30 +02:00
Bernd Bestel
d0a7756a67 Added changelog for #986 2020-09-06 10:08:08 +02:00
fipwmaqzufheoxq92ebc
85a95f1973 Apikeys (#986)
* Add QR-Code for API-Url/Key

* Show only API-Keys for current user

* Allow only admin users to create custom API-Keys

* Use a managed package of qrcode-generator instead of a copy of the JS file

* Reuse existing localization string (API key)

* Center QR-Code in popups

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-06 10:00:49 +02:00
dependabot[bot]
40f379b761 Bump bl from 4.0.2 to 4.0.3 (#987)
Bumps [bl](https://github.com/rvagg/bl) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/rvagg/bl/releases)
- [Commits](https://github.com/rvagg/bl/compare/v4.0.2...v4.0.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-03 15:57:12 +02:00
Bernd Bestel
836bcc82e5 Applied PHP-CS-Fixer rules 2020-09-01 21:29:47 +02:00
Bernd Bestel
3da8904cba Switch to use PHP-CS-Fixer to format PHP files 2020-09-01 21:22:50 +02:00
Bernd Bestel
0ed1813bee Added changelog for #985 2020-09-01 20:17:23 +02:00
fipwmaqzufheoxq92ebc
32a4f81f62 Filtering of API-Results (#985)
* Add FilteredApiResponse

* Use FilteredApiResponse for Generic-Entity-Search

* Use FilteredApiResponse for Recipe-Fullfillment

* Use FilteredApiResponse for GetUsers

* Use FilteredApiResponse for current Tasks

* Use FilteredApiResponse for ProductStockEntries & ProductStockLocations

* Use FilteredApiResponse for current chores

* Use FilteredApiResponse for batteries-current

* Fix missing highlighting of "< X days"

* Keep to use existing views

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-01 19:59:40 +02:00
Bernd Bestel
60f3d900e8 Display "Track date only"-chores as all-day also in iCal API endpoint (references #941) 2020-09-01 19:32:28 +02:00
Bernd Bestel
2bc3b53c63 Remove phpfmt again, doesn't really work well... 2020-09-01 19:27:37 +02:00
Bernd Bestel
ae590fa910 Also return Userfields for Userobjects (endpoint /objects/{entity}) (fixes #979) 2020-08-31 22:32:56 +02:00
Bernd Bestel
ad4f8a19af Removed the barcodes column from the products list as we don't have that field there anymore 2020-08-31 22:13:02 +02:00
Bernd Bestel
d4c5da2173 Applied PHP formatting rules 2020-08-31 20:40:31 +02:00
Bernd Bestel
33325d5560 Applied .blade.php formatting rules 2020-08-31 20:32:50 +02:00
Bernd Bestel
ea9ba0b2be Typo 2020-08-31 20:21:46 +02:00
Bernd Bestel
7e2574eb73 Added changelog for #977 2020-08-31 20:12:28 +02:00
fipwmaqzufheoxq92ebc
07beee93a9 Add user-field-type "file" (#977)
* Add user-field-type "file"

* Add userfield-type "picture"

* Also limit image height on userfieldsform

* Prevent empty userfields (cause warnings in tables after deleting a file)

* Show files in dialogs

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-31 20:07:46 +02:00
Bernd Bestel
318db53818 Typo 2020-08-31 19:22:08 +02:00
Bernd Bestel
a995ce0538 Added changelog for #976 2020-08-31 19:19:05 +02:00
fipwmaqzufheoxq92ebc
6f8ad9b76e Locales: use http-accept-language or cookie (#976)
* Locales: use http-accept-language or "language"-cookie

* Add user-setting "locale"

Rename CULTURE to DEFAULT_LOCALE

* Use LocaleMiddleware also in dev mode

* CORS: don't require authentication on OPTIONS

* Use a standard user-settings-control and start a new generic user settings page, not a separate page for the locale setting

* Fixed (broken by myself) link-return handling

* Clarify language settings

* Removed unneeded files

* Better user settings icon

* Added localization hints

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-31 19:11:51 +02:00
Bernd Bestel
4a030b7ffc Added editor.insertSpaces setting 2020-08-31 08:50:55 +02:00
Bernd Bestel
5c101e6750 Use phpfmt to format .php files 2020-08-30 22:52:35 +02:00
Bernd Bestel
2f00d673a7 Also format .blade.php files by default VSCode formatting rules 2020-08-30 22:08:17 +02:00
Bernd Bestel
9cea0c77cd Applied VSCode JS formatting settings 2020-08-30 12:18:16 +02:00
Bernd Bestel
e0e3212f13 Added VSCode JS formatting settings 2020-08-30 12:16:23 +02:00
Bernd Bestel
747660d909 Return API exceptions with proper content type 2020-08-29 19:29:24 +02:00
Bernd Bestel
e93f58916e Forgot some entries in permission_hierarchy... 2020-08-29 19:24:19 +02:00
fipwmaqzufheoxq92ebc
17094f56eb Run database-Migrations in right order (#973) 2020-08-29 19:15:02 +02:00
Bernd Bestel
0f499c69d9 Fixed .pot file syntax error 2020-08-29 18:34:05 +02:00
Bernd Bestel
86300b7025 Refined permissions by existing feature structure (closes #971, references #960) 2020-08-29 18:31:28 +02:00
Bernd Bestel
a8395cb748 Fixed undefined constants warning on the 404 error page 2020-08-29 17:12:31 +02:00
Bernd Bestel
22384aaa2e Error page style improvements 2020-08-29 16:58:06 +02:00
Bernd Bestel
3b0d29bed0 Applied EditorConfig settings to all files 2020-08-29 16:41:27 +02:00
Bernd Bestel
2c966c77fd Added an EditorConfig file 2020-08-29 16:10:05 +02:00
kriddles
22ca427ca9 Include location and shopping_location_id when opening products (#965) 2020-08-29 12:26:36 +02:00
Bernd Bestel
32cd928460 Added changelog for #960 2020-08-29 12:22:53 +02:00
fipwmaqzufheoxq92ebc
b7d1b21f1d [WIP] Implemented basic permissions (#960)
* Add permissions to Database & add "User"-classes

* Add UI & API for Permissions, protect "User"-(Api)-Controller with new permissions.

* Add some permissions.

* Add permission localization

* Add error handling.

* Error pages: only redirect on 404

* ExceptionController: return JSON-Response on api-routes

* Rename PRODUCT_ADD to PRODUCT_PURCHASE

* Move translation to new file

* Fix checkboxes stay selected on reload.

* Remove configurable User-implementation

* Remove MASTER_DATA_READ

* Disable buttons the user isn't allowed to use.

* Add default permissions for new users

* When migration to permissions, everyone starts as ADMIN

* Permission-Localization: add to transifex & LocalizationService

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-29 12:05:32 +02:00
Bernd Bestel
f28697e5b4 Added a "Clear filter" button on the stock overview page (closes #879) 2020-08-25 20:20:51 +02:00
Bernd Bestel
0417b73cb5 Show if a consume booking was spoiled on the stock journal page (closes #953) 2020-08-25 19:51:54 +02:00
Bernd Bestel
71a6cbef2d First try on stock overview page: Make filter row more compact 2020-08-25 19:45:54 +02:00
Bernd Bestel
471a8665d0 Remove the new help icons where not needed and translate help text 2020-08-25 19:28:44 +02:00
Bernd Bestel
4058925f40 Handle edited stock entries in GetProductPriceHistory (fixes #913) 2020-08-25 19:09:47 +02:00
Bernd Bestel
0b98504371 Don't hide the product row on the stock overview page if there are still child products in stock 2020-08-25 18:15:34 +02:00
Bernd Bestel
4db373b272 Fixed parent product amount aggregation (fixes #878) 2020-08-25 18:13:26 +02:00
Bernd Bestel
3b564294e3 Allow decimal amounts in general for the shopping list 2020-08-24 20:25:50 +02:00
Bernd Bestel
ece880ea44 Don't round up missing amounts and allow decimal numbers (fixes #758) 2020-08-24 20:16:21 +02:00
Bernd Bestel
9d04d81744 Use correct amount for the success popup on the consume page (fixes #766) 2020-08-24 19:06:33 +02:00
Bernd Bestel
5c62377ba6 Don't trigger row select event on first column (fixes #791) 2020-08-24 18:42:32 +02:00
Bernd Bestel
a569048a3a Validate form after changing the QU on the recipe ingredient edit page (fixes #907) 2020-08-24 18:32:50 +02:00
Bernd Bestel
95ca6f6354 Display "Track date only"-chores as all-day events on the calendar (fixes #941) 2020-08-24 18:27:40 +02:00
Bernd Bestel
c8c540970d Added missing localization string 2020-08-24 18:16:49 +02:00
Bernd Bestel
fa32258553 Only reload "Disable stock fulfillment checking for this ingredient" by the products default when creating a recipe ingredient (fixes #910) 2020-08-24 18:16:32 +02:00
Bernd Bestel
4d38614671 Reload recipe page after add/edit an ingredient (fixes #803) 2020-08-24 18:02:46 +02:00
Bernd Bestel
2c151fb4de Do an exact search for product group and location filters on the stock overview pages (fixes #778) 2020-08-24 17:57:43 +02:00
Bernd Bestel
e039db22f5 Don't prefill for empty prices when editing a stock entry (fixes #961) 2020-08-24 17:42:41 +02:00
Bernd Bestel
a6db08943c Streamline naming 2020-08-22 19:09:36 +02:00
Bernd Bestel
e3ff16c66a Downgrade animate.css, upgrade to v4 needs customizations 2020-08-22 18:25:59 +02:00
Bernd Bestel
fdb419fe55 Fixed errors while populating demo data 2020-08-22 17:59:42 +02:00
Bernd Bestel
0a3e85dab4 Make sure that the view products_last_purchased always returns a row per product, also for not in stock items (references #801)
Otherwise there are errors when getting product details for currently not in stock items...
2020-08-22 17:50:08 +02:00
Bernd Bestel
939b98e470 Make sure that the views products_average_price and products_oldest_stock_unit_price always returns a row per product, also for not in stock items (references #801)
Otherwise there are errors when getting product details for currently not in stock items...
2020-08-22 10:06:37 +02:00
Bernd Bestel
ffec1134a3 Added changelog for #959 2020-08-22 10:05:10 +02:00
fipwmaqzufheoxq92ebc
923e027a4b Some bug fixes. (#959)
* Fixes #956. Return 404 for missing objects in GenericEntityApiController.php

* Fixes #936 and #943. Include Products that expire today in /stock/volatile and "Expiring soon"-sum on stockoverview

* Fixes #881. Remove items of deleted shopping lists.

* Fixes #875. Prevent infinite nested recipes.

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-22 09:58:25 +02:00
Bernd Bestel
cf9bb87f6e Upgraded to Quagga2 (again) (closes #799, also references #844) 2020-08-19 20:04:17 +02:00
Bernd Bestel
04bbad2167 Added changelog for #844 2020-08-19 19:56:24 +02:00
Andre Monteiro
b8cd5cd0b5 Additional configuration options for Quagga2 (#844) 2020-08-19 19:52:04 +02:00
Bernd Bestel
2cd3779d82 Added changelog for #855 2020-08-19 19:49:32 +02:00
Michał Przybyś
f8c6e81dcb Fix grocy/grocy#834 (#855)
* Fix grocy/grocy#834

* stock_missing_products_including_opened didn't take the opened amount in HAVING clauses

* Resolved merge conflicts

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-19 19:46:25 +02:00
Bernd Bestel
31c412a28c Typo 2020-08-19 19:31:52 +02:00
Bernd Bestel
41359137dc Added changelog for #921 2020-08-19 19:29:39 +02:00
fipwmaqzufheoxq92ebc
d60d981fd1 Refactor Authentication and add proxy-authentication (#921)
* Refactor Authentication-Middlewares

* Add Proxy-Authentication

* Disable "Logout" & "Manage Users" when using ProxyAuth

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-19 19:23:13 +02:00
Bernd Bestel
5b475d9307 Added changelog for #876 2020-08-18 19:46:38 +02:00
Matthias B
88949dc3e4 Make product amount picker locale independent (#876)
Since the value of $('#amount') will be written to the database it should not be locale dependent. This code also limits the result to a maximum of 4 digits but always uses a dot as decimal separator.
2020-08-18 19:43:50 +02:00
Bernd Bestel
e4d0978f5d Merge branch 'master' of https://github.com/grocy/grocy 2020-08-18 19:37:10 +02:00
Bernd Bestel
f88401a44a Added changelog for #933 2020-08-18 19:36:45 +02:00
fipwmaqzufheoxq92ebc
e7af74f550 use last Chore-Log when determining the next assigned person (#933) 2020-08-18 19:34:19 +02:00
Bernd Bestel
295f360306 Added changelog for #927 2020-08-18 19:30:00 +02:00
fipwmaqzufheoxq92ebc
42dc55625a Improve Performance (#927)
* Stock-Overview: Reduce amount of database queries and FindObjectInArray()-calls

* Speed-up stock_current by improving products_resolved and creating indices.

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-18 19:23:37 +02:00
Bernd Bestel
7510c677f1 Added changelog for #880 2020-08-18 18:30:35 +02:00
duck
7e276289e0 WIP: Fix typo on "Consumed Amount" localization string (#880)
* Fix typo on localization string in strings.pot

Should be "Consumed Amount"

* Remove typo Consumed Amount string in locationcontentsheet template
2020-08-18 18:28:39 +02:00
Bernd Bestel
273811fdc1 Updated dependencies 2020-08-18 18:27:58 +02:00
Bernd Bestel
a93a3e1df1 Added changelog for #939 2020-08-18 18:15:50 +02:00
Stefan Haller
623fce6c08 Run multi instances by making GROCY_DATAPATH customizable (#939)
Previously the data directory was fixed to the GROCY_DATAPATH constant.

This commit allows overriding the default GROCY_DATAPATH location by the
FastCGI parameter `GROCY_DATAPATH`. Relative paths are modified and get
rooted at the top level grocy installation directory.

The previous behaviour is preserved in case the new parameter is absent.

The following example nginx config snippet shows how to run multiple
instances.

```nginx
server {
    location /instance1/ {
        alias /var/www/grocy/;
        set $instance instance1;
        try_files $uri @grocy;
    }

    location /instane2/ {
        alias /var/www/grocy/;
        set $instance instance2;
        try_files $uri @grocy;
    }

    location @grocy {
        fastcgi_pass 127.0.0.1:9000;
        include fastcgi_params;
        fastcgi_param SCRIPT_FILENAME index.php;
        fastcgi_param GROCY_DATAPATH data/$instance;
    }
}
```
2020-08-18 18:10:26 +02:00
Bernd Bestel
68dcd02d00 Revert "Fix base path computation when running in subdirectory (#945)" (#954)
This reverts commit 6cd874f3ba.
2020-08-18 18:01:50 +02:00
Stefan Haller
6cd874f3ba Fix base path computation when running in subdirectory (#945) 2020-08-18 17:57:35 +02:00
Bernd Bestel
b6b6f903ab Added more changelog for #801 2020-08-18 11:49:25 +02:00
Bernd Bestel
144ca094e6 Typo 2020-08-17 22:13:53 +02:00
Bernd Bestel
da05cbffc0 Added changelog for #801 2020-08-17 22:12:39 +02:00
kriddles
e8845fe2e8 Qu factor purchase to stock & Product Barcode Details (#801)
* Puchase add qu_factor_to_stock

* qu_factor_purchase_to_stock for stock edit

* product barcodes with QU and Stores

* remove product barcode tags

* migrations/0103 add value and factor_puchase_amount to stock_current and stock_current_location_content

* Remove unused method

* StockService#GetProductDetails: include stock_value

* productcard: include stock_value

* Add Purchase Factor to Stock Overview

* update demo data with stock qu_factor_purchase_to_stock

* recipes_pos_resolved update

* avg_price and oldest_price in product details

* add average price to product card

* hint for recipe costs not included if not in stock

* Round value and factor_purchas_amount. Include currency for stock value

* Add factor_purchase_amount to product card stock amount

* Allow editing qu_factor_purchase_to_stock for stock entries

* fix update qu_factor_purchase_to_stock for Transfers

* Add barcode to existing product update to add to product_barcodes table

* Add barcode to new product workflow update to add to product_barcodes table

* *** Price now saved as 1 QU to stock in stock tables ***

* remove column product barcode and use product_barcodes

* Allow products to be deactivated instead of deleted

* Embedded barcode and qu-conversion with page reload on change

* Save current product barcode into new product_barcodes table

* Embedded popup for product group add/edit

* barcode scanner added to product barcodes input

* Edit product qu_stock is unavailable after first purchase

* StockOverview: Filters break when columns are reordered so for now just disable colReorder

* view stockoverview.blade: display product_group column

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-17 21:47:33 +02:00
Bernd Bestel
d1e395b45e Added the Korean translation (closes #903) 2020-08-17 18:22:42 +02:00
Bernd Bestel
7f461bfa51 Added the Greek translation (closes #952) 2020-08-17 18:07:05 +02:00
Bernd Bestel
cadf61d641 Pulled translations from Transifex 2020-08-17 17:57:40 +02:00
Bernd Bestel
f6852e82b2 Website link has changed (references grocy/grocy-website#15) 2020-07-28 20:15:42 +02:00
Bernd Bestel
98f214e9f1 Added changelog for #826 2020-05-03 20:28:04 +02:00
Germs2004
f25902214f Change ellipsis to dash (#826)
An ellipsis in software often implies that the element is clickable to get more information.  Changing that to a simple dash symbol makes it more clear that the value is simply undefined and is not a clickable element.
2020-05-03 20:25:27 +02:00
Bernd Bestel
1e07a2dc2e Added changelog for #806 2020-04-29 19:55:56 +02:00
Marc Ole Bulling
a9dc5deaaa Added SQLite check for #805 (#806)
* Added SQLite check

* Moved check behind Extensions check

* Changed to SqlitePDO
2020-04-29 19:54:05 +02:00
Shadow
86b7cfed29 Fixed (#802)
Reordered days for better readability.
2020-04-27 18:11:32 +02:00
Bernd Bestel
fc9e2927f9 Added changelog for #796 2020-04-26 17:30:21 +02:00
kriddles
45c14723b0 Fix Product Shopping Location Prefill for Edits (#796) 2020-04-26 17:28:02 +02:00
Bernd Bestel
d72fd565ca Changelog and little adjustments for #800 2020-04-26 17:26:32 +02:00
Shadow
6c3c2d5384 #570 Added fix for weekly chores with multiple days (#800) 2020-04-26 17:14:54 +02:00
Bernd Bestel
37054475c2 Little adjustments and changelog for #795 2020-04-24 18:06:57 +02:00
Bernd Bestel
9e824e1845 Little adjustments and changelog for #788 2020-04-24 17:51:48 +02:00
Zack Arnett
f076b0d0c6 Recipe updates (#795) 2020-04-24 17:41:57 +02:00
kriddles
385e7287fe Create Inverse QU Conversions (#788) 2020-04-24 17:41:50 +02:00
Bernd Bestel
60f321d9c2 Added changelog for #793 2020-04-23 20:51:34 +02:00
Marc Ole Bulling
49e5eda30f Make GetUriParam work with special characters (eg. "&") (#793) 2020-04-23 20:48:48 +02:00
Bernd Bestel
5833bb1e8f Added changelog for #784 2020-04-22 18:05:05 +02:00
Zack Arnett
29b4672346 Link to respective page on Calendar Event Click (#784)
* Link to Page on calendar event click

* Undo my Prettier Changes.. Oops
2020-04-22 18:03:05 +02:00
Bernd Bestel
fbb8999513 Fixes and changelog for #767 2020-04-22 18:00:25 +02:00
Bernd Bestel
1ea26cadcc Merge branch 'master' of https://github.com/grocy/grocy 2020-04-22 17:38:37 +02:00
kriddles
9a921cfc86 Purchase Price Hints (#767)
* productcard update last price with per qu purchase name

* Purchase price hints

* purchase set default to 2999-12-31 if not best before date tracking

* purchase- move amount above best buy date and focus amount after product selection
2020-04-22 17:38:24 +02:00
Bernd Bestel
16b9e2c30a Return Access-Control-Allow-Origin for all API (content) requests (references #681) 2020-04-22 17:36:20 +02:00
Bernd Bestel
5e6a9dd443 Return status code 204 for CORS OPTIONS requests (references #681) 2020-04-21 21:15:45 +02:00
Bernd Bestel
53a0a2f4e1 Also allow just all headers and request methods for CORS OPTIONS requests (references #681) 2020-04-21 21:09:49 +02:00
Bernd Bestel
98f2276e17 Send just * for Access-Control-Allow-Origin header in CORS OPTIONS requests (again closes #681) 2020-04-21 21:05:32 +02:00
Zack Arnett
7fb76df33a Recipe Pages UI updates (#776)
* Recipe updates

* Add help text icon
2020-04-21 08:18:09 +02:00
Bernd Bestel
f4b70e9ae3 Fixed product edit page barcodes field tab handling (fixes #764) 2020-04-19 15:01:58 +02:00
Bernd Bestel
8cbfd5fedb Added changelog for #763 2020-04-19 14:56:29 +02:00
tsia
eb190537e9 Fixed Timezone in CalendarApiController (#763)
`PHP Warning:  DateTime::setTimezone() expects parameter 1 to be DateTimeZone, string given in /var/www/grocy/controllers/CalendarApiController.php on line 22`
2020-04-19 14:55:08 +02:00
Bernd Bestel
0e2a067e30 Added changelog for #753 2020-04-19 14:53:33 +02:00
Zack Arnett
4629df17b4 Cosmetic Update (#753)
* UI changes

* New (header) style was missing on some pages

* Added/changed new localization strings

* Unify page titles / apply .title class everywhere

* Reduce spacing below page title

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-04-19 14:51:02 +02:00
Bernd Bestel
59650728a2 Make sure to include /data/.htaccess in release ZIPs 2020-04-17 20:12:06 +02:00
Bernd Bestel
743395ff93 Pulled translations from Transifex 2020-04-17 20:07:15 +02:00
Bernd Bestel
6931d2a764 Prepared next release 2020-04-17 20:07:01 +02:00
Bernd Bestel
356cdf4991 Fixed pre requisite checker paths (fixes #748) 2020-04-17 19:57:22 +02:00
Bernd Bestel
b4a480aa37 Downgrade / use QuggaJS again instead of Quagga2 (fixes #749) 2020-04-17 19:48:11 +02:00
James Addison
b2dbc64f29 Remove NodeJS dependency check (#745) 2020-04-17 08:24:02 +02:00
Bernd Bestel
1cb0ba5e68 Pulled translations from Transifex 2020-04-16 19:21:20 +02:00
Bernd Bestel
d4fefa846b Hotfix (will be included in the v2.7.0 release): Downgraded jQuery (fixes #743) 2020-04-16 19:14:26 +02:00
Bernd Bestel
7121e814b0 Updated dependencies 2020-04-16 18:22:38 +02:00
Bernd Bestel
70a1704bc2 Pulled translations from Transifex 2020-04-16 18:12:50 +02:00
Bernd Bestel
629b3c0706 Prepared next release 2020-04-16 18:05:45 +02:00
Bernd Bestel
db3021e475 Revert "Use a route cache file (speed optimization)"
This reverts commit 59cd4dbac4.
2020-04-14 09:02:48 +02:00
Bernd Bestel
e897570968 Only adjust the camera barcode scanning live stream picture size once (fixes #734) 2020-04-13 22:34:52 +02:00
Bernd Bestel
2e625f330d Little style changes and changelog for #733 2020-04-13 22:30:35 +02:00
Michael Frikke Madsen
a6030798c7 Add camera picker button (#733)
* Add camera picker button

* Remove button and nested dialog - make it a select
- Also make Cancel button gray again
2020-04-13 22:07:38 +02:00
Bernd Bestel
71770540f6 Fixed stock overview page did not load when GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING is disabled (references #673) 2020-04-13 21:56:24 +02:00
Bernd Bestel
59cd4dbac4 Use a route cache file (speed optimization) 2020-04-13 21:26:34 +02:00
Bernd Bestel
6f4769a7b3 Make product groups on the shopping list collapsible (closes #604) 2020-04-13 19:11:13 +02:00
Bernd Bestel
1390c65864 Show optionally an icon on the stock overview page if the product is already on the shopping list (closes #708) 2020-04-13 18:47:41 +02:00
Bernd Bestel
840b35b30d Add tooltips to shopping list item buttons (closes #572) 2020-04-13 18:26:53 +02:00
Bernd Bestel
886721e972 Fixed consuming tare weight handling enabled products from the stock overview page (fixes #731) 2020-04-13 17:29:00 +02:00
Bernd Bestel
1686fcca8e Fixed that product-opened-actions had no transaction_id in stock_log (fixes #732) 2020-04-13 17:04:59 +02:00
Bernd Bestel
7d9bad58b5 Added changes of #601 to grocy.openapi.json 2020-04-13 16:57:06 +02:00
Bernd Bestel
25be604b31 Also return userfields in generic object(s) GET API routes (closes #601) 2020-04-13 16:52:34 +02:00
Bernd Bestel
87e68523e5 Typo... 2020-04-13 16:27:36 +02:00
Bernd Bestel
858315ed3f Added DataTables accent neutralise plugin (closes #654) 2020-04-13 16:27:02 +02:00
Bernd Bestel
f36d9c46ed Make Quagga2 setting "numOfWorkers" adjustable (closes #713) 2020-04-13 16:14:43 +02:00
Bernd Bestel
45d96cb60f Use Quagga2 instead of QuaggaJS (closes #579) 2020-04-13 16:08:46 +02:00
Bernd Bestel
10f890ef89 Added a camera-barcode-scanner-button to the barcodes field on the product edit page (closes #723) 2020-04-13 15:55:27 +02:00
Bernd Bestel
c6e06ab07c Fix weekday order for next chore execution calculation for weekly chores (fixes #570) 2020-04-13 15:16:38 +02:00
Bernd Bestel
9a93c32d3c Fix total price amount relation on purchase (fixes #722) 2020-04-13 14:52:13 +02:00
Bernd Bestel
1fc802c30e Typo/duplicated function (references #718) 2020-04-13 10:41:37 +02:00
Bernd Bestel
42e6a8ef94 Added new API endpoints to get all user and config settings (closes #718) 2020-04-13 10:35:20 +02:00
Bernd Bestel
b971375881 Reimplemented CORS handling (fixes #681) 2020-04-13 10:00:29 +02:00
Bernd Bestel
855b24c515 Fix consume page form validation limits for the amount input when tare weight handling is enabled (fixes #727) 2020-04-12 21:41:04 +02:00
Bernd Bestel
b62d3b02e6 Only add not empty translation strings to POT in DEV mode 2020-04-12 20:31:30 +02:00
Bernd Bestel
0327188125 Optimize datetimepicker form validation events (fixes #726) 2020-04-12 18:41:23 +02:00
Bernd Bestel
73b3ad3b4c Unify wording 2020-04-12 18:32:32 +02:00
Bernd Bestel
152d3b7005 Respect QU conversions when aggregating parent product stock amounts (fixes #615) 2020-04-12 18:29:44 +02:00
Bernd Bestel
5b314351dd Don't show disabled product options (fixes #724) 2020-04-12 15:59:08 +02:00
Bernd Bestel
7b39bc995c Fixed update.sh line endings (fixes #705) 2020-04-12 15:42:25 +02:00
Bernd Bestel
c562e09073 Dummy change to fix line endings (references #705) 2020-04-12 15:40:11 +02:00
Bernd Bestel
8cfd3e19ba Typo... 2020-04-12 15:34:27 +02:00
Bernd Bestel
81e6530ddc Always set number inputs in browser locale format (fixes #610) 2020-04-12 15:33:36 +02:00
Bernd Bestel
86ef36d76a Don't ignore the decimal part when editing a stock entry (fixes #616) 2020-04-12 15:22:36 +02:00
Bernd Bestel
1d4b6a0a24 Updated README.md 2020-04-12 14:49:53 +02:00
Bernd Bestel
d907bca3cb Include userfields when printing a shopping list (fixes #719) 2020-04-12 14:39:11 +02:00
Bernd Bestel
3356b07342 Always show models / overlay everything else (fixes #628) 2020-04-12 14:34:50 +02:00
Bernd Bestel
615de378ba Don't load demo_data strings in production setups 2020-04-12 14:22:18 +02:00
Bernd Bestel
0f3a3887a2 Fixed that best before dates were displayed on the stock overview and stock entries page even with disabled GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING (fixes #673) 2020-04-12 14:17:52 +02:00
Bernd Bestel
390af436ab Fixed that the stock entries page was broken when there were product userfields defined with enabled "Show as column in tables" (fixes #677) 2020-04-12 14:13:28 +02:00
Bernd Bestel
4e5e191b22 Fixed the conversion factor hint on the purchase page (fixes #625) 2020-04-12 14:09:38 +02:00
Bernd Bestel
6867057b6e Clarify button tooltips on the stock entries page (closes #621) 2020-04-12 14:02:24 +02:00
Bernd Bestel
9dbd6a68c4 Don't change the displayed QU to the products stock QU when "Only check if a single unit is in stock" is set when editing a recipe ingredient (fixes #606) 2020-04-12 13:55:26 +02:00
James Addison
4f8ef2859e Fixup: paths for localization file existence checks (#710) 2020-04-09 08:29:44 +02:00
Mik-
a6dd794ce8 Add missing form validation on presetting QU id stock (#704) 2020-04-07 16:37:30 +02:00
Bernd Bestel
6b75decd4a Added roadmap section 2020-04-07 13:54:10 +02:00
Bernd Bestel
2334b010fd Added roadmap section 2020-04-07 13:48:55 +02:00
Bernd Bestel
1cb3128042 Added changelog for #703 2020-04-07 11:46:07 +02:00
Shane Kerr
cc012c7348 Create the backup tarball explicitly before invoking tar (#703)
When grocy is installed on a btrfs file system, the tar command
fails if the tarball is not created first.
2020-04-07 11:43:54 +02:00
Bernd Bestel
bfb46494cf Added new at least 80 % complete localizations 2020-04-05 08:41:08 +02:00
Bernd Bestel
4072dfd26f Use default strings if any of the minor translation files is not available 2020-04-05 08:40:42 +02:00
Bernd Bestel
769a13aa31 Added a default .htaccess file for the data directory 2020-04-05 08:39:57 +02:00
Bernd Bestel
2924502878 Added info about the new release branch 2020-04-04 20:42:12 +02:00
Bernd Bestel
30908f5ba9 Fixed typo (references #697) 2020-04-03 18:55:48 +02:00
James Addison
ca9354064d PSR7-decoupled rework of authentication fixup (#697) 2020-04-03 18:45:40 +02:00
Bernd Bestel
9a9b4d1000 Updated version.json 2020-04-03 18:35:46 +02:00
Bernd Bestel
808745dbfa Added v2.6.2 changelog (hotfix, will be included/changed in the last 5 releases also) 2020-04-03 18:34:00 +02:00
Bernd Bestel
2778d2ad56 Don't return anything in the response body when unauthenticated (fixes #696) 2020-04-03 18:22:05 +02:00
Bernd Bestel
11bf89e13a Added changelog for #688 2020-04-02 08:39:25 +02:00
Mik-
1aa788b6c2 Preset the stock qu with the purchase qu on new products. (#688) 2020-04-02 08:36:20 +02:00
Mik-
7200f2c17f Fix errors with disabled feature flag STOCK_PRICE_TRACKING (#687)
fixes #685
2020-04-02 08:34:43 +02:00
Bernd Bestel
746203b82d Allow any used HTTP request method for CORS (references #681) 2020-03-31 17:53:34 +02:00
tsia
8e82525732 fix api endpoint url in comment (#676) 2020-03-29 18:15:27 +02:00
Bernd Bestel
f092c8b10d Added changelog for #675 2020-03-29 14:29:38 +02:00
Mik-
f66a4c9631 Camera barcode scanner enhancements (#675)
* Disable torch button, if not supported

* Allow toggling torch

* Don't exceed the screen width with camera window

* Disable torch button, if not supported

* Allow toggling torch

* Don't exceed the screen width with camera window

* Allow toggling torch

* Disable torch button, if not supported

* Allow toggling torch

* Don't exceed the screen width with camera window

* Allow toggling torch

* Allow toggling torch

* Don't exceed the screen width with camera window

* Remove toggling of torch, as it's not working
and add resize of video to fit in viewport hieght

* Add feature to always turn on the torch in camera scanner.

* Fix feature flag name

Co-authored-by: Michael Neuendorf <neuendorf@gonicus.de>
2020-03-29 14:25:04 +02:00
Bernd Bestel
caf7127c13 Added changelog for #672 2020-03-27 19:32:25 +01:00
kriddles
2fee4b45ff set default store for product, purchase set last store purchased if available or use product default (#672) 2020-03-27 19:27:40 +01:00
Bernd Bestel
d509f9add0 Added changelog for #669 2020-03-27 17:46:08 +01:00
tsia
81d84d93e2 fixed missing class error in CalendarApiController (#669) 2020-03-27 17:44:29 +01:00
Bernd Bestel
646f638111 Added changelog for #668 2020-03-27 14:32:30 +01:00
Marc Ole Bulling
9a27b8e3a5 Added amount value for locations api (#668) 2020-03-27 14:29:26 +01:00
Bernd Bestel
d7738aa1ec Added some demo data to showcase the new price tracking per store feature (references #658) 2020-03-25 20:56:33 +01:00
Bernd Bestel
4f40b40fe0 Fixed migration (references #658) 2020-03-25 20:39:19 +01:00
Bernd Bestel
7b737590ea Added changelog for #657 2020-03-25 20:32:37 +01:00
Mik-
f3b504b7de Optionally use number pad input in best-before-date fields on mobile Chrome (#657)
* Add missing translation for de

* Add option to set best-before-date field input-type to number
This allows faster input in mobile devices

* Fix datetimepicker with inputmode

* Fix datatimepicker with numeric input

* Add missing translation for de

* Add option to set best-before-date field input-type to number
This allows faster input in mobile devices

* Fix datetimepicker with inputmode

* Fix datatimepicker with numeric input

* Use more precise name for number pad option

* Update localization/de/strings.po

Co-Authored-By: Bernd Bestel <bernd@berrnd.de>

* Fix merge conflict

* Fix merge conflict try 2

Co-authored-by: Michael Neuendorf <neuendorf@gonicus.de>
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-03-25 20:26:54 +01:00
Bernd Bestel
2619d03cc0 Added changelog for #658 2020-03-25 20:12:38 +01:00
Bernd Bestel
305f5b67e4 Name shopping locations "Stores" on the frontend (references #658) 2020-03-25 20:09:28 +01:00
Bernd Bestel
5214a775ed Fix stock entries page rendering problem when FEATURE_FLAG_STOCK_PRICE_TRACKING is set to false (references #658) 2020-03-25 20:02:59 +01:00
Bernd Bestel
2d00f6f84a Immediately show the changed shopping location after edit on the stock entries page (references #658) 2020-03-25 20:00:52 +01:00
Bernd Bestel
06f65594de Fix stock entries page error when there is no shopping location (references #658) 2020-03-25 19:53:00 +01:00
Bernd Bestel
c3d4be352d Fix product card chart rendering error when there is no shopping location (references #658) 2020-03-25 19:49:10 +01:00
Immae
a45317aea1 Add shopping location for price tracking (#658) 2020-03-25 19:34:56 +01:00
dacto
573b6ece89 Process Settings from environment and settingoverrides values the same: (#660)
* fixes handling strings representing bools from settingoverrides .txt files
  * trailing newline characters are now stripped
2020-03-25 19:30:16 +01:00
Bernd Bestel
22eaeee572 Added changelog for #660 2020-03-25 19:29:30 +01:00
Bernd Bestel
375865d80e Changelog and some small changes for #639 2020-03-22 18:02:19 +01:00
Marc Ole Bulling
3fc14db5d5 Check if all dependencies are installed (#639)
* Added check if all dependencies are installed and config.php/config-dist.php exists

* Also check for php modules

* Uncomment code that was accidentally disabled for debug purposes
2020-03-22 17:55:23 +01:00
Bernd Bestel
dcfd9d848d Added changelog for #637 / #638 2020-03-22 09:27:49 +01:00
Marc Runkel
03eee1329c Fix recipes page (#638)
* My config

* Add check to see if any recipe is selected

* Add check to see if a recipe is actually selected

Co-authored-by: Marc Runkel <marc.runkel@plusforta.de>
2020-03-22 09:24:49 +01:00
Bernd Bestel
03566d0644 Added changelog for #633 / #629 2020-03-21 15:56:59 +01:00
Mik-
71b62d5708 629 Make ellipsis menu in stock overview more responsive (#633)
* Make popup menues in table rows responsive

* Move "consum all" button to ellipsis menu on small devices
2020-03-21 15:52:51 +01:00
Bernd Bestel
eb3c0f9397 Typo... 2020-03-06 21:46:14 +01:00
Bernd Bestel
40034ed7bd Prepared next release 2020-03-06 21:29:37 +01:00
Bernd Bestel
c67a5bf77d Updated dependencies 2020-03-06 21:28:36 +01:00
Bernd Bestel
9f6daac010 Added new demo data localization string 2020-03-06 21:23:31 +01:00
Bernd Bestel
e0f71aa308 Pulled translations from Transifex 2020-03-06 21:14:50 +01:00
Bernd Bestel
f1496894b5 Fixed adding new chores did not work (references #479) 2020-03-06 21:01:41 +01:00
Bernd Bestel
48dc8e45ba Fixed localization string (references #588) 2020-03-06 20:58:01 +01:00
Bernd Bestel
f440604007 Fixed Location Content Sheet product ordering (fixes #590) 2020-03-06 20:56:11 +01:00
Bernd Bestel
5cfe7cf34d Fixed that the recipe page was reloaded when expanding a collapsed row on mobile (fixes #589) 2020-03-06 20:51:09 +01:00
Bernd Bestel
e2bb3a7d00 Changelog & little changes for #592 2020-03-06 20:46:27 +01:00
DarienFord
b0ddc026f8 Added chore name when getting list of all chores. (#592) 2020-03-06 20:43:38 +01:00
Bernd Bestel
8be14768df Added new config.php setting for subdirectory base path (closes #568) 2020-03-06 20:41:00 +01:00
Bernd Bestel
c73ce21ef5 Removed selective/basepath (references #568) 2020-03-06 20:33:36 +01:00
Bernd Bestel
c38c519b18 Fixed that images did not work after merging #479 2020-03-01 19:48:08 +01:00
Bernd Bestel
fc131f5598 Little changes and changelog for #574 2020-03-01 17:58:10 +01:00
Radim Kabeláč
51cd81422e Button to Flashlight ON in Barcodescanner (#574)
* Button to Flash lights ON in barcodereader

Only to ON, not OFF (you can Cancel)

* First documentation files for ReadThedoc

* Delete index.md

* Delete mkdocs.yml

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-03-01 17:53:28 +01:00
Bernd Bestel
14c9c045e7 Added changelog for #479 2020-03-01 17:50:34 +01:00
zebardy
1a5f3ce926 Convert services to singletons and use lazy loading to improve performance (#479)
* use singletons to reduce need to recreate the same objects

* unable to make the constructor private

* comment out debug printing to log file

* correct typo of treating self() as a var instead of a function

* utilise Localisation service as a singleton

* fix errent line that should have been commented

* remove phpinfo

* correct mistake in stock controller

* try storing app in apcu

* serialise inside the app closures

* get timings for db-changed-time

* get timings for db-changed-time

* store localisation service in apcu

* stor translations in apcu instead of localisation service (due to database connection)

* correct syntax error

* forgot to uncomment instance map

* correct indentation and variable out of scope

* more timings for app execution time

* try apc caching for views

* correct scope for Pot variable

* remove additional fopen

* correct timings for app build time

* correct timings for app object build time

* correct timings for app route build time

* get timings for routing timings

* get more in depth timings for routing loading

* fix more in depth timings for routing loading

* start investigating session auth middleware creation

* start investigating session auth middleware creation

* start investigating Login controller time

* start investigating Login controller time

* in depth look at Logincontroller timings

* comment out debug printing

* lazily obtain valus for page rendering

* correct syntax error

* correct scope of variable

* correct visibiity of methds inherited from BaseController

* missing use for Userfieldsservice

* lazy loading of open api spec

* lazy loading of users service

* lazy loading of batteries service

* lazy loading of services in controllers

* lazy loading of services in services

* correct mistake

* fix userservice

* fix userservice

* fix userfieldservice

* fix chores service

* fix calendar service

* remove Dockerfile used for development

* Remove docker compose file used for development

* Clean up app.php

* remove last diff

* Clean up base controller

* Clean up controllers

* lean up middleware

* Clean up and tuen all services into singletons

* remove debug from routes.php

* remove acpu from localisation

* Complete removal of acpu from localisation

* fixes for things broken

* More fixes following merge

* Fix for start up bug. Re factoring singleton code had brroken due to scope of clas var.

* fix bug where getUsersService is declared twice

* bug fixes following merge

* bug fixes following merge

* bug fixes following merge

* bug fixes following merge

* bug fixes following merge

* Fix all the not working things...

* Deleted off-topic files

* Deleted off-topic files

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-03-01 17:47:47 +01:00
Bernd Bestel
2b1dc7756d Added new demo localization string 2020-02-24 13:44:23 +01:00
Bernd Bestel
de20699580 Updated recommended nginx try_files directive 2020-02-13 22:29:05 +01:00
Bernd Bestel
c58b396a55 Try 1 to fix the problem after Slim Framework 4 upgrade when running grocy in a subdirectory 2020-02-13 22:10:39 +01:00
Bernd Bestel
5dd78aa19a Remove accidentally added function 2020-02-11 19:36:15 +01:00
Bernd Bestel
3c4264c3a0 Reload the meal plan after consuming a recipe 2020-02-11 19:24:34 +01:00
Bernd Bestel
d4fa1a64c2 Upgrade Slim Framework to v4 (closes #561) 2020-02-11 17:42:03 +01:00
Bernd Bestel
d56aebc9b8 Don't crash when @stack['componentScripts'] is empty and properly format the output 2020-02-10 21:20:21 +01:00
Bernd Bestel
c266b53ff1 Added an ugly hack to prevent including the same component JS file multiple times 2020-02-10 20:21:52 +01:00
Bernd Bestel
a32206834b Make product card recipe ingredient indentation dynamic (references #556) 2020-02-10 19:30:49 +01:00
Bernd Bestel
aa787e765e Changelog, small changes and added missing localization strings for #556 2020-02-10 18:24:15 +01:00
kriddles
c5f38689fa Include product_group in recipe ingredient list (#556)
* Include product_group in recipe ingredient list

* Delete 0098.sql

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-02-10 18:04:57 +01:00
Bernd Bestel
6b8169a1f1 Changelog and small changes for #557) 2020-02-10 18:00:42 +01:00
kriddles
898ea26139 Recipe Overview recipePositionsResolved should only include normal recipes (#557) 2020-02-10 17:56:52 +01:00
Bernd Bestel
49edd011b4 Changelog and small fixes for #545 2020-02-09 21:50:56 +01:00
kriddles
7638254f14 Mealplan - use mealplan recipe_servings when consuming and adding missing recipe ingredients (#545) 2020-02-09 21:43:31 +01:00
Bernd Bestel
472c083bca Little changes, changelog and added missing localization strings for #555 2020-02-09 21:16:47 +01:00
kriddles
7be2d94cf7 View base servings on recipecard (#555) 2020-02-09 21:08:11 +01:00
Bernd Bestel
5a65f37f4a Little wording change/fix 2020-02-09 21:03:11 +01:00
Bernd Bestel
540ae2627a Changelog & small changes for #554 2020-02-09 21:01:29 +01:00
kriddles
2c0f7f0883 Default initial recipe add for mealplan to use recipe's base_servings (#554) 2020-02-09 20:57:25 +01:00
Bernd Bestel
97095d6e68 Typo... 2020-02-09 17:33:02 +01:00
Bernd Bestel
785dd30724 Fixed that the wrong FEATURE_FLAG was used (references #552) 2020-02-09 17:28:49 +01:00
Bernd Bestel
1953a26d7f Changelog and small changes for #552) 2020-02-09 17:27:46 +01:00
kriddles
13f99ad5f2 CalendarService reflect config options for GetEvents (#552) 2020-02-09 17:22:54 +01:00
Bernd Bestel
ba4dfa30a7 Added changelog 2020-02-09 17:17:30 +01:00
Bernd Bestel
62dae64a88 Make meal plan entries editable (references #545) 2020-02-09 17:15:13 +01:00
Bernd Bestel
0359003e09 Little changes for #551 2020-02-09 15:36:03 +01:00
Marc Ole Bulling
a0ab5c5e94 Add option to disable automatic switching to compact shoppinglist view on mobile devices (#551) 2020-02-09 15:25:54 +01:00
Bernd Bestel
e9f55de987 Fixed FullCalendar height was not calculated dynamically (fixes #549) 2020-02-09 15:24:05 +01:00
Bernd Bestel
3af5bd8e29 Scoll to the recipe card after selecting a recipe on mobile devices (closes #547) 2020-02-09 15:11:38 +01:00
Bernd Bestel
06fe308f31 Fixed recipeposform initial product quantity unit was not set 2020-02-04 20:04:48 +01:00
Bernd Bestel
35388b798c We don't need rounded borders on card headers 2020-02-04 19:51:39 +01:00
Bernd Bestel
35eb976706 Don't show nested-resolved recipe ingredients of the selected recipe 2020-02-04 19:49:09 +01:00
Bernd Bestel
a5277224f5 Reworked recipe card (fixes #543) 2020-02-04 19:48:00 +01:00
Bernd Bestel
fcfe62f4d3 Further optimize spacing to waste less space 2020-02-03 21:45:15 +01:00
Bernd Bestel
171d6af5e1 We don't need that switch-button, a native Boostrap button is enough and less disturbing 2020-02-03 21:21:42 +01:00
Bernd Bestel
58cff18b03 Improved the meal plan add-dialogs (closes #540) 2020-02-03 20:04:22 +01:00
Leroy Förster
b4a759c0fc Use full width for compact shopping list (#541)
I had luck with not enforcing any width, not even 100% and removed the
padding an margin overrides from the shoppinglist.js

I also tested it on a real Android device to be really sure.
2020-02-03 08:48:37 +01:00
Bernd Bestel
b9e32a9795 Fixed contextual time ago display was missing (references #513) 2020-02-02 17:55:35 +01:00
Bernd Bestel
9e519e0841 Annotate variable ingredient amounts (closes #530) 2020-02-02 17:26:32 +01:00
Bernd Bestel
ba1272ced8 Made the navbar a little smaller 2020-02-02 17:16:02 +01:00
Bernd Bestel
3ca6982c39 Don't show and use scan mode in embedded mode (dialogs) 2020-02-02 13:13:18 +01:00
Bernd Bestel
890663bf63 Fixed the "Shopping list to stock workflow" with disabled FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING (fixes #537) 2020-02-02 13:01:31 +01:00
Bernd Bestel
5effa0c103 Fixed recipeposform edit when "Only check if a single unit is in stock" is set (again closes #535) 2020-02-02 12:33:48 +01:00
Bernd Bestel
7235d9c0c9 Next try to fix scrolling issues on shopping list compact view (again closes #453) 2020-02-02 12:01:47 +01:00
Bernd Bestel
ad9f336035 Fix new recipe creation when reloading the /recipes/new page (fixes #536) 2020-02-01 18:16:44 +01:00
Bernd Bestel
23efe0c87a Added an option to hide the calendar on the shopping list (closes #531) 2020-02-01 12:55:12 +01:00
Bernd Bestel
683ea0984c Further optimized shopping list compact view (references #453) 2020-02-01 12:35:06 +01:00
Bernd Bestel
debb29ddaa Fixed recipeposform edit when "Only check if a single unit is in stock" is set (fixes #535) 2020-02-01 09:03:30 +01:00
Bernd Bestel
55c5501d96 Optimized recipeposform input ordering (closes #533) 2020-02-01 08:59:37 +01:00
Bernd Bestel
b8c6ac6905 Fixed location_id handling when FEATURE_FLAG_STOCK_LOCATION_TRACKING is disabled (fixes #532) 2020-01-31 21:27:51 +01:00
Bernd Bestel
170c7627fd Only apply fullscreen-no-gutters class when a fullscreen-card is displayed (references #453) 2020-01-31 18:17:39 +01:00
Bernd Bestel
72e18ed0a4 Show the shopping list notes field in compact view (references #453) 2020-01-31 17:58:47 +01:00
Bernd Bestel
6d4a15d372 Improve shopping list compact view (references #453) 2020-01-31 17:52:03 +01:00
Bernd Bestel
ce3b30f601 Prepared next release 2020-01-31 08:51:16 +01:00
Bernd Bestel
fcd421d17b Pulled translations from Transifex 2020-01-31 08:47:50 +01:00
Bernd Bestel
d4367808a2 Include 80 % complete translations in releases 2020-01-30 07:32:09 +01:00
Bernd Bestel
28e3f6226f Added the new hungarian translation 2020-01-30 07:30:46 +01:00
Bernd Bestel
caa4edf7e3 Added new demo_data localization string 2020-01-29 11:26:24 +01:00
Bernd Bestel
0e0c58542e Added the slovak localization 2020-01-29 11:19:43 +01:00
Bernd Bestel
15b4f2ede3 Added new demo_data localization string 2020-01-28 22:30:09 +01:00
Bernd Bestel
da92ac40c4 Always save the recipe before leaving/reloading the page (this now closes #520) 2020-01-28 21:04:59 +01:00
Bernd Bestel
eaacca61c2 Order product picker list by name on the recipe edit page (references #520) 2020-01-28 20:58:35 +01:00
Bernd Bestel
8d490351d0 Replaced jQuery UI by Animate.css (better, faster, lighter) 2020-01-28 19:27:18 +01:00
kriddles
6f549bdf3a Battery fix (#519)
* bugfix variable name

* Typo: curent->current
2020-01-28 08:44:25 +01:00
Bernd Bestel
a64b35e9d4 Made the sidebar menu items a little smaller 2020-01-27 22:34:48 +01:00
Bernd Bestel
0e41500a63 Properly check for any boolean value query parameter 2020-01-27 22:20:20 +01:00
Bernd Bestel
5d83ec7967 Typo 2020-01-27 22:17:19 +01:00
Bernd Bestel
e84c7063d3 Consume any subproduct when consuming a recipe ingredient which is not in stock (fixes #446) 2020-01-27 22:14:11 +01:00
Bernd Bestel
dceed6759a Added missing localization string 2020-01-27 20:23:05 +01:00
Bernd Bestel
0c0604c693 Properly space/divide userentities in the newly arranged sidebar 2020-01-27 20:22:49 +01:00
Bernd Bestel
4124b2eee8 Updated dashboard screenshot 2020-01-27 19:21:10 +01:00
Bernd Bestel
4c1c971f6d Rename /stockedit and /stockdetail to match the "naming conventions" (references #421) 2020-01-27 19:19:09 +01:00
Bernd Bestel
40730328b8 Updated README.md 2020-01-27 19:07:13 +01:00
Bernd Bestel
05aceb72ae Squashed commit
- Only refresh contextual number/datetime info/formatting where needed (closes #513)
- Also refresh correlated stock journal entries on undo (closes #471)
- Prefill "New amount" with the current stock amount on the inventory page (closes #434)
- Ensure that the location_id of the stock and stock_log tables is never empty after migration 95 (references #421)
- Load initial values of the /stockedit form server side to improve loading performance (references #421)
- Use more or less the same input ordering as on the purchase page for the /stockedit page (references #421)
- Also display the "Compact view" button on the shopping list page when FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS is disabled (references #453)
- Ensure that the currently active sidebar menu item is visible
- Optimized sidebar menu item grouping/spacing
- Properly order the API documentation route groups and put the "by-barcode" routes into a separate group
- Updated dependencies
- Pulled translations from Transifex
- Prepared changelog for next release
2020-01-27 19:00:49 +01:00
Bernd Bestel
9221d787a5 How many units are in stock doesn't really mean anything... 2020-01-26 21:18:09 +01:00
Bernd Bestel
4cc31a87e0 Added changelog RSS feed info to changelog 2020-01-26 21:03:32 +01:00
Bernd Bestel
2764bb680c Changed some localization strings 2020-01-26 20:13:15 +01:00
Bernd Bestel
71a57c9dcb Implement "Free products" (closes #426) 2020-01-26 20:01:30 +01:00
Bernd Bestel
f09ba08549 Typo... (references #517) 2020-01-26 18:02:12 +01:00
Bernd Bestel
430cd05278 Break long mealplan notes (fixes #517) 2020-01-26 18:00:29 +01:00
Bernd Bestel
a8f43a1d45 Added a quick video demo to showcase the new "Scan mode" feature 2020-01-26 16:43:46 +01:00
Bernd Bestel
bad19721db Make the scan mode switch-buttons a little bigger 2020-01-26 15:44:09 +01:00
Bernd Bestel
c7bcb9984a Implemented "Scan mode" 2020-01-26 15:35:01 +01:00
Bernd Bestel
7a048136c6 Added missing localization strings 2020-01-26 13:40:26 +01:00
kriddles
ac1be1e90f 450 updates (#518)
* prevent seeing undefinde if no recipes

* disable weekRecipeConsume if weekCosts are zero

* reword title

* Add meal plan notes and products to Calendar
2020-01-26 08:50:44 +01:00
Bernd Bestel
0ef9b2fdb7 Added a new setting to be able to start the meal plan on a different weekday (closes #429) 2020-01-25 20:01:40 +01:00
Bernd Bestel
d64a1a546c Finalize products on meal plan feature (references #450) 2020-01-25 19:42:46 +01:00
Bernd Bestel
98f70d1525 Finalize products on meal plan feature (references #450) 2020-01-25 18:36:54 +01:00
Bernd Bestel
aa97a8c301 Finalize products on meal plan feature (references #450) 2020-01-25 18:34:03 +01:00
kriddles
3762c1f799 450 consume meal plan product (#514)
* typo

* mealplan product consume
2020-01-25 18:02:50 +01:00
Bernd Bestel
e111d07f4e Added the ability to directly add products to the meal plan (closes #450) 2020-01-25 11:51:00 +01:00
Bernd Bestel
061f4da041 Don't try to switch twice to shopping list compact mode on mobile (references #453) 2020-01-25 08:49:17 +01:00
Bernd Bestel
3cbeea7d95 Added an option to filter for only undone items on the shopping list (closes #452) 2020-01-24 22:26:36 +01:00
Bernd Bestel
ad54253d72 Added a compact view for shopping list (for mobile shopping) (closes #453) 2020-01-24 22:05:08 +01:00
Bernd Bestel
fd5a72264d Meal plan recipe and notes also fit into one table (references #477) 2020-01-23 21:57:47 +01:00
Bernd Bestel
6663551a66 A day can have multiple meal plan notes (references #477) 2020-01-23 21:01:35 +01:00
Bernd Bestel
8d7f985b59 Make it possible to add notes to meal plan (days) (closes #477) 2020-01-23 20:59:19 +01:00
Bernd Bestel
594dc0858b Make sure that Grocy.CurrentUrlRelative is set without the query string (fixes #509) 2020-01-23 20:12:38 +01:00
Bernd Bestel
d7c7e0f53c Added missing localization string 2020-01-23 20:05:57 +01:00
Bernd Bestel
469dcefc7a Don't show not listable entites in Swagger UI (fixes #510) 2020-01-23 20:05:44 +01:00
Bernd Bestel
b4997abf75 Reload the page if a stock row cannot be found by id (references #506) 2020-01-23 19:13:35 +01:00
Bernd Bestel
99d4b05a3c Make purchased date on /stockedit editable / Dirty workaround for 2 datetimepickers on the same page (references #506) 2020-01-23 18:58:05 +01:00
kriddles
3baffcfe7b typo (#511) 2020-01-23 09:34:17 +01:00
Bernd Bestel
a9d235d9ce Added missing localization string 2020-01-22 22:36:21 +01:00
Bernd Bestel
6300a8fd09 Typo... 2020-01-22 22:36:01 +01:00
Bernd Bestel
ec2551d263 Little refinements for #507 2020-01-22 21:17:04 +01:00
kriddles
ef9f28d154 421 (#507)
* refactor to be stock/entry/{entryId}

* Allow recipeform add productworkflow

* on document ready stockdetail filter based on ProductPicker

* openDate fixes for undo

* RefreshStockDetailRow refresh location-id
2020-01-22 21:08:49 +01:00
Bernd Bestel
101355cae2 Added day summary (costs and calories) to the meal plan (closes #502) 2020-01-21 22:44:04 +01:00
Bernd Bestel
ca6c2b0af8 Also show calories per serving on the meal plan (references #502) 2020-01-21 22:02:53 +01:00
Bernd Bestel
5793f6b041 Fixed that meal plan week costs were missing for weeks 1 - 9 2020-01-21 21:54:22 +01:00
Bernd Bestel
22c978c8dc Preselect the default serving size when adding a nested recipe (closes #500) 2020-01-21 21:42:52 +01:00
Bernd Bestel
6f035fd64d Allow decimal numbers for the kcal field (closes #492) 2020-01-21 21:31:42 +01:00
Bernd Bestel
5cdfd30852 Added changelog for #501 2020-01-21 20:49:25 +01:00
Bernd Bestel
0816359867 Some refinements for #501 2020-01-21 20:45:34 +01:00
kriddles
3a36bdaf45 recipes can create products (#501) 2020-01-21 20:20:26 +01:00
Bernd Bestel
c22496ca7c Fixed /stockedit opened checkbox (references #506) 2020-01-21 20:04:33 +01:00
Bernd Bestel
f543a3a472 Fixed and optimized some things related to #421 (& some more cleanup) 2020-01-21 17:30:09 +01:00
Bernd Bestel
17e5c04bf9 Added changelog for #503 2020-01-19 09:53:58 +01:00
Bernd Bestel
d0036e8034 Tried to simplify #503 (also references #487) 2020-01-19 09:52:23 +01:00
Grégory SACRE
61a45c030f Feature request : api/stock can return detailed products #487 (#503)
The response of the call '/api/stock' now returns a new attribute
('product') which contains the details of the related product.
2020-01-19 09:14:07 +01:00
Bernd Bestel
cd522220ce Added changelog for #491 2020-01-17 18:15:45 +01:00
kriddles
7c2320e978 refresh productcard on save (#495) 2020-01-17 18:13:43 +01:00
Bernd Bestel
5de563f2c9 Added changelog for #489 2020-01-17 18:08:54 +01:00
kriddles
cdbfc3c3db productcard.js check null location (#494) 2020-01-17 18:06:33 +01:00
kriddles
2a608c41e9 Stock detail updates (#493)
* Fix spelling

* stockdetail refresh with location name

* Stock updates

* change stock_row_id to id

* fix stockdetail refresh rows after clicking undo

* fix stockdetail consume spoiled
2020-01-17 17:54:34 +01:00
Bernd Bestel
d4bec3bd10 Added a "keep screen on" option using NoSleep.js (closes #427) 2020-01-05 10:03:02 +01:00
Bernd Bestel
485eb262f9 Show some more info when camera access is not possible (closes #437) 2020-01-05 09:20:58 +01:00
Bernd Bestel
a8cf5ae9ab Handle demo mode via a setting instead of checking the existence of a file (closes #484) 2020-01-05 09:11:11 +01:00
Bernd Bestel
539334f5ee Fixed the response type description of the /stock/volatile API endpoint (fixes #460) 2020-01-03 15:03:03 +01:00
Bernd Bestel
e515f21d3b Fixed DataTables earch / don't search the first column with buttons/menus (fixes #440) 2020-01-03 14:18:56 +01:00
Bernd Bestel
6345e69922 Fixed tare weight handling min. amount on purchase was not calculated based on the products qu_factor_purchase_to_stock (fixes #457) 2020-01-03 14:10:43 +01:00
Bernd Bestel
8e26bd2c31 Allow partial units during inventory (fixes #459) 2020-01-03 13:55:14 +01:00
Bernd Bestel
675bf25927 Allow empty date(time) inputs when the field is not required (fixes #462( 2020-01-03 13:50:10 +01:00
Bernd Bestel
0be672aa48 Fixed that when FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS was set to false, the shopping list appeared empty after some actions (fixes #428) 2020-01-03 13:35:48 +01:00
Bernd Bestel
8da13ab22b Added changelog for #476 2019-12-21 12:38:15 +01:00
kriddles
36e8484046 Recipe form updates (#476)
* recipePosForm - hide when embeded productcard

* recipeposform: remove prefillByName for productPicker

* recipeform add data-product-id

* recipeposform cleanup extra clicks

* recipeform: bootbox the recipe pos edit button

* recipeform: bootbox the recipe pos add button

* recipeposform postMessage back

* recipeform reload if IngredientsChanged

* Fix page reload for new recipes (URL = /recipe/new)

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2019-12-21 12:36:02 +01:00
Bernd Bestel
2a361a9f72 Forgot to save strings.pot... 2019-12-19 20:11:34 +01:00
Bernd Bestel
bf81d8a794 Added changelog for #469 2019-12-19 20:10:21 +01:00
kriddles
e89832c3aa Check for Price Tracking in mealplan.js (#469) 2019-12-19 20:07:13 +01:00
Bernd Bestel
d617a72397 Again small localization string changes (references #421) 2019-12-19 20:03:27 +01:00
Bernd Bestel
b02e43aea8 Added changelog for #421 2019-12-19 20:00:47 +01:00
kriddles
6c7420ea08 Stock Service Updates (#421)
* viewjs consume: implement location and update stock specific

* Transfer Products

* services StockService#GetProductStockEntriesByLocation: add method

* services StockService#AddProduct: check for stock and locations

* services StockService: include location_id

* services StockService#LocationExists: add method

* services StockService#UndoBooking: fix based on stockRow

* Reimplement StockServer->TransferProduct (one loop for the whole action to preserve stock_id)

* Ensure that the location_id is never NULL in the stock and stock_log table (checked by an INSERT trigger, sets the products default location if empty)

* Only consider stock amount at the given location on consume, if supplied

* Restore more/old display text for "specific stock entry"

* Don't allow transfering tare weight enabled products

* Various small changes (code style, missing OpenAPI endpoint, remove location_id null checking)

* Updated translations strings

* Added transaction_id and correlation_id to stock_log entries to group them together

* ProductCard - location to default location label change

* Also undo correlated bookings on undo

* Added API endpoints for listing and undoing transactions and use them on purchase/consume/inventory/stockoverview

* Initial Stock detail page

* Allow Undo for Tranfers

* Price step to .01

* Some localization string changes & fixes
2019-12-19 19:48:36 +01:00
Bernd Bestel
0be1994c02 Added changelog for #456 and #458 2019-12-08 20:53:28 +01:00
beetle442002
275db21740 ExternalBarcodeLookup (#458)
* Changed line 173 to /stock/barcodes/external-lookup/{barcode} fixes grocy/grocy#456

* Changed line 173 to /stock/barcodes/external-lookup/{barcode} fixes grocy/grocy#456 and I changed grocy.openapi.json to reflect the change
2019-12-08 20:46:37 +01:00
Bernd Bestel
709afac1af Proper pt-br localization/demo 2019-11-26 11:13:14 +01:00
Bernd Bestel
9bd43cf67a Added the Portuguese translation files 2019-11-13 14:47:23 +01:00
Bernd Bestel
e493abf784 Dummy change to force-commit file (references #412) 2019-11-02 08:45:40 +01:00
Bernd Bestel
62b85cda0e Dummy change to force-commit file (references #412) 2019-11-02 08:45:30 +01:00
Bernd Bestel
7b0fdfe62e Renormalize line endings (closes #412) 2019-11-02 08:42:49 +01:00
Bernd Bestel
5d42cc15a6 Added a .gitattributes file (references #412) 2019-11-02 08:40:03 +01:00
Bernd Bestel
da2c8d48ac Changelog and code optimizations for pull request #420 2019-10-19 10:33:46 +02:00
Marc Ole Bulling
a0fc06f6ed Add GET parameter to close window after product creation (#420)
* Add GET parameter to close window after product creation

PR for issue #419

This only works when the window was opened by Javascript (eg. from a third party plugin like Barcode Buddy)

* Added flow if window closing fails

If the window could not be closed, the normal flow continues
Added comments

* Made GET parameter case insensitive
2019-10-19 10:26:18 +02:00
Bernd Bestel
e133508814 Delay DataTables search by 200ms (references #424) 2019-10-15 19:59:14 +02:00
Bernd Bestel
9e1804252e Centralize default DataTables init settings (references #424) 2019-10-15 19:38:51 +02:00
Lewis Juggins
1b0308f39d Improve mobile performance on stock overview (#424) 2019-10-15 19:24:23 +02:00
Lewis Juggins
9ba66aeac2 Rename location to "Default location" on product page (#416)
* Rename location to default location on product page

* Move resource
2019-10-12 14:27:15 +02:00
Bernd Bestel
3328c789d4 Fixed that the meal plan menu item was not visible when the calendar was disabled (through feature flags) (closes #415) 2019-10-12 10:35:47 +02:00
Bernd Bestel
68dc1bc1f9 Added changelog for #417 2019-10-12 10:25:39 +02:00
Bernd Bestel
21b9c1a8aa Always use the proper URL for meal plan links in iCal calendar export (references #417) 2019-10-12 10:22:17 +02:00
kriddles
c6ae8cc348 Calendar descriptions (iCal export) (#417)
* controllers CalendarApiController: setDescription for events

* services CalendarService: include link to mealplan in calendar descriptions
2019-10-12 10:16:06 +02:00
Bernd Bestel
744fd03633 Added a note that browser barcode scanning only works when served via a secure connection (closes #411) 2019-10-06 11:51:46 +02:00
Bernd Bestel
d994551f75 Pulled translations from Transifex 2019-10-05 13:15:54 +02:00
Bernd Bestel
ed4d292b23 Prepared next release 2019-10-05 13:14:28 +02:00
Bernd Bestel
700db9ae00 Added a new sub feature flag FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS 2019-10-05 13:10:56 +02:00
Bernd Bestel
ff92e8235f Added missing translation string (source language) 2019-10-04 11:27:59 +02:00
Bernd Bestel
ba6bfa6a2c Added a chore period type "yearly" (closes #407) 2019-10-04 11:24:51 +02:00
Bernd Bestel
28b23fd313 Implemented chore period intervals to have more flexible schedules (closes #312) 2019-10-04 11:14:11 +02:00
Bernd Bestel
554ac104f8 Added missing translation string 2019-10-04 10:31:06 +02:00
Bernd Bestel
039ed54a58 Optimized nested recipe resolving / prevent infinite nested recipes 2019-10-04 10:30:30 +02:00
Bernd Bestel
5d98140843 Added input shorthands for date fields to increase/decrease the date by 1 month/year (closes #405) 2019-10-02 16:06:44 +02:00
Bernd Bestel
420e4b933f Don't display QU conversions for other products on the product edit page (fixes #400) 2019-10-02 15:53:36 +02:00
Bernd Bestel
901b345714 Fixed/workaround for recipes_nestings_resolved view when recipe count > 100 (fixes #403) 2019-10-01 15:34:20 +02:00
Bernd Bestel
35b569c832 Pulled translations from Transifex 2019-09-28 13:27:20 +02:00
Bernd Bestel
d81fe4777c Prepared next release 2019-09-28 13:23:50 +02:00
Bernd Bestel
95208f5582 Updated unmanaged dependencies (font) 2019-09-28 08:53:59 +02:00
Bernd Bestel
dea2ffeaaf Added a "clear" button above the new notes field on the shopping list page 2019-09-28 08:48:58 +02:00
Bernd Bestel
e548caabb1 Formatting... 2019-09-27 17:32:52 +02:00
Bernd Bestel
2b0f5d8d84 Only do a product by barcode lookup if there is actually any input 2019-09-27 17:27:45 +02:00
Bernd Bestel
e9f2edea75 Optimize the initial state of the barcode scanner start button if the input element is disabled and make sure it does nothing, if the button is enabled however but the input element is disabled 2019-09-27 17:24:44 +02:00
Bernd Bestel
1b9a3c7f57 Fix that the barcode scanner start button overlaps everything 2019-09-27 17:03:50 +02:00
Bernd Bestel
2636456461 Show the journal of the product/chore/battery cards in a dialog 2019-09-27 16:54:40 +02:00
Bernd Bestel
81f6b58fe4 Added a button to jump to the journal on the product/chore/battery card 2019-09-27 14:19:06 +02:00
Bernd Bestel
9ba4585143 Reduce console.log spam 2019-09-27 14:08:24 +02:00
Bernd Bestel
4aa575e0e8 Display just "unlimited" on the product card for the average shelf life if it is > 200 years 2019-09-27 14:04:44 +02:00
Bernd Bestel
765f908966 Make it possible to provide the purchase price also as a total price (closes #390) 2019-09-27 13:50:16 +02:00
Bernd Bestel
9527305311 Userobjects list page print optimizations (closes #396) 2019-09-27 13:23:10 +02:00
Bernd Bestel
9d52f82bc2 Updated changelog for pull request #397 2019-09-27 08:35:15 +02:00
DeeeeLAN
6522aca30e Fixed navigation menu and full screen recipe smooth scrolling on iOS (#397)
* fixed barcode button on iOS and made nicer on the desktop

* fixed indentation

* fixed indentation

* fixed recipe ingredient layout issue in safari

* fixed navigation menu and full screen recipe smooth scrolling on iOS
2019-09-27 08:33:08 +02:00
Bernd Bestel
e59a35c6d1 Also refresh the parent product on sub product actions on the stock overview page (closes #394) 2019-09-27 08:30:08 +02:00
Bernd Bestel
cc2bf68f31 Fixed row highlighting after product actions on the stock overview page 2019-09-27 08:12:37 +02:00
Bernd Bestel
654d00dd67 Again corrections for #384) 2019-09-26 20:56:19 +02:00
Bernd Bestel
cf2e6f1039 Added a sub feature flag to disable chore assignments when not needed 2019-09-26 17:20:25 +02:00
Bernd Bestel
cf3217ada4 Fixed expired products count on stock overview page (fixes #392) 2019-09-26 16:42:59 +02:00
Bernd Bestel
21503c26d2 Use properly formatted numbers "everywhere" (partly references #389) 2019-09-26 15:25:30 +02:00
Bernd Bestel
7369603d78 Added missing localization string 2019-09-26 14:55:31 +02:00
Bernd Bestel
41e93d2c50 Little night mode improvements 2019-09-26 14:13:30 +02:00
Bernd Bestel
b39866bda2 Immediately refresh the QU conversion hint on key presses on the product edit page 2019-09-26 13:59:41 +02:00
Bernd Bestel
b8f9d09afc Don't remove products from stock overview on consuming all and the product has a min. stock amount & show it again on undo 2019-09-26 13:55:42 +02:00
Bernd Bestel
a2b6d9ae39 Various small UI refinements 2019-09-26 13:14:24 +02:00
Bernd Bestel
45d3c25b21 Again optimizations for #384 2019-09-26 13:13:49 +02:00
Bernd Bestel
2809cc1454 Typo... 2019-09-26 12:45:35 +02:00
Bernd Bestel
02f30d141e Reviewed/optimized last changes (references #384) 2019-09-26 12:43:00 +02:00
DeeeeLAN
c5927a10f3 fixed recipe ingredient layout issue in safari (#387)
* fixed barcode button on iOS and made nicer on the desktop

* fixed indentation

* fixed indentation

* fixed recipe ingredient layout issue in safari
2019-09-26 11:42:30 +02:00
Bernd Bestel
828ab8eba0 Allow accumulating min. stock amounts on parent product level (closes #384) 2019-09-26 10:36:49 +02:00
Bernd Bestel
75f8ecfad2 Updated the changelog and config-dist.php for #383) 2019-09-25 13:11:20 +02:00
Lewis Juggins
fd14083443 Support meal plan as default page (#383)
* Support meal plan as default page

* Update SystemController.php
2019-09-25 13:08:41 +02:00
Bernd Bestel
04808eaa66 Include the server timezone in iCal calendar export (closes #379) 2019-09-25 09:52:32 +02:00
Bernd Bestel
53f0893f55 Fix unit conversion handling (factor of destination qu is always 1) (fixes #382) 2019-09-25 09:32:06 +02:00
Bernd Bestel
2eb3d8fe47 Updated changelog for #378 / #380 2019-09-25 09:16:43 +02:00
DeeeeLAN
c0d79b1518 Fixed #378 (#380)
* fixed barcode button on iOS and made nicer on the desktop

* fixed indentation

* fixed indentation
2019-09-25 09:00:36 +02:00
Bernd Bestel
5351828e79 Reuse existing shopping list items when adding products from the stock overview page (closes #375) 2019-09-24 18:27:50 +02:00
Bernd Bestel
b0c7958891 Updated the changelog for #376 2019-09-24 15:53:48 +02:00
Marc Ole Bulling
f444d3e095 Fixed API call AddProductToShoppingList (#376)
$productId->id was undefined, therefore all items added to the shopping list with the API call had a null entry for "product_id"
2019-09-24 15:50:35 +02:00
Bernd Bestel
d8be254ff3 Link /barcodescannertesting page in settings menu 2019-09-24 10:43:10 +02:00
Bernd Bestel
49b26bd375 Return a Cache-Control header for files served via the API 2019-09-24 10:38:41 +02:00
Bernd Bestel
50e829f270 Hide the recipe interaction buttons when displayed as a fullscreen card (as the dialogs would be behind the fullscreen card) 2019-09-24 10:28:42 +02:00
Bernd Bestel
3b29110500 Never show close buttons in modal dialogs, this is not needed 2019-09-24 10:24:47 +02:00
Bernd Bestel
e727a38071 Improved the responsiveness of the "Create or assign product" dialog 2019-09-24 10:19:23 +02:00
Bernd Bestel
099ac7e75a Use exact matches for product barcode lookups (closes #366) 2019-09-24 09:52:05 +02:00
Bernd Bestel
53c56cc1cb Include meal plan recipes in the calendar (closes #368) 2019-09-24 09:40:56 +02:00
Bernd Bestel
2a9f927a13 Improved responsiveness of /mealplan and /calendar (closes #372 and closes #373) 2019-09-24 09:21:57 +02:00
Bernd Bestel
6bb9d2c51d Some little changes for pull request #369 (also references #367) 2019-09-24 08:35:30 +02:00
Bernd Bestel
ca719072c9 Merge branch 'master' of https://github.com/grocy/grocy 2019-09-24 08:14:07 +02:00
kriddles
66f61ec1ad public mealplan: add fullscreen recipe in popup (#369) 2019-09-24 08:13:42 +02:00
Bernd Bestel
cc500c50ff Fixed some types in the last changelog 2019-09-24 08:08:52 +02:00
Bernd Bestel
eef844d42e Optimized dropdown caret position a little bit 2019-09-23 20:19:53 +02:00
Bernd Bestel
e92843a9bf Added new demo strings 2019-09-23 13:21:02 +02:00
Bernd Bestel
66571f662f Hotfix (will be included in v2.5.0 release): Don't break image loading when php-gd extension is not installed 2019-09-22 14:48:50 +02:00
Bernd Bestel
e5aebad5d9 Small night mode fix 2019-09-22 13:32:18 +02:00
Bernd Bestel
f3a1489abf Little night mode improvements 2019-09-22 10:26:43 +02:00
Bernd Bestel
6ca694226b Pulled translations from Transifex 2019-09-22 09:49:09 +02:00
Bernd Bestel
5d5cfb1548 Prepared next release 2019-09-22 09:47:58 +02:00
Bernd Bestel
1a7be05e3f Added linuxserver/docker-grocy to README 2019-09-22 09:46:19 +02:00
Bernd Bestel
f7c4662e2b Prevent error message spam when navigating away before the page has completely loaded 2019-09-22 09:36:28 +02:00
Bernd Bestel
4c57bf8b9d Always navigate back to the previous page after saving a product (closes #364) 2019-09-22 09:03:59 +02:00
Bernd Bestel
e5530e2058 Trigger input event after SetValue of datetimepicker (fixes #363) 2019-09-22 08:53:05 +02:00
Bernd Bestel
363dcf448e Give the main page content section an id 2019-09-22 08:35:03 +02:00
Bernd Bestel
d16f3c2daf Optimized demo instance localization & data handling 2019-09-22 08:21:15 +02:00
Bernd Bestel
51e0154101 Try to improve QuaggaJS barcode scanning recognition accuracy (this now closes #362) 2019-09-21 20:46:23 +02:00
Bernd Bestel
fc2a37d3fc Typo... 2019-09-21 20:20:32 +02:00
Bernd Bestel
c32ea087df Added a little barcode scanner testing page (references #362) 2019-09-21 20:01:49 +02:00
Bernd Bestel
4eabee3db7 Typo... 2019-09-21 17:30:33 +02:00
Bernd Bestel
95478cbb18 Updated README.md 2019-09-21 17:26:53 +02:00
Bernd Bestel
d8360993cc Internal change that the demo instances (stable and pre-release) can be served through a single instance for all localizations (references #241) 2019-09-21 15:07:29 +02:00
Bernd Bestel
6e4117526b Improved productcard "never" date display 2019-09-21 13:40:31 +02:00
Bernd Bestel
e4437f5db1 Fixed that "Spoil rate" and "Average shelf life" on the product card was wrong in most cases 2019-09-21 13:30:44 +02:00
Bernd Bestel
b57fd83cb8 Fixed various smaller problems after some testing 2019-09-21 13:08:42 +02:00
Bernd Bestel
327c1f4fb3 Fixed meal plan did not load when a containing recipe was deleted (closes #361) 2019-09-21 09:18:40 +02:00
Bernd Bestel
ab44566890 Small style refinements 2019-09-21 08:38:28 +02:00
Bernd Bestel
d2a841143e Don't show the sidebar on other menus on the login page 2019-09-21 08:28:08 +02:00
Bernd Bestel
d580990b25 Fixed JS errors on the login page 2019-09-21 08:25:32 +02:00
Bernd Bestel
78b658e86e Also the product calories field is not required 2019-09-20 20:19:12 +02:00
Bernd Bestel
051cb816fe Disabled CSS class was applied to calories product field by mistake 2019-09-20 20:17:54 +02:00
Bernd Bestel
91c275e66b Slightly reordered the header of the shopping list page 2019-09-20 20:14:47 +02:00
Bernd Bestel
653098a81e Improved product picture display on the productcard 2019-09-20 20:10:03 +02:00
Bernd Bestel
c228126c3a Added a new field calories for products (closes #268) 2019-09-20 20:06:24 +02:00
Bernd Bestel
1ae5f552d1 Inventory is always possible, also when the produc is not in stock currently (references #327) 2019-09-20 18:26:32 +02:00
Bernd Bestel
63d7f8f36d Typo... 2019-09-20 18:18:43 +02:00
Bernd Bestel
4754cc306a Currently there are no multiple shopping lists output options, so no dropdown button needed (this now closes #245) 2019-09-20 18:13:38 +02:00
Bernd Bestel
339a25d1e3 Added a notes field to shopping lists (references #245) 2019-09-20 18:08:38 +02:00
Bernd Bestel
5a91c86b81 Added an option to print a shopping list (references #245) 2019-09-20 17:40:45 +02:00
Bernd Bestel
292b652437 Updated localizations & improved some special and demo translation string data handling 2019-09-20 16:26:50 +02:00
Bernd Bestel
399ebbe14a Updated dependencies 2019-09-20 14:47:42 +02:00
Bernd Bestel
a95d6be4f4 Added more product actions on the stock overview page (closes #327) 2019-09-20 13:37:53 +02:00
Bernd Bestel
ca9b8d068a Reuse existing routes for the by-barcode API routes and complete them (references #331) 2019-09-20 10:45:58 +02:00
Bernd Bestel
58890f6bec Typo... 2019-09-20 10:35:30 +02:00
Bernd Bestel
9f8216378e Only show the "Test plural forms"-button on the qu edit page when the current language requires more than 2 plural forms (references #261) 2019-09-20 10:33:44 +02:00
Bernd Bestel
d4c76aaa76 Properly show qu plural forms on the product or qu conversion edit page 2019-09-20 10:30:46 +02:00
Bernd Bestel
6ce4e6cb37 An icon is not needed when not showing an userentity in the sidebar menu (references #242) 2019-09-20 10:22:59 +02:00
Bernd Bestel
aa670adefc Added a say-thanks-button on the about page 2019-09-20 10:08:10 +02:00
Bernd Bestel
1d92e6a4ab Updated changelog 2019-09-19 21:44:59 +02:00
Bernd Bestel
e720311572 Fixed hidden price_factor field in recipeposform.blade.php 2019-09-19 21:31:37 +02:00
Bernd Bestel
7c114cfec3 Implemented a price factor option for recipe ingredients (closes #295) 2019-09-19 21:30:24 +02:00
Bernd Bestel
35a409f462 Fixed/refined some things regarding purchase/consume/inventory of products with enabled tare weight handling 2019-09-19 21:10:36 +02:00
Bernd Bestel
412653d67d Small Swagger UI refinements 2019-09-19 19:59:17 +02:00
Bernd Bestel
58a69d650f Added an API endpoint to add/remove products to stock by its barcode (closes #331) 2019-09-19 18:36:46 +02:00
Bernd Bestel
a4d479d047 Also consider opened products for minimum stock amounts (optionally, but by default) (closes #353) 2019-09-19 18:11:03 +02:00
Bernd Bestel
cbf1d1ca40 Implemented stock sub-feature-flags (closes #314) 2019-09-19 17:46:52 +02:00
Bernd Bestel
5e9a7fb7ca Implemented browser barcode scanning (closes #102) 2019-09-19 12:48:02 +02:00
Bernd Bestel
9f18b75526 Auto focus the amount field on the qu plural form testing page (references #261) 2019-09-18 20:27:35 +02:00
Bernd Bestel
346b589534 Make it possible to test quantity unit plural forms (closes #261) 2019-09-18 20:21:09 +02:00
Bernd Bestel
8f798a94d1 Only allow night mode enabled manually or automatically, but not both at the same time (again fixes #71) 2019-09-18 19:43:33 +02:00
Bernd Bestel
991706920f Fixed that datetimepickers not considered the config.php setting CALENDAR_FIRST_DAY_OF_WEEK (closes #334) 2019-09-18 18:46:07 +02:00
Bernd Bestel
ce12202c86 Make it configurable if calendars shows week numbers or not (closes #333) 2019-09-18 18:30:25 +02:00
Bernd Bestel
ca470ed4ee Fixed version display in prerelease mode 2019-09-18 17:27:47 +02:00
Bernd Bestel
2237e2f8f4 Hide userfields form border for custom objects because all fields are userfields... (references #242) 2019-09-18 16:31:00 +02:00
Bernd Bestel
2522b3748c Just name it "fields" not "userfields" for custom objects (references #242) 2019-09-18 16:25:38 +02:00
Bernd Bestel
096fb7a116 Implement custom entities / objects (closes #242) 2019-09-18 16:18:15 +02:00
Bernd Bestel
918f84f568 Lazy load all images to increase page load times (references #275) 2019-09-18 13:59:37 +02:00
Bernd Bestel
d209c0bd22 Automatically downscale pictures to reduce page loading times (closes #275) 2019-09-18 11:04:59 +02:00
Bernd Bestel
ba089a3d79 Also show the stock QU (as on all other places) after a product is selected on the chore edit page (references #279) 2019-09-18 10:08:59 +02:00
Bernd Bestel
3df44697bf Implemented the option to automatically consume a product on tracking a chore execution (closes #279) 2019-09-18 10:02:52 +02:00
Bernd Bestel
e326e69d49 Allow decimal numbers in "Factor purchase to stock quantity unit" when "Allow partial units in stock" is enabled (closes #351) 2019-09-17 20:02:27 +02:00
Bernd Bestel
bbd8e8c1fa Typo... 2019-09-17 19:42:01 +02:00
Bernd Bestel
9b5f3ba7b8 Render product Userfields also on the shopping list (this now closes #258) 2019-09-17 19:39:55 +02:00
Bernd Bestel
0fa0138972 Implemented new Userfield type "Link" (references #258) 2019-09-17 19:33:06 +02:00
Bernd Bestel
6aa278c19c Updated changelog 2019-09-17 19:20:32 +02:00
Bernd Bestel
3fd0f44fe4 Merge pull request #360 from mduret/master
Parse settings provided via environment variables as boolean if needed
2019-09-17 19:15:50 +02:00
Bernd Bestel
0c27157db6 Implemented new Userfield type "Select list" (closes #325) 2019-09-17 19:11:06 +02:00
Bernd Bestel
bbd5ce1dc4 Typo... 2019-09-17 17:54:09 +02:00
Bernd Bestel
0771d58fe7 Fixed that /api/system/db-changed-time always returned the current time 2019-09-17 17:49:58 +02:00
Bernd Bestel
db0c4f78bd Fix some missing OpenAPI documentation (closes #359) 2019-09-17 17:35:13 +02:00
Bernd Bestel
ef8f6b6d42 Updated changelog 2019-09-17 17:24:19 +02:00
Bernd Bestel
4dd804003b Re-apply filter after chore execution on the chores overview page 2019-09-17 17:17:33 +02:00
Bernd Bestel
182d063886 Fixed user filter button on chores overview page (references #253) 2019-09-17 16:58:42 +02:00
Bernd Bestel
bc487b4867 Make it possible to also filter by chore assignments on the chore overview page (references #253) 2019-09-17 16:50:29 +02:00
Mathieu Duret
b5b2f9c5b9 Parse settings provided via environment variables as boolean if needed (https://github.com/grocy/grocy/issues/346) 2019-09-17 16:45:11 +02:00
Bernd Bestel
b5761ae544 Show to whom the chore execution is assigned in calendar events (references #253) 2019-09-17 16:28:11 +02:00
Bernd Bestel
597a9e3d21 Show aggregated product amounts also on the productcard (references #196) 2019-09-17 16:18:00 +02:00
Bernd Bestel
1b19940aba Only cascade changes of stock QU to recipe ingredients which uses the same QU (references #177) 2019-09-17 16:01:30 +02:00
Bernd Bestel
74f9470769 Implemented that chores can be assigned to users (closes #253) 2019-09-17 13:13:26 +02:00
Bernd Bestel
3dcd513094 Fixed new translation strings 2019-09-16 11:02:03 +02:00
Bernd Bestel
a799f2b43f Finished qu unit conversion handling (closes #177) 2019-09-16 09:35:20 +02:00
Bernd Bestel
c532a67884 Started working on qu unit conversion handling (references #177) 2019-09-15 17:06:52 +02:00
Bernd Bestel
6094096675 Started working on qu unit conversion handling (references #177) 2019-09-15 16:40:54 +02:00
Bernd Bestel
30d89f4529 Typo... 2019-09-14 17:38:58 +02:00
Bernd Bestel
a0a0e104b0 Implemented product variations (closes #196) 2019-09-14 17:34:36 +02:00
Bernd Bestel
26ebeec74f Improved date display of "Track date only"-chores (never show the time part for them) 2019-09-14 13:05:36 +02:00
Bernd Bestel
a4454f825a Fixes/changes for pull request #349 2019-08-31 14:08:15 +02:00
Bernd Bestel
6ec3872518 Merge pull request #349 from Forceu/master
Add API call for adding products to shoppinglist
2019-08-31 13:58:10 +02:00
Marc Ole Bulling
d4eb767f1b Add API call for adding products to shoppinglist 2019-08-30 09:21:11 +02:00
Bernd Bestel
afa4165d1c Updated changelog 2019-08-15 14:39:11 +02:00
Bernd Bestel
f9036f0248 Use the summernote editor for product description (closes #288) 2019-08-15 14:35:28 +02:00
Bernd Bestel
257dd644aa Render checkbox Userfields in tables as checkmark (closes #326) 2019-08-15 14:05:33 +02:00
Bernd Bestel
be4b5c81b2 ixed that the delete button not always deleted the currently selected equipment item (fixes #307) 2019-08-15 13:53:30 +02:00
Bernd Bestel
f88ed1ee8a Merge pull request #343 from Forceu/master
API: Return stock amount of 0 instead of null, if product is not in stock
2019-08-13 14:23:27 +02:00
Forceu
411aad2398 Set stock amount to 0 instead of null if product not in stock
Without this the API returns null instead of 0 when queried for product stock amount
2019-08-13 12:20:14 +02:00
Bernd Bestel
7004cf4400 Finished the implementation of "Location Content Sheet" (closes #341) 2019-08-11 09:24:47 +02:00
Bernd Bestel
28716ed96c First draft for printable location content sheets (references #341) 2019-08-10 16:34:29 +02:00
Bernd Bestel
d6e9dc1b59 Allow providing the API key also via a query parameter (closes #329) 2019-08-10 13:30:50 +02:00
Bernd Bestel
19935276e9 Typo... 2019-08-10 13:11:02 +02:00
Bernd Bestel
fa326fdfda Added an API endpoint to search for objects by name (closes #337) 2019-08-10 13:07:08 +02:00
Bernd Bestel
e6020432c6 Add chores due date rollover (closes #340) 2019-08-10 12:44:09 +02:00
Bernd Bestel
12a2c0945e Added the changelog for the next release 2019-08-10 08:33:54 +02:00
Bernd Bestel
cc1c6a6442 Little changes for pull request #338 2019-08-10 08:33:30 +02:00
Bernd Bestel
c757ee3874 Merge pull request #338 from Forceu/master
Add API call to remove an item from the shopping list by productid
2019-08-10 08:04:00 +02:00
Marc Ole Bulling
1e33975a96 Use default best before date when adding product through API 2019-08-04 20:58:11 +02:00
Forceu
1a23eaabf1 Add API call to remove an item from the shopping list by productid
This adds an API call, so a shopping list item can easily be removed

Please note: This is UNTESTED, as I was unable to run the current grocy master commit on my server.
2019-08-04 20:31:47 +02:00
Bernd Bestel
3dbce7547f Fixed "datatables_localization" localization JSON-string (fixes #323) 2019-07-20 15:48:58 +02:00
Bernd Bestel
0bb3e0ae28 Merge pull request #317 from skevas/fix-typo
Fixes typo in update.sh
2019-07-14 15:16:22 +02:00
skevas
8d4a2d0ff9 Fixes typo in update.sh 2019-07-14 13:02:21 +02:00
Bernd Bestel
3234a97b3c Merge pull request #315 from oncleben31/patch-1
Use list title when display a user field form
2019-07-13 08:26:51 +02:00
Oncleben31
b61d569247 Use list title when display a used filed form
To replace the default string `Product group`
2019-07-13 01:34:57 +02:00
Bernd Bestel
0daf0aeb61 Added a hint to the new community contributions section on the website 2019-07-12 13:45:35 +02:00
Bernd Bestel
889f520afb grocy-desktop is not really "NEW" anymore... 2019-07-12 13:42:35 +02:00
Bernd Bestel
c6420a74ba Merge pull request #290 from nielstholenaar/master
Allow possibility to choose custom homepage
2019-07-10 22:14:19 +02:00
Niels Tholenaar
e3f53aaebd Added possible values to entry page config setting 2019-07-10 17:14:25 +02:00
Niels
94e2ec5e15 Merge branch 'master' into master 2019-07-10 15:11:36 +02:00
Niels Tholenaar
0a61ea0fcf Improved entry page resolving to handle disabled features 2019-07-10 15:10:39 +02:00
Bernd Bestel
091145c62c Minor typos... 2019-07-07 20:00:05 +02:00
Bernd Bestel
197b83fee8 Prepared next release 2019-07-07 19:51:40 +02:00
Bernd Bestel
430286ae9e Don't consider a chores executed when the execution was undone 2019-07-07 19:47:05 +02:00
Bernd Bestel
6e3407b157 Always show "Track date only" shore execution times without the time part 2019-07-07 19:38:57 +02:00
Bernd Bestel
13c432b0cf Fixed weekly chores were scheduled on the same day (fixes #304) 2019-07-07 19:19:54 +02:00
Bernd Bestel
4822d9a4b8 Fixed date-only-datetimepicker width 2019-07-07 10:10:20 +02:00
Bernd Bestel
52dd01f313 Fixed that a string was never translated 2019-07-07 09:29:04 +02:00
Bernd Bestel
87976b86d9 Also display price data from inventory corrections, not only purchases (fixes #303) 2019-07-07 09:25:13 +02:00
Bernd Bestel
84e6e253ea Fixed date "never" display on stock overview page (again closes #296) 2019-07-07 09:04:40 +02:00
Bernd Bestel
001d5c5d1d Prepared next release 2019-07-06 20:43:30 +02:00
Bernd Bestel
b4d2e2a20a Added the possibility to undo a task (closes #252) 2019-07-06 20:34:01 +02:00
Bernd Bestel
914dde4609 Added a new config.php setting CALENDAR_FIRST_DAY_OF_WEEK to be able to change the first day of a week used for calendar views (closes #256) 2019-07-06 20:19:21 +02:00
Bernd Bestel
1eb1aa8b11 Added a "consume this recipe"-button to the meal plan (and also a button to consume all recipes for a whole week) (closes #283) 2019-07-06 20:02:40 +02:00
Bernd Bestel
09b23847b5 Added a new config.php setting DISABLE_AUTH to be able to disable authentication / the login screen (closes #246) 2019-07-06 18:29:18 +02:00
Bernd Bestel
8c205941c7 Added that products can now also be consumed as spoiled from the stock overview page (option in the more/context menu per line) (closes #251) 2019-07-06 18:15:53 +02:00
Bernd Bestel
b24683f954 Added the possibility to mark a shopping list item as "done" (closes #257) 2019-07-06 17:56:59 +02:00
Bernd Bestel
e4d26bb8fd Make it possible to switch shopping list items between shopping lists (closes #284) 2019-07-06 17:31:17 +02:00
Bernd Bestel
c6c10c87e4 Improved date display for dates of today and no time
Instead of the hours since midnight now just "Today" will be shown
2019-07-06 17:19:28 +02:00
Bernd Bestel
df529c3c0b Show 2999-12-31 as "Never" everywhere (closes #296) 2019-07-06 15:43:54 +02:00
Bernd Bestel
482a520062 Slightly modified new recipe stock fulfillment API endpoints (references #289) 2019-07-06 15:28:49 +02:00
Bernd Bestel
ddef58e2a9 Merge pull request #289 from Aerex/add-resolved-recipes-endpoint
Add requirement fulfillment recipes endpoint
2019-07-06 15:02:20 +02:00
Bernd Bestel
d34c7b0a87 Created the changelog for the next version 2019-07-06 14:56:56 +02:00
Bernd Bestel
b76e51ba41 Fixed nested recipes costs calculation (fixes #299) 2019-07-06 14:48:46 +02:00
Bernd Bestel
67cfd0ba5f Remove the internal meal plan recipe when removing a meal plan entry (fixes #298) 2019-07-06 13:57:49 +02:00
Bernd Bestel
3fcede0b7c Fix that "Track date only" cannot be tracked <> today (fixes #300) 2019-07-06 13:32:40 +02:00
Bernd Bestel
0c0e8c6957 Fixed the consume success message on stock overview page (fixes #302) 2019-07-06 13:13:38 +02:00
Niels Tholenaar
86f5667039 Allow possibility to choose custom homepage 2019-06-22 16:02:52 +02:00
Aerex
a01a80578c Merge branch 'master' into add-resolved-recipes-endpoint 2019-06-20 23:40:55 -05:00
grocy
7a51fb77b0 feat: Added recipes/requirements route
- feat: Added requirements route to allow clients to access the requirements fulfilments of recipes
2019-06-20 23:11:57 -05:00
Bernd Bestel
511c95070e Minor typos... 2019-06-09 09:34:21 +02:00
Bernd Bestel
eec6270cb7 Prepared next release 2019-06-09 09:30:18 +02:00
Bernd Bestel
7c7c5db28c Fixed that a entered barcode on the product edit page was only saved when "adding" it to the barcodes list by pressing TAB (closes #269) 2019-06-09 09:21:56 +02:00
Bernd Bestel
6b98fa85d3 Improved meal plan entry reference when deleting an entry (references #255) 2019-06-09 09:10:29 +02:00
Bernd Bestel
825be63b93 Fixed single quotes problem in all pickers (fixes #264) 2019-06-09 09:06:44 +02:00
Bernd Bestel
a56f8be19e Fixed page reloads with unsaved form data and "Auto reload on external changes" enabled (fixes #265) 2019-06-09 08:58:46 +02:00
Bernd Bestel
f736c4de44 Added changelog with current changes 2019-06-08 17:03:17 +02:00
Bernd Bestel
56217804b7 Always include en_GB localizations regardless of completion (because there aren't real translations needed, fixes #276) 2019-06-08 16:56:37 +02:00
Bernd Bestel
43710b5062 Properly show the API error when it failed to undo a stock booking (fixes #267) 2019-06-08 16:53:31 +02:00
Bernd Bestel
b1adaa24cf Fix session problem on 32 bit systems when using "stay logged in permanently" (fixes #278) 2019-06-08 16:47:45 +02:00
Bernd Bestel
9e7d62b62d Make sure to hide all tooltips before removing an element (fixes #260) 2019-06-08 16:39:35 +02:00
Bernd Bestel
9f2481a6a8 Fixed an issue when a plural translation is empty/null (can be the case for quantity units, fixes #259) 2019-06-08 16:32:23 +02:00
Bernd Bestel
2b77bc6ae6 Fixed deleting meal plan entries did not work (fixes #255) 2019-06-08 16:30:45 +02:00
Bernd Bestel
91116ee768 Make sure user settings variable is populated always (fixes #277) 2019-06-08 15:54:56 +02:00
Bernd Bestel
167e57ef3f Merge pull request #272 from BlizzWave/patch-23
Update grocy_night_mode.css
2019-05-30 19:42:05 +02:00
Marius Boro
3321bcd683 Update grocy_night_mode.css
Fixed unreadable text
2019-05-30 14:32:27 +02:00
Bernd Bestel
41b8b5d11e Prepared new release 2019-05-16 22:25:46 +02:00
Bernd Bestel
0a4ea6861a Fixed quotes were not escaped properly for contains search in dropdowns (fixes #249) 2019-05-16 22:20:01 +02:00
Bernd Bestel
8f9c3c66f7 Don't load userfieldsform.js when not needed 2019-05-16 22:14:04 +02:00
Bernd Bestel
d412b81eae Hotfix (will be included in v2.4.0 release): Fixed a potential problem when the plural form of a translation (e. g. plural forms for user defined quantity units) is NULL 2019-05-10 21:22:53 +02:00
Bernd Bestel
55e5fd7bf1 Prepared next release 2019-05-10 21:08:42 +02:00
Bernd Bestel
1787690795 Added missing translations string 2019-05-10 21:04:28 +02:00
Bernd Bestel
3eb8b5f381 Pulled translations from Transifex 2019-05-10 21:01:58 +02:00
Bernd Bestel
d8cefeffb7 Added missing translations strings 2019-05-10 20:57:49 +02:00
Bernd Bestel
5da50d1e1e Updated dependencies 2019-05-10 20:56:03 +02:00
Bernd Bestel
de89fee5bb Fixed wrong amount was displayed in popup after consume 2019-05-10 20:43:57 +02:00
Bernd Bestel
338c6c0a9d Added a new userfield type "preset-list" (closes #239) 2019-05-07 21:24:59 +02:00
Bernd Bestel
8504eb9b38 Finished first version of meal planning (for now closes #146) 2019-05-07 19:48:14 +02:00
Bernd Bestel
3f53919ddd Also allow placeholders for plural translations (references #161) 2019-05-07 19:42:35 +02:00
Bernd Bestel
57233dba1a Added first basic version of meal planning (references #146) 2019-05-06 19:38:47 +02:00
Bernd Bestel
e240260f9f Unify translations strings which include an amount + quantity unit (references #161) 2019-05-05 14:31:27 +02:00
Bernd Bestel
dd148a8fc3 Use named arguments for all gettext strings which have more than 1 argument (again closes #161) 2019-05-05 14:13:50 +02:00
Bernd Bestel
153ac61867 Fix deleting user have not worked (fixes #237) 2019-05-04 23:10:01 +02:00
Bernd Bestel
9ef55f1f01 Make it possible to track a chore execution without the time part, only the day 2019-05-04 16:13:05 +02:00
Bernd Bestel
98fcd767b3 Fixed chore edit form - period type hint did not work (references #151) 2019-05-04 15:40:26 +02:00
Bernd Bestel
fe8bb43996 Fixed userfields did not load (references #176) 2019-05-04 15:21:50 +02:00
Bernd Bestel
328d96ed60 Only show plural forms text field on quantity unit edit page when the current language has more than 2 plural forms to prevent confusion (references #161) 2019-05-04 15:15:03 +02:00
Bernd Bestel
970e5edfa3 Fixed an issue with translations string without an placeholder (references #161) 2019-05-04 15:13:01 +02:00
Bernd Bestel
12ba99f649 Added "variable amount" for recipe ingredients (closes #181) 2019-05-04 14:50:15 +02:00
Bernd Bestel
314e434fd1 Updated translations 2019-05-04 13:43:14 +02:00
Bernd Bestel
29f69c92e9 Update OpenAPI object schemas and added more examples (closes #218) 2019-05-04 13:33:44 +02:00
Bernd Bestel
0eb974bd92 Make it possible to customize the default amount for purchase/consume (closes #215) 2019-05-04 13:19:34 +02:00
Bernd Bestel
bcd6dd4b20 Forgot to save a file on the last commit... 2019-05-03 22:18:24 +02:00
Bernd Bestel
6cecb2ca7b Make it possible to enter up to 4 decimal places for price fields (this now closes #225) 2019-05-03 22:15:30 +02:00
Bernd Bestel
bcae9f9292 Added price field on inventory page (for added products) (references #225) 2019-05-03 22:11:20 +02:00
Bernd Bestel
8138dd43ac Added barcode as a column to master data / products page (closes #234) 2019-05-03 21:41:31 +02:00
Bernd Bestel
78a230c5d5 Fixed again a problem with productpicker workflows and disabled URL rewriting (closes #232) 2019-05-03 20:22:48 +02:00
Bernd Bestel
4c2cf4944d Added a feature flag to also be able to hide all stock related UI elements and routes (closes #228) 2019-05-03 20:03:04 +02:00
Bernd Bestel
bd296f8fe1 Fixed a problem where the current stock fulfillment amount is not correctly displayed (references #161) 2019-05-03 19:51:08 +02:00
Bernd Bestel
24680154d8 Properly display/round recipe ingredients amounts (closes #230) 2019-05-03 19:36:27 +02:00
Bernd Bestel
dfd501c515 Don't load or save userfields if there are none (references #176) 2019-05-03 19:29:12 +02:00
Bernd Bestel
dae5bb2b34 Make it possible to filter recipes by stock availability (closes #231) 2019-05-03 19:22:58 +02:00
Bernd Bestel
595171afa5 Properly show and handle that the new amount during inventory cannot equal the current stock amount (this now closes #224) 2019-05-03 19:08:54 +02:00
Bernd Bestel
7fc4992b3a Fixed API response for /api/stock/products/{productId}/inventory when the new amount equals the current stock amount (references #224) 2019-05-03 18:37:02 +02:00
Bernd Bestel
618ff5609f Fixed success message on inventory page showed the previous amount instead of the new one (references #224) 2019-05-03 18:32:59 +02:00
Bernd Bestel
94c6e634b8 Fixed the "Add as barcode to existing product" productpicker workflow failed to add the barcode to the given product (fixes #222) 2019-05-03 18:29:09 +02:00
Bernd Bestel
b310aa55c5 Prevent productpicker workflow modal from being opened twice (fixes #229) 2019-05-02 21:46:15 +02:00
Bernd Bestel
3cf8ebeb89 Fixed product picker workflow URLs were wrong when running grocy in a subdirectory and with disabled URL rewriting (again fixes #219) 2019-05-02 21:33:59 +02:00
Bernd Bestel
ae156ed0e6 Removed accidentally added strings 2019-05-02 20:31:47 +02:00
Bernd Bestel
4912dd56d1 Finished migration to use gettext (this now closes #161) 2019-05-02 20:20:18 +02:00
Bernd Bestel
5d3f248d94 Pulled translations from Transifex (references #161) 2019-05-01 20:38:25 +02:00
Bernd Bestel
9b2dba2397 Migrated (hopefully) all translations to PO/Gettext (references #161) 2019-05-01 20:19:18 +02:00
Bernd Bestel
40b5afe926 Backup current state of LocalizationService.php (references #161)
This will serve as a permanent backup for the migration algorithm used to migrate all current translation files to PO/Gettext
2019-05-01 20:04:06 +02:00
Bernd Bestel
6ceb6e3643 Backup all current translations from Transifex (references #161)
This will serve as a permanent backup of the current translations before migrating them to PO/gettext
2019-05-01 19:34:09 +02:00
Bernd Bestel
a999112a21 Added a link to the new grocy subreddit (references grocy/grocy-website#1) 2019-04-28 21:18:35 +02:00
Bernd Bestel
310cdd7d4c Pulled translations from Transifex 2019-04-28 19:17:31 +02:00
Bernd Bestel
77f094810b Added changelog with current changes for next release 2019-04-28 09:55:43 +02:00
Bernd Bestel
b6b8c76d3a Fixed product picker workflows URLs were wrong when running grocy in a subdirectory (fixes #219) 2019-04-27 15:17:55 +02:00
Bernd Bestel
6442665f6c Just some technical corrections for the new sv_SE translation 2019-04-23 09:49:25 +02:00
Bernd Bestel
04ca6edbd3 Pulled translations from transifex 2019-04-23 09:40:04 +02:00
Bernd Bestel
c5993ad994 Finalize user-defined-fields (closes #176) 2019-04-23 09:06:18 +02:00
Bernd Bestel
72a3f63546 Extended contributing info to use pull requests for changes 2019-04-22 23:13:57 +02:00
Bernd Bestel
eae8536c9b Added contribution info 2019-04-22 22:43:07 +02:00
Bernd Bestel
fc11da3c3f Started working on user-defined-fields for all entities (references #176) 2019-04-22 22:16:35 +02:00
Bernd Bestel
77f3b80540 Implemented daily/weekly/monthly recurrence patterns for chores (closes #151) 2019-04-22 14:01:31 +02:00
Bernd Bestel
d72fe69a17 Show more info in product card (closes #173) 2019-04-22 10:11:58 +02:00
Bernd Bestel
162adeb359 Improve API related changes regarding multiple shopping lists (references #190) 2019-04-22 08:21:57 +02:00
Bernd Bestel
49d16b458d Added missing localization strings 2019-04-20 19:25:59 +02:00
Bernd Bestel
cdd02efcc6 Implemented multiple/named shopping lists (closes #190) 2019-04-20 17:04:40 +02:00
Bernd Bestel
c1674d33b4 Make "next X days" configurable (closes #175) 2019-04-20 15:30:45 +02:00
Bernd Bestel
41988aa1ee Updated version.json 2019-04-06 16:16:44 +02:00
Bernd Bestel
18b8712369 Updated dependencies for next release 2019-04-06 16:13:19 +02:00
Bernd Bestel
42a9d5af2b Pulled translations from Transifex 2019-04-06 16:03:43 +02:00
Bernd Bestel
c4d377ce4e Added new changelog 2019-04-06 16:00:17 +02:00
Bernd Bestel
50a782c8c0 Added missing translation strings 2019-04-06 16:00:02 +02:00
Bernd Bestel
fa6f09679f Made "Disable stock fulfillment checking for this ingredient" a default option per product (closes #182) 2019-04-06 15:42:40 +02:00
Bernd Bestel
25c257bb2c Allow partial minimum stock amount when enabled (closes #203) 2019-04-06 15:27:00 +02:00
Bernd Bestel
0496ae9e00 Added an info for product-add-workflows (closes #192) 2019-04-06 15:15:20 +02:00
Bernd Bestel
45ae386005 Fixed context menu is not visible when the table height is smaller than the menu height (fixes #195) 2019-04-06 14:41:43 +02:00
Bernd Bestel
b6e80580ed Make it possible to provide a different location for added product during inventory (closes #183) 2019-04-05 21:26:44 +02:00
Bernd Bestel
886e272c03 Show product count per group on the product groups page and added a link to the products page filtered by the current product group (closes #174) 2019-04-05 21:08:30 +02:00
Bernd Bestel
40cc0ff280 Revert changes in file public/js/grocy.js of commit "Fixed differences in highlighting for expiring/expired items in header vs table on stock overview page (fixes #198)"
This reverts changes in file public/js/grocy.js of commit 12082b52ab.
2019-04-05 18:59:58 +02:00
Bernd Bestel
3a0bb913d5 Improved form input padding (fixes #180) 2019-04-05 18:50:46 +02:00
Bernd Bestel
12082b52ab Fixed differences in highlighting for expiring/expired items in header vs table on stock overview page (fixes #198) 2019-04-05 18:41:21 +02:00
Bernd Bestel
2d3df2024a Fixed "Mark as open" button is disabled on stock overview page when current stock amount == 1 (fixes #197) 2019-04-05 18:01:21 +02:00
Bernd Bestel
a9c0539305 Updated version.json 2019-03-10 16:29:02 +01:00
Bernd Bestel
5b304c5e97 Added new changelog and update translations 2019-03-10 16:27:34 +01:00
Bernd Bestel
1b26a6277b Make demo product locations a little bit more realistic 2019-03-10 16:18:24 +01:00
Bernd Bestel
353a65d41c Tried to fix inventory form validation again (closes #167) 2019-03-10 16:08:15 +01:00
Bernd Bestel
bfcd05473a Allow best before date on purchase/inventory to be today or in the past, but display a hint when so (closes #172) 2019-03-10 16:02:13 +01:00
Bernd Bestel
3d485d4850 Fixed datetimepicker had no validation message displayed (references #172) 2019-03-10 15:40:19 +01:00
Bernd Bestel
9d02fbc13c Again some changes for the new product-by-barcode API method (references #171) 2019-03-10 14:53:06 +01:00
Bernd Bestel
27ba2bfd55 Fixed display errors when consuming partial amounts from stock overview page (fixes #170) 2019-03-10 14:10:25 +01:00
Bernd Bestel
61f582554f Return a proper API response when booking amount for consume/open is > current stock amount (references #170) 2019-03-10 13:50:28 +01:00
Bernd Bestel
75241fc61f Just some changes for the new product-by-barcode API method (references #171) 2019-03-10 13:43:58 +01:00
Bernd Bestel
91289588b5 Merge pull request #171 from matejdro/barcode_fetch
Add fetch by barcode API method
2019-03-10 13:28:36 +01:00
Matej Drobnič
3f4a5cc0d6 Add fetch by barcode API method 2019-03-10 12:20:31 +01:00
Bernd Bestel
e693460894 Finalized next version 2019-03-09 17:19:02 +01:00
Bernd Bestel
47a6260d27 Show the plural form of stock QU unit when showing purchase to stock conversion factor on purchase page when QU units are different (references #169) 2019-03-09 17:04:34 +01:00
Bernd Bestel
bfd29def8d Show purchase to stock conversion factor on purchase page when QU units are different (closes #169) 2019-03-09 17:00:57 +01:00
Bernd Bestel
cd0ca4a67c Prepared next release 2019-03-09 16:42:46 +01:00
Bernd Bestel
659d60b235 Make it possible to show the changelog directly via /about?tab=changelog 2019-03-09 16:25:23 +01:00
Bernd Bestel
8efcb79ed7 Updated screenshots 2019-03-09 16:18:20 +01:00
Bernd Bestel
5ba55823c9 Clarify that the CURRENCY setting should be the ISO 4217 code of the currency (to work with the JS toLocaleString function) 2019-03-09 16:04:03 +01:00
Bernd Bestel
6de4b120b3 Include changelog as markdown files and show it in the about dialog 2019-03-09 15:54:16 +01:00
Bernd Bestel
8fec262184 Added missing translation strings 2019-03-09 13:14:36 +01:00
Bernd Bestel
bd483ec8b0 Added a context menu to all stock overview page items 2019-03-09 13:11:50 +01:00
Bernd Bestel
4d215edbd0 Clear displayed quantity unit after purchase/consume/inventory bookings 2019-03-09 12:31:45 +01:00
Bernd Bestel
a3d4fd834f Added a small right border to separate button columns in all tables better 2019-03-09 10:49:26 +01:00
Bernd Bestel
2d0c0bf34f Fixed cancel button color in unknown product resolve dialog 2019-03-09 10:41:03 +01:00
Bernd Bestel
0f03420808 Removed unnecessary table column heading for button columns 2019-03-09 10:40:38 +01:00
Bernd Bestel
ba319dc6f1 Fixed equipment page edit/delete button icons were not visible 2019-03-08 22:22:05 +01:00
Bernd Bestel
c10890205c Don't load not existing / not need localization JS files (this now closes #165) 2019-03-08 22:18:42 +01:00
Bernd Bestel
643f6272e4 Fixed file name case sensitivity issue with tagmanager jQuery Plugin (references 165) 2019-03-08 22:13:47 +01:00
Bernd Bestel
cad5e9ef79 Tried to fix inventory form validation (references #167) 2019-03-08 22:03:59 +01:00
Bernd Bestel
01fdfe1a0c Fixed recipe ingredient notes were not displayed on the recipes page 2019-03-07 22:20:08 +01:00
Bernd Bestel
acd1e7337c Prepared next release 2019-03-06 19:38:22 +01:00
Bernd Bestel
3586bf77c3 Added info about Feature Flags 2019-03-06 19:37:55 +01:00
Bernd Bestel
ff886fea61 Fixed termination after first command 2019-03-06 19:29:17 +01:00
Bernd Bestel
5bd00d8be7 Only download at least 90 percent completed translation files from Transifex 2019-03-06 19:25:35 +01:00
Bernd Bestel
9f36a599a4 Changed the about dialog slightly 2019-03-06 19:23:53 +01:00
Bernd Bestel
ff15e81abe Fixed a rounding regarding stock amount comparison when a (scaled) recipe needs a decimal amount (closes #164) 2019-03-06 19:05:32 +01:00
Bernd Bestel
e8b471f572 Fixed termination after first command 2019-03-06 18:42:51 +01:00
Bernd Bestel
2d8ad24887 Implemented that included recipes can have a serving amount (closes #163 and references #127) 2019-03-05 23:45:04 +01:00
Bernd Bestel
45db9ff90c Added scripts for Transifex upload/download & updated translations 2019-03-05 21:22:54 +01:00
Bernd Bestel
c813a6500d Removed embedded binary tools - not needed to be in the repo here 2019-03-05 21:11:15 +01:00
Bernd Bestel
1077149784 Hide the form validation feedback icons introduced in Bootstrap 4.2.0 - a colored border is enough 2019-03-05 20:15:29 +01:00
Bernd Bestel
e08dfb408c Reorganized dev scripts and tools 2019-03-05 19:54:38 +01:00
Bernd Bestel
fcdeda91d9 Show the iCal sharing link instead of directly open it (references #141) 2019-03-05 19:36:14 +01:00
Bernd Bestel
4932b9c6d2 Improved recipe header display on small screens 2019-03-05 19:22:16 +01:00
Bernd Bestel
7f2942d414 Also filter gallery items when searching for recipes (references #147) 2019-03-05 19:17:10 +01:00
Bernd Bestel
3a1c5efcfd Fix gallery tab was not selected by query parameter (references #147) 2019-03-05 18:04:16 +01:00
Bernd Bestel
816eb03147 Added a "recipe gallery" view (closes #147) 2019-03-05 17:59:33 +01:00
Bernd Bestel
8504429f5f Implemented tare weight handling (closes #132) 2019-03-05 17:51:50 +01:00
Bernd Bestel
90291fdbca Added possibility to export the calendar in iCal format (closes #141) 2019-03-04 17:44:48 +01:00
Bernd Bestel
77b0bc675c Varios small UI changes / improve UI consistency 2019-03-04 17:43:12 +01:00
Bernd Bestel
8020f92d6b Track on consume for which recipe it was (closes #64 and references #64) 2019-03-03 18:20:06 +01:00
Bernd Bestel
38825c70da Added missing translations strings & pulled translations from Transifex 2019-03-03 17:01:35 +01:00
Bernd Bestel
bb5daa5f8b Display total cost of recipes based on last purchase prices (closes #128) 2019-03-03 16:33:48 +01:00
Bernd Bestel
8c11d0f15d Add an option per recipe to not check against the shopping list when adding missing recipe ingredients, only against stock (closes #154) 2019-03-03 15:23:39 +01:00
Bernd Bestel
5b544f76a5 Merge pull request #160 from d-Rickyy-b/patch-1
FIX: Typo in config-dist.php
2019-03-03 15:00:29 +01:00
Bernd Bestel
6f93da9b5f Only list missing products in the "recipe put everything on the shopping list"-dialog (references #125) 2019-03-03 14:57:36 +01:00
Bernd Bestel
e9ef7ea6d8 Allow recipe ingredients to be ignored when putting them on the shopping list (closes #125) 2019-03-03 14:49:46 +01:00
Rico
54a23019b8 FIX: Typo in config-dist.php 2019-03-03 14:47:38 +01:00
Bernd Bestel
89ad25c904 Implemented scalable recipes (closes #127) 2019-03-03 13:27:10 +01:00
Bernd Bestel
ee38d626aa Added all application icon variants (closes #159) 2019-03-02 08:56:53 +01:00
Bernd Bestel
40b60bed85 Added apple-touch-icon tag (references #159) 2019-03-01 22:37:15 +01:00
Bernd Bestel
b89643ddb1 Allow different locations per product in stock (closes #124)
Kind of basic for now, a different location can be set on purchase, the filters on the stock overview page handles different locations
2019-03-01 20:25:01 +01:00
Bernd Bestel
32e878afc9 Added feature flags to disable/hide parts not needed (closes #157)
grocy was initally about stock management, so this is always enabled, the rest can be disabled
2019-03-01 19:33:33 +01:00
Bernd Bestel
9974305ad4 Hide relative date when clearing the datetimepicker (this now closes #143) 2019-02-09 14:48:13 +01:00
Bernd Bestel
a3b2d03d68 Fixed datetimepicker only worked once when not selecting a date
References #143
Using a self-patched version of tempusdominus/bootstrap-4 for now, see 2cf725fed9 and tempusdominus/bootstrap-4#34
2019-02-09 14:44:37 +01:00
Bernd Bestel
01e9e3f5ce Move about dialog into separate view and add API endpoint for system info 2019-02-09 13:41:40 +01:00
Bernd Bestel
b5ac319a90 Pull translations from Transifex 2019-02-03 17:02:40 +01:00
Bernd Bestel
ad09630dbe Make it possible to add pictures to recipes (closes #136) 2019-01-26 20:06:01 +01:00
Bernd Bestel
03720940d4 Resize embedded iframes to content height (this should fix #130) 2019-01-26 19:31:41 +01:00
Bernd Bestel
dfc05e0bec Allow optional partial units of products in stock (closes #123) 2019-01-26 14:17:02 +01:00
Bernd Bestel
9e139e2b73 Remove missing translation and improve database migration for #149 2019-01-26 14:12:18 +01:00
Bernd Bestel
5c622b9512 Fix product form was not validated when changing location (fixes #144) 2019-01-26 13:13:38 +01:00
Bernd Bestel
eec3515b6d Don't use a second hidden amount field for shopping list entries which were added by "Add missing products to shopping list" (fixes #149) 2019-01-26 13:09:01 +01:00
Bernd Bestel
276bc94cc6 More improvements on the REST API (references #139) 2019-01-21 22:13:42 +01:00
Bernd Bestel
bfa59dd29c Rework API to be more RESTful (references #139) 2019-01-19 14:51:51 +01:00
Chris Forkner
0ce8d706a6 API - A bit more RESTful (#140)
* Restful routes

* Change public/viewjs to match API routes

* Move the GET and POST together. Fixed Typos. PUT for object/user edits.

* Verb-less Generic Entity Interactions

* Create Grocy.Api.Put

* Create Grocy.Api.Delete

* Fix Volatile Slim Error order in routes and adjust to english noun
2019-01-19 08:37:21 +01:00
Bernd Bestel
98d95f80df Prepared next release 2019-01-10 21:02:11 +01:00
Bernd Bestel
a72afa7174 Forgot to save before pushing last commit... 2019-01-05 21:14:23 +01:00
Bernd Bestel
0d145bbf1e Respect QU purchase factor when adding or comparing recipe ingredients to shopping list entries (fixes #131) 2019-01-05 21:11:36 +01:00
Bernd Bestel
f6cf26009d Better API response when request body is not valid JSON (references #126) 2019-01-05 20:39:22 +01:00
Bernd Bestel
c042657dd8 Fix location edit form (edit did not work) 2019-01-05 20:38:27 +01:00
Bernd Bestel
43c9ab7734 Fixed a problem with newer SQLite versions (references and fixes #133) 2019-01-05 20:28:21 +01:00
Bernd Bestel
f6649d51bd Finalize loading speed improvements for all data tables (this now closes #120)
This is a workaround for now. The tables are still DOM sourced because of too big dependencies between server side rendering and frontend JS code. The tables are initially load while tbody is hidden, this results in a speedup by around 65 %.
2019-01-05 20:06:35 +01:00
Bernd Bestel
2e265ac70a Again some changes for stock overview table loading speed workaround (references #120) 2019-01-05 16:27:26 +01:00
Bernd Bestel
30e54997b2 Workaround to improve stock overview table loading time (references #120) 2019-01-05 14:27:40 +01:00
Bernd Bestel
b9f0470d76 Prepared next release 2018-12-30 09:21:11 +01:00
Bernd Bestel
bdcd176f81 Make config.php settings also available as environment variables (closes #118) 2018-12-23 16:45:16 +01:00
Bernd Bestel
04dacacd73 Pull translations from Transifex for new release 2018-11-27 17:30:40 +01:00
Bernd Bestel
a9502d1ddb Fix wrong translation string 2018-11-26 20:03:14 +01:00
Bernd Bestel
5c25e91984 Add possibility to skip items in "all shopping list items to stock workflow" (closes #116) 2018-11-26 20:02:01 +01:00
Bernd Bestel
02163c4305 Properly refresh opened product amount after consume on stock overview page (fixes #114) 2018-11-26 19:47:07 +01:00
Bernd Bestel
c3731b3200 Sort recipes fulfillment column by amount of missing products (closes #113) 2018-11-26 19:40:29 +01:00
Bernd Bestel
5cdf2c14d3 Fix shopping list edit form - product was not prefilled (fixes #115) 2018-11-26 19:37:17 +01:00
Bernd Bestel
e92d74f5c3 This is v1.23.0 2018-11-24 20:41:45 +01:00
Bernd Bestel
2b3516dadd Pull translations from Transifex 2018-11-24 20:39:42 +01:00
Bernd Bestel
8041dd9c26 Support single quotes in demo data 2018-11-24 20:39:17 +01:00
Bernd Bestel
2f7b78bc40 Update dependencies for next release 2018-11-24 20:18:50 +01:00
Bernd Bestel
61fc6e05f4 Add an agenda view to calendar 2018-11-24 20:18:13 +01:00
Bernd Bestel
367a3e52de Properly sort recipes fulfillment column (closes #113) 2018-11-24 19:59:24 +01:00
Bernd Bestel
a3617cffb8 Small different UI improvements
Show the cursor as pointer on stock overview page while hovering the product name cell to highlight that the productcard can be opened
Show a waiting cursor and disable all form inputs while doing background XHR calls to highlight that the user should wait
Place the search field (to search a table) on all pages to the left most place
2018-11-24 19:40:50 +01:00
Bernd Bestel
ff341d8547 Typo... 2018-11-21 22:17:51 +01:00
Bernd Bestel
01fab6999f Add new demo translation string 2018-11-21 22:16:02 +01:00
Bernd Bestel
b6152ce874 Pull translations from Transifex 2018-11-21 21:54:15 +01:00
Bernd Bestel
ca5df3b217 Hopefully finally fix the navbar scrollbar problems now 2018-11-21 21:36:22 +01:00
Bernd Bestel
dd48be595c Remove "debug" JS output 2018-11-21 19:16:06 +01:00
Bernd Bestel
306d0f7da6 Add "one click shopping list to stock workflow" (closes #110) 2018-11-21 19:08:36 +01:00
Bernd Bestel
c61c37e67a Properly initialize show_clock_in_header user setting control after page reload 2018-11-20 19:34:06 +01:00
Bernd Bestel
f7f90238f2 Show optionally a clock in the header (closes #109) 2018-11-20 19:23:48 +01:00
Bernd Bestel
589ad36855 Remove unneeded translation string 2018-11-18 15:52:48 +01:00
Bernd Bestel
5da24d2d4f Added first version of calendar (closes #42) 2018-11-18 15:39:43 +01:00
Bernd Bestel
f7f2bf3fc0 Various small UI improvements for the shopping list 2018-11-18 14:19:50 +01:00
Bernd Bestel
34d1bdd53f Added missing translation string 2018-11-18 14:15:11 +01:00
Bernd Bestel
e021c93d22 Make clear than picking a specific stock item on consume always means an amount of 1 2018-11-18 13:46:23 +01:00
Bernd Bestel
2ff5faacc0 Prevent opening more products than are unopened in stock 2018-11-18 13:35:21 +01:00
Bernd Bestel
a489190e81 Add some opened products to demo 2018-11-18 13:21:57 +01:00
Bernd Bestel
a403bb687a Show amount of opened products on stock overview page and in product card 2018-11-18 13:17:36 +01:00
Bernd Bestel
5966a3d678 Improve journal UI when undoing a transaction 2018-11-18 12:58:15 +01:00
Bernd Bestel
c71e46191f Optimized stock logic 2018-11-18 12:34:05 +01:00
Bernd Bestel
862fd7c644 Added missing translation string 2018-11-17 19:46:59 +01:00
Bernd Bestel
10ea9c44fd Make it possible to mark a product as opened (closes #86) 2018-11-17 19:39:37 +01:00
Bernd Bestel
816ca6460f Make it possible to pick a specific stock item on consume (closes #62) 2018-11-17 17:51:35 +01:00
Bernd Bestel
b6d60c4e34 Fix datetimepicker did not trigger a change event (fixes #108) 2018-11-17 15:00:51 +01:00
Bernd Bestel
6f67619784 Finish "shopping list to stock workflow" (closes #98) 2018-11-17 14:50:52 +01:00
Bernd Bestel
db0b48e7ae Fix GitHub project links 2018-11-17 12:58:44 +01:00
Bernd Bestel
973f07b360 Add embedded mode (hides menu and so on), maybe need for #98 2018-11-17 12:57:35 +01:00
Bernd Bestel
0f73d849eb Fixed equipment edit button always pointed to the first equipment item (fixes #107) 2018-11-17 08:26:31 +01:00
Bernd Bestel
1a6849ad37 Moved docker related things to https://github.com/grocy/grocy-docker (this now closes #101, thanks @talmai) 2018-11-16 07:58:03 +01:00
Bernd Bestel
8f31f891fd Add a "shopping list item to stock flow" (references #98) 2018-11-14 21:40:17 +01:00
Bernd Bestel
83985e9f21 Migrate translations to use Transifex 2018-11-03 14:29:14 +01:00
Bernd Bestel
04e9ba8e34 Allow fraction numbers for recipe ingredients when not checked against stock and add option to not check stock for a recipe position (closes #105) 2018-11-02 19:53:01 +01:00
Bernd Bestel
960ee919f9 Mention minimum SQLite version (closes #104) 2018-10-29 22:09:44 +01:00
Bernd Bestel
f4534a4bfb Update dependencies for next release 2018-10-27 17:58:05 +02:00
Bernd Bestel
89553b7fa0 Workaround for datepicker problem (fixes #100) 2018-10-27 17:56:53 +02:00
Bernd Bestel
364f6b2051 Add journal and undo UI for stock bookings, chore executions and battery charge cycles (closes #63, closes #97) 2018-10-27 17:26:00 +02:00
Bernd Bestel
fe83e2fa6f Created API endpoints to undo battery charge cycles and chore executions (references #63) 2018-10-27 10:55:30 +02:00
Bernd Bestel
1f3dd58ddf Properly display line breaks of recipe positions and shopping list item notes 2018-10-27 10:39:52 +02:00
Bernd Bestel
da98efa833 Finalize nested recipes / group recipe positions feature (closes #77) 2018-10-27 10:37:31 +02:00
Bernd Bestel
3e6cf545d7 Finalize stock booking undo API (references #63 and #97) 2018-10-27 10:19:06 +02:00
Bernd Bestel
1080c3486c Created first version of an API endpoint to undo stock bookings (references #63 and #97) 2018-10-26 22:28:58 +02:00
Bernd Bestel
cd7b6b686d Fix API keys cannot be deleted (fixes #99) 2018-10-26 20:12:48 +02:00
Bernd Bestel
b84e6da0dd Added recipe position groups (references #77) 2018-10-25 22:45:44 +02:00
Bernd Bestel
fc3a4c6899 Finish first version of nested recipes feature (references #77) 2018-10-25 20:36:29 +02:00
Bernd Bestel
12a2cb0bdf Created basis edit UI for nested recipes (references #77) 2018-10-23 19:36:39 +02:00
Bernd Bestel
57a0864465 Show productcard as a popup on stockoverview page instead of only the product picture (closes #93) 2018-10-22 19:28:59 +02:00
Bernd Bestel
b3da837ede Added link to item edit page for all item cards (product/chore/battery) (references #93) 2018-10-22 19:13:08 +02:00
Bernd Bestel
3de3e03ab3 Created database logic for nested recipes (references #77) 2018-10-21 15:02:52 +02:00
Bernd Bestel
78865a9d3c Fix product groups were empty on product presets page (references #92) 2018-10-20 15:22:32 +02:00
Bernd Bestel
5b3230d63d Properly name the quantity unit field on product presets page (references #92) 2018-10-20 15:18:58 +02:00
Bernd Bestel
04c93d937e Make presets for new products configurable (closes #92) 2018-10-20 14:55:49 +02:00
Bernd Bestel
5318e79f55 Properly pluralize quantity unit in success message on purchase/consume/inventory page 2018-10-20 14:09:19 +02:00
Bernd Bestel
7bf4421d44 Improve best before date comparison on stockoverview page (fixes #87) 2018-10-20 14:04:09 +02:00
Bernd Bestel
366152c049 Next attempt to fix the scroll issue of navigation section (references #90) 2018-10-20 11:25:22 +02:00
Bernd Bestel
70c00e81d9 Cascade changes of stock quantity unit of products to recipe positions (fixes #91) 2018-10-20 11:17:51 +02:00
Talmai Oliveira
f13abf483e Grocy docker patch fix (#94)
fixed:

Warning: Use of undefined constant GROCY_USER_ID - assumed
'GROCY_USER_ID' (this will throw an Error in a future version of PHP) in
/www/controllers/BaseController.php on line 47
2018-10-20 09:07:05 +02:00
Bernd Bestel
0e723a0a9b Fixed reported login problem ("PHP Warning: date() expects parameter 2 to be integer, float given") 2018-10-16 18:21:38 +02:00
Bernd Bestel
4a35477c35 Don't auto reload when database has changed in "fullscreen-card-mode" (fixes #88) 2018-10-13 09:18:16 +02:00
Bernd Bestel
df7d360516 Update screenshots 2018-10-11 10:33:38 +02:00
Bernd Bestel
03eaa6c79f Add possibility to filter by product group on stock overview page 2018-10-06 18:19:31 +02:00
Bernd Bestel
132999ce36 Show the little "product has an image icon" also on products page (references #58) 2018-10-06 18:08:25 +02:00
Bernd Bestel
188407e3c7 Merge branch 'master' of https://github.com/berrnd/grocy 2018-10-06 18:02:30 +02:00
Bernd Bestel
8cf68ade30 Fix missing translation (references #85) 2018-10-06 18:02:13 +02:00
Marius Boro
d62657c698 Better translation (#84)
* Update no.php

* Update no.php

minor fix
2018-10-06 17:57:21 +02:00
Bernd Bestel
3262e534dc Hotfix (will be included in v1.21.0 release): Fixed a syntax error in norwegian localization file 2018-10-06 12:08:44 +02:00
Bernd Bestel
6202e8bda7 Update dependencies for next release 2018-10-06 11:48:47 +02:00
Bernd Bestel
9984e8f218 Small visual/space improvements/changes on recipes and equipment page 2018-10-06 11:43:46 +02:00
Marius Boro
b0c91f6ad1 added missing and updated for new features. (#83) 2018-10-06 09:15:54 +02:00
Marius Boro
9e24586190 Update no.php (#82) 2018-10-06 09:15:40 +02:00
Bernd Bestel
7ba6fc875b Improve responsive embeds (references #25) 2018-10-03 19:05:00 +02:00
Bernd Bestel
3b10906e78 Optimize space around the embedded PDF a little bit (references #25) 2018-10-03 18:04:46 +02:00
Bernd Bestel
ebd24bf30e Use new editor also for recipes 2018-10-03 16:41:21 +02:00
Bernd Bestel
ebd9b1b851 Add possibility to show equipment notes/instruction manuals also in fullscreen mode (references #25) 2018-10-03 16:40:40 +02:00
Bernd Bestel
b242a5de52 Finish equipment / instruction manuals feature (references #25) 2018-10-03 16:11:39 +02:00
Bernd Bestel
81ec011095 Product edit page: Slightly improved styling of barcodes 2018-10-03 13:34:38 +02:00
Bernd Bestel
2a371cc081 Product edit page: Enforce a quantity unit conversion factor > 1 when quantity unit purchase != quantity unit stock 2018-10-03 13:27:36 +02:00
Bernd Bestel
edb986ce24 Added a quick mockup for equipment / instruction manuals (references #25) 2018-10-02 20:03:08 +02:00
Bernd Bestel
f90faca62e Accept only files for product picture file input 2018-10-02 18:33:16 +02:00
Bernd Bestel
6090ac621e Prevent deletion of products with current stock (closes #81) 2018-10-02 18:17:26 +02:00
Bernd Bestel
ae58606d04 Center title in product picture dialog 2018-10-02 18:00:52 +02:00
Bernd Bestel
bb9caf9cc9 Fixed volatil stock logic (fixes #69) 2018-10-02 17:06:21 +02:00
Bernd Bestel
9dd57decdf Finish "pictures for products" features (now closes #58) 2018-10-02 16:48:39 +02:00
Bernd Bestel
f1fc0ee549 Finished first version of "pictures for products" (references #58) 2018-10-01 20:20:50 +02:00
Bernd Bestel
fcdeb33426 Merge branch 'master' of https://github.com/berrnd/grocy 2018-09-30 23:22:45 +02:00
Bernd Bestel
44cd26ae77 Finish first early version of "pictures for products" (references #58) 2018-09-30 23:22:17 +02:00
Marius Boro
04f34ea6b0 Update no.php (#80) 2018-09-30 22:17:15 +02:00
Bernd Bestel
e5fb609c8e Finalize file API (references #58) 2018-09-30 22:16:33 +02:00
Bernd Bestel
c675b534ef Fix missing german translation 2018-09-30 21:41:30 +02:00
Marius Boro
6c74881f95 Update no.php (#79) 2018-09-30 21:40:26 +02:00
Bernd Bestel
756ec319cc Update dependencies for next release 2018-09-30 20:11:24 +02:00
Bernd Bestel
ba2d32be60 Fixes for auto night mode (references #71) 2018-09-30 19:31:03 +02:00
Bernd Bestel
7cc09cec67 The last fix (maybe) for auto night mode handling (references #71) 2018-09-30 18:07:28 +02:00
Bernd Bestel
8b815fce93 Finalize auto night mode feature (references #71) 2018-09-30 18:02:59 +02:00
Bernd Bestel
f1c78659be Optimize user settings 2018-09-30 17:14:04 +02:00
Bernd Bestel
5c79a80f7a Prepared auto night mode configuration option (references #71) 2018-09-30 13:33:21 +02:00
Bernd Bestel
f451e65278 Also log missing localization found in frontend (only when MODE == dev) 2018-09-30 13:02:07 +02:00
Bernd Bestel
176333df5b Save night mode enabled state and apply night mode class to <body> on server side (references #71) 2018-09-30 11:25:07 +02:00
Bernd Bestel
d4227d2e41 Make auto reloading the page on external database changes configurable (closes #74) 2018-09-30 11:17:28 +02:00
Bernd Bestel
0bbd2d9880 Prepare user settings API (references #74 and #71) 2018-09-30 10:47:56 +02:00
Bernd Bestel
b81316bd60 Include products which are not in stock currently but below min. stock amount on stock overview page (fixes #69) 2018-09-30 10:13:37 +02:00
Bernd Bestel
d11dcb38fe Only reload the page on external changes when there is no unsaved form data (fixes #73) 2018-09-30 09:57:42 +02:00
Bernd Bestel
77d82f22dc Fixed scrolling did not work when showing a recipe in fullscreen mode (fixes #76) 2018-09-30 09:41:22 +02:00
Talmai Oliveira
be326a5211 Grocy docker patch (#78)
* typo corrections

* more typos

* initial work towards dockerized version of grocy

* placeholder for future README

* fully working dockerized grocy

* updated final size of docker images
2018-09-30 09:31:16 +02:00
Marius Boro
83624eaf27 Update no.php (#75) 2018-09-30 09:22:30 +02:00
Bernd Bestel
055619d275 Tweaked grocy_night_mode.css slightly (references #71) 2018-09-29 16:35:17 +02:00
Bernd Bestel
cda3dde120 Quick test implementation of night (references #71) 2018-09-29 15:39:16 +02:00
Bernd Bestel
5a0b862d22 v1.19.2 release 2018-09-29 13:45:50 +02:00
Bernd Bestel
bb5fd8360b Fix double form submit when using ENTER (fixes #72) 2018-09-29 13:41:56 +02:00
Marius Boro
d7180bd7b2 Updated no.php (#70)
* Update no.php

* Update no.php
2018-09-27 20:39:11 +02:00
Bernd Bestel
8c9b0dedb2 Release v1.19.1 2018-09-27 14:10:28 +02:00
Bernd Bestel
9c2c2c1fa2 Prepare file upload API (references #58) 2018-09-27 14:01:00 +02:00
Bernd Bestel
596dc9e36d Don't show tooltips on touch input devices (this closes #67) 2018-09-27 13:33:03 +02:00
Bernd Bestel
b2019ba42d Fixed new-chore-form did not work (fixes #68) 2018-09-27 12:54:06 +02:00
Bernd Bestel
003d4a567a Use the last commit time as release date when MODE is prerelease 2018-09-25 16:33:09 +02:00
Bernd Bestel
5112e0f551 Next attempt to fix tooltip flickering problems (references #66 and #51) 2018-09-25 16:24:43 +02:00
Bernd Bestel
8008fcdc65 Next attempt to fix #56 2018-09-25 15:52:38 +02:00
Bernd Bestel
8d41dcc650 Use current commit hash as version "number" when MODE is prerelease 2018-09-25 08:55:25 +02:00
Bernd Bestel
037d024862 Also don't remember column searches for all data tables (this now closes #60) 2018-09-25 08:50:28 +02:00
Bernd Bestel
03ca5cd45b Only detect a change when the new database changed time is actually AFTER the last remembered one (references #59) 2018-09-25 08:44:12 +02:00
Bernd Bestel
60d47bef84 Fixed line break 2018-09-24 19:17:42 +02:00
Bernd Bestel
98a7bcb044 Added info about pre-release demo 2018-09-24 19:16:19 +02:00
Bernd Bestel
7401971884 Make info bars clickable and add a filter for them on all overview pages (references #60) 2018-09-24 19:13:53 +02:00
Bernd Bestel
067a10e1b2 Hotfix (will be included in v1.19.0 release): Fixed a regression bug regarding issue #56 (product-flow-popup did not work anymore) 2018-09-24 16:50:30 +02:00
Bernd Bestel
ddfe33fab6 Update dependencies for next release 2018-09-24 13:57:20 +02:00
Bernd Bestel
2a0ec30bb0 Auto reload the current page when the database has changed and when idling (closes #59) 2018-09-24 13:53:18 +02:00
Bernd Bestel
8540fc44f3 Added option to stay logged in permanently 2018-09-24 13:16:57 +02:00
Bernd Bestel
66095738e3 Added product groups (this closes #55) 2018-09-24 13:02:52 +02:00
Bernd Bestel
e472711d23 Fixed strange (and still kind of unknown) problem in productpicker (fixes #56) 2018-09-24 09:51:55 +02:00
Bernd Bestel
8e054a4981 Fix scrolling to top of page when dynamically removing a table row (fixes #57) 2018-09-24 09:30:26 +02:00
Bernd Bestel
feb28211d8 Slightly reordered the main menu 2018-09-24 09:16:53 +02:00
Bernd Bestel
06f25b7006 Finish first version of tasks feature 2018-09-23 19:26:13 +02:00
Bernd Bestel
f85a67a1ff Continue working on tasks feature 2018-09-23 09:22:54 +02:00
Bernd Bestel
6fe0100927 Start working on tasks feature 2018-09-22 22:01:32 +02:00
Bernd Bestel
bcb359e317 Fixed custom JS/CSS was not included on API doc page 2018-09-22 13:28:49 +02:00
Bernd Bestel
4075067a10 Renamed habits to chores as this is more what it is about 2018-09-22 13:26:58 +02:00
Bernd Bestel
bd3c63218b Fixed missing translation in productpicker 2018-09-22 10:58:17 +02:00
Bernd Bestel
27daf384da Respect X-Forwarded-Proto header in UrlManager (closes #54) 2018-09-21 12:49:01 +02:00
Bernd Bestel
905fc0f357 Hotfix (will be include in v1.18.1 release): Price input on purchase page was not optional 2018-09-08 14:31:42 +02:00
Bernd Bestel
9cd0e4ab2d Update dependencies for next release 2018-09-08 14:14:23 +02:00
Bernd Bestel
6b38cd450f Finalized latest changes 2018-09-08 14:06:19 +02:00
Bernd Bestel
bb60f5f043 Typo... 2018-09-08 12:05:44 +02:00
Bernd Bestel
e777be4d3b Replaced the default number input arrow buttons with own ones to better support touch input (references #44) 2018-09-08 12:04:31 +02:00
Bernd Bestel
8a71d55f0f Added missing German translation for last changes 2018-09-08 09:27:50 +02:00
Bernd Bestel
b01b49d10c Show generic error message on saving master data (this closes #45) 2018-09-08 09:26:12 +02:00
Bernd Bestel
496594d898 Don't save filters across page reloads for all data tables (fixes #52) 2018-09-08 08:56:32 +02:00
Bernd Bestel
1d5e82c341 Fixed tooltip flickering problems (this closes #51) 2018-09-08 08:49:09 +02:00
Bernd Bestel
a9b696f41c Fixed datetimepicker (this closes #43) 2018-09-08 08:36:45 +02:00
Marius Boro
e50b1eb359 Update no.php (#50)
* Update no.php

* Update no.php

* Update no.php

* Update no.php

* Update no.php

* Update no.php
2018-09-04 17:25:52 +02:00
Bernd Bestel
92e0245387 Merge pull request #49 from BlizzWave/patch-14
Update it.php
2018-09-04 08:54:04 +02:00
Bernd Bestel
67d0d3c3d6 Merge pull request #48 from BlizzWave/patch-13
Update de.php
2018-09-04 08:53:54 +02:00
Bernd Bestel
23bcbc23e9 Merge pull request #47 from BlizzWave/patch-12
Update batteriesoverview.js
2018-09-04 08:53:44 +02:00
Marius Boro
085d9a0bc7 Update no.php (#46)
* Update no.php

Updated for version 1.18.0 some typos fixed and more fluent translations.

* Update no.php

* Update no.php
2018-09-04 08:53:28 +02:00
Marius Boro
368df142cf Update it.php
typo
2018-09-03 22:09:37 +02:00
Marius Boro
d38edabb14 Update de.php
typo
2018-09-03 22:09:02 +02:00
Marius Boro
4426a10e2e Update batteriesoverview.js
typo
2018-09-03 22:07:05 +02:00
Bernd Bestel
931dc9d243 Reset the date shortcut checkbox on value changes when it's not the shortcut value 2018-08-18 08:14:26 +02:00
Bernd Bestel
c5b8893008 Update dependencies for next release 2018-08-11 14:55:27 +02:00
Bernd Bestel
c27f41aee4 Don't use buttons in tables with full row select as this is confusing when clicking a button of a not selected row 2018-08-11 14:38:17 +02:00
Bernd Bestel
ef043b38ce Use normal color for successfully validate checkbox inputs 2018-08-11 14:29:08 +02:00
Bernd Bestel
bb261f99c4 Use tooltips where appropriate 2018-08-11 14:23:36 +02:00
Bernd Bestel
48ca0f2ac7 Also clear the shopping list without reloading the whole page 2018-08-11 14:16:11 +02:00
Bernd Bestel
b7f0b06684 Remove items from shopping list without reloading the whole page 2018-08-11 14:07:44 +02:00
Bernd Bestel
324487d395 Add a "consume all ingredients of this recipe" button (this now closes #32) 2018-08-11 11:48:25 +02:00
Bernd Bestel
9a8c61497b Fixed typo 2018-08-09 17:32:21 +02:00
Bernd Bestel
bc7afe4bdd Auto "click" the shortcut checkbox when manually entering the shortcut date (references #40) 2018-08-09 17:25:27 +02:00
Bernd Bestel
bb5dcb2434 Fixed a warning on embedded and demo installations 2018-08-09 17:24:37 +02:00
Bernd Bestel
71b9d11ff5 Implement that recipe ingredients can have arbitrary quantity units (references #32) 2018-08-09 17:24:04 +02:00
Bernd Bestel
3e73a44576 Merge pull request #41 from BlizzWave/patch-10
Update no.php
2018-08-07 21:00:06 +02:00
Marius Boro
dedfe3a854 Update no.php
updated to follow closed issues
2018-08-07 20:46:27 +02:00
Bernd Bestel
c4b0ef4d49 Refresh the complete row on all overview pages on changes, including the background color (closes #39) 2018-08-07 20:11:08 +02:00
Bernd Bestel
339d81318f Add a checkbox to set the "never expires date" (closes #40) 2018-08-06 22:41:35 +02:00
Bernd Bestel
282ee0885b Hotfix - syntax error in norwegian localization file (this will be included in the v1.17.0 release) 2018-08-04 17:46:40 +02:00
Bernd Bestel
5833364e51 Add pluralization of demo and default quantity units 2018-08-04 17:37:43 +02:00
Bernd Bestel
525f1705d1 Update dependencies for next release 2018-08-04 17:22:15 +02:00
Bernd Bestel
5a13cb5ffe Fix jquery timeago update did not really work 2018-08-04 16:54:46 +02:00
Bernd Bestel
e830805443 Refresh also habit/battery statistics on changes on overview pages (references #26) 2018-08-04 15:44:58 +02:00
Bernd Bestel
ca3f28b615 Refresh stock statistics on consume on stock overview page (references #26) 2018-08-04 14:25:32 +02:00
Bernd Bestel
6081b8ee67 Fix some form validation problems (closes #36) 2018-08-04 07:45:24 +02:00
Bernd Bestel
7eef4acd81 Use the same info-bar to explain table colors in shopping list as in stock overview (fixes #27) 2018-08-03 09:06:11 +02:00
Bernd Bestel
678579e933 Don't use ORDER BY in VIEWS (as this is invalid SQL, why does this even work sometimes in SQLite) (fixes #33) 2018-08-03 08:26:59 +02:00
Bernd Bestel
4cc2d39063 Merge remote-tracking branch 'remotes/origin/fix-issue-33' 2018-08-03 08:18:59 +02:00
Bernd Bestel
14cc153422 Removed unused dependency 2018-08-03 08:16:33 +02:00
Bernd Bestel
f5b5c4c7e1 Add default quantity units and locations to reduce confusion (only for new installations) (references #38) 2018-08-03 08:14:23 +02:00
Bernd Bestel
88b76a52a5 Merge pull request #37 from BlizzWave/patch-9
Update no.php
2018-08-02 07:48:33 +02:00
Marius Boro
a4a25af460 Update no.php
typos
2018-08-01 22:44:23 +02:00
Bernd Bestel
41a72d11da Remove unneeded ORDER BY as this maybe lead to problems like in #33 2018-07-31 17:42:07 +02:00
Bernd Bestel
c8236b101b Fix redefine of constant GROCY_DATAPATH when it's not an embedded AND not a demo installation 2018-07-31 17:31:03 +02:00
Bernd Bestel
ef1df0a446 Unify path references and only use relative ones 2018-07-30 19:16:36 +02:00
Bernd Bestel
5c4953b9b2 Merge pull request #28 from BlizzWave/patch-5
Update README.md
2018-07-30 19:12:06 +02:00
Bernd Bestel
ccaf2411fe Merge pull request #30 from BlizzWave/patch-7
Update de.php
2018-07-30 19:03:41 +02:00
Bernd Bestel
bce8bd6b35 Merge pull request #31 from BlizzWave/patch-8
Update batteriesoverview.blade.php
2018-07-30 19:03:28 +02:00
Marius Boro
66c07887cb Update no.php (#29)
* Update no.php

Keeping it updated

* Update no.php
2018-07-30 19:02:02 +02:00
Marius Boro
be99880ce4 Update batteriesoverview.blade.php
Some german slipped in there too.
2018-07-29 23:49:35 +02:00
Marius Boro
e026609972 Update de.php 2018-07-29 23:46:16 +02:00
Marius Boro
3474f55866 Update README.md
added useful information for new users
2018-07-29 23:26:34 +02:00
Bernd Bestel
f583810d5c Properly pluralize everything (closes #19) 2018-07-27 19:39:34 +02:00
Bernd Bestel
419445f5ae Don't add a dummy data point on chart initialization (not needed, will lead to that the current price is always 0 - references #22) 2018-07-26 21:23:37 +02:00
Bernd Bestel
c64eb27ca1 Add something for product price tracking (references #22) 2018-07-26 20:27:38 +02:00
Bernd Bestel
f4eb5196f7 Merge pull request #24 from BlizzWave/patch-4
Updated for Version 1.16.0
2018-07-26 17:30:51 +02:00
Bernd Bestel
9e493430d8 Battery charge interval was not editable and not shown anywhere 2018-07-26 17:28:30 +02:00
Marius Boro
7690eedd70 Update no.php
Updated for Version 1.16.0
2018-07-25 23:40:57 +02:00
Bernd Bestel
aaa270a52f Hotfix for old user to database migration (this will be included in the v1.16.0 release) 2018-07-25 20:26:23 +02:00
Bernd Bestel
6f47a5415c Added a rudimentary habit analysis possibility 2018-07-25 20:01:58 +02:00
Bernd Bestel
42c1709633 Optimize and refactor latest changes 2018-07-25 19:28:15 +02:00
Bernd Bestel
4685ff4145 Add an update script for Linux 2018-07-25 08:22:27 +02:00
Bernd Bestel
249b01d7a8 Added possibility to track who did a habit (this implements and closes #21) 2018-07-24 20:45:14 +02:00
Bernd Bestel
bcbdf58376 Prefix all global vars 2018-07-24 19:41:35 +02:00
Bernd Bestel
7f8540ff4e Replace the single user (defined in /data/config.php) with a multi user management thing 2018-07-24 19:31:43 +02:00
Marius Boro
b52ab91606 Update no.php (#23)
* Update no.php

Better translation and minor typos

* Update no.php
2018-07-23 21:23:55 +02:00
Bernd Bestel
7246ac55b6 Hide scrollbar in sidebar for now (workaround for #15, found no better solution, this closes #15)
This also references BlackrockDigital/startbootstrap-sb-admin#73
2018-07-23 21:21:27 +02:00
Bernd Bestel
848931da21 Mention grocy-desktop in README 2018-07-22 13:59:53 +02:00
Bernd Bestel
bf4092e746 Changed latest release download link 2018-07-22 13:26:46 +02:00
Bernd Bestel
7cee18c926 This is version 1.15.0 2018-07-22 13:10:12 +02:00
Bernd Bestel
e9a4b43268 Improve date picker MMDD shorthand 2018-07-22 13:09:23 +02:00
Bernd Bestel
b1522742cc Add new date input shorthand 2018-07-22 13:03:08 +02:00
Bernd Bestel
ecdaaab789 Update README.md 2018-07-22 12:41:11 +02:00
Bernd Bestel
3379942086 Document settingoverrides for embedded mode 2018-07-22 11:06:01 +02:00
Bernd Bestel
12eaa8c074 Fixed barcode lookup disabled hint was not localized 2018-07-22 10:18:03 +02:00
Bernd Bestel
c6310d636d Always save the recipe edit form when adding, editing or deleting ingredients (fixes #17) 2018-07-22 10:14:06 +02:00
Bernd Bestel
9bedc6a138 Fixed habit- and batterytracking dropdowns - selection did not work 2018-07-22 09:54:06 +02:00
Bernd Bestel
70dbc6018f Fix selected product in productpicker was not highlighted 2018-07-22 09:33:01 +02:00
Bernd Bestel
3afeb44b1d Prepare for embedded mode 2018-07-18 19:07:00 +02:00
Bernd Bestel
3131b8965e Prepare for embedded mode 2018-07-16 21:23:13 +02:00
Bernd Bestel
bbc2fc9e42 Merge pull request #18 from BlizzWave/patch-2
Update no.php
2018-07-16 21:18:23 +02:00
Bernd Bestel
3b4141eb4d Prepare for embedded mode 2018-07-16 21:17:32 +02:00
BlizzWave
5f826be82c Update no.php
typos
2018-07-16 19:17:47 +02:00
BlizzWave
db9ee93d2b Norwegian localization (#16)
* Create no.php

* Update no.php
2018-07-15 21:46:16 +02:00
Bernd Bestel
1eabd29105 Describe new API function 2018-07-15 13:57:27 +02:00
Bernd Bestel
dc05c56440 Do not expand card body automatically 2018-07-15 13:39:48 +02:00
Bernd Bestel
cb88ab2080 Changed file extension of custom CSS and JS files to clarify that the content is HTML and not directly CSS/JS 2018-07-15 13:35:54 +02:00
Bernd Bestel
254e1a9bc1 Fix all the little things for the next release 2018-07-15 13:33:59 +02:00
Bernd Bestel
0fc7c297bf Fixed a problem about recipe fulfillment wrong when there is no stock of a given product 2018-07-15 11:25:12 +02:00
Bernd Bestel
82bfb6a3c3 Improve demo data 2018-07-15 11:24:36 +02:00
Bernd Bestel
277c622475 Add missing German translations 2018-07-15 10:40:21 +02:00
Bernd Bestel
091a0f3efe Removed not needed Italian technical translation item 2018-07-15 10:32:50 +02:00
Bernd Bestel
823c76aa08 Add missing German translations 2018-07-15 10:30:27 +02:00
Bernd Bestel
37dee2a50b Display first recipe by default on recipes page 2018-07-15 10:16:36 +02:00
Bernd Bestel
ea0f5101ec Finalize recipes feature 2018-07-15 09:56:10 +02:00
Bernd Bestel
be650d093d Add a button to clear the whole shopping list 2018-07-15 08:29:26 +02:00
Bernd Bestel
734814d96b More or less finalize recipes feature 2018-07-14 22:49:42 +02:00
Bernd Bestel
d9246b9b42 Start working on recipes feature 2018-07-14 18:23:41 +02:00
Bernd Bestel
70e7e630c3 Refresh screenshots 2018-07-14 14:52:18 +02:00
Bernd Bestel
71fc49252f Modularize product picker 2018-07-14 14:43:57 +02:00
Bernd Bestel
aa0771877f Remember sidebar collapsed state 2018-07-14 11:25:19 +02:00
Bernd Bestel
e5a4d11c0b Remove arrows on tooltips (only needed for sidebar, but found now way to limit this now) 2018-07-14 11:08:10 +02:00
Bernd Bestel
909949a9e1 Expand and highlight parent menu item when active page sidebar navigation item is a sub menu 2018-07-14 10:28:33 +02:00
Bernd Bestel
f018696219 Save data tables state (client side for now) 2018-07-14 10:17:12 +02:00
Bernd Bestel
347a47d0d2 Add info about how to maintain own localizations 2018-07-14 08:51:48 +02:00
Bernd Bestel
c3de4b86b0 Enable column reordering for all data tables 2018-07-14 08:48:14 +02:00
Bernd Bestel
594e77ca41 Only changed default width of datetimepicker for date-only inputs, as this does not work for side-by-side with time picker (references #14) 2018-07-14 08:38:03 +02:00
Bernd Bestel
31ce7a13ea Show a calendar on the shopping list page (just for info purposes) 2018-07-13 22:38:31 +02:00
Bernd Bestel
5d762001c8 Fix too small border in datetime picker (references #14) 2018-07-13 21:37:49 +02:00
Bernd Bestel
bc3d339d9c Small UI adjustments 2018-07-13 21:10:58 +02:00
Bernd Bestel
33e5ed9ddc Fix non-string settings were not correctly recognized 2018-07-12 22:23:00 +02:00
Bernd Bestel
2d712b0ef7 Update comment to reflect changed config "style" 2018-07-12 21:24:37 +02:00
Bernd Bestel
13d81a4e4b Fixed wrong icon 2018-07-12 21:23:47 +02:00
Bernd Bestel
8d917aee12 Corrected typo 2018-07-12 21:21:51 +02:00
Bernd Bestel
09b2cfc46a Fixed loading of a JS when the webserver is case sensitive 2018-07-12 19:48:59 +02:00
Bernd Bestel
789e475207 Fix missing comma 2018-07-12 19:30:33 +02:00
Bernd Bestel
eec5105e5b Merge pull request #13 from davidoskky/master
Italian localization
2018-07-12 19:27:38 +02:00
Bernd Bestel
82f7b2109c Changed how custom JS/CSS can be added 2018-07-12 19:25:45 +02:00
Bernd Bestel
840dd58c03 Add some more info 2018-07-12 19:22:05 +02:00
Bernd Bestel
37d1377f99 Fixed the rest of the broken stuff after the dependency upgrade party 2018-07-12 19:12:31 +02:00
davidoskky
882a3545e5 Add files via upload 2018-07-12 01:04:42 +02:00
Bernd Bestel
778191fd11 Fixed all (or most of) the broken stuff after the dependency upgrade party 2018-07-11 19:43:05 +02:00
Bernd Bestel
71701804ea (More or less) finish upgrading to Bootstrap 4 2018-07-10 20:37:13 +02:00
Bernd Bestel
306c404362 Continue upgrading to Bootstrap 4 2018-07-10 00:07:38 +02:00
Bernd Bestel
4fab4f87d3 Start upgrading top Bootstrap 4 2018-07-09 21:33:23 +02:00
Bernd Bestel
54717a81b1 Streamline data tables 2018-07-09 19:27:22 +02:00
Bernd Bestel
eca299454b Migrate to use Yarn instead of Bower for frontend dependencies 2018-07-08 21:36:07 +02:00
Bernd Bestel
c58083f84a Better approach for stock overview filtering by location (references #11) 2018-07-08 16:54:37 +02:00
Bernd Bestel
ecf96252b9 Add possibility to filter products by location (references #10) 2018-07-08 15:16:24 +02:00
Bernd Bestel
92e648490a Sort all dropdowns 2018-07-08 13:59:42 +02:00
Bernd Bestel
6dd3c26ddd Fix Bower (for now, need to switch to Yarn soon) 2018-07-08 13:51:29 +02:00
Bernd Bestel
02ea26b090 Disable pagination for data tables 2018-07-08 13:50:52 +02:00
Bernd Bestel
0954b5a741 Add option to not use URL rewriting 2018-06-15 20:50:40 +02:00
Bernd Bestel
02b6c3b721 Make it also possible to directly execute/track battery charge cycles and habits from overview pages 2018-05-13 09:38:22 +02:00
Bernd Bestel
6fa4e13ba2 Fix API version display 2018-05-13 09:00:14 +02:00
Bernd Bestel
9837f79f9c Make it also possible to consume the whole stock of a product from stock overview 2018-05-13 08:42:45 +02:00
944 changed files with 184827 additions and 6517 deletions

View File

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

View File

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

View File

@@ -0,0 +1,27 @@
<?php
// This is executed inside DatabaseMigrationService class/context
use Grocy\Services\StockService;
$PRODUCTS = [3, 4, 5, 6, 7, 8];
$i = 1;
$days = -1;
while ($i <= 500)
{
$productId = $PRODUCTS[array_rand($PRODUCTS)];
$transactionId1 = $this->getStockService()->AddProduct($productId, 1, date('Y-m-d', strtotime('+180 days')), StockService::TRANSACTION_TYPE_PURCHASE, date('Y-m-d', strtotime("$days days")), XRandomPrice());
$transactionId2 = $this->getStockService()->ConsumeProduct($productId, 1, false, StockService::TRANSACTION_TYPE_CONSUME);
$this->getDatabaseService()->ExecuteDbStatement("UPDATE stock_log SET row_created_timestamp = DATETIME(row_created_timestamp, '$days days') WHERE transaction_id = '$transactionId1'");
$this->getDatabaseService()->ExecuteDbStatement("UPDATE stock_log SET row_created_timestamp = DATETIME(row_created_timestamp, '$days days') WHERE transaction_id = '$transactionId2'");
$days--;
$i++;
}
function XRandomPrice()
{
return mt_rand(2 * 100, 25 * 100) / 100 / 4;
}

View File

@@ -0,0 +1,16 @@
<?php
// This is executed inside DatabaseMigrationService class/context
use Grocy\Services\RecipesService;
$recipesService = RecipesService::getInstance();
for ($i = 1; $i <= 87; $i++)
{
$recipesService->CopyRecipe(1);
$recipesService->CopyRecipe(2);
$recipesService->CopyRecipe(3);
$recipesService->CopyRecipe(4);
$recipesService->CopyRecipe(5);
}

View File

@@ -0,0 +1,19 @@
<?php
// This is executed inside DatabaseMigrationService class/context
$db = $this->getDatabaseService()->GetDbConnection();
// Reset the password of the user "admin" to "admin"
$adminUserRow = $db->users()->where('username', 'admin')->fetch();
if ($adminUserRow == null)
{
$adminUserRow = $db->users()->createRow([
'username' => 'admin'
]);
}
$adminUserRow->update([
'password' => password_hash('admin', PASSWORD_DEFAULT)
]);

Binary file not shown.

View File

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

View File

@@ -0,0 +1,3 @@
pushd ..
tx pull --all --resources grocy.strings --minimum-perc=70
popd

View File

@@ -0,0 +1,14 @@
pushd ..
for /d %%d in (localization\*) do (
if %%~nxd neq en (
tx pull --languages %%~nxd --force
)
)
copy /Y localization\en\userfield_types.po localization\en_GB\userfield_types.po
copy /Y localization\en\stock_transaction_types.po localization\en_GB\stock_transaction_types.po
copy /Y localization\en\component_translations.po localization\en_GB\component_translations.po
copy /Y localization\en\chore_period_types.po localization\en_GB\chore_period_types.po
copy /Y localization\en\chore_assignment_types.po localization\en_GB\chore_assignment_types.po
copy /Y localization\en\permissions.po localization\en_GB\permissions.po
copy /Y localization\en\locales.po localization\en_GB\locales.po
popd

View File

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

View File

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

8
.editorconfig Normal file
View File

@@ -0,0 +1,8 @@
root = true
[*]
indent_style = tab
indent_size = 4
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

2
.gitattributes vendored Normal file
View File

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

1
.github/FUNDING.yml vendored Normal file
View File

@@ -0,0 +1 @@
custom: ["https://grocy.info/#say-thanks"]

22
.github/ISSUE_TEMPLATE/bug-report.md vendored Normal file
View File

@@ -0,0 +1,22 @@
---
name: Bug Report
about: If you've found something that does not work, please report it to help improve
Grocy
title: 'Bug: '
labels: bug
assignees: ''
---
<!--
Please make sure to:
- Describe the bug as detailed as possible by providing the exact steps how to reproduce it
- Attach screenshots where useful
- Check if the problem was maybe already reported or fixed by searching open and closed issues here
- Keep it to one topic per issue
Please also try to reproduce the problem on the pre-release demo: => https://demo-prerelease.grocy.info
- Use a private demo instance to make your example persistent
- If the problem is not reproducible there, it's most likely not a bug - please use the r/grocy subreddit for general questions / help: => https://www.reddit.com/r/grocy
-->

5
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Questions / Help
url: https://www.reddit.com/r/grocy
about: Please use the r/grocy subreddit for general questions / help

View File

@@ -0,0 +1,17 @@
---
name: Feature Request
about: Ideas for improvements or new things which you would find useful are always
welcome
title: 'Feature Request: '
labels: enhancement
assignees: ''
---
<!--
Please make sure to:
- Describe what you would find useful
- Check if your idea was maybe already requested by searching open requests here
- Keep it to one topic per request
-->

5
.github/SECURITY.md vendored Normal file
View File

@@ -0,0 +1,5 @@
Grocy is not an enterprise application and neither one you (should) host publicly (means without authentication) on the internet.
So unless something really bad can be abused _unauthenticated_, please just open a regular issue on the [Issue Tracker](https://github.com/grocy/grocy/issues/new/choose).
You can also contact me directly, please see [berrnd.de](https://berrnd.de) for any contact information.

BIN
.github/publication_assets/chores.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

BIN
.github/publication_assets/mealplan.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 476 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

BIN
.github/publication_assets/stock.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 KiB

6
.gitignore vendored
View File

@@ -1,3 +1,5 @@
/public/bower_components
/vendor
embedded.txt
.DS_Store
/.release
/packages
/public/packages

54
.php-cs-fixer.php Normal file
View File

@@ -0,0 +1,54 @@
<?php
$finder = PhpCsFixer\Finder::create()
->exclude(['packages'])
->ignoreVCSIgnored(true)
->files()->name('*.php')
->in(__DIR__);
$cfg = new PhpCsFixer\Config();
return $cfg
->setRules([
'@PSR2' => true,
'array_indentation' => true,
'array_syntax' => ['syntax' => 'short'],
'combine_consecutive_unsets' => true,
'class_attributes_separation' => true,
'class_attributes_separation' => ['elements' => ['const' => 'none', 'property' => 'none']],
'multiline_whitespace_before_semicolons' => false,
'single_quote' => true,
'blank_line_after_opening_tag' => true,
'curly_braces_position' => [
'control_structures_opening_brace' => 'next_line_unless_newline_at_signature_end',
'anonymous_functions_opening_brace' => 'next_line_unless_newline_at_signature_end'
],
'control_structure_continuation_position' => [
'position' => 'next_line'
],
'cast_spaces' => [
'space' => 'none'
],
'concat_space' => ['spacing' => 'one'],
'declare_equal_normalize' => true,
'type_declaration_spaces' => true,
'single_line_comment_style' => ['comment_types' => ['hash']],
'include' => true,
'lowercase_cast' => true,
'no_leading_import_slash' => true,
'no_leading_namespace_whitespace' => true,
'no_multiline_whitespace_around_double_arrow' => true,
'no_spaces_around_offset' => true,
'no_whitespace_before_comma_in_array' => true,
'no_whitespace_in_blank_line' => true,
'object_operator_without_whitespace' => true,
'blank_lines_before_namespace' => true,
'ternary_operator_spaces' => true,
'trim_array_spaces' => true,
'unary_operator_spaces' => true,
'whitespace_after_comma_in_array' => true,
'no_trailing_comma_in_singleline' => true
])
->setIndent("\t")
->setLineEnding("\n")
->setUsingCache(false)
->setFinder($finder);

56
.tx/config Normal file
View File

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

15
.vscode/settings.json vendored
View File

@@ -1,3 +1,16 @@
{
"phpserver.relativePath": "public"
"phpserver.relativePath": "public",
"editor.formatOnType": true,
"editor.formatOnPaste": true,
"editor.formatOnSave": true,
"editor.insertSpaces": false,
"javascript.format.placeOpenBraceOnNewLineForControlBlocks": true,
"javascript.format.placeOpenBraceOnNewLineForFunctions": true,
"javascript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
"javascript.preferences.quoteStyle": "double",
"blade.format.enable": true,
"html.format.wrapAttributes": "force",
"html.format.wrapLineLength": 0,
"php-cs-fixer.formatHtml": true,
"php-cs-fixer.autoFixBySemicolon": true
}

4
.yarnrc Normal file
View File

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

177
README.md
View File

@@ -1,71 +1,184 @@
# grocy
ERP beyond your fridge
<div align="center">
<img alt="Logo" height="60" src="https://raw.githubusercontent.com/grocy/grocy/master/public/img/logo.svg?sanitize=true" />
<h3>ERP beyond your fridge</h3>
<h4>Grocy is a web-based self-hosted groceries & household management solution for your home<br>Created by <a href="https://github.com/berrnd">@berrnd</a></h4>
</div>
-----
## Give it a try
Public demo of the latest version &rarr; [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.
- Public demo of the latest stable version (`release` branch) &rarr; [https://demo.grocy.info](https://demo.grocy.info)
- Public demo of the current development version (`master` branch) &rarr; [https://demo-prerelease.grocy.info](https://demo-prerelease.grocy.info)
## What it is about
For now my main focus is on stock management, ERP your fridge!
## Features
See the website &rarr; <https://grocy.info>
## Questions / Help / Bug Reports / Feature Requests
- General help and usage questions &rarr; [r/grocy subreddit](https://www.reddit.com/r/grocy)
- Bug Reports and Feature Requests &rarr; [Issue Tracker](https://github.com/grocy/grocy/issues/new/choose)
_Please don't send me private messages or call me regarding Grocy help. I check the issue tracker and the subreddit pretty much daily, but don't provide any support beyond that._
## Community contributions
See the website for a list of community contributed Add-ons / Tools. &rarr; [https://grocy.info/addons](https://grocy.info/addons)
## How to install
Just unpack the [latest release](https://github.com/berrnd/grocy/releases/latest) on your PHP (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 Bower dependencies manually.
> Checkout [Grocy Desktop](https://github.com/grocy/grocy-desktop), if you want to run Grocy without having to manage a webserver just like a normal (Windows) desktop application.
>
> Directly download the [latest release](https://releases.grocy.info/latest-desktop) - the installation is nothing more than just clicking 2 times "next".
If you use nginx as your webserver, please include `try_files $uri /index.php;` in your location block.
See the website for some installation guides and troubleshooting help. &rarr; [https://grocy.info/links](https://grocy.info/links)
Grocy is technically a pretty simple PHP application, so the basic notes to get it running are:
- Unpack the [latest release](https://releases.grocy.info/latest)
- Copy `config-dist.php` to `data/config.php` + edit to your needs
- Ensure that the `data` directory is writable
- The webserver root should point to the `public` directory
- Include `try_files $uri /index.php$is_args$query_string;` in your location block if you use nginx
- Or disable URL rewriting (see the option `DISABLE_URL_REWRITING` in `data/config.php`)
- &rarr; Default login is user `admin` with password `admin`, please change the password immediately (user menu at the top right corner)
Alternatively clone this repository (the `release` branch always references the latest released version) and install Composer and Yarn dependencies manually.
### Platform support
- PHP 8.1 or 8.2 (with SQLite 3.34.0+)
- Required PHP extensions: `fileinfo`, `pdo_sqlite`, `gd`, `ctype`, `json`, `intl`, `zlib`, `mbstring`
- _Recommendation: Benchmark tests showed that e.g. unit conversion handling is up to 5 times faster when using a more recent (3.39.4+) SQLite version._
- Recent Firefox, Chrome or Edge
## How to run using Docker
See [grocy/grocy-docker](https://github.com/grocy/grocy-docker) or [linuxserver/docker-grocy](https://github.com/linuxserver/docker-grocy) for instructions.
## How to update
Just overwrite everything with the latest release while keeping the `/data` directory, check `config-dist.php` for new configuration options and add them to your `data/config.php` (it will show up as an error if something is missing there).
- Overwrite everything with the [latest release](https://releases.grocy.info/latest) while keeping the `data` directory
- Check `config-dist.php` for new configuration options and add them to your `data/config.php` where appropriate (the default values from `config-dist.php` will be used for not in `data/config.php` defined settings)
- Empty the `data/viewcache` directory
- Visit the main route once to apply database migrations ([see below](https://github.com/grocy/grocy#database-migrations))
If you run Grocy on Linux, there is also `update.sh` (remember to make the script executable (`chmod +x update.sh`) and ensure that you have `unzip` installed) which does exactly this and additionally creates a backup (`.tgz` archive) of the current installation in `data/backups` (backups older than 60 days will be deleted during the update).
## Localization
Grocy is fully localizable - the default language is English (integrated into code), a German localization is always maintained by me.
You can easily help translating Grocy on [Transifex](https://www.transifex.com/grocy/grocy/dashboard/) if your language is incomplete or not available yet.
The default language can be set in `data/config.php`, e. g. `Setting('DEFAULT_LOCALE', 'it');` and there is also a user setting (see the user settings page) to set a different language per user.
The [pre-release demo](https://demo-prerelease.grocy.info) is available for any translation which is at least 70 % complete and will pull the translations from Transifex 10 minutes past every hour, so you can have a kind of instant preview of your contributed translations. Thank you!
Also any translation which once reached a completion level of 70 % ([`strings` resource](https://www.transifex.com/grocy/grocy/strings/)) will be included in releases.
_RTL languages are unfortunately not yet supported._
## 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 was a pain to use at the end and Excel is Excel. So I searched for and tried different things for a (very) long time, nothing 100 % fitted, so this is my aim for a "complete household management"-thing. ERP your fridge!
## Things worth to know
### REST API & data model documentation
See the integrated Swagger UI instance on [/api](https://demo-en.grocy.info/api).
### REST 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.
See the integrated Swagger UI instance on [/api](https://demo.grocy.info/api).
### Barcode readers & camera scanning
Some fields (with a barcode icon above) also allow to select a value by scanning a barcode. It works best when your barcode reader prefixes every barcode with a letter which is normally not part of a item name (I use a `$`) and sends a `TAB` after a scan.
Additionally it's also possible to use your device camera to scan a barcode by using the camera button on the right side of the corresponding field (powered by [Quagga2](https://github.com/ericblade/quagga2), totally offline / client-side camera stream processing, please note due to browser security restrictions, this only works when serving Grocy via a secure connection (`https://`)). Quick video demo: <https://www.youtube.com/watch?v=Y5YH6IJFnfc>
_My personal recommendation: Use a USB barcode laser scanner. They are cheap and work 1000 % better, faster, under any lighting condition and from any angle._
### Input shorthands for date fields
For (productivity) reasons all date (and time) input fields use the ISO-8601 format regardless of localization.
For (productivity) reasons all date (and time) input (and display) fields use the ISO-8601 format regardless of localization.
The following shorthands are available:
- `MMDD` gets expanded to the given day on the current year in proper notation
- Example: `0517` will be converted to `2018-05-17`
- `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 `2021-05-17`
- `YYYYMMDD` gets expanded to the proper ISO-8601 notation
- Example: `20190417` will be converted to `2019-04-17`
- `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
- Example: `20210417` will be converted to `2021-04-17`
- `YYYYMMe` or `YYYYMM+` gets expanded to the end of the given month in the given year in proper notation
- Example: `202107e` will be converted to `2021-07-31`
- `[+/-]n[d/m/y]` gets expanded to a date relative to today, while adding (**+**) or subtracting (**-**) the **n**umber of**d**ays/**m**onths/**y**ears, in proper notation
- Example: `+1m` will be converted to the same day next month
- `x` gets expanded to `2999-12-31` (which is an alias for "never overdue")
- Down/up arrow keys will increase/decrease the date by 1 day
- Right/left arrow keys will increase/decrease the date by 1 week
- Shift + down/up arrow keys will increase/decrease the date by 1 month
- Shift + right/left arrow keys will increase/decrease the date by 1 year
### Keyboard shorthands for buttons
Wherever a button contains a bold highlighted letter, this is a shortcut key.
Example: Button "Add as new **p**roduct" can be "pressed" by using the `P` key on your keyboard.
Example: Button "**P** Add as new product" 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).
### 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.
_Please note: Database migrations are supposed to work between releases, not between every commit. If you want to run the current `master` branch (which is the development version), you need to handle that (and maybe more) yourself._
### Other things
When the file `data/add_before_end_body.html` exists, the contents of the file be added just before `</body>` on every page, useful for your own JS/CSS without to have to modify the application itself.
### Disable certain features
If you don't use certain feature sets of Grocy (for example if you don't need "Chores"), there are feature flags per major feature set to hide/disable the related UI elements (see `config-dist.php`).
### Adding your own CSS or JS without to have to modify the application itself
- When the file `data/custom_js.html` exists, the contents of the file will be added just before `</body>` (end of body) on every page
- When the file `data/custom_css.html` exists, the contents of the file will be added just before `</head>` (end of head) on every page
### Demo mode
When the `MODE` setting is set to `dev`, `demo` or `prerelease`, the application will work in a demo mode which means authentication is disabled and some demo data will be generated during the database schema migration (pass the query parameter `nodemodata`, e.g. `https://grocy.example.com/?nodemodata` to skip that).
### Embedded mode
When the file `embedded.txt` exists, it must contain a valid and writable path which will be used as the data directory instead of `data` and authentication will be disabled (used in [Grocy Desktop](https://github.com/grocy/grocy-desktop)).
In embedded mode, settings can be overridden by text files in `data/settingoverrides`, the file name must be `<SettingName>.txt` (e. g. `BASE_URL.txt`) and the content must be the setting value (normally one single line).
## Contributing / Say Thanks
Any help is welcome, feel free to contribute anything which comes to your mind or see <https://grocy.info/#say-thanks> if you just want to say thanks.
## Roadmap
There is none. The progress of a specific bug/enhancement is always tracked in the corresponding issue, at least by commit comment references.
[Milestones](https://github.com/grocy/grocy/milestones) are used to indicate in which version the corresponding request was done (`vNEXT` means it's currently planned to do that for the next release).
## Screenshots
#### Dashboard
![Dashboard](https://github.com/berrnd/grocy/raw/master/publication_assets/dashboard.png "Dashboard")
#### Purchase - with barcode scan
![Purchase - with barcode scan](https://github.com/berrnd/grocy/raw/master/publication_assets/purchase-with-barcode.gif "purchase-with-barcode")
### Stock overview
#### Consume - with manual search
![Consume - with manual search](https://github.com/berrnd/grocy/raw/master/publication_assets/consume.gif "consume")
![Stock overview](https://github.com/grocy/grocy/raw/master/.github/publication_assets/stock.png "Stock overview")
### Shopping List
![Shopping List](https://github.com/grocy/grocy/raw/master/.github/publication_assets/shoppinglist.png "Shopping List")
### Meal Plan
![Meal Plan](https://github.com/grocy/grocy/raw/master/.github/publication_assets/mealplan.png "Meal Plan")
### Chores overview
![Chores overview](https://github.com/grocy/grocy/raw/master/.github/publication_assets/chores.png "Chores overview")
## License
The MIT License (MIT)

134
app.php
View File

@@ -1,44 +1,112 @@
<?php
use \Psr\Http\Message\ServerRequestInterface as Request;
use \Psr\Http\Message\ResponseInterface as Response;
use Grocy\Controllers\ExceptionController;
use Grocy\Helpers\UrlManager;
use Grocy\Middleware\LocaleMiddleware;
use Grocy\Middleware\CorsMiddleware;
use Psr\Container\ContainerInterface as Container;
use Slim\Factory\AppFactory;
use Slim\Views\Blade;
use \Grocy\Helpers\UrlManager;
use \Grocy\Controllers\LoginController;
// Load composer dependencies
require_once __DIR__ . '/packages/autoload.php';
require_once __DIR__ . '/vendor/autoload.php';
require_once __DIR__ . '/data/config.php';
// Load config files
require_once GROCY_DATAPATH . '/config.php';
require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
require_once __DIR__ . '/helpers/ConfigurationValidator.php';
// Setup base application
$appContainer = new \Slim\Container([
'settings' => [
'displayErrorDetails' => true,
'determineRouteBeforeAppMiddleware' => true
],
'view' => function($container)
{
return new \Slim\Views\Blade(__DIR__ . '/views', __DIR__ . '/data/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')
// Error reporting definitions
if (GROCY_MODE === 'dev')
{
$app->add(\pavlakis\cli\CliRequest::class);
error_reporting(E_ALL);
}
else
{
error_reporting(E_ALL ^ (E_NOTICE | E_WARNING | E_DEPRECATED));
}
// Definitions for dev/demo/prerelease mode
if ((GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease') && !defined('GROCY_USER_ID'))
{
define('GROCY_USER_ID', 1);
}
// Definitions for disabled authentication mode
if (GROCY_DISABLE_AUTH === true)
{
if (!defined('GROCY_USER_ID'))
{
define('GROCY_USER_ID', 1);
}
}
// Check if any invalid entries in config.php have been made
try
{
(new ConfigurationValidator())->validateConfig();
}
catch (EInvalidConfig $ex)
{
exit('Invalid setting in config.php: ' . $ex->getMessage());
}
// Create data/viewcache folder if it doesn't exist
if (!file_exists(GROCY_DATAPATH . '/viewcache'))
{
mkdir(GROCY_DATAPATH . '/viewcache');
}
// Setup base application
AppFactory::setContainer(new DI\Container());
$app = AppFactory::create();
$container = $app->getContainer();
$container->set('view', function (Container $container)
{
return new Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
});
$container->set('UrlManager', function (Container $container)
{
return new UrlManager(GROCY_BASE_URL);
});
$container->set('ApiKeyHeaderName', function (Container $container)
{
return 'GROCY-API-KEY';
});
// Load routes from separate file
require_once __DIR__ . '/routes.php';
// Set base path if defined
if (!empty(GROCY_BASE_PATH))
{
$app->setBasePath(GROCY_BASE_PATH);
}
if (GROCY_MODE === 'production' || GROCY_MODE === 'dev')
{
$app->add(new LocaleMiddleware($container));
}
else
{
define('GROCY_LOCALE', GROCY_DEFAULT_LOCALE);
}
$authMiddlewareClass = GROCY_AUTH_CLASS;
$app->add(new $authMiddlewareClass($container, $app->getResponseFactory()));
// Add default middleware
$app->addRoutingMiddleware();
$errorMiddleware = $app->addErrorMiddleware(true, false, false);
$errorMiddleware->setDefaultErrorHandler(
new ExceptionController($app, $container)
);
$app->add(new CorsMiddleware($app->getResponseFactory()));
$app->getRouteCollector()->setCacheFile(GROCY_DATAPATH . '/viewcache/route_cache.php');
ob_clean(); // No response output before here
$app->run();

View File

@@ -1,25 +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",
"swagger-ui": "^3.13.4",
"jquery-ui": "^1.12.1",
"bootstrap-side-navbar": "^1.0.1"
}
}

View File

@@ -1,13 +0,0 @@
set projectPath=%~dp0
if %projectPath:~-1%==\ set projectPath=%projectPath:~0,-1%
set releasePath=%projectPath%\.release
mkdir "%releasePath%"
for /f "tokens=*" %%a in ('type version.txt') 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 "%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\*

Binary file not shown.

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,49 @@
## !! Important notice
If you run Grocy in a subdirectory, you need to set a new `config.php` setting (`BASE_PATH`, see `config-dist.php`)
### Stock fixes
- Fixed purchase/consume/inventory problems when `FEATURE_FLAG_STOCK_LOCATION_TRACKING` was set to `false`
- Fixed that products on the Location Content Sheet were not ordered by the product name
### Shopping list improvements/fixes
- Added an option to hide the month-calendar (in the shopping list settings / top right corner settings menu) (defaults to disabled, so please enable this option if you still want to have the month-calendar on the shopping list)
- Optimized the new compact view (there was a little too much white space at the sides of the page)
- Added an option to not switch to the new compact view on mobile devices automatically (in the shopping list settings / top right corner settings menu) (defaults to `false`, so no changed behavior when not configured) (thanks @Forceu)
- Fixed that the "Shopping list to stock workflow" did not work when `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` was set to `false`
### Recipe improvements/fixes
- Optimized the ordering of the inputs on the recipe ingredient edit page (moved "Only check if a single unit is in stock" before the amount)
- Variable ingredient amounts are now marked accordingly on the renedered recipe
- After selecting a recipe on mobile devices, the page now automatically scrolls to the recipe card
- Added the recipes base servings to be displayed on the recipe card and properly named the servings column in the recipes list/table (thanks @kriddles)
- Added that recipe ingredients can now also be displayed grouped by the products product group (additionally to the ingredient group, new option in the recipes settings / top right corner settings menu) (defaults to `false`, so no changed behavior when not configured) (thanks @kriddles)
- Fixed that when editing a recipe ingredient which had "Only check if a single unit is in stock" set, not any quantity unit could be picked and the amount stayed empty
- Fixed that when reloading the "new recipe"-page (or when it gets auto-reloaded due to "Auto reload on external changes" is enabled), for each reload a new recipe was created
- Fixed that the recipe "fullscreen card" was not correctly displayed
- Fixed that nested recipes showed all ingredients of the nested recipes twice
- Fixed that when displaying or consuming a recipe from the meal plan the serving amount was maybe wrong (was the one from the recipe instead the one from the meal plan entry) (thanks @kriddles)
- Fixed that the stock fulfillment counts on the recipe card were maybe wrong if that recipe was also added to the meal plan (thanks @kriddles)
- Fixed that the recipe page was reloaded when expanding a collapsed row on mobile (thanks @Mikhail5555)
### Meal plan improvements
- Improved that all add-dialogs can be submitted by using `ENTER` and that the next input is automatically selected after selecting a recipe/product
- Added an edit button to all types of meal plan entries
- When adding a recipe, the serving amount is now prefilled with the one of the selected recipe (thanks @kriddles)
- Fixed that the meal plan not used the full height on mobile devices
### Calendar fixes
- Fixed to only include events when the corresponding feature flag is enabled (e. g. don't show expiring products when `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` is set to `false`) (thanks @kriddles)
- Fixed that the calendar not used the full height on mobile devices
### API improvements/fixes
- The endpoint `/chores` now also includes the chore name (new field `chore_name`) (thanks @DarienFord)
### General & other improvements/fixes
- Big backend performance improvements (thanks @zebardy)
- Added a button to enable the device flash light on the camera barcode scanner popup (thanks @radim-ek)
- Optimized the top navbar height and overall spacing to waste less space
- Replaced the scan-mode-switch-button by a native button because it's less disturbing
- Fixed that the "contextual time ago" of date/time pickers was not displayed
- New translations: (thanks all the translators)
- Czech (demo available at https://cs.demo.grocy.info)
- Portuguese (Portugal) (demo available at https://pt-pt.demo.grocy.info)

View File

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

View File

@@ -0,0 +1,66 @@
### New feature: Price history per store
- Define stores under master data
- New product option to set the default store
- Track on purchase/inventory in which store you bought the product (gets prefilled by the last store you purchased the product, or the default store of the product if you never bought it)
- => The price history chart on the product card shows a line per store
- (Thanks @immae and @kriddles)
### Stock improvements/fixes
- When creating a new product, the "QU id stock" is now preset by the "QU id purchase" (because most of the time that's most probably the same) (thanks @Mik-)
- Clarified the row-button colors and toolips on the stock entries page
- Added a camera-barcode-scanning-button to the barcode(s) field on the product edit page to be able to also scan barcodes by the device camera there
- Added a new option (stock settings / top right corner settings menu) to show an icon on the stock overview if the product is already on the shopping list (next to the amount) (defaults to enabled)
- Fixed that the aggregated parent product amount (displayed on the stock overview page and on the product card) did not respect quantity unit conversions when the parent/sub products had different stock quantity units (the unit conversion needs to be globally defined, or as an override on the sub product)
- Fixed the conversion factor hint to display also decimal places on the purchase page (only displayed when the product has a different purchase/stock quantity unit)
- Fixed that the stock entries page was broken when there were product userfields defined with enabled "Show as column in tables"
- Fixed that best before dates were displayed on the stock overview and stock entries page even with disabled `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING`
- Fixed that when editing a stock entry and setting a decimal amount, the decimal part was ignored (only possible when the product option "Allow partial units in stock" is enabled)
- Fixed that "Default best before days" and "Default best before days after opened" on the product edit page were always shown regardless of the feature flags `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` and `FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING`
- Fixed that the form validation limits for the amount input and products with enabled tare weight handling were wrong
- Fixed that the price was saved wrong for products with a different purchase/stock quantity unit when using "Total price" on purchase (resulted for example in wrong recipe costs)
- Fixed that undoing "product-opened"-actions was not possible
- Fixed/improved consuming from the stock overview page for products with enabled tare weight handling ("consume 1" button is now disabled for such products, "consume all" works again)
### Shopping list improvements/fixes
- It's now possible to collapse/expand the product group sections (by clicking on the grey group header)
- Fixed that the "shopping list to stock workflow"-dialog was not visible in compact view
- Fixed that when printing the shopping list, configured userfields were not included
### Recipe fixes
- Fixed that when editing an ingredient with "Only check if a single unit is in stock" set, the quantity unit was always set to the products stock quantity unit regardless if a different one was selected for that ingredient
- Fixed a PHP notice on the recipes page when there are no recipes (thanks @mrunkel)
### Chores fixes
- Fixed that weekly chores, where the next execution should be in the same week, were scheduled always for the next week only
### Calendar fixes
- Fixed that the "Share/Integrate calendar (iCal)" button did not work (thanks @tsia)
### API improvements/fixes
- New endpoint `/user/settings` to get all user settings of the currently logged in user (key/value pairs)
- New endpoint `/system/config` to get all config settings (`config.php`) (key/value pairs)
- The endpoint `/stock/products/{productId}/locations` now also returns the current stock amount of the product in that loctation (new field/property `amount`) (thanks @Forceu)
- The endpoints `/objects/{entity}` and `/objects/{entity}/{objectId}` now also include/return userfields of the object(s) (new field/property `userfields` per object, key/value pairs or `null`, when the object has no userfields)
- Fixed that CORS was broken (there was no response to preflight OPTIONS requests)
### General & other improvements/fixes
- Optimized that sometimes the corresponding form was not validated when selecting a date from the datetimepicker
- New `config.php` setting `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD` which activates the number pad for best-before-date fields on (supported) mobile browsers (useful because of [shorthands](https://github.com/grocy/grocy#input-shorthands-for-date-fields)) (defaults to `true`) (thanks @Mik-)
- Enhancements for the camera barcode scanner
- Torch / light improvements (thanks @Mik-)
- The light button is only displayed when the device has a flash light
- New `config.php` setting `FEATURE_FLAG_AUTO_TORCH_ON_WITH_CAMERA` to always enable the flash light automatically
- It's now possible to change the camera when the device has more than one (dropdown in the camera scanning dialog, only visible if there is more than one camera available) (thanks @MichaelMadsen)
- Replaced [QuaggaJS](https://github.com/serratus/quaggaJS) (seems to be unmaintained) by [Quagga2](https://github.com/ericblade/quagga2)
- New user setting `quagga2_numofworkers` (`config.php`) to make the Quagga2 setting "numOfWorkers" adjustable (defaults to `4`)
- Various display/CSS improvements (thanks @Mik-)
- Prerequisites (PHP extensions, critical files/folders) will now be checked and properly reported if there are problems (thanks @Forceu)
- Improved the the overview pages on mobile devices (main column was hidden) (thanks @Mik-)
- The general search field now searches accent insensitive (and table sorting is also accent insensitive)
- Fixed that all number inputs are always prefilled in the browser locale number format
- Optimized the handling of settings provided by `data/settingoverrides` files (thanks @dacto)
- Optimized the update script (`update.sh`) to create the backup tar archive before writing to it (was a problem on Btrfs file systems) (thanks @shane-kerr)
- Fixed (again) that the `update.sh` file had wrong line endings (DOS instead of Unix)
- New translations: (thanks all the translators)
- Japanese (demo available at https://ja.demo.grocy.info)
- Chinese (Taiwan) (demo available at https://zh-tw.demo.grocy.info)

View File

@@ -0,0 +1,2 @@
- Fixed that camera barcode scanning was broken
- Fixed that the new prerequisites check handled things incorrectly in Docker images and in embedded mode

View File

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

View File

@@ -0,0 +1,279 @@
> ⚠️ The major version bump is due to breaking API changes, please see below if you use the API
> ⚠️⚠️ SQLite >= 3.9.0 (was released in late 2015) is required
>
> [Here](https://github.com/grocy/grocy/issues/1209#issuecomment-749760765) is a workaround if you still run a SQLite version >= 3.8.3 < 3.9.0
>
> _PHP 7.2 (with SQLite 3.8.3+) was the formerly minimum runtime requirement, any future release will only support PHP 7.4 (with SQLite 3.27.2+) - supporting those (very) old runtime stuff is too time consuming..._
> ❗ If some pages/tables doesn't load at all, please check that your `/data/config.php` setting `CURRENCY` is a valid ISO 4217 currency code - that's most probably the issue then.
### New feature: Use any product related quantity unit anywhere
- Finally it's possible to use any product related quantity unit on any page
- Products still have one quantity unit stock and one (default) quantity unit purchase, but any QU, which has a direct or indirect conversion for that product, can be used to pick an amount
- Because the stock quantity unit is now the base for everything, it cannot be changed after the product was once added to stock (for now, maybe there will be a possibilty to change it in a future release)
### New feature: Prefill purchase data by barcodes
- Imagine you buy for example eggs in different pack sizes and they have different barcodes
- Each product barcode can be assigned an amount, quantity unit and store (on the product edit page), which is then automatically prefilled on the purchase page
- Additionally, the last price per barcode will be tracked and prefilled as a "Total price" on purchase
- (Thanks @kriddles for the initial work on this)
### New feature: User permissions
- Users can now have permissions, can be configured per user on the "Manage users" page (lock icon)
- Default permissions for new users can be set via a new `config.php` setting `DEFAULT_PERMISSIONS` (defaults to `ADMIN`, so no changed behavior when not configured)
- All currently existing users will get all permissions (`ADMIN`) during the update/migration
- Creating API keys on the "Manage API keys"-page (top right corner settings menu) now requires the `ADMIN` permission
- Other users only see their API keys on that page
- (Thanks @fipwmaqzufheoxq92ebc for the initial work on this)
### New feature: External authentication support
- New `config.php` setting `AUTH_CLASS` to change the used authentication provider
- Via LDAP
- New `config.php` settings `LDAP_DOMAIN`, `LDAP_ADDRESS` and `LDAP_BASE_DN`
- If you set `AUTH_CLASS` to `Grocy\Middleware\LdapAuthMiddleware`, users will be authenticated against your directory (and will also be created (in Grocy), if not already present)
- Via a reverse proxy
- New `config.php` setting `REVERSE_PROXY_AUTH_HEADER`
- If you set `AUTH_CLASS` to `Grocy\Middleware\ReverseProxyAuthMiddleware` and your reverse proxy sends a username in the HTTP header `REMOTE_USER` (header name can be changed by the setting `REVERSE_PROXY_AUTH_HEADER`), the user is automatically authenticated (and will also be created (in Grocy), if not already present)
- (Thanks @fipwmaqzufheoxq92ebc for the initial work on this)
### Stock improvements/fixes
- Changes about best before dates: It's now possible to distinguish between best before dates and expiration dates:
- New product option "Due date type" (defaults to "Best before date")
- Wording changes:
- All current places where "Best before date" was used now use "Due date"
- Products with `Due date type = Best before date` (so all existing products) are "due" or "overdue" (they don't "expire" or are "expired")
- Products with `Due date type = Expiration date` (new option) can "expire" or are "expired"
- Color changes:
- Products which are due soon or expire soon are (still) highlighted in yellow
- Products which are overdue are highlighted in grey (there is also a new filter button on the stock overview page for them)
- Products which are expired (new option) are highlighted in red
- When creating a quantity unit conversion it's now possible to automatically create the inverse conversion (thanks @kriddles)
- The product option "Allow partial units in stock" was removed, partial amounts are now possible by default for all products
- On purchase there is now a warning shown, when the due date of the purchased product is earlier than the next due date in stock (enabled by default, can be disabled by a new stock setting (top right corner settings menu))
- The amount to be used for the "quick consume/open buttons" on the stock overview page can now be configured per product (new product option "Quick consume amount", defaults to 1)
- This "Quick consume amount" can optionally also be used as the default on the consume page (new stock setting / top right corner settings menu)
- Products can now be duplicated (new dropdown menu item on the products list page, all fields will be preset from the copied product, except the name)
- Products can now be merged (new dropdown menu item on the products list page)
- Useful if you have two products which are basically the same and want to replace all occurrences of one with the other one
- When consuming or opening a parent product, which is currently not in stock, any in-stock sub product will now be consumed/opened (like already automatically done when consuming recipes)
- Opened stock entries get now consumed first by default when no specific stock entry is used/selected
- So the default consume rule is now "Opened first, then first due first, then first in first out"
- Optimized/clarified what the total/unit price on the purchase page is (thanks @kriddles)
- On the purchase page the amount field is now displayed above/before the due date for better `TAB` handling (thanks @kriddles)
- Changed that when `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` is disabled, products now get internally a due date of "never overdue" (aka `2999-12-31`) instead of today (thanks @kriddles)
- Products can now be disabled to keep the history/journal, but hide it everywhere, without deleting it (new product option "Active", deleting a product now explicitly also deletes its journal and all other references) (thanks @kriddles for the initial work on this)
- Products can now be hidden from the stock overview page, even if they are in-stock (new product option "Never show on stock overview", disabled by default, so no changed behavior when not configured)
- That's maybe useful for parent products you only use as a kind of "container"
- The due date is now also prefilled on the inventory page based on the products "Default due days" (was only done on the purchase page before)
- On the stock journal page, it's now visible if a consume-booking was spoiled
- It's now tracked who made a stock change (currently logged in user, visible on the stock journal page) (thanks @fipwmaqzufheoxq92ebc)
- Product edit page improvements ("Save & continue" button, deleting and adding a product picuture is now possible in one go) (thanks @Ma27)
- For products with tare weight handling enabled, it's now optionally possible to consume a fixed/exact amount (just like for "normal" products) in case you don't want to weigh the whole container this time (new checkbox on the consume page) (thanks @fipwmaqzufheoxq92ebc)
- The stock overview page now also shows the value - new column and also the total value in the header (thanks @kriddles)
- It's now possible to set a custom purchased date on purchase (new field on the purchase and inventory page, hidden by default - enable it by a new stock setting (top right corner settings menu)) (thanks @kriddles)
- The decimal places for all amount and price inputs can now be configured (stock settings / top right corner settings menu, default for amounts is `4`, for prices `2`)
- When clicking the product name on the shopping list, the product card will now be displayed (like on the stock overview page) (thanks @kriddles)
- On the product card there is now also a button to jump directly to the stock entries of the corresponding product (thanks @kriddles)
- The product picker workflows can now also be started by `ENTER` (additionally to `TAB`)
- Added a "retry camera barcode scan" button (button with camera icon, shortcut `C`) to the product picker workflow dialog
- Added more filters on the stock journal page
- Added a grouped/summarized stock journal (new button "Journal summary" at the top of the stock journal page) (thanks @fipwmaqzufheoxq92ebc)
- Provides an overview of summarized transactions per product, transaction type and user + summarized amount
- The product option "Default due days after freezing" now also supports `-1` (like the option "Default due days") to set the product to "never due" on freezing
- Fixed that changing the products "Factor purchase to stock quantity unit" not longer messes up historical prices (which results for example in wrong recipe costs) (thanks @kriddles)
- Fixed that when adding products through a product picker workflow and when the created products contains special characters, the product was not preselected on the previous page (thanks @Forceu)
- Fixed that when editing a product the default store was not visible / always empty regardless if the product had one set (thanks @kriddles)
- Fixed that `FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT` (option to configure if opened products should be considered for minimum stock amounts) was not handled correctly (thanks @teddybeermaniac)
- Fixed that the "Due soon" sum (yellow filter button) on the stock overview page didn't include products which are due today (thanks @fipwmaqzufheoxq92ebc)
- Fixed that the shopping cart icon on the stock overview page was also shown if the product was on an already deleted shopping list (if enabled) (thanks @fipwmaqzufheoxq92ebc)
- Fixed that when editing a stock entry without a price, the price field was prefilled with `1`
- Fixed that the location & product groups filter on the stock overview page used a contains search instead of an exact search
- Fixed that the amount on the success popup was wrong when consuming a product with "Tare weight handling" enabled
- Fixed that the aggregated amount of parent products was wrong on the stock overview page when the child products had not the same stock quantity units
- Fixed that edited stock entries were not considered for the price history chart on the product card
- Fixed that `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` is set to `false`, the purchase page validation failed (thanks @fipwmaqzufheoxq92ebc)
- Fixed that consuming (and editing the amount of) products with enabled tare weight handling did not work on the stock entries page
- Fixed that the recipes dropdown on the consume page also displayed internal recipes (thanks @kriddles)
- Fixed that opening tare weight handling enabled products is prevented via the UI and the API (as this makes no sense)
- Fixed that undoing a consume transaction of an opened item added it back to stock unopened
- Fixed that a "Total price" on purchase was not handled correctly for tare weight handling enabled products (the total price was wrongly related to the amount including the tare weight)
### Shopping list improvements
- Added a button to add all currently in-stock but overdue and expired products to the shopping list (thanks @m-byte)
- Improved that when `FEATURE_FLAG_STOCK` is disabled, all product/stock related inputs and buttons are now hidden on the shopping list page (thanks @fipwmaqzufheoxq92ebc)
- Shopping list items can now have their own Userfields (entity `shopping_list`), on the shopping list table those fields are rendered additionally to the product Userfields
- The print view is now configurable (new dialog before printing - option to hide header, group products by their product group, alternative list layout)
- Fixed that "Add products that are below defined min. stock amount" always rounded up the missing amount to an integral number, this now allows decimal numbers
### Recipe improvements/fixes
- It's now possible to print recipes (button next to the recipe title) (thanks @zsarnett)
- Changed that recipe costs are now based on the costs of the products picked by the default consume rule ("Opened first, then first due first, then first in first out") (thanks @kriddles)
- Recipe costs were based on the last purchase price per product before, so this now better reflects the current real costs
- Improved the recipe add workflow (a recipe called "New recipe" is now not automatically created when starting to add a recipe) (thanks @zsarnett)
- On the recipe page, the calories and costs per ingredient are now shown to get a better overview of how much each ingredient contributed
- Fixed that images on the recipe gallery view were not scaled correctly on larger screens (thanks @zsarnett)
- Fixed that decimal ingredient amounts maybe resulted in wrong conversions or truncated decimal places if your locale does not use a dot as the decimal separator (thanks @m-byte)
- Fixed that a recipe cannot be included in itself (because this will cause an infinite loop) (thanks @fipwmaqzufheoxq92ebc)
- Fixed that when editing a recipe ingredient the checkbox "Disable stock fulfillment checking for this ingredient" was not initaliased with the saved value
- Fixed that the status filter ("Enough in stock", etc.) on the recipes page did not filter recipes on the gallery tab (thanks @fipwmaqzufheoxq92ebc)
- Fixed that consuming a recipe ingredient with tare weight handling enabled consumed a wrong amount (thanks @fipwmaqzufheoxq92ebc)
- Fixed that consuming a parent product recipe ingredient did not consider quantity unit conversion when effectively consuming a child product
### Meal plan fixes
- Fixed that for products the quantity unit purchase was displayed instead of the products quantity unit stock (thanks @BenoitAnastay)
### Chores improvements/fixes
- Chores can now be disabled to keep the history/journal, but hide it everywhere, without deleting it (new chore option "Active", deleting a chore now explicitly also deletes its journal and all other references)
- Changed that not assigned chores on the chores overview page display now just a dash instead of an ellipsis in the "Assigned to" column to make this more clear (thanks @Germs2004)
- The assignment type "Random" now don't prevents anymore that the last user will be assigned next
- Fixed (again) that weekly chores, where the next execution should be in the same week, were scheduled (not) always (but sometimes) for the next week only (thanks @shadow7412)
- Fixed that the assignment type "In alphabetic order" did not work correctly (the last person in the list was always assigned next once reached) (thanks @fipwmaqzufheoxq92ebc)
### Equipment improvements
- There is now a button to download the instruction manual (next to the "expand to fullscreen"-button)
### Calendar improvements/fixes
- Events are now links to the corresponding page (thanks @zsarnett)
- Fixed a PHP warning when using the "Share/Integrate calendar (iCal)" button (thanks @tsia)
- Fixed that "Track date only"-chores were always displayed at 12am (are now displayed as all-day events)
- Fixed that it was not possible to switch to an other view than the default one on mobile (thanks @PhyberApex)
### Tasks improvements
- Tasks don't need to unique anymore (name field)
### Batteries improvements
- Batteries can now be disabled to keep the history/journal, but hide it everywhere, without deleting it (new battery option "Active", deleting a battery now explicitly also deletes its journal and all other references)
### Userfield improvements/fixes
- New Userfield type "File" to attach any file, will be rendered as a link to the file in tables (if enabled) (thanks @fipwmaqzufheoxq92ebc)
- New Userfield type "Picture" to attach a picture, the picture will be rendered (small) in tables (if enabled) (thanks @fipwmaqzufheoxq92ebc)
- New Userfield type "Link (with title)" - a link with a title (two input fields), so that the title is rendered in tables (if enabled) instead of the link itself
- Userfields can now be reordered on the input form (new field "Sort number" per Userfield, fields will be ordered by that number, if any)
- Users can now also have Userfields
### General & other improvements/fixes
- UI refresh / style improvements (thanks @zsarnett for the idea and initial work on this)
- Improved mobile views (thanks @4lloyd for the idea and initial work on this)
- The buttons on the top of each page and the filter row is now collapsed (use the ellipsis/filter button to show them, this also superseded the shopping list compact view)
- Tables are horizontally scrollable (instead of collapsing columns which don't fit)
- All tables are now customizable (new little eye icon on the top left corner on each table)
- Table columns be shown/hidden
- There are also new columns on some pages, hidden by default
- Stock overview: Value, Product group, Calories, Last purchased, Last price, Min. stock amount
- Products list: Default store
- Shopping list: Last price (Unit), Last price (Total), Default store, Barcodes (as scannable code-image)
- Row grouping can be customized to use any available column (thanks @edenhaus)
- Table states (visible columns, sorting, column order and so on) are now saved server side (in user settings) means that this stays the same when using different browsers
- Dialogs are now used everywhere where appropriate instead of jumping between pages (for example when adding/editing shopping list items)
- Added a "Clear filter"-button on all pages (with filters) to quickly reset applied filters
- Users can now have a picture (will then be shown next to the current user name instead of the generic user icon)
- Prefilled number inputs now use sensible decimal places (max. the configured decimals while hiding trailing zeros where appropriate, means if you never use partial amounts for a product, you'll never see decimals for it)
- Improved / more precise validation messages for number inputs
- Optimized what's hidden when `GROCY_FEATURE_FLAG_STOCK` is disabled
- Products, quantity units and product groups are possible to use now
- Means you can use for example the shopping list, recipes and the meal plan with products while the "stock handling part" is hidden
- Ordering now happens case-insensitive
- The data path (previously fixed to the `data` folder) is now configurable, making it possible to run multiple Grocy instances from the same directory (with different `config.php` files / different database, etc.) (thanks @fgrsnau)
- Via an environment variable `GROCY_DATAPATH` (higher priority)
- Via an FastCGI parameter `GROCY_DATAPATH` (lower priority)
- The language can now be set per user (see the new user settings page / top right corner settings menu) (thanks @fipwmaqzufheoxq92ebc)
- Additionally, the language is now also auto-guessed based on the browser locale (HTTP-Header `Accept-Language`)
- The `config.php` option `CULTURE` was renamed to `DEFAULT_LOCALE`
- So the used language is based on (in that order)
- The user setting
- If not set, then based on browser locale
- If no matching localizaton was found, `DEFAULT_LOCALE` from `config.php` is used
- Performance improvements (page loading time) of the stock overview page (thanks @fipwmaqzufheoxq92ebc)
- The prerequisites checker now also checks for the minimum required SQLite version (thanks @Forceu)
- Replaced (again, added before in v2.7.0, then reverted in v2.7.1 due to some problems) [QuaggaJS](https://github.com/serratus/quaggaJS) (seems to be unmaintained) by [Quagga2](https://github.com/ericblade/quagga2)
- More `config.php` settings (see the section `Component configuration for Quagga2`) to tweak Quagga2 (this is the component used for device camera for barcode scanning) (thanks @andrelam)
- Some localization string fixes (thanks @duckfullstop)
- Better error pages
- Fixed that numeric and date-time sorting of table columns did not work correctly
- Fixed that XSS / HTML injection was possible through some user input fields (low severity / not really a problem as this could not be abused unauthenticated)
- New translations: (thanks all the translators)
- Greek (demo available at https://el.demo.grocy.info)
- Korean (demo available at https://ko.demo.grocy.info)
- Chinese (China) (demo available at https://zh-cn.demo.grocy.info)
- Tamil (demo available at https://ta.demo.grocy.info)
- Finnish (demo available at https://fi.demo.grocy.info)
### API improvements/fixes
- ⚠️ **Breaking changes**:
- All prices are now related to the products stock quantity unit (instead of the products purchase QU)
- All (product) amounts are now related to the products stock quantity unit (was related to the products purchase QU for the shopping list before)
- The product object no longer has a field `barcodes` with a comma separated barcode list, instead barcodes are now stored in a separate table/entity `product_barcodes` (use the existing "Generic entity interactions" endpoints to access them)
- The endpoint `/objects/{entity}/search` was removed (use the existing `/objects/{entity}` endpoint with the new filter capabilities mentioned below)
- The output / field names of `ProductDetailsResponse` have slightly changed (endpoint `/stock/products/{productId}`)
- Endpoint `/stock/volatile`
- The query parameter `expring_days` was renamed to `due_soon_days`
- The field `expiring_products` was renamed to `due_products`
- The field `expired_products` now only contains expired products (so them with `Due date type = Expiration date`)
- The new field `overdue_products` contains only overdue products (so them with `Due date type = Best before date`)
- The following endpoints now return all bookings of the transaction (so the response is now an array, was before a single stock booking - and a random one if the transaction affected multiple stock entries)
- PUT `/stock/entry/{entryId}`
- POST `/stock/products/{productId}/add`
- POST `/stock/products/{productId}/consume`
- POST `/stock/products/{productId}/transfer`
- POST `/stock/products/{productId}/inventory`
- POST `/stock/products/{productId}/open`
- POST `/stock/products/by-barcode/{barcode}/add`
- POST `/stock/products/by-barcode/{barcode}/consume`
- POST `/stock/products/by-barcode/{barcode}/transfer`
- POST `/stock/products/by-barcode/{barcode}/inventory`
- POST `/stock/products/by-barcode/{barcode}/open`
- (The response is the same as if you would fetch the stock transaction via `/stock/transactions/{transactionId}`)
- For better integration (apps), it's now possible to show a QR-Code for API keys (thanks @fipwmaqzufheoxq92ebc)
- New QR-Code button on the "Manage API keys"-page (top right corner settings menu), the QR-Codes contains `<API-Url>|<API-Key>`
- And on the calendar page when using the button "Share/Integrate calendar (iCal)", there the QR-Codes contains the Share-URL (which is displayed in the textbox above)
- The output of the following endpoints can now be filtered (by any field), ordered and paginated (thanks for the initial work on this @fipwmaqzufheoxq92ebc)
- `/objects/{entity}`
- `/stock/products/{productId}/entries`
- `/stock/products/{productId}/locations`
- `/recipes/fulfillment`
- `/users`
- `/tasks`
- `/chores`
- `/batteries`
- There are 4 new (optional) query parameters to utilize that
- `order` The field to order by (use the separator `:` to specify the sort order - `asc` or `desc`, defaults to `asc` when omitted)
- `limit` The maximum number of objects to return
- `offset` The number of objects to skip
- `query[]` An array of conditions, each of them is a string in the form of `<field><condition><value>`, where
- `<field>` is a field name
- `<condition>` is a comparison operator, one of
- `=` equal
- `!=` not equal
- `~` LIKE
- `!~` not LIKE
- `<` less
- `>` greater
- `<=` less or equal
- `>=` greater or equal
- `§` regular expression
- `<value>` is the value to search for
- New endpoint `/stock/shoppinglist/add-overdue-products` to add all currently in-stock but overdue products to a shopping list (thanks @m-byte)
- New endpoint `/stock/shoppinglist/add-expired-products` to add all currently in-stock but expired products to a shopping list
- New endpoints GET/POST/PUT `/users/{userId}/permissions` for the new user permissions feature mentioned above
- New endpoint `/user` to get the currently authenticated user
- New endpoint DELETE `/user/settings/{settingKey}` to delete a user setting
- New endpoint POST `/stock/products/{productIdToKeep}/merge/{productIdToRemove}` for the new product merging feature mentioned above
- The following entities are now also available via the endpoint `/objects/{entity}` (only listing, no edit)
- `stock_log` (the stock journal)
- `stock` (the "raw" stock entries)
- `stock_current_locations` (info how much of each product is currently stored at which location)
- Performance improvements of the `/stock/products/*` endpoints (thanks @fipwmaqzufheoxq92ebc)
- The endpoint `/stock/products/{productId}/locations` now also has an optional query parameter `include_sub_products` to optionally also return locations of sub products of the given product
- The following endpoints now have an optional request body parameter `allow_subproduct_substitution` to consume/open any child product when the given product is a parent product and currently not in stock
- `/stock/products/{productId}/consume`
- `/stock/products/by-barcode/{barcode}/consume`
- `/stock/products/{productId}/open`
- `/stock/products/by-barcode/{barcode}/open`
- Fixed that the endpoint `/objects/{entity}/{objectId}` always returned successfully, even when the given object not exists (now returns `404` when the object is not found) (thanks @fipwmaqzufheoxq92ebc)
- Fixed that the endpoint `/stock/volatile` didn't include products which are due today (thanks @fipwmaqzufheoxq92ebc)
- Fixed that the endpoint `/objects/{entity}` did not include Userfields for Userentities (so the effective endpoint `/objects/userobjects`)
- Fixed that the endpoint `/stock/consume` returned the response code `200` and an empty response body when `stock_entry_id` was set (consuming a specific stock entry) but invalid (now returns the response code `400`) (thanks @fipwmaqzufheoxq92ebc)
- Fixed that the endpoint `/user/settings/{settingKey}` didn't return the default setting if it was not configured for the current user (same behavior as the endpoint `/user/settings` now)
- Endpoint `/calendar/ical`: Fixed that "Track date only"-chores were always set to happen at 12am (are treated as all-day events now)
- Fixed (again) that CORS was broken

View File

@@ -0,0 +1,19 @@
> ⚠️⚠️ SQLite >= 3.9.0 (was released in late 2015) is required
>
> [Here](https://github.com/grocy/grocy/issues/1209#issuecomment-749760765) is a workaround if you still run a SQLite version >= 3.8.3 < 3.9.0
>
> _PHP 7.2 (with SQLite 3.8.3+) was the formerly minimum runtime requirement, any future release will only support PHP 7.4 (with SQLite 3.27.2+) - supporting those (very) old runtime stuff is too time consuming..._
- Improved the prerequisites checker (added missing required PHP extension `ctype`) (thanks @Forceu)
- Added validation checks for most `data/config.php` settings to prevent using invalid ones (thanks @Forceu)
- When using reverse proxy authentication (`ReverseProxyAuthMiddleware`), _additionally_ a valid API key can now also be used for authentication (if you don't want to protect the API endpoints via your reverse proxy, however)
- Added a new API endpoint `/system/time` to get the current server time (thanks @Forceu)
- An amount attached to a barcode is now also prefiled when scanning the product on the Consume/Transfer/Inventory page
- Fixed that some number inputs were broken when the new decimal places setting were set to `0`
- Fixed that browser camera barcode scanning did not work on the product edit page for adding product barcodes
- Fixed that indirect unit conversions (those between units, not product overrides) could not be used/selected
- Fixed that the new product option "Never show on stock overview" was unintentionally set by default for new products
- Fixed that adding items to the shopping list from the context/more menu on the stock overview page did not work
- Fixed that consuming was not possible when `FEATURE_FLAG_STOCK_LOCATION_TRACKING` was disabled
- Fixed that adding images in text editor fields did not work
- Fixed some other minor UI glitches

View File

@@ -0,0 +1,128 @@
> ⚠️ The following PHP extensions are now additionally required: `json`, `intl`, `zlib`
> ⚠️ PHP 8.0 (with SQLite 3.27.2+) is from now on the only supported runtime version.
### New feature: Grocycode / label printer support
#### (Own) Product/stock entry/chores/batteries labels/barcodes
- Print own labels/barcodes for products/stock entries/chores/batteries and then scan that code on every place a product/stock entry/chore/battery can be selected
- Can be printed (or downloaded) via
- The product/chore/battery edit page
- The context/more menu per line on the overview pages and for stock entries on the stock entries page
- Automatically on purchase (new option on the purchase page, defaults can be configured per product) for stock entries
- The used barcode type can be configured via the `config.php` option `GROCYCODE_TYPE`:
- `1D` (default) will produce a `Code128` 1D barcode (supported by the integrated camera barcode scanner)
- `2D` will produce a `DataMatrix` 2D barcode (currently not supported by the integrated camera barcode scanner, but can be probably printed smaller)
- Label printer functionality can be enabled via the new feature flag `FEATURE_FLAG_LABEL_PRINTER` (defaults to disabled)
- Label printer communication happens via WebHooks - see the new `LABEL_PRINTER*` `config.php` options
- grocycodes can also be used without a label printer - you can view or download thm as pictures and print them manually
- More information:
- https://github.com/grocy/grocy/tree/v3.1.0/docs/grocycode.md
- https://github.com/grocy/grocy/tree/v3.1.0/docs/label-printing.md
- (Thanks a lot @mistressofjellyfish for the initial work on this)
### New feature: Meal plan sections
- Split the meal plan into sections like Breakfast/Lunch/Dinner
- => New button "Configure sections" on the meal plan page to configure the sections (top right corner)
- => Each meal plan entry can be assigned to a section
### New feature: Shopping list thermal printer support
- The shopping list can now be printed on a thermal printer
- The printer must be compatible to the `ESC/POS` protocol and needs to be locally attached or network reachable to/by the machine hosting Grocy (so the server)
- See the new `TPRINTER*` `config.php` options to configure the printer connection and other options
- => New button on the shopping list print dialog
- Can be enabled via the new feature flag `FEATURE_FLAG_THERMAL_PRINTER` (defaults to disabled)
- (Thanks a lot @Forceu)
### Stock improvements/fixes
- Product barcodes are now enforced to be unique across products
- On the stock overview page it's now also possible to search/filter by product barcodes (via the general search field)
- The product picker on the consume and transfer page now only shows products which are currently in stock
- Added a filter option to only show currently in-stock products on the stock overview and products list (master data) page
- Added new columns on the stock overview page (hidden by default): Product description, product default location, parent product, product picture
- Added a new product option "Should not be frozen" (defaults to disabled and only visible when `FEATURE_FLAG_STOCK_PRODUCT_FREEZING` is enabled)
- When enabled, on moving the product to a freezer location (so when freezing it), a corresponding warning will be shown
- Optimized that when opening a product which has "Default due days after opened" set, the resulting date now never extends the original due date
- Added a new stock setting (top right corner settings menu) "Add decimal separator automatically for price inputs" (defaults to disabled)
- When enabled, you always have to enter the value including decimal places, the decimal separator will be automatically added based on the amount of allowed decimal places
- Fixed that editing stock entries was not possible
- Fixed that consuming with Scan Mode was not possible
- Fixed that the current stock total value (header of the stock overview page) didn't include decimal amounts (thanks @Ape)
- Fixed that the transfer page was not fully populated when opening it from the stock entries page
- Fixed that undoing a consume/open action from the success notification on the stock entries page was not possible
- Fixed that adding a barcode to a product didn't save the selected quantity unit when the product only has a single one
- Fixed that the store information on a stock entry was lost when transferring a partial amount to a different location
- Fixed that the "Spoil rate" on the product card was wrong in some cases
- Fixed that the stock journal showed always the products default location (instead of the location of the transaction)
- Fixed that the aggregated amount of parent products was wrong when indirect quantity unit conversions were used
### Shopping list improvements/fixes
- The amount now defaults to `1` for adding items quicker
- Added a status filter for only _done_ items
- The total value is now also shown (based on "Last price (Total)" per item, displayed on the page header and only when `FEATURE_FLAG_STOCK_PRICE_TRACKING` is enabled)
- Fixed that shopping list prints had a grey background (thanks @Forceu)
- Fixed the form validation on the shopping list item page (thanks @Forceu)
- Fixed that when adding products to the shopping list from the stock overview page, the used quantity unit was always the products default purchase QU (and not the selected one)
- Fixed that the displayed last unit/total price was wrong when the used quantity unit was not the products stock QU
- Fixed that the "Add as barcode to existing product" productpicker workflow did not work
### Recipe improvements/fixes
- Recipe printing improvements (thanks @Ape)
- Calories are now always displayed per single serving (on the recipe and meal plan page)
- The note of an ingredient will now also be added to the corresponding shopping list item when using "Put missing products on the shopping list"
- It's now possible to copy a recipe (button/dropdown menu item per recipe)
- Fixed that the recipe page was slow when there were a lot meal plan recipe entries
- Fixed that "Only check if any amount is in stock" (recipe ingredient option) didn't work for stock amounts < 1
- Fixed that when adding missing items to the shopping list, on the popup deselected items got also added
- Fixed that the amount of self produced products with tare weight handling enabled was wrong ("Produces product" recipe option)
- Fixed that the ingredient amount calculation for included/nested recipes was (for most cases) wrong
- Fixed that the ingredient amount was wrong when using a to the product indirectly related quantity unit
- Fixed that the calories amount calculation was wrong when quantity unit conversions were involved
### Meal plan improvements/fixes
- Improved the meal plan page loading time (drastically when having a big history of meal plan entries)
- Meal plan entries can now be visually marked as "done" (new button per entry)
- This happens automatically on consuming a recipe/product from the meal plan page
- It's now possible to copy all entries of a day to another day (in the dropdown of the add button in the header of each day column)
- The "Display recipe" button was removed, instead clicking the recipe title now displays the recipe (and this now also works for products; shows the product card)
- Fixed that stock fulfillment checking used the desired servings of the recipe (those selected on the recipes page, not them from the meal plan entry)
### Chores improvements/fixes
- It's now possible to track any addtional info on a chore execution by using Userfields
- => Configure the desired Userfields for the entity `chores_log`
- => The on chore execution tracking entered information is then visible on the corresponding chore journal entry
- Fixed that tracking chores with "Done by" a different user was not possible
### Userfield improvements/fixes
- Userfields can now be configured as mandatory (new Userfield option, defaults to disabled)
- Fixed that numeric Userfields were initialised with `1.0`
- Fixed that shortcuts (up/down key) and the format did not work correctly when using multiple date/time Userfields per object
- Fixed that Userfields were not saved when adding a product or a recipe (only on editing)
### General & other improvements/fixes
- LDAP authentication improvements / OpenLDAP support (thanks @tank0226)
- A read only service account can now be used for binding
- The username attribute is now configurable
- Filtering of accounts is now possible
- => See the new `LDAP*` `config.php` options
- Improved the page loading time of all journal pages (stock/chores/batteries) by adding a new date range filter
- Some night mode style improvements (thanks @BlizzWave and @KTibow)
- Help tooltips are now additionally also triggered by clicking on them (instead of only hovering them, which doesn't work on mobile / touch devices)
- The camera barcode scanner now also supports Code 39 barcodes (used for example in Germany on pharma products (PZN)) (thanks @andreheuer)
- Fixed that the number picker up/down buttons did not work when the input field was empty or contained an invalid number
- Fixed that links and embeds (e.g. YouTube videos) did not work in the text editor
- Fixed that the "Manage users" and "Manage API keys" menu was not shown when using reverse proxy authentication
### API improvements/fixes
> ~~❗ Numbers are now returned as numbers (so technically without quotes around them, were strings for nearly all endpoints before - should practically be no real difference)~~
>
> => ❗❗❗ This has been reverted after this (v3.1.0) release since it had unintended side effects
- Added a new endpoint `/system/localization-strings` to get the localization strings (gettext JSON representation; in the by the user desired language)
- Added a new endpoint `/recipes/{recipeId}/copy` to copy a recipe
- The `GET /chores` endpoint now also returns the `next_execution_assigned_user` object per chore (like the endpoint `GET /chores/{choreId}` already did for a single chore)
- The `GET /tasks` endpoint now also returns the assigned user and category object per task
- Empty Userfields are now also returned (were previously omitted, endpoint `GET /objects/{entity}` and `GET /objects/{entity}/{objectId}`)
- Fixed that due soon products with `due_type` = "Expiration date" were missing in `due_products` of the `/stock/volatile` endpoint
- Fixed that `PUT/DELETE /objects/{entity}/{objectId}` produced an internal server error when the given object id was invalid (now returns `400 Bad Request`)
- Fixed that hyphens in filter values did not work
- Fixed that cyrillic letters were not allowed in filter values

View File

@@ -0,0 +1,16 @@
- Fixed that the upgrade failed when having "> 2 times duplicate" (means the same barcode was added more than 2 times) product barcodes
- Fixed that the upgrade failed when having unsupported parent/child product nesting levels
- More information on this: Only 1 level is currently supported; creating > 1 level nestings was _never_ possible via the UI/frontend, but not checked/enforced by the backend before `v3.0.0` - so it was potentially possible via the API (or any third party app/tool which utilizes it) to create such a nesting which then made this upgrade to fail
- Fixed that it was not possible to select a chore/battery on the corresponding tracking pages by mouse/touch
- Fixed that grouping by columns in tables may caused duplicate groups
- Fixed that Grocycode camera barcode scanning didn't recognize the scanned code for chore/battery tracking
- Fixed that when having any "Track date only" chore on the calendar, the iCal export was broken
- Optimized the meal plan page to be properly printable (thanks @MrKrisKrisu)
### API
> ❗ The release before (v3.1.0) introduced that "numbers are now returned as numbers": **This was reverted** since it had unintended side effects (so all fields are technically strings now again, just like before - sorry for that)
- Fixed that `missing_products` of the `/stock/volatile` endpoint also contained inactive products
- Fixed that when having multiple Userfields for an entity, the `/objects/{entity}` endpoint returned wrong Userfield values
- Fixed that the `/stock/products/by-barcode/{barcode}/consume` and `/stock/products/by-barcode/{barcode}/transfer` endpoints haven't used the stock entry given by a stock entry Grocycode (thanks @lowlee for the initial work on this)
- Fixed that the "Stock by-barcode" API routes were broken for normal barcodes (only grocycodes were accepted) (thanks @larsverp)
- Fixed that the "Stock by-barcode" API routes also accepted chore or battery grocycodes (thanks @lowlee)

View File

@@ -0,0 +1,12 @@
- Fixed that the "Add all list items to stock" shopping list workflow did not work for more than ~6 items (thanks @tjhowse)
- Fixed that plural form handling (e.g. for quantity units) was wrong for negative numbers
- Fixed that the context menu entries `Consume` and `Transfer` on the stock overview page were disabled when the amount in stock was < 1
- Fixed that on consuming a product from not the products default location, the products default location was recorded in the stock journal
- Fixed that when undoing a stock consume transaction from not the products default location, the corresponding amount was always added back to to the products defaullt location
- Fixed that when having multiple quantity unit conversions for a products default QU purchase, on purchase was potentially a wrong conversion factor picked
- Fixed that when there was any chore with a schedule, but without a "next estimated tracking" date/time, the iCal export was broken
- The product and chore edit pages now have bottom-sticky save buttons
- A product picture can now be added when creating a product (was currently only possible when editing a product)
### API
- Fixed that international characters and spaces were not allowed in API query filters

View File

@@ -0,0 +1,19 @@
- The "Below min. stock amount" filter on the stock overview page now also includes due-soon, overdue or already expired products
- The default shopping list (named "Shopping list"; localized) can now be renamed
- Added the products average price as a (hidden by default) column on the stock overview page
- Added a new "Presets for new products" stock setting for the "Default due days" option of new products
- When adding (purchase) a product with "Default due days after freezing" set directly to a freezer location, the due date is now prefilled by that (instead of the normal "Default due days") (thanks @grahamc for the initial work on this)
- Chores can now be merged (new item in the context-/more-menu on the chores list page)
- Fixed that "Label per unit" stock entry labels (on purchase) weren't unique per unit
- Fixed that the "Add as new product" productpicker workflow, started from the shopping list item form, always selected the default shopping list after finishing the flow
- Fixed that when undoing a product opened transaction and when the product has "Default due days after opened" set, the original due date wasn't restored
- Fixed that "Track date only"-chores were shown as overdue on the due day on the chores overview page
- Fixed that dropdown filters for tables maybe did not work after reordering columns
- Fixed that auto night mode over midnight did not always work
- Fixed that the labels of context-/more-menu items were not readable in Night Mode (thanks @corbolais)
- Fixed that the "Stay logged in permanently" checkbox on the login page had no effect (thanks @0)
### API
- New endpoint `/chores/{choreIdToKeep}/merge/{choreIdToRemove}` for merging chores
- Endpoint `/stock/products/{productId}/add` API endpoint: The (optional) request body parameter `print_stock_label` was renamed to `stock_label_type`
- Fixed that backslashes were not allowed in API query filters

View File

@@ -0,0 +1,79 @@
### Stock
- The `config.php` option `FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT` was removed and is now a new product option `Treat opened as out of stock`, means, if opened stock entries will be counted as missing for calculating if a product is below its minimum stock amount, can now be configured per product
- The existing option will be migrated to all existing products, so no changed behavior after the update
- There is also a new stock setting (section "Presets for new products") which can be used to configure the default when adding products (also that will be set based on the old setting on migration)
- When using/scanning a stock entry Grocycode on the consume page, the amount is now prefilled by the stock entry amount (making it essentially possible to consume the corresponding stock entry in one go)
- Stock entry labels get now also printed on inventory (only when adding products, same option "Stock entry label" like on the purchase page)
- Fixed that stock entry labels on purchase were printed, even when "No label" was selected (was only a problem when running label printer WebHooks server side)
- Fixed that formatted (HTML) text for the (hidden by default) product description column on the stock overview page was not correctly displayed
- Fixed that numeric and date-time sorting of table columns on the stock entries page did not work correctly (thanks @MasterofJOKers)
- Fixed that the consume page/dialog wasn't properly initialized when opening it from the stock entries page
- Fixed that entries for not existing users were missing on the stock journal
### Recipes
- Optimized recipe costs calculation to better reflect the current real costs: Out of stock ingredients now use the last price
- Background: Before v3.0.0 recipe costs were only based on the last price per product and since v3.0.0 the "real costs" (based on the default consume rule "Opened first, then first due first, then first in first out") are used, means out of stock items have no price - so using the last price for out of stock items should reflect the current real costs better
- Added a new recipes setting (top right corner settings menu) "Show the recipe list and the recipe side by side" (defaults to enabled, so no changed behaviour when not configured)
- When disabled, on the recipes page, the recipe list is displayed full-width and the recipe will be shown in a popup instead of on the right side
- Recipes are now also Grocycode enabled (works like any other Grocycode; download/print it via the recipes edit page or the more/context menu on the recipes page; use/scan it at any place a recipe can be selected)
- Performance improvements (page loading time) of the recipes page
- Fixed that when adding missing recipe ingredients, with the option "Only check if any amount is in stock" enabled, to the shopping list, unit conversions (if any) weren't considered
- Fixed that the recipe stock fulfillment information about shopping list amounts was not correct when the ingredient had a decimal amount
### Meal plan
- Meal plan sections can now (optionally) define a time, which will then be displayed on the meal plan section header and used for the corresponding calendar events
- Additionally the correspnding calendar event now also mentions the meal plan section name
- The day/week view can now be toggled
- New button on top right corner of the meal plan (only visible on bigger screens)
- On smaller screen the day view is still the default (no change)
- Fixed that the meal plan showed the total calories per recipe (instead of per serving as stated by the suffix)
### Chores
- Chore schedules can now be skipped
- New button on the chores overview and chore tracking page
- Skipped schedules will be highlighted accordingly on the chore journal
- Added a new chore option "Start date" which is used as a schedule starting point when the chore was never tracked
- Until now, the schedule starting point was the first tracked execution
- For all existing chores, the start date will be set to the first tracked execution time (or today, for chores which were never tracked) on migration
- The `Yearly` period type has been changed to be schedule the chore on the _same day_ each year
- This period type scheduled chores 1 year _after the last execution_ before, which is also possible by using the `Daily` period type and a period interval of 365 days; all existing `Yearly` schedules will be converted to that on migration
- Added a new `Hourly` period type (to schedule chores every `x` hours)
- Added a new `Adaptive` period type (to schedule chores dynamically based on the past average execution frequency)
- Removed the period type `Dynamic regular`, since it's the same as `Daily`
- All existing `Dynamic regular` schedules will be converted to that on migration
- The chorecard now also shows the average execution frequency (how often the chore was executed in the past on average)
### Calendar
- Fixed that when having a task without a due date, the iCal export was broken
### Tasks
- Added a "Save & add another task"-button on the add task dialog to quickly create multiple tasks without having to close/reopen the dialog
- Fixed that when editing a task without a due date, `1970-01-01` was shown
### General
- Added a separate status filter and table row highlighting (blue) on the chores, tasks and batteries overview pages for items due today
- Additionally, the "due soon" days of chores/tasks/batteries (top right corner settings menu) can be set to `0` to disable that filter/highlighting
- Optimized relative time display (also fixed a phrasing problem for some languages, e.g. Hungarian) (thanks @Tallyrald)
- New input shorthand `[+/-]n[d/m/y]` for date fields to quickly input a date relative to today (adding (**+**) or subtracting (**-**) the **n**umber of **d**ays/**m**onths/**y**ears, see the full list of available shorthands [here](https://github.com/grocy/grocy#input-shorthands-for-date-fields))
- When using LDAP authentication, the configured `LDAP_UID_ATTR` is now used to compare if the user already exists instead of the username entered on the login page (that prevents creating multiple users if you enter the username in different notations) (thanks @FloSet)
- When using reverse proxy authentication (`ReverseProxyAuthMiddleware`), it's now also possible to pass the username in an environment variable instead of an HTTP header (new `config.php` option `REVERSE_PROXY_AUTH_USE_ENV`) (thanks @Forceu)
- The `config.php` option `DISABLE_BROWSER_BARCODE_CAMERA_SCANNING` has been renamed to `FEATURE_FLAG_DISABLE_BROWSER_BARCODE_CAMERA_SCANNING`
- Fixed that when having a quantity unit matching any application string, the translation of that string was used to display that unit
- Fixed that the logout button/menu was missing when using external authentication (e.g. LDAP)
- New translations: (thanks all the translators)
- Catalan (demo available at https://ca.demo.grocy.info)
### API
- The API endpoint `/stock/shoppinglist/clear` has now a new optional request body parameter `done_only` (to only remove done items from the given shopping list, defaults to `false`)
- The API endpoint `/chores/{choreId}/execute` has now a new optional request body parameter `skipped` (to skip the next chore schedule, defaults to `false`)
- The API endpoint `/chores/{choreId}` has new response field/property `average_execution_frequency_hours` (contains the average past execution frequency in hours or `null`, when the chore was never executed before)
- New API endpoint `/recipes/{recipeId}/printlabel` (to print recipe grocycodes on the configured label printer)
- Fixed that the barcode lookup for the "Stock by-barcode" API endpoints was case sensitive

View File

@@ -0,0 +1,121 @@
### New feature: Notes and Userfields for stock entries
- Stock entries can now have notes
- For example to distinguish between same, yet different products (e.g. having only a generic product "Chocolate" and note in that field what special one it is exactly this time - as an alternative to have sub products)
- Or for example to track ownership of stock items when sharing the fridge with your flatmates
- => New field on the purchase and inventory (and stock entry edit) page
- => New column on the stock entries and stock journal page
- => Visible also in the "Use a specific stock item" dropdown on the consume and transfer page
- Additionally it's also possible to add arbitrary own fields by using Userfields
- => Configure the desired Userfields for the entity `stock`
- => Those Userfields are then visible on the same places as mentioned above for the built-in "Note" field
### New feature: Recipes "Due score"
- A number (new column on the recipes page) which represents a score which is higher the more ingredients, of the corresponding recipe, currently in stock are due soon, overdue or already expired
- Or in other words: A score to see which recipes to cook to not waste already overdue/expired or due soon products
- The score is in detail based on:
- 1 point for each due soon ingredient (based on the stock setting "Due soon days")
- 10 points per overdue ingredient
- 20 points per expired ingredient
- (or else 0)
- The corresponding ingredient is also highlighted in red/yellow/grey (same colors as on the stock overview page)
### Stock
- It's now possible to change a products stock QU, even after it was once added to stock
- When the product was once added to stock, there needs to exist a corresponding unit conversion for the new QU
- Product card, stock overiew and stock entries page optimizations regarding displaying prices:
- Prices are now shown per default purchase quantity unit, instead of per stock QU and when clicking/hovering, a tooltip shows the price per stock QU
- The price history chart is now based on the value per purchase QU, instead of per stock QU
- New product option "Default consume location" (not mandatory, defaults to not set / empty)
- When set, stock entries at that location will be consumed first
- => This will be automatically taken into account when consuming from the stock overview page and all other places where no specific location can be selected
- => On the consume page the location is preselected in the following order:
1. The new default consume location, if the product currently has any stock there, otherwise
2. The products default location, if the product currently has any stock there, otherwise
3. The first location where the product currently has any stock
- Optimized quantity unit conversion handling:
- The option "Create inverse QU conversion" was removed when creating a QU conversion
- => Instead the corresponding inverse conversion is now always created/updated/deleted automatically
- New product option "Disable own stock" (defaults to disabled)
- When enabled, the corresponding product can't have own stock, means it will not be selectable on purchase (useful for parent products which are just used as a summary/total view of the sub products)
- The location content sheet can now optionally list also out of stock products (at the products default location, new checkbox "Show only in-stock products" at the top of the page, defaults to enabled)
- Added a location filter to the stock entries page
- Added the product Grocycode as a (hidden by default) column to the products list (master data)
- The price entered on the inventory page is now related to the selected quantity unit (like on the purchase page, was always related to the products stock QU before)
- Fixed that consuming via the consume page was not possible when `FEATURE_FLAG_STOCK_LOCATION_TRACKING` was disabled
### Shopping list
- Added a new shopping list setting (top right corner settings menu) to automatically add products, that are below their defined min. stock amount, to the shopping list (defaults to disabled)
- Fixed that when using "Add products that are below defined min. stock amount", the calculated missing amount was wrong for products which had the new product option `Treat opened as out of stock` set and when having at least one opened stock entry
### Recipes
- When a parent product is used as an ingredient, which is currently not in stock itself, the substituted product (so the one which was already taken into account when consuming the recipe) is now displayed below the ingredient and the costs (and calories) are taken from that one, to reflect the current real costs even better
- Added a new recipes setting (top right corner settings menu) "Show a little checkbox next to each ingredient to mark it as done" (defaults to disabled)
- When enabled, next to each ingredient a little checkbox will be shown
- When clicked, the ingredient is crossed out
- This status is not saved, means reset when the page is reloaded
- Fixed that consuming recipes was possible when not all ingredients were in stock (and this potentially consumed some of the in stock ingredients; not matching the message "nothing removed")
- Fixed that the price of the "Produces product"-product, which is added to stock on consuming a recipe, was wrong (was the recipe total costs multiplied by the serving amount instead of only the recipe total costs)
- Fixed that calories of recipe ingredients were displayed with an indefinite number of decimal places
- Fixed that ingredient amounts were wrong for multi-nested (> 2 levels) recipes, when the included recipe used an serving amount other than 1
- Fixed that searching/filtering the recipe gallery view did not work correctly
- Fixed that searching/filtering recipes by products did not work (e.g. via the context-/more menu option "Search for recipes containing this product" on the stock overview page)
### Meal plan
- The day is now editable on the edit dialog of any meal plan entry, which makes it possible to move entries to a different day
- Fixed that it was not possible to print the meal plan (and other pages) in landscape (thanks @miguelangel-nubla)
### Chores
- The `Daily` period type has been changed to schedule the chore at the _same time_ (based on the start date) each `n` days
- This period type scheduled chores `n` days _after the last execution_ before, which is also possible by using the `Hourly` period type and a corresponding period interval; all existing `Daily` schedules will be converted to that on migration
- It's now possible to manually reschedule / assign chores
- New entry "Reschedule next execution" in the context/more menu on the chores overview page
- If you have rescheduled a chore and want to continue the normal schedule/assignment instead, use the "Clear" button in the same dialog
- Rescheduled/reassigned chores will be highlighted with an corresponding icon next to the "Next estimated tracking date" / "Assigned to"
- Optimized that when skipping chores via the chore tracking page, the given time is used as the "skipped time", not the scheduled next estimated tracking time of the corresponding chore (making it essentially possible to skip more then one schedule at once)
- Fixed that when consuming a parent product on chore execution (chore option "Consume product on chore execution"), no child products were used if the parent product itself is not in stock
- Fixed that the upgrade to v3.2.0 failed when having any former "Dynamic Regular" chore with a "Period interval" of `0` (which makes absolutely no sense in reality)
### Tasks
- Fixed that tasks without a due date were highlighted in red (like overdue tasks)
### Batteries
- Fixed that the batteries overview page was broken when there was any battery Userfield with enabled "Show as column in tables" option
- Fixed that Grocycode label printer printing didn't work from the battery edit page (master data) (thanks @andreheuer)
- Fixed that undoing a battery charge cycle had no effect on "Last charged" and "Next planned charge cycle" of the corresponding battery
### Equipment
- It's now possible to add multiple files (PDFs / manuals) to each equipment
- Define as many Userfields for the entity `equipment` and use the type `File`
- => Each of those File-Userfields will be shown as a separate tab on the equipment page
### Userfields
- Userfields of type "Date & time" and "Date (without time)" have now the option to default to now / today for new objects (new Userfield option "Default value")
### General
- Optimized form validation: Save / submit buttons are now not disabled when the form is invalid, the invalid / missing fields are instead highlighted when trying to submit / save the form (making it more obvious which fields are invalid / missing exactly)
- Night mode can now use / follow the system preferred color scheme
- The view/user setting "Enable night mode" has been removed and replaced by "Night mode" which now defaults to "Use system setting" (which uses the system preferred color scheme, "On" and "Off" are other possible options to always enable/disable night mode)
- Some night mode style refinements
- Fixed an server error (on every page) when not having any quantity unit
- New translations: (thanks all the translators)
- Slovenian (demo available at <https://sl.demo.grocy.info>)
### API
- Added a new endpoint `GET /stock/locations/{locationId}/entries` to get all stock entries of a given location (similar to the already existing endpoint `GET /stock/products/{productId}/entries`)
- Endpoint `/recipes/{recipeId}/consume`: Fixed that consuming partially fulfilled recipes was possible, although an error was already returned in that case (and potentially some of the in stock ingredients were consumed in fact)
- Endpoint `/stock/products/{productId}`:
- New field/property `current_price` which returns the current price of the corresponding product, based on the stock entry to use next (defined by the default consume rule "Opened first, then first due first, then first in first out") or on the last price if the product is currently not in stock
- The field/property `oldest_price` is deprecated and will be removed in a future version (this had no real sense, currently returns the same as `current_price`)

View File

@@ -0,0 +1,33 @@
### Stock
- New product option "Move on open" (defaults to disabled)
- When enabled, on marking the product as opened, the corresponding amount will be moved to the products default consume location
- (Thanks @RosemaryOrchard)
- The stock setting "Decimal places allowed for prices" has been split into separate settings for input and displaying prices (the existing setting will be set for both new options on migration, so no changed behavior when not configured)
- Optimized that when the plural form(s) of a quantity unit is/are not provided, the singular form is used to display plural amounts
- Fixed that "Automatically add products that are below their defined min. stock amount to the shopping list" (stock setting) was only done when consuming products, not when opening them
- Fixed that the price history chart (product card) showed the price on a wrong date when having multiple purchases on the same date from different stores
### Recipes
- Fixed that when a substituted product is used to display costs and calories (so when a parent product ingredient is currently not in stock itself), no unit conversions were considered for costs/calories calculation
- Fixed that the displayed "already on the shopping list"-amount (for missing ingredients) was wrong when the products "Factor purchase to stock quantity unit" wasn't 1
### Chores
- Fixed that rescheduling of "Track date only"-chores for today was not possible
### Calendar
- Fixed that clicking on meal plan product and notes calendar entries redirected to an invalid page
### General
- LDAP authentication: Optimized that it's not required that LDAP accounts need to have a first-/lastname
### API
- Endpoint `/stock/products/{productId}`: New field/property `default_consume_location` (contains the products default consume location object)
- Endpoint `/stock/products/{productId}/add`: Fixed that the request body parameter `transaction_type` was ignored / always set to `purchase`
- Fixed that the endpoint `/stock/products/by-barcode/{barcode}/open` didn't handle stock entries provided by a Grocycode (thanks @jtommi)
- Fixed that less or equal (`<=`) and greater or equal (`>=`) filter comparisons didn't work (optional `query[]` request query parameter on most endpoints)

View File

@@ -0,0 +1,42 @@
### Stock
- Improved that when editing a unit conversion, the "Quantity unit from" and "Quantity unit to" of the corresponding inverse conversion is now also updated accordingly if changed (until now only the factor was updated automatically)
- Changed that the "Move on open" product option can now always be used/set, even when the "Default location" and "Default consume location" are the same
- Fixed that stock entry notes were lost when consuming/opening/transferring a partial amount of the corresponding stock entry (thanks @akoshpinter)
- Fixed that the average shelf life of a product (on the product card) was wrong when the corresponding stock entry was edited
- Fixed that when the stock setting "Decimal places allowed for amounts" was set to `0`, unit conversion (if any) failed when adding the corresponding product to stock
- Fixed that consuming a parent product which is not in stock itself (so essentially using any of the child products) may failed when unit conversions were involved (the current stock amount check was wrong in that case)
- Fixed that the status button counters on the stock overview page ("X products are overdue" and so on) included products which have the option `Never show on stock overview` enabled
- Fixed that adding Userfields to existing stock entries was not possible (only editing existing Userfield values, e.g. added during purchase or inventory, was possible)
- Fixed that it was not possible to change a products stock QU, when the needed unit conversion (old QU => new QU) was only defined globally (means on QU level) or by the products "Factor purchase to stock quantity unit"
- Fixed that when changing a products stock QU, the products "Quick consume mount", "Energy (kcal)" and "Tare weight" wasn't updated according to the corresponding unit conversion factor
- Fixed that when changing a products stock QU, the product barcode amounts were also changed based on the corresponding unit conversion factor
### Shopping list
- Fixed that products could not be added to the shopping list via barcode scanning
### Recipes
- Fixed that headlines in the recipe description (preparation text) were removed on saving
- Fixed that the default consume rule was not always applied correctly when a recipe consumed a substituted ingredient (so when having a parent product in the recipe which is currently not in stock itself)
### Userfields
- Fixed that edit forms were broken when editing an object with `null` Userfields (so when the field for that object was not set before / on the initial object creation)
### General
- It's now possible to edit a user without necessarily updating the users password
- Fixed that column reordering didn't work on the stock overview, stock entries and shopping list page when showing columns which are not shown by default
- Fixed that when running label printer WebHooks client side (so when `LABEL_PRINTER_RUN_SERVER` = `false`), the setting `LABEL_PRINTER_HOOK_JSON` was ignored (the WebHook data was always sent as form data)
- Fixed that granular user permissions (like "Shopping list / Add items" or "Equipment") didn't allow to add/edit the corresponding items without also having the "Edit master data" permission
- New translations: (thanks all the translators)
- Lithuanian (demo available at <https://lt.demo.grocy.info>)
- Ukrainian (demo available at <https://uk.demo.grocy.info>)
### API
- Endpoint `/stock/volatile`
- The field/property `missing_products` now also contains the `product` object
- Endpoint `/recipes/{recipeId}/consume`: Fixed (again) that consuming partially fulfilled recipes was possible, although an error was already returned in that case (and potentially some of the in stock ingredients were consumed in fact)

View File

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

View File

@@ -0,0 +1,118 @@
> ⚠️ PHP 8.1 (with SQLite 3.34.0+) is from now on the only supported runtime version.
> ❗ The major version bump is due to breaking API changes, please see below if you use the API.
> _Recommendation: Benchmark tests showed that e.g. unit conversion handling is up to 5 times faster when using a more recent (3.39.4+) SQLite version._
### New feature: Indirect quantity unit conversions with unlimited levels
- Quantity unit conversions now support indirect conversions with unlimited levels (thanks a lot @esclear)
- _Explained by a practical example: When a conversion between Teaspoons and Milliliters and another one between Milliliters and Liters exists (and so forth; unlimited levels), Grocy can now calculate Teaspoons to Liters (before a direct conversion definition between Teaspoons and Liters was required)_
- **Heads up:** If you have such "each to each absolute conversion definitions" currently (for the example above the conversion between Teaspoons and Liters), you should clean them up, since they are no longer needed
- The product option "Factor purchase to stock quantity unit" was removed
- => Use normal product specific QU conversions instead, if needed
- An existing "Factor purchase to stock quantity unit" was automatically migrated to a product specific QU conversion
### New feature: Stock reports
- New button "Reports" on the stock overview page
- The first report (more to come) "Spendings" makes it possible to explore (pie chart and table data) the total value spend by product or product group in any time range
- (Thanks for the initial work on this @raupie)
### Stock
- New product option "Default quantity unit consume"
- Will be used/selected as the default quantity unit on the consume page
- The product's "Quick consume amount" is now displayed related to this quantity unit ("quick consume/open buttons" on the stock overview page)
- Defaults to the product's "Quantity unit stock" (so no changed behavior when not configured)
- New product option "Quantity unit for prices"
- Prices are now shown related to this quantity unit (instead of per "Default quantity unit purchase") on the product card, price history chart, stock overiew and stock entries page
- Defaults to the product's "Default quantity unit purchase" (so no changed behavior when not configured)
- Changed that when the ingredient option "Only check if any amount is in stock" is enabled, costs and calories are now based on the original entered amount instead of an "virtual" fixed amount of `1`
- When using the "Add as barcode to existing product" workflow on a purchase transaction, the selected quantity unit and the entered amount and note are now also added to the new barcode
- New product option "Auto reprint stock entry label"
- When enabled, auto-changing the due date of a stock entry (by opening/freezing/thawing and having corresponding default due days set) will reprint its label (only server side label printer WebHooks are supported)
- Defaults to disabled, so no changed behavior when not configured
- Added a new option "Reprint stock entry label" on the stock entry edit page (will print the correspondind stock entry label on save)
- This option will be automatically set on changing the entry's due date
- The product option "Quick consume amount" (the amount used for the "quick consume/open buttons" on the stock overview page) has been split into another option "Quick open amount", to be able to set different amounts for consume and open (defaults to the "Quick consume amount" per product, so no changed behavior when not configured)
- Changed that for the product's average and last price (and for the price history chart) stock transactions with an empty or `0` price are ignored
- Added a filter option to only show currently out-of-stock products on the products list (master data) page
- When clicking a product name on the products list (master data) or on the stock journal page, the product card will now be displayed (like on the stock overview page)
- When using/scanning a product barcode and the purchase or inventory page, the barcode's note will now also be prefilled (if any)
- Each row on the stock journal now also has a context-/more menu for quick access to product related actions (the same as on the stock overview page)
- The amount of "Label per unit" stock entry labels (on purchase and inventory) is now displayed, to help prevent printing a lot of labels where this maybe is not intended
- Fixed that hiding the "Purchased date" column (table options) on the stock entries page didn't work
- Fixed that sorting by the "Value" and "Min. stock amount" columns on the stock overview page didn't work
- Fixed that the consumed amount was wrong, when consuming multiple substituted subproducts at once and when multiple/different conversion factors were involved
- Fixed that for a product's average price, only currently in-stock items were considered, not already consumed ones
- Fixed that when copying a product, some fields (like "Default consume location" or "Disable own stock) weren't copied along
- Fixed that the total product count on the stock overview page also included products with "Never show on stock overview" enabled
### Shopping list
- Added a new button "Clear done items" (to clear all done items with one click)
### Recipes
- Added a new entry "Add to meal plan" in the context/more menu per recipe to directly add a recipe to the meal plan from the recipes page
- Changed that when a ingredient has a "Variable amount" set, the text entered there now also replaces the unit when displaying the recipe (not only the amount as before)
- When displaying a recipe in fullscreen mode, the ingredients and preparation is now shown side by side (or below each other on small screens) instead of in tabs
- When consuming a recipe which has a "Produces product" set and when the product's "Default stock entry label" is configured accordingly, the corresponding label will now be printed on that action (only server side label printer WebHooks are supported)
- Fixed that hiding the "Requirements fulfilled" column (table options) on the recipes page didn't work
- Fixed that ingredient costs and calories were wrong when product substitution and unit conversions were involved at the same time
### Meal plan
- Added a new sub feature flag `FEATURE_FLAG_RECIPES_MEALPLAN` (in `config.php`) to only disable the meal plan if not needed (thanks @webysther)
- The `config.php` setting `MEAL_PLAN_FIRST_DAY_OF_WEEK` can now be set to `-1` to dynamically start the meal plan week on _today_
- Fixed that consuming a recipe from the meal plan didn't add its "Produces product"-product to stock (if any)
- Fixed that the "Put missing products on shopping list"-button in the header (to put all missing products on the shopping list for a whole week) was missing under certain circumstances (related to locale week numbers and turn of the year)
### Chores
- Changed the handling of the tracking buttons on the chores overview page
- The green button now tracks an execution of the corresponding chore on the next scheduled time, rather than for now/today
- New context-/more menu option "Track chore execution now" to track an execution for now/today (so the same what the green button did before)
- Removed the limitation on the chore tracking page that the tracked time couldn't be in the future
- Fixed that "assidgned to" was not recalculated when undoing chores
### Calendar
- Added a button to jump to today (between the prev/next buttons, top right corner)
### Tasks
- Fixed that hiding the "Category" column (table options) on the tasks page didn't work
### Userfields
- Product group Userfields are now also rendered on the shopping list
- Fixed that when having e.g. a Userfield for the `stock` entity and using the "Never overdue" shortcut checkbox for the due date on purchase, this Userfield would also be set to the corresponding "never overdue date"
### General
- Like already possible for products/chores/batteries, locations, stores, quantity units, product groups and task categories can now be disabled to keep them for existing references without deleting them, but to hide them everywhere for selections and so on (new option "Active")
- Added a new `config.php` setting `ENERGY_UNIT` to customize the label to display energy values (was fixed `kcal` before and defaults to that, so no changed behavior when not configured)
- New logo and "Grocy" is now officially spelled with a capital initial letter (before everything was lowercase)
- Various frontend performance enhancements
- Fixed that users were unable to delete their own API keys (when not having the `All permissions` permission)
- Fixed that button tooltips on some places didn't disappear after clicking the corresponding button
- New translations: (thanks all the translators)
- Estonian (demo available at <https://et.demo.grocy.info>)
- Romanian (demo available at <https://ro.demo.grocy.info>)
### API
- ⚠️ **Breaking changes**:
- The product property `qu_factor_purchase_to_stock` was removed (existing factors were migrated to normal product specific QU conversions, see above)
- Numbers are now returned as numbers (so technically without quotes around them, were strings for nearly all endpoints before)
- Endpoint `/stock/products/{productId}`:
- Added a new field/property `qu_conversion_factor_purchase_to_stock` for convenience (contains the conversion factor of the corresponding QU conversion from the product's `qu_id_purchase` to `qu_id_stock`)
- Added a new field/property `qu_conversion_factor_price_to_stock` for convenience (contains the conversion factor of the corresponding QU conversion from the product's `qu_id_price` to `qu_id_stock`)
- Added a new field/property `default_quantity_unit_consume` (contains the quantity unit object of the product's "Default quantity unit consume")
- The following entities are now also available via the endpoint `/objects/{entity}` (only listing, no edit)
- `quantity_unit_conversions_resolved` (returns all final/resolved conversion factors per product and any directly or indirectly related quantity units)
- `recipes_pos_resolved` (returns stock fulfilment information for all recipe ingredients)
- The endpoint `/batteries` now also returns the corresponding battery object (as field/property `battery`)
- API keys can now have a description (to e.g. track where the corresponding key is used)

View File

@@ -0,0 +1,19 @@
> 💡 PHP 8.2 is from now on (additionally to PHP 8.1) supported.
### Stock
- Fixed performance issues affecting all places where quantity unit conversions / prices are involved
- Fixed that the upgrade failed when having improperly defined product specific quantity unit conversions
- Fixed that edited stock entries were not considered in some cases (affecting the product's last price, average price, the price history and the stock reports)
### Shopping list
- Changed that unit prices on the shopping list (table column "Last price (Unit)") are now related to the there selected quantity unit (instead of to the product's QU stock as before)
### Meal plan
- Fixed that the meal plan did initially not display the current week when the settings `MEAL_PLAN_FIRST_DAY_OF_WEEK` and `CALENDAR_FIRST_DAY_OF_WEEK` were set to different values
### API
- Fixed performance issues on the endpoint `/stock/products/{productId}`

Some files were not shown because too many files have changed in this diff Show More