kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +00:00
Code Issues Projects Releases Wiki Activity
2,163 Commits 2 Branches 80 Tags
9cdb0908d64e014097f626a63cbc6c6ac8261d3e
Commit Graph

346 Commits

Author SHA1 Message Date
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
7ee79ec56c Fixed permission check when deleting API keys (fixes #2204) 2023-04-30 22:32:08 +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
71d44edb8c Optimized week recipe handling in mealplan (fixes #2168) 2023-04-01 22:04:30 +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
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
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
995df64054 Support OFFSET without LIMIT in API query filters (closes #2105) 2023-01-12 13:32:12 +01:00
Bernd Bestel
597abe236d AddMissingProductsToShoppingList also on adding/editing products (references #2094) 2023-01-04 22:54:12 +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
Bernd Bestel
0585e80c70 Implemented "Default quantity unit consume" (closes #1845) 2022-12-26 11:11:55 +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
2ebb9b2cd9 Show product group Userfields on the shopping list (closes #2069) 2022-12-18 20:56:02 +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
50fac692ad Added a dialog to show product related resolved QU conversions (references #2056 and #1360) 2022-12-04 19:02:15 +01:00
Bernd Bestel
605ceb1b19 Fixed typos 2022-11-19 19:35:10 +01:00
Bernd Bestel
3070448555 Fixed granular user permission checking in GenericEntityApiController (fixes #2025) 2022-10-17 21:00:10 +02:00
Bernd Bestel
fa49b449dd Allow img style attribute in HTML filter (fixes #2011) 2022-09-28 21:04:41 +02:00
Bernd Bestel
e1967bd603 Allow chevrons in HTML filter (fixes #2007) 2022-09-25 22:39:06 +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
9b52168b94 Fixed /userfields/{entity}* endpoints OpenAPI definition (fixes #1967) 2022-08-14 23:09:27 +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
a85af22d6a Allow h1-h6 tags in HTMLPurifier (fixes #1932) 2022-07-03 08:24:32 +02:00
Bernd Bestel
6da637ab66 Fixed API filter >= and <= comparison (fixes #1904) 2022-05-30 17:20:15 +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
d4bd6b2fb3 Fixed /stock/products/{productId}/add request body parameter validation (fixes #1860) 2022-04-15 15:40:55 +02:00
Bernd Bestel
76d6342156 Show stock userfields on the stock entry edit form 2022-04-06 19:08:17 +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
f7c33a4579 Optionally show out of stock products on the location content sheet (closes #1641) 2022-04-01 21:55:06 +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
d3a39270de Implemented notes and Userfields for stock entries (closes #443) 2022-03-30 17:32:53 +02: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
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
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
222c518a5f Added grocycode for recipes (closes #1562) 2022-02-11 17:49:30 +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
12e5377c40 Split application translation strings and QU strings (fixes #1705) 2022-02-06 21:09:34 +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
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
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
8ec0d9319b Exclude tasks without an due date from the iCal export (fixes #1745) 2022-01-11 20:54:23 +01:00
Bernd Bestel
ae5fad290f Sort entities on the /api page 2022-01-06 14:17:02 +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
a711bbd8f6 Print stock entry labels also on inventory when adding products (closes #1713) 2021-12-09 18:32:59 +01:00
Bernd Bestel
4d21668265 Added the possibility to merge chores 2021-11-14 16:19:52 +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
ab53a157e4 Allow backslashes in API query filters (fixes #1649) 2021-11-12 17:52:32 +01:00
Bernd Bestel
ea63246a12 Apply timezone for iCalendar events (closes #1637) 2021-10-05 20:55:29 +02:00