github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-03-28 07:39:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,533 Commits 2 Branches 81 Tags 29 MiB
a42d151c93
Commit Graph

378 Commits

Author SHA1 Message Date
9Lukas5
a42d151c93
allow add full recipe required ingredient amount 
This modifies the bootbox on to add recipe ingredients
to the shopping list in a way, that it
- button to open bootbox is always enabled
- popup lists all* ingredients, independent of fulfillment state
- two new quick-select buttons to check only missing or all ingredients
- radio button selection to define if the full or only missing amount
    shall be added to the shopping list

*This still excludes ingredients which have the stock check disabled
in a recipe.
In order to get this information, the RecipesController was modified
that it adds the data from the recipe ingredient setting as new
additional field in the recipePositionsResolved.

closes https://github.com/grocy/grocy/issues/686
 2026-01-31 22:42:21 +01:00
Fándly Gergő
89b8a9c1a9
Added option to include details in the webhook sent to label printers (#2704) 
* Added option to include details in the webhook sent to label printers

* Removed LABEL_PRINTER_INCLUDE_DETAILS flag

* Make this actually work

* Care about all places where webhooks are used / don't forget recipes

---------

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2025-03-21 16:34:33 +01:00
Bernd Bestel
6605eeafd0
Optimized tooltip hide handling 2025-01-17 16:22:41 +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
c73be7d18e
Finalized frontend external barcode lookup implementation (references #158) 2025-01-12 13:58:47 +01:00
Bernd Bestel
11ea8f3716
Fixed shopping list print view table/list sorting (fixes #2602) 2024-11-08 16:40:30 +01:00
Daniel Reinoso
5b48004449
Exclude self-produced product prices from spending reports (#2596) 
* Exclude self-produced product prices from spending reports

* Fix SQL query

* Code style

---------

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2024-10-25 23:19:00 +02:00
Bernd Bestel
4f6075d8c5
Fixed product barcode scanning on the recipe ingredient edit page (fixes #2572) 2024-08-24 18:22:39 +02:00
TheDodger
477f333466
Add userfields to battery charge cycle tracking (#2490) 
Co-authored-by: Manuel Worschech <mw@abot.xyz>
 2024-03-10 18:12:02 +01:00
bbx0
d2a878e98e
Stream uploads to file (#2477) 
* Stream uploads to file

* Adapt code style / use up to date reasonable chunk size

---------

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2024-02-23 17:56:32 +01:00
Bernd Bestel
40d1a9c3d0
Show the number of items per shopping list in the shopping lists dropdown (closes #2467) 2024-02-12 20:36:33 +01:00
Torqu3Wr3nch
151bd7f025
Fix blank/missing items in spending report (#2432) 
* Fixes blank/missing items in spending report

Use left (outer) join when connecting product to optional product group

* Properly display ungrouped items in table and chart

---------

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2024-01-09 18:36:09 +01:00
Bernd Bestel
8f52aaeadc
Handle stock userfields in generic entity interaction API endpoints (closes #2381) 2023-11-14 21:07:30 +01:00
Bernd Bestel
27f9d70b56
Implemented a way to use the external barcode lookup plugin also from within the frontend as a product picker workflow 2023-11-03 20:47:43 +01:00
Bernd Bestel
c8891236e6
Optimized meal plan weekRecipe handling (fixes #2333) 2023-09-05 21:07:38 +02:00
Bernd Bestel
387a5f7dd3
Move GetParsedAndFilteredRequestBody into BaseApiController 2023-09-01 17:58:02 +02:00
Bernd Bestel
5080d776a7
Only accept application/json requests for (JSON) API requests 2023-09-01 00:53:25 +02:00
Bernd Bestel
3a2929c016
stockreports/spendings: Support grouping by store (closes #2308) 2023-08-14 18:12:40 +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
61a3a4329b
Unified edited stock transactions handling (fixes #2292) 2023-08-05 09:58:21 +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
b74fbddd94
Use a dynamic (title / URL) manifest 2023-08-01 17:12:35 +02:00
Bernd Bestel
e52b1c5f60
Upgraded package php-di/php-di 2023-07-29 14:02:56 +02:00
Bernd Bestel
70bb014c9f
Removed pre-release special version handling 2023-05-24 20:32:48 +02:00
Bernd Bestel
d0e0102752
API keys can now have a description 2023-05-23 20:31:51 +02:00
Bernd Bestel
d16d976d0b
Simplified viewjs / active page handling 2023-05-20 18:20:30 +02:00
Bernd Bestel
5f65f2abd0
New logo 2023-05-19 18:08:26 +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
dd5bd3852a
Optimized imports 2023-05-13 14:43:51 +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
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