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,548 Commits 2 Branches 81 Tags 29 MiB
release
Commit Graph

409 Commits

Author SHA1 Message Date
Bernd Bestel
df4907f5d4
Fixed a theoretical (not relevant for SQLite) SQL injection possibility (references #2201) 2023-04-29 08:57:05 +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
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
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
0bd698c968
Print stock entry labels when consuming a "Produces product" recipe (closes #2123) 2023-02-05 15:24:28 +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
39d1f49431
Fixed demo data generation 2022-12-26 10:12:29 +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
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
38a4ad8ec4
Upgraded to PHP 8.1 2022-12-10 15:19:11 +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
7d4a9602ab
Return the battery object in endpoint /batteries (closes #2045) 2022-11-19 19:33:50 +01: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
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
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
a5e3442602
Don't enforce first/last name when creating users (closes #1888) 2022-05-14 16:59:11 +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
6ecf94073d
Automatically create/update/delete inverse QU conversions (closes #1844) 2022-04-06 22:21:21 +02:00
Bernd Bestel
4da546fc80
Don't compact stock entries with userfields 2022-04-06 19:07:33 +02:00
Bernd Bestel
e336f24225
Upgraded Font Awesome to v6 2022-04-04 20:27:51 +02:00
Bernd Bestel
61ed756dd0
Implemented "default consume location" handling (closes #1365) 2022-04-03 21:15:05 +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
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
d3a39270de
Implemented notes and Userfields for stock entries (closes #443) 2022-03-30 17:32:53 +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
5dc745f301
Use the given time when skipping chores via /choretracking (references #1830) 2022-03-23 17:51:05 +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
1a82d0599c
Use child product substitution on consuming during chore execution (fixes #1807) 2022-03-05 09:03:57 +01:00
Bernd Bestel
e220b3e9f3
Fixed products product stock entry price (fixes #1791) 2022-02-19 09:03:42 +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
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
69a7ea6057
Added a new "adaptive" chore period type (closes #1495) 2022-02-10 18:06:33 +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
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
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
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
c190002ebb
More recipes page performance optimizations (references #1750) 2022-01-16 16:08:57 +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
c1952e98bc
Show stock journal entries of deleted users / fixed default user handling (fixes #1725) 2022-01-06 15:14:32 +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
ad0dbdfc22
Lookup product barcodes case insensitive (fixes #1734) 2022-01-06 13:42:38 +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
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
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
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
4338ccc132
Restore the original due date when undoing a product opened transaction (fixes #1659) 2021-11-12 18:12:34 +01:00
Bernd Bestel
282168f92c
Potentially fix a type mismatch problem (fixes #1629) 2021-09-29 09:21:45 +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
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
616e1dd5d7
Fixed negative number plural form handling (fixes #1601) 2021-09-06 22:26:31 +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
cebf7a3e54
Don't consider inactive products to be missing (fixes #1578) 2021-08-17 18:00:33 +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
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
2d2700cacb
Implemented meal plan sections (closes #370) 2021-07-15 17:54:48 +02:00
Bernd Bestel
f6986fac18
Fixed cost/calories calculation for nested recipes (references #1264) 2021-07-14 16:27:03 +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
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
55807bfc94
Auto-compact stock entries (closes #1343) 2021-07-11 21:06:05 +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
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
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
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
90a0caf1dc
Fixed meal plan recipe servings stock fulfillment checking (fixes #1391) 2021-07-10 12:32:29 +02:00
Bernd Bestel
7595d640f5
Return empty Userfields empty (closes #1412) 2021-07-08 20:12:58 +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
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
b0d38b87de
PHP 8 support 2021-07-05 17:48:34 +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
bcf963ac49
Fixed self production amount was wrong for tare weight handling enabled products (fixes #1431) 2021-07-03 18:30:53 +02:00