kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-09 15:46:08 +00:00
Code Issues Projects Releases Wiki Activity
2,528 Commits 2 Branches 80 Tags
1934256f294ce5b717b1f4d424b860f5a72131ce
Commit Graph

195 Commits

Author SHA1 Message Date
GammaC0de
1934256f29 Support data: URI images for external barcode lookup plugins (#2814) 
* add support for data: URI images for external barcode lookup plugins

* Adapt existing code style

---------

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2025-09-28 20:37:47 +02:00
Jordy
23ccd05719 Get the image file type from the response content type (#2811) 
* Get the image file type from the response content type
When using the external lookup tool, the file extention in the URL is used for the name of the downloaded image. However, some API's do not use file types in the resource name. If that is the case, the Content-Type of the request will now be used to define the file extention.

* Typo: Deleted last empty line on accident.

* Typo

* Apply code style and simplify this

---------

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2025-09-20 12:12:45 +02: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
2a3e23ded4 Handle image URLs with query parameters returned from an external barcode lookup plugin 2025-03-04 20:40:48 +01:00
Bernd Bestel
ef9413c5c1 Optimized recipe missing ingredients shopping list item handling (closes #1890, closes #2134) 2025-01-19 21:31:36 +01:00
Bernd Bestel
f3effc5a60 Use qu_id_purchase when adding products to the shopping list (closes #1355) 2025-01-19 15:16:40 +01:00
Bernd Bestel
bc78359dba Make it possible to disable open per product (closes #1911) 2025-01-19 14:57:19 +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
f4d5f21832 Squashed commit 
Fixed recipe ingredient costs/calories calculation when having different QUs and when only_check_single_unit_in_stock is set (fixes #2529)
Added a new column "Product picture" on /products (closes #2640)
Fixed partly opening stock entries stock_id handling (fixes #2391)
 2025-01-13 17:41:08 +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
98fad559d4 Don't replace due date on freezing when default_best_before_days_after_freezing are set to 0 (closes #1880) 2025-01-06 19:55:18 +01:00
Bernd Bestel
af1f2aef96 Don't allow amounts <= 0 on purchase/consume 
References https://github.com/grocy/grocy/issues/2156#issuecomment-2040336492
 2024-04-05 20:12:11 +02: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
35766bf5b3 Optimized CurrentVolatileStock handling (fixes #2341) 2023-09-15 17:24:29 +02:00
Bernd Bestel
1f7580af3f Fixed GetCurrentStock caching 2023-09-02 09:12:37 +02:00
Bernd Bestel
60adda2b42 Optimized performance of CurrentVolatileStock 2023-09-01 18:11:36 +02:00
Bernd Bestel
fdbb8a045a Optimized performance of GetProductDetails 2023-09-01 17:03:22 +02:00
Bernd Bestel
1d7f7b2992 Cache expensive stock data calculations 2023-08-06 13:28:14 +02:00
Bernd Bestel
61a3a4329b Unified edited stock transactions handling (fixes #2292) 2023-08-05 09:58:21 +02:00
Bernd Bestel
d006436d49 Upgraded PHP-CS-Fixer / applied optimized rules 2023-08-02 18:44:30 +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
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
8c033ff6c8 Revert "Cache StockService->GetCurrentStock result" 
This (partly) reverts commit bc5051351a.
 2023-05-23 21:26:53 +02:00
Bernd Bestel
bc5051351a Cache StockService->GetCurrentStock result 2023-05-23 17:34:38 +02:00
Bernd Bestel
5f65f2abd0 New logo 2023-05-19 18:08:26 +02:00
Bernd Bestel
d03175f75a Added a separate QU for displaying prices (closes #2225) 2023-05-18 13:37:13 +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
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
df4907f5d4 Fixed a theoretical (not relevant for SQLite) SQL injection possibility (references #2201) 2023-04-29 08:57:05 +02: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
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
4e56dee6f0 Finalized "Auto reprint stock entry label" (closes #2092) 2023-01-05 20:12:15 +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
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
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
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
0b532f7624 Fixed StockService->ConsumeProduct $productStockAmount check (fixes #1949) 2022-07-18 17:35:35 +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
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
632db0d8d1 Fixed new user settings naming 2022-04-07 19:25:27 +02:00
Bernd Bestel
4da546fc80 Don't compact stock entries with userfields 2022-04-06 19:07:33 +02:00
Bernd Bestel
61ed756dd0 Implemented "default consume location" handling (closes #1365) 2022-04-03 21:15:05 +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
b53d1a076f Reviewed latest changes regarding price handling views 2022-04-01 17:04:09 +02:00