109 Commits

Author SHA1 Message Date
Bernd Bestel c3122609f2 Optimized locale handling 2026-04-21 18:47:18 +02:00
Bernd Bestel a3f66b664b Change the default Grocycode type to DataMatrix 2025-03-21 17:49:31 +01:00
Fándly Gergő e786433273 Replaced barcode scanning library with ZXing (#2706)
* Replaced barcode scanning library with ZXing

* Applied code formatting rules

* Delete now obsolete user settings

* Review

---------

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2025-03-21 17:41:39 +01:00
Bernd Bestel b2ba1de9e3 Use JSON label printer webhooks by default 2025-03-21 16:40:56 +01:00
Bernd Bestel 6a7436dbf0 Persist shopping list print settings (closes #2667) 2025-02-03 18:36:10 +01:00
Bernd Bestel 1946ff870e Make it possible to round up shopping list and recipe ingredient amounts (closes #902, closes #2644) 2025-01-19 20:16:37 +01:00
Bernd Bestel 83b8b95b73 Streamline in stock / out of stock wording 2025-01-18 10:33:26 +01:00
Bernd Bestel b0dded1346 Added a new stock settings to always show all products on /stockoverview (closes #2398) 2025-01-15 21:44:45 +01:00
Bernd Bestel dc05753a0f Added a new product preset for default_stock_label_type (closes #2445) 2025-01-15 20:34:53 +01:00
Bernd Bestel 9cac3b2311 Make track now / next schedule buttons on /choresoverview swappable (closes #2424) 2025-01-14 19:43:12 +01:00
Bernd Bestel 11d28622e8 Squashed commit
Make it possible to actively not-check a mandatory checkbox Userfield (closes #2601)
Pluralize the "opened" localization string (closes #2280)
Added a trendline to the price history chart (closes #2237)
Various minor style/code refinements
2025-01-14 17:54:06 +01:00
Bernd Bestel c73be7d18e Finalized frontend external barcode lookup implementation (references #158) 2025-01-12 13:58:47 +01:00
Bernd Bestel c9ffe4885d Implemented frontend external barcode lookup workflow + a plugin for Open Food Facts (closes #158) 2025-01-11 20:04:32 +01:00
Bernd Bestel 80d7284d72 Implemented calendar category colors (closes #2368) 2023-11-04 14:11:02 +01: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 5f65f2abd0 New logo 2023-05-19 18:08:26 +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 b64d726c42 Added a new config option for energy unit display (closes #2109) 2023-02-05 15:55:45 +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 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 632db0d8d1 Fixed new user settings naming 2022-04-07 19:25:27 +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 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 2042db29ee Use prefers-color-scheme for night mode by default (closes #1334) 2022-04-02 19:26:55 +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 f52b8e11bb Support camera barcode scanning in recipepicker (references #1562) 2022-02-11 18:18:17 +01:00
Bernd Bestel 8e033d035a Reviewed config-dist.php 2022-02-11 17:46:40 +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 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
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 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 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 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 2503590463 config-dist.php formatting 2021-07-11 10:34:46 +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 0f88eed08c Upgraded to PHP-CS-Fixer v3 2021-07-03 17:46:47 +02:00
tank0226 b3ed80d186 Improved support for other LDAP servers (#1380)
Co-authored-by: kuanhong <>
2021-06-20 13:22:18 +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
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
Edward Betts 7bbcec91aa Correct spelling (#1420) 2021-03-31 22:12:51 +02:00
Bernd Bestel 1da51cde67 Reviewed config-dist.php 2020-12-19 15:00:31 +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 b393998601 Distinguish expiry/best before dates (closes #851) 2020-11-15 19:53:44 +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 96b86c230c Use sensible decimal amounts 2020-11-13 17:45:09 +01:00
Bernd Bestel d82fd09fba UI test/review 2020-11-08 15:09:10 +01:00
Bernd Bestel 31fcdf377a Implemented LDAP authentication support (closes #305) 2020-10-20 21:43:58 +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
kriddles f7a1634442 typo (#1062) 2020-10-18 13:57:10 +02:00
Bernd Bestel e24f3143b5 Changelog/little naming changes/fixes/new translations strings for #1056 2020-10-17 11:03:47 +02:00