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
2847908523
Some small recipe page adjustments
2021-07-10 20:35:38 +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
72e6ed76bf
Fixed an error when adding object and there are no Userfields (references b0d38b87de)
2021-07-09 21:30:35 +02:00
Bernd Bestel
8c5c12cb47
Added new columns on the stock overview page ( closes #1351 )
2021-07-08 20:42:07 +02:00
Bernd Bestel
8b977644f7
Added the product descrption as a column on the stock overview page ( closes #1362 )
2021-07-08 20:22:51 +02:00
Bernd Bestel
1ead23cb87
Added on option to only show in-stock products on the /products page ( closes #1388 )
2021-07-06 20:08:02 +02:00
Bernd Bestel
135ac118b0
Added a filter for only done items on the /shoppinglist page ( closes #1406 )
2021-07-06 19:40:26 +02:00
Bernd Bestel
ffad8bfa7f
Make it possible to search on the stock overview page for product barcodes ( closes #1443 )
2021-07-06 19:25:34 +02:00
Bernd Bestel
54bf7ed659
Produce a schema-valid OpenAPI specification ( closes #1457 )
2021-07-05 23:23:59 +02:00
Bernd Bestel
079437384e
Use the now available @once directive instead of the legacy hack to only include component scripts once
2021-07-05 22:49:51 +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
0dc37fb361
Don't allow a min. stock amount for child products when the parent has "Accumulate sub products min. stock amount" set (references #1409 )
2021-07-04 17:36:44 +02:00
Bernd Bestel
47c936e026
Reworked authentication related menu item handling ( fixes #1462 )
2021-07-03 19:40:42 +02:00
Bernd Bestel
b856911f0f
Browser-cache localization strings (+ new API endpoint to get them)
2021-06-29 20:24:02 +02:00
Bernd Bestel
7587ead732
Fixed /tasks group by category ( fixes #1274 )
2021-06-28 19:31:27 +02:00
Bernd Bestel
69f8c237ff
Fixed /stockentries group by purchased_date ( fixes #1419 )
2021-06-28 19:14:15 +02:00
Bernd Bestel
b8e15b990b
Typo
2021-06-28 18:39:08 +02:00
Bernd Bestel
35fb87ab1e
Squashed commit
...
Use managed fonts
Include userentities dynamically in grocy.openapi.json for /userfields/{entity}/{objectId} endpoints (closes #1218 )
Fixed userfieldsform load / save (for products and recipes) handling (fixes #1302 )
Fixed PUT/DELETE /objects/{entity}/{objectId} when the given object id was invalid (fixes #1396 )
Allow arrays in HTMLPurifier (fixes #1407 )
2021-06-28 17:00:16 +02:00
Bernd Bestel
33ea1e56cf
Trigger help-tooltips also by click (instead of only hover, which is Bootstraps default) ( fixes #1468 )
2021-06-27 19:34:28 +02:00
Bernd Bestel
44d6173569
Also disable generic consume context menu item on /stockoverview when the item is not in stock ( fixes #1523 )
2021-06-27 18:34:58 +02:00
Katharina Bogad
f5da53a761
Migrated bootstrap3 col-xs-* to bootstrap4 col-* classes ( #1521 )
2021-06-24 22:46:47 +02:00
Bernd Bestel
f8fa5db3e7
Fixed multiple datetimepicker contextual timeago (references #1520 )
2021-06-24 07:46:32 +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
rozgonik
980778e599
Fix untranslateable hint values ( #1435 )
2021-03-31 22:14:42 +02:00
Bernd Bestel
c483c34598
Display calories always per single serving ( fixes #1359 )
2021-02-21 20:57:34 +01:00
Bernd Bestel
5583074001
Don't initialise numeric Userfields with 1.0 ( fixes #1312 )
2021-02-21 19:14:49 +01:00
Bernd Bestel
2aca551692
Fixed product page QU conversion hint pluralisation ( fixes #1352 )
2021-02-21 18:24:04 +01:00
Lauri Niskanen
0a6c7d73a7
Hide unsuitable fields from printed recipe pages ( #1332 )
...
* Hide unsuitable fields from printed recipe pages
Resolves #1330 .
* Use proper total energy label in the recipe page
2021-02-14 12:55:01 +01:00
Bernd Bestel
a455a01204
Fixed print layout display handling ( fixes #1272 )
2021-01-30 13:11:40 +01:00
Bernd Bestel
d78e156609
Use barcode defaults also for scan mode ( fixes #1253 )
2021-01-04 21:15:22 +01:00
Bernd Bestel
a646f2c6bd
Fixed included recipe missing amount resolving (references #1252 )
2021-01-03 22:40:33 +01:00
Bernd Bestel
65f0253307
Fixed product form min tare weight
2021-01-03 16:22:58 +01:00
Bernd Bestel
966211b71a
Fixed shopping list product userfields ( fixes #1246 )
2021-01-02 17:30:28 +01:00
Bernd Bestel
43ef9b793b
Fixed chore form weekly day selection labels ( fixes #1242 )
2021-01-01 14:31:49 +01:00
Bernd Bestel
97b93f23bd
Fixed/unified shopping list item button tooltips ( fixes #1239 )
2020-12-31 13:09:55 +01:00
Bernd Bestel
9f1692e31f
Improved shopping list item form validation ( closes #1226 )
2020-12-29 21:06:31 +01:00
Bernd Bestel
278a5f004a
Fix consuming when FEATURE_FLAG_STOCK_LOCATION_TRACKING is disabled ( fixes #1229 )
2020-12-29 18:06:56 +01:00
Bernd Bestel
6fcc0636e8
Optimized textarea heights
2020-12-27 09:38:31 +01:00
Bernd Bestel
2e3c237648
Fixed zero decimals handling ( fixes #1213 )
2020-12-23 19:56:37 +01:00
Bernd Bestel
cf05be35fe
Fix default for product option "Never show on stock overview" ( fixes #1212 )
2020-12-22 19:10:02 +01:00
Bernd Bestel
937bd6b702
Fixed camera scanning targets ( fixes #1210 )
2020-12-22 19:06:41 +01:00
Bernd Bestel
b42bcaaa44
Hide price decimals setting when FEATURE_FLAG_STOCK_PRICE_TRACKING is disabled
2020-12-22 16:24:13 +01:00
Bernd Bestel
c1ac9e8a45
Optimized/clarified new "Hide product from stock overview" option (references #906 )
2020-12-21 20:43:10 +01:00
Bernd Bestel
694b78f72a
Optimized GROCY_FEATURE_FLAG_STOCK handling ( closes #966 )
2020-12-21 20:13:49 +01:00
Bernd Bestel
7478d9bb38
Removed RTL CSS handling (not needed until we have full RTL support)
2020-12-21 19:36:20 +01:00
Bernd Bestel
cf299a3d0b
Optimized file save/delete handling
2020-12-21 19:16:14 +01:00
Bernd Bestel
5953e42d70
Updated icons
2020-12-21 19:04:48 +01:00
Bernd Bestel
431a2ab9f7
Added new Userfield type "Link (with title)" ( closes #790 )
2020-12-21 17:57:48 +01:00
Bernd Bestel
e97fccd03a
Optimized shopping list header
2020-12-21 16:29:39 +01:00
Bernd Bestel
01306bc1ae
Fixed product barcodes table display when FEATURE_FLAG_STOCK_PRICE_TRACKING is disabled ( fixes #1202 )
2020-12-21 09:54:20 +01:00
Bernd Bestel
360f25ec44
Make the new user picture a little bigger (references #1158 )
2020-12-21 09:49:40 +01:00
Bernd Bestel
3b1f8cba70
Moved the new copy/merge products buttons in a dropdown menu
2020-12-21 09:30:19 +01:00
Bernd Bestel
2b13102299
Implemented Userfields for users ( closes #1159 )
2020-12-20 22:16:58 +01:00
Bernd Bestel
8f1ce607f7
Implemented user pictures ( closes #1158 )
2020-12-20 22:08:50 +01:00
Bernd Bestel
c9b5e14473
Make it possible to merge products ( closes #243 )
2020-12-20 20:58:22 +01:00
Bernd Bestel
dadf93a94c
Merge used libraries for Barcode/QR-Code generation
2020-12-20 19:53:28 +01:00
Bernd Bestel
1d16021404
Show barcode as barcode-image on shopping list ( closes #1133 )
2020-12-20 19:31:12 +01:00
Robert Resch
6ec3743d12
fix missing > ( #1201 )
2020-12-20 16:02:33 +01:00
Bernd Bestel
6eaee0c6f9
Fixed number display for quick consume buttons
2020-12-20 15:02:22 +01:00
Bernd Bestel
b2d7003335
Performance optimizations
2020-12-20 10:44:19 +01:00
Bernd Bestel
76e4a1578c
Added Default store as a column to the shopping list ( closes #957 )
2020-12-20 10:26:02 +01:00
Bernd Bestel
268b8e87d7
Make it possible to hide chores/batteries ( closes #1069 )
2020-12-20 10:19:44 +01:00
Bernd Bestel
832141a718
Made the shopping list print view configurable ( closes #740 )
2020-12-19 23:57:33 +01:00
Bernd Bestel
77e842a736
Fixed shopping list print button when FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS was disabled (references #1199 )
2020-12-19 23:00:07 +01:00
Bernd Bestel
f5e0709913
Added columns for last price on shopping list ( closes #410 )
2020-12-19 17:55:49 +01:00
Bernd Bestel
250b308d5d
Support -1 for "Default due days after freezing" ( closes #846 )
2020-12-19 17:32:47 +01:00
Bernd Bestel
362b3f8508
Added min. stock amount column to stock overview ( closes #856 )
2020-12-19 17:25:13 +01:00
Bernd Bestel
3ad5f2cac5
Added a note field to product barcodes ( closes #962 )
2020-12-19 17:20:54 +01:00
Bernd Bestel
1b864f990b
Updated screenshots
2020-12-19 17:08:08 +01:00
Bernd Bestel
ea888fffb7
Updated unmanaged dependencies
2020-12-19 14:28:32 +01:00
Bernd Bestel
796e35d60b
Removed unneeded dependency
2020-12-19 14:19:26 +01:00
Bernd Bestel
574d17fa52
General UI review/test
2020-12-19 14:03:28 +01:00
Bernd Bestel
7ef5bc6f77
Add some more columns (hidden by default) (references https://github.com/grocy/grocy/issues/1058#issuecomment-744059155 )
2020-12-19 10:51:07 +01:00
Bernd Bestel
eb4a748da3
Consume opened products first ( closes #1183 )
2020-12-19 10:28:35 +01:00
Bernd Bestel
cc2ea93313
Make DataTable row groups collapsible everywhere (references #1189 )
2020-12-17 17:41:31 +01:00
Bernd Bestel
b5fc64cf5d
Fixed DataTables numeric/datetime sorting ( fixes #1085 )
2020-12-17 17:33:24 +01:00
Robert Resch
07ff28da39
Add row group customization ( #1189 )
...
* Add row group customization
* fix rowGroup state loading
* activate rowGroup for all datatables
* add reset button
* reload page done on success callback
* Review
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-12-16 18:18:03 +01:00
Bernd Bestel
672c4d33bf
Added basic RTL support (reference #984 )
2020-12-11 18:06:32 +01:00
Bernd Bestel
cf34df5e3f
Squashed commit
...
Fixed some localization strings
Reviewed/optimized product deletion handling
Add option to hide products from the stock overview page (closes #906 )
Prefill default_due_days also on the inventory page (closes #591 )
Added DataTables accent chinese-string plugin (closes #872 )
Show costs and calories per recipe ingredient (closes #1072 )
Fixed user permission saving (fixes #1099 )
User permissions should not have an effect for demo mode (closes #972 )
Handle QU conversion when consuming a substituation (child) product (fixes #1118 )
Consume/open any child product when the parent product is not in stock (closes #899 )
Added a retry camera barcode scanning button to product picker workflow (closes #736 )
2020-12-07 19:48:33 +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
8ec7e9923c
Fixed productcard aggregated amount was in wrong line
2020-11-19 18:41:09 +01:00
Bernd Bestel
2b4d8a7cc5
Load userobject forms in dialogs
2020-11-17 21:18:05 +01:00
Bernd Bestel
639ffe13f5
Reverted 41067b23bb because that's not needed (references #1049 and #958 )
2020-11-17 21:10:26 +01:00
Bernd Bestel
604629ed5e
Added a button to download equipment instruction manuals ( closes #833 )
2020-11-17 21:01:45 +01:00
Bernd Bestel
d2d09cf928
Removed dragscroll dependency ( fixes #1135 , references #1115 )
2020-11-17 20:50:04 +01:00
Bernd Bestel
e32d12699e
Properly initialize sort_number on the Userfield edit form (references #1134 )
2020-11-17 20:28:26 +01:00
Bernd Bestel
6270f39688
Make Userfields reorderable ( closes #1134 )
2020-11-17 20:12:45 +01:00
Bernd Bestel
887526c727
Squashed commit
...
Fixed number input min/max amount handling
Only (auto) save valid user inputs
More filters on the stock journal pages
Save the last price per used barcode and preselect that as a total price on purchase if not empty (closes #1131 )
Don't apply conversions for only_check_single_unit_in_stock ingredients (fixes #1120 )
Render shopping list userfields (closes #1052 )
Fixed Focus when adding included recipes (closes #1019 )
Order all base objects with NOCASE (closes #1086 )
2020-11-17 19:11:02 +01:00
Bernd Bestel
e85b21384f
Remove "Allow partial units in stock" product option / unify number input validation messages
2020-11-16 17:10:41 +01:00
Bernd Bestel
7b4edf3147
Adapt shopping list add expired products for #851
2020-11-15 22:38:21 +01:00
Bernd Bestel
1bbd7787d8
More proper number formatting
2020-11-15 22:29:47 +01:00
Bernd Bestel
b393998601
Distinguish expiry/best before dates ( closes #851 )
2020-11-15 19:53:44 +01:00
Bernd Bestel
9a7196b761
Make it possible to copy products ( closes #571 )
2020-11-15 16:05:25 +01:00
Bernd Bestel
3fc3bdd34c
Make the help icons a little not so prominent
2020-11-15 15:23:47 +01:00
Bernd Bestel
9942a2dbab
Use new style also on the login page
2020-11-15 15:17:13 +01:00
Bernd Bestel
3568fd9dcb
Added a "error info copy & paste" text box on the 500 error page
2020-11-15 15:12:15 +01:00
Bernd Bestel
22e9e4e311
Forgot to save...
2020-11-15 14:59:54 +01:00
Bernd Bestel
dd8fa5ff66
Save DataTable states server side
2020-11-15 14:58:35 +01:00
Bernd Bestel
6866109b97
Add clear filter button to stock entries page + mobile view optimizations (this now closes #1129 )
2020-11-15 14:48:48 +01:00
Bernd Bestel
4b342dbd43
Improved number input initial value decimal handling
2020-11-15 14:15:09 +01:00
Bernd Bestel
1d1642b464
Make the quick consume buttons on the stock overview page configurable per product ( closes #613 )
2020-11-15 09:57:45 +01:00
Bernd Bestel
17ae7e3d0c
Added a tooltip what scan mode is
2020-11-15 09:27:07 +01:00
Bernd Bestel
3b73df57e5
Unify tooltips
2020-11-15 09:22:05 +01:00
Bernd Bestel
185627af7d
Fixed table filters
2020-11-15 09:21:54 +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
db5c9ce3e8
stockentryform amount doesn't need to handle tare weight
2020-11-14 22:54:29 +01:00
Bernd Bestel
6e867cafbd
Unify/remove used icons
2020-11-14 11:59:49 +01:00
Bernd Bestel
16b17b25a4
Reordered input fields
2020-11-14 11:07:36 +01:00
Bernd Bestel
b267295e86
Fixed product picker workflows
2020-11-14 11:05:36 +01:00
Bernd Bestel
71f6b38cb2
Fixed chore edit page QU hint
2020-11-13 19:03:25 +01:00
Bernd Bestel
ed2239c1f6
Wording correction
2020-11-13 17:58:46 +01:00
Bernd Bestel
b0b3322266
Also relate the shopping list amount to QU stock
2020-11-13 17:30:57 +01:00
Bernd Bestel
ab68a51ba7
Recipe edit page fixes
2020-11-13 15:46:44 +01:00
Bernd Bestel
c360cbec4c
UI strings/tooltips/basic handling review/optimizations
2020-11-12 21:35:10 +01:00
Bernd Bestel
ea9722bfa4
Fixed undefined variable warnings on product edit page
2020-11-12 13:08:50 +01:00
Bernd Bestel
6f3a3f62af
Typo
2020-11-11 22:39:24 +01:00
Bernd Bestel
0c8b6c55c1
Added total calories as a column to stock overview (references #1058 )
2020-11-11 22:38:01 +01:00
Bernd Bestel
0a600d3277
Fix hide/view columns dialog did not work on pages with more than 1 table (references #1058 )
2020-11-11 22:28:05 +01:00
Bernd Bestel
c3e59d21b9
Only number picker help hint when not empty
2020-11-11 22:17:01 +01:00
Bernd Bestel
11f65629e3
Fixed number picker help hint
2020-11-11 22:09:26 +01:00
Bernd Bestel
7c8a17ce78
Add calories as a column to stock overview (references #1058 )
2020-11-11 22:06:01 +01:00
Bernd Bestel
0245a925b7
Make it possible to hide columns ( closes #1058 )
...
Hide new overview page columns by default
2020-11-11 21:11:17 +01:00
Bernd Bestel
e3ab943fe7
Use the custom-file-pickers also for the new file and image userfields
2020-11-11 18:49:08 +01:00
Bernd Bestel
9c81fc890b
Simplified "checkboxUncheckedValue" handling
2020-11-11 17:34:37 +01:00
Bernd Bestel
9949f30c2b
Unify hint texts
2020-11-10 22:01:23 +01:00
Bernd Bestel
06f345324f
Fied wrong/missing product picker hint on product edit page
2020-11-10 21:59:19 +01:00
Bernd Bestel
68eeb07e5f
Test/review/rework (and hopefully finalized) new price handling
2020-11-10 18:11:33 +01:00
Bernd Bestel
33a6a28208
Also use the productamountpicker on the shopping list item page (refernces #1015 )
2020-11-09 22:15:25 +01:00
Bernd Bestel
b6f4cfa851
Also use the productamountpicker for inventory (refernces #1015 )
2020-11-09 21:51:55 +01:00
Bernd Bestel
ad3b91ef98
Improved form spacing
2020-11-09 21:30:22 +01:00
Bernd Bestel
8bd157ca9d
Use producamountpicker "everywhere" ( closes #1015 )
2020-11-09 19:25:46 +01:00
Bernd Bestel
40283609b5
Product / QU form refinements
2020-11-08 22:13:36 +01:00
Bernd Bestel
ea5b3dcd51
UI test/review
2020-11-08 19:51:56 +01:00
Bernd Bestel
3e3321bf11
UI test/review
2020-11-08 19:00:12 +01:00
Bernd Bestel
d82fd09fba
UI test/review
2020-11-08 15:09:10 +01:00
4lloyd
76cbf796b6
[WIP] Simplified overviews on mobile ( #1115 )
...
* Simplified stock overview on mobile.
* Stock table horizontally scrollable
* Use the new mobile views for all pages (except the shopping list page, use the existing special handling there for now)
And add a clear filter button to all pages
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-11-07 14:53:45 +01:00
Bernd Bestel
7b32d1d8a4
More compact page headers / streamlined new page design for all pages
2020-10-31 18:37:10 +01:00
Bernd Bestel
18617dc9fb
Fixed undefined variable warning
2020-10-31 16:29:12 +01:00
Bernd Bestel
7d175563ca
Fixed stock overview status filter ( fixes #1080 )
2020-10-29 17:32:21 +01:00
kriddles
64a2f5b25e
dialogs for shopping list ( #1103 )
2020-10-29 17:09:35 +01:00
kriddles
9bbcdafab9
Add purchased date to inventory ( #1102 )
...
* Add purchased date to inventory
* Clarify stock settings label
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-29 17:04:34 +01:00
Bernd Bestel
be18d59735
Fixed minimum for two number inputs (fixes 1083#)
2020-10-21 18:14:24 +02:00
Bernd Bestel
def61eee6e
Typo
2020-10-20 20:38:19 +02:00
kriddles
ff254f8db2
stock entries button on product card ( #1079 )
2020-10-20 20:14:25 +02:00
kriddles
57aa6499eb
display productCard when clicking item on shopping list ( #1078 )
2020-10-20 20:14:11 +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
Bernd Bestel
9e982979c3
Allow 4 decimals for all amount inputs (this now closes #998 )
2020-10-19 20:25:42 +02:00
Bernd Bestel
80beff2cae
Fixed price input decimals, started reviewing all number inputs ( fixes #1076 , references #998 )
2020-10-19 20:03:26 +02:00
