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
Bernd Bestel
f93261404b
Fixed by PHP-CS-Fixer broken formattings
2020-10-18 15:08:09 +02:00
Bernd Bestel
196d304de6
Disable opening of tare weight handling enabled products also on the stock entries page (same as for the stock overview page, references #988 )
2020-10-18 14:48:21 +02:00
Bernd Bestel
80cf68aeaa
Allow no product for shopping list items & always in-/decrement by 1 when using the number input arrow buttons ( fixes #964 )
2020-10-18 14:27:23 +02:00
kriddles
f7a1634442
typo ( #1062 )
2020-10-18 13:57:10 +02:00
Bernd Bestel
e24f3143b5
Changelog/little naming changes/fixes/new translations strings for #1056
2020-10-17 11:03:47 +02:00
kriddles
cd65195532
add purchased date to purchase ( #1056 )
2020-10-17 10:54:10 +02:00
kriddles
5ae36e6ba8
Value information ( #1045 )
...
* viewjs stockoverview: add total value to stock overview
* view stockoverview.blade: add Value column
* refresh stockOverview value column
* Removed the total units info
* Properly format the total stock value number
* Added new localization strings
* Resolved merge conflict
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-15 19:46:27 +02:00
kriddles
96c6faf208
fix expiring filter ( #1051 )
2020-10-14 22:59:58 +02:00
Bernd Bestel
08644f95bf
Revert "Excape HTML (where needed, for bootbox) (references #996 )"
...
This reverts commit 0df2590de2#996 )"
This reverts commit 0624b0df59
2020-10-14 22:58:26 +02:00
fipwmaqzufheoxq92ebc
a85998dd40
Improvements ( #1049 )
...
* Fixes #1035 : Check available amount after filtering by stock_entry_id
* Fixes #1036 : Remove stock-related buttons/options from Shopping-list if FEATURE_FLAG_STOCK is disabled
* Fixes #1010 : Repair recipe-picture upload.
* Fixes #958 : Disable auto-reload of equipments-page.
* Fix uncaught exception in locationpicker.js
* Fixes #761 and #762 : Add "Remove exact amount" for products with tare weight handling and use it for recipe-consumption.
* Fixes #1048 : Repair product-group-filter on "Master Data"/Products
* Renamed variable
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-14 17:48:37 +02:00
SourceFactory.at
617b25bda8
added button to add expired products to shoppinglist ( #1026 )
...
* added button to add expired products to shoppinglist
* Localizations are managed via Transifex
Revert "added button to add expired products to shoppinglist"
This reverts commit ad1ab5d6a0
2020-10-04 15:20:34 +02:00
Bernd Bestel
931e4b7e9a
Applied formatting rules for by #1018 changed files
2020-10-04 15:02:08 +02:00
fipwmaqzufheoxq92ebc
b03e43b708
Ui fixes ( #1018 )
...
* Fixes #1005 . Recipes: filter by stock-status in gallery
* Fixes #1017 . Productform: Remove "Store"-Header from barcode-table if FEATURE_FLAG_STOCK_PRICE_TRACKING is not set.
* Fixed typo
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-04 15:00:34 +02:00
Bernd Bestel
4b5b7bcb19
Applied formatting rules for by #1000 changed files
2020-09-14 11:20:29 +02:00
fipwmaqzufheoxq92ebc
5056ca9397
Some bug fixes. ( #1000 )
...
* Fix #997 . Remove datetimepicker if FEATURE_FLAG_STOCK_BEST_BEFORE_DATE is not set.
* datetimepicker: Fix that SetValue did not set the value if "shortcut-checkbox" (e.g. "never expires") was checked.
* Use parent div as clickable area for checkboxes in dropdowns
* Fix nightmode-enable
* Fix possibly undefined variables in CalendarService.php
* Fix undefined variable in GenericEntityApiController.php
* Fix "Trying to access property barcodes on non-object" in productpicker
* Fix undefined "hintId" in shoppinglocationpicker
* Fix undefined variables in locationpicker.blade.php
2020-09-14 11:15:11 +02:00
Bernd Bestel
0624b0df59
Excape shopping list item notes (references #996 )
2020-09-08 18:25:42 +02:00
Maximilian Bosch
34ffdb2b4b
Adds a few small frontend fixes ( #995 )
...
* Add a few instructions to the readme on how to get `grocy` running locally
* Fix toggle for header-clock
I'm not 100% sure why, but with this change, the listener which calls
`CheckHeaderClockEnabled` will be invoked *before* the listener which
persists the setting.
If the setting is persisted before that, the clock doesn't show up when
enabling it in the settings-menu and appears/disappears in the exact
opposite way the setting is true/false.
* Allow replacing a product picture when removing it at first
Right now, a preview image of a product doesn't get updated when
pressing the delete-button at first and adding a new image the
upload-form which can be quite confusing for an end-user.
This patch allows to delete an image and add a new one in one go.
* Add `Save & return` button to product form
Same concept as for recipes: when pressing this button, the user will
stay at the form's site after saving.
* Removed unneeded class
* Revert "Add a few instructions to the readme on how to get `grocy` running locally"
This reverts commit 6ffad1d3c7
2020-09-08 17:46:37 +02:00
Bernd Bestel
6adac0588a
Applied formatting rules for by #989 changed files
2020-09-06 13:31:54 +02:00
fipwmaqzufheoxq92ebc
0454c128f0
Stock-Journal: API, Summary, Done By ( #989 )
...
* Stockjournal: Add "Done by"
* Add API for Stock-Journal
* Add "Journal-Summary"
* Use ALTER TABLE
* Moved the "Jounral summary" button to the stock journal page
* Changed icon & context menu position for new stock journal summary page
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-06 13:18:51 +02:00
fipwmaqzufheoxq92ebc
85a95f1973
Apikeys ( #986 )
...
* Add QR-Code for API-Url/Key
* Show only API-Keys for current user
* Allow only admin users to create custom API-Keys
* Use a managed package of qrcode-generator instead of a copy of the JS file
* Reuse existing localization string (API key)
* Center QR-Code in popups
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-06 10:00:49 +02:00
fipwmaqzufheoxq92ebc
32a4f81f62
Filtering of API-Results ( #985 )
...
* Add FilteredApiResponse
* Use FilteredApiResponse for Generic-Entity-Search
* Use FilteredApiResponse for Recipe-Fullfillment
* Use FilteredApiResponse for GetUsers
* Use FilteredApiResponse for current Tasks
* Use FilteredApiResponse for ProductStockEntries & ProductStockLocations
* Use FilteredApiResponse for current chores
* Use FilteredApiResponse for batteries-current
* Fix missing highlighting of "< X days"
* Keep to use existing views
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-01 19:59:40 +02:00
Bernd Bestel
ad4f8a19af
Removed the barcodes column from the products list as we don't have that field there anymore
2020-08-31 22:13:02 +02:00
Bernd Bestel
33325d5560
Applied .blade.php formatting rules
2020-08-31 20:32:50 +02:00
fipwmaqzufheoxq92ebc
07beee93a9
Add user-field-type "file" ( #977 )
...
* Add user-field-type "file"
* Add userfield-type "picture"
* Also limit image height on userfieldsform
* Prevent empty userfields (cause warnings in tables after deleting a file)
* Show files in dialogs
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-31 20:07:46 +02:00
fipwmaqzufheoxq92ebc
6f8ad9b76e
Locales: use http-accept-language or cookie ( #976 )
...
* Locales: use http-accept-language or "language"-cookie
* Add user-setting "locale"
Rename CULTURE to DEFAULT_LOCALE
* Use LocaleMiddleware also in dev mode
* CORS: don't require authentication on OPTIONS
* Use a standard user-settings-control and start a new generic user settings page, not a separate page for the locale setting
* Fixed (broken by myself) link-return handling
* Clarify language settings
* Removed unneeded files
* Better user settings icon
* Added localization hints
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-31 19:11:51 +02:00
Bernd Bestel
86300b7025
Refined permissions by existing feature structure ( closes #971 , references #960 )
2020-08-29 18:31:28 +02:00
Bernd Bestel
22384aaa2e
Error page style improvements
2020-08-29 16:58:06 +02:00
Bernd Bestel
3b0d29bed0
Applied EditorConfig settings to all files
2020-08-29 16:41:27 +02:00
fipwmaqzufheoxq92ebc
b7d1b21f1d
[WIP] Implemented basic permissions ( #960 )
...
* Add permissions to Database & add "User"-classes
* Add UI & API for Permissions, protect "User"-(Api)-Controller with new permissions.
* Add some permissions.
* Add permission localization
* Add error handling.
* Error pages: only redirect on 404
* ExceptionController: return JSON-Response on api-routes
* Rename PRODUCT_ADD to PRODUCT_PURCHASE
* Move translation to new file
* Fix checkboxes stay selected on reload.
* Remove configurable User-implementation
* Remove MASTER_DATA_READ
* Disable buttons the user isn't allowed to use.
* Add default permissions for new users
* When migration to permissions, everyone starts as ADMIN
* Permission-Localization: add to transifex & LocalizationService
* Review
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-29 12:05:32 +02:00
Bernd Bestel
f28697e5b4
Added a "Clear filter" button on the stock overview page ( closes #879 )
2020-08-25 20:20:51 +02:00
Bernd Bestel
0417b73cb5
Show if a consume booking was spoiled on the stock journal page ( closes #953 )
2020-08-25 19:51:54 +02:00
Bernd Bestel
71a6cbef2d
First try on stock overview page: Make filter row more compact
2020-08-25 19:45:54 +02:00
Bernd Bestel
471a8665d0
Remove the new help icons where not needed and translate help text
2020-08-25 19:28:44 +02:00
Bernd Bestel
3b564294e3
Allow decimal amounts in general for the shopping list
2020-08-24 20:25:50 +02:00
Bernd Bestel
2c151fb4de
Do an exact search for product group and location filters on the stock overview pages ( fixes #778 )
2020-08-24 17:57:43 +02:00
Bernd Bestel
e039db22f5
Don't prefill for empty prices when editing a stock entry ( fixes #961 )
2020-08-24 17:42:41 +02:00
Bernd Bestel
a6db08943c
Streamline naming
2020-08-22 19:09:36 +02:00
Bernd Bestel
cf9bb87f6e
Upgraded to Quagga2 (again) ( closes #799 , also references #844 )
2020-08-19 20:04:17 +02:00
fipwmaqzufheoxq92ebc
d60d981fd1
Refactor Authentication and add proxy-authentication ( #921 )
...
* Refactor Authentication-Middlewares
* Add Proxy-Authentication
* Disable "Logout" & "Manage Users" when using ProxyAuth
* Review
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-19 19:23:13 +02:00
fipwmaqzufheoxq92ebc
42dc55625a
Improve Performance ( #927 )
...
* Stock-Overview: Reduce amount of database queries and FindObjectInArray()-calls
* Speed-up stock_current by improving products_resolved and creating indices.
* Review
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-18 19:23:37 +02:00
duck
7e276289e0
WIP: Fix typo on "Consumed Amount" localization string ( #880 )
...
* Fix typo on localization string in strings.pot
Should be "Consumed Amount"
* Remove typo Consumed Amount string in locationcontentsheet template
2020-08-18 18:28:39 +02:00
kriddles
e8845fe2e8
Qu factor purchase to stock & Product Barcode Details ( #801 )
...
* Puchase add qu_factor_to_stock
* qu_factor_purchase_to_stock for stock edit
* product barcodes with QU and Stores
* remove product barcode tags
* migrations/0103 add value and factor_puchase_amount to stock_current and stock_current_location_content
* Remove unused method
* StockService#GetProductDetails: include stock_value
* productcard: include stock_value
* Add Purchase Factor to Stock Overview
* update demo data with stock qu_factor_purchase_to_stock
* recipes_pos_resolved update
* avg_price and oldest_price in product details
* add average price to product card
* hint for recipe costs not included if not in stock
* Round value and factor_purchas_amount. Include currency for stock value
* Add factor_purchase_amount to product card stock amount
* Allow editing qu_factor_purchase_to_stock for stock entries
* fix update qu_factor_purchase_to_stock for Transfers
* Add barcode to existing product update to add to product_barcodes table
* Add barcode to new product workflow update to add to product_barcodes table
* *** Price now saved as 1 QU to stock in stock tables ***
* remove column product barcode and use product_barcodes
* Allow products to be deactivated instead of deleted
* Embedded barcode and qu-conversion with page reload on change
* Save current product barcode into new product_barcodes table
* Embedded popup for product group add/edit
* barcode scanner added to product barcodes input
* Edit product qu_stock is unavailable after first purchase
* StockOverview: Filters break when columns are reordered so for now just disable colReorder
* view stockoverview.blade: display product_group column
* Review
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-17 21:47:33 +02:00
Germs2004
f25902214f
Change ellipsis to dash ( #826 )
...
An ellipsis in software often implies that the element is clickable to get more information. Changing that to a simple dash symbol makes it more clear that the value is simply undefined and is not a clickable element.
2020-05-03 20:25:27 +02:00
kriddles
45c14723b0
Fix Product Shopping Location Prefill for Edits ( #796 )
2020-04-26 17:28:02 +02:00
Bernd Bestel
37054475c2
Little adjustments and changelog for #795
2020-04-24 18:06:57 +02:00
Bernd Bestel
9e824e1845
Little adjustments and changelog for #788
2020-04-24 17:51:48 +02:00
Zack Arnett
f076b0d0c6
Recipe updates ( #795 )
2020-04-24 17:41:57 +02:00
kriddles
385e7287fe
Create Inverse QU Conversions ( #788 )
2020-04-24 17:41:50 +02:00
kriddles
9a921cfc86
Purchase Price Hints ( #767 )
...
* productcard update last price with per qu purchase name
* Purchase price hints
* purchase set default to 2999-12-31 if not best before date tracking
* purchase- move amount above best buy date and focus amount after product selection
2020-04-22 17:38:24 +02:00
Zack Arnett
7fb76df33a
Recipe Pages UI updates ( #776 )
...
* Recipe updates
* Add help text icon
2020-04-21 08:18:09 +02:00
Zack Arnett
4629df17b4
Cosmetic Update ( #753 )
...
* UI changes
* New (header) style was missing on some pages
* Added/changed new localization strings
* Unify page titles / apply .title class everywhere
* Reduce spacing below page title
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-04-19 14:51:02 +02:00
Bernd Bestel
b4a480aa37
Downgrade / use QuggaJS again instead of Quagga2 ( fixes #749 )
2020-04-17 19:48:11 +02:00
Bernd Bestel
71770540f6
Fixed stock overview page did not load when GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING is disabled (references #673 )
2020-04-13 21:56:24 +02:00
Bernd Bestel
6f4769a7b3
Make product groups on the shopping list collapsible ( closes #604 )
2020-04-13 19:11:13 +02:00
Bernd Bestel
1390c65864
Show optionally an icon on the stock overview page if the product is already on the shopping list ( closes #708 )
2020-04-13 18:47:41 +02:00
Bernd Bestel
840b35b30d
Add tooltips to shopping list item buttons ( closes #572 )
2020-04-13 18:26:53 +02:00
Bernd Bestel
886721e972
Fixed consuming tare weight handling enabled products from the stock overview page ( fixes #731 )
2020-04-13 17:29:00 +02:00
Bernd Bestel
858315ed3f
Added DataTables accent neutralise plugin ( closes #654 )
2020-04-13 16:27:02 +02:00
Bernd Bestel
45d96cb60f
Use Quagga2 instead of QuaggaJS ( closes #579 )
2020-04-13 16:08:46 +02:00
Bernd Bestel
10f890ef89
Added a camera-barcode-scanner-button to the barcodes field on the product edit page ( closes #723 )
2020-04-13 15:55:27 +02:00
Bernd Bestel
5b314351dd
Don't show disabled product options ( fixes #724 )
2020-04-12 15:59:08 +02:00
Bernd Bestel
d907bca3cb
Include userfields when printing a shopping list ( fixes #719 )
2020-04-12 14:39:11 +02:00
Bernd Bestel
0f3a3887a2
Fixed that best before dates were displayed on the stock overview and stock entries page even with disabled GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING ( fixes #673 )
2020-04-12 14:17:52 +02:00
Bernd Bestel
390af436ab
Fixed that the stock entries page was broken when there were product userfields defined with enabled "Show as column in tables" ( fixes #677 )
2020-04-12 14:13:28 +02:00
Bernd Bestel
6867057b6e
Clarify button tooltips on the stock entries page ( closes #621 )
2020-04-12 14:02:24 +02:00
kriddles
2fee4b45ff
set default store for product, purchase set last store purchased if available or use product default ( #672 )
2020-03-27 19:27:40 +01:00
Mik-
f3b504b7de
Optionally use number pad input in best-before-date fields on mobile Chrome ( #657 )
...
* Add missing translation for de
* Add option to set best-before-date field input-type to number
This allows faster input in mobile devices
* Fix datetimepicker with inputmode
* Fix datatimepicker with numeric input
* Add missing translation for de
* Add option to set best-before-date field input-type to number
This allows faster input in mobile devices
* Fix datetimepicker with inputmode
* Fix datatimepicker with numeric input
* Use more precise name for number pad option
* Update localization/de/strings.po
Co-Authored-By: Bernd Bestel <bernd@berrnd.de>
* Fix merge conflict
* Fix merge conflict try 2
Co-authored-by: Michael Neuendorf <neuendorf@gonicus.de>
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-03-25 20:26:54 +01:00
Bernd Bestel
305f5b67e4
Name shopping locations "Stores" on the frontend (references #658 )
2020-03-25 20:09:28 +01:00
Bernd Bestel
5214a775ed
Fix stock entries page rendering problem when FEATURE_FLAG_STOCK_PRICE_TRACKING is set to false (references #658 )
2020-03-25 20:02:59 +01:00
Bernd Bestel
2d00f6f84a
Immediately show the changed shopping location after edit on the stock entries page (references #658 )
2020-03-25 20:00:52 +01:00
Bernd Bestel
06f65594de
Fix stock entries page error when there is no shopping location (references #658 )
2020-03-25 19:53:00 +01:00
Immae
a45317aea1
Add shopping location for price tracking ( #658 )
2020-03-25 19:34:56 +01:00
Mik-
71b62d5708
629 Make ellipsis menu in stock overview more responsive ( #633 )
...
* Make popup menues in table rows responsive
* Move "consum all" button to ellipsis menu on small devices
2020-03-21 15:52:51 +01:00
zebardy
1a5f3ce926
Convert services to singletons and use lazy loading to improve performance ( #479 )
...
* use singletons to reduce need to recreate the same objects
* unable to make the constructor private
* comment out debug printing to log file
* correct typo of treating self() as a var instead of a function
* utilise Localisation service as a singleton
* fix errent line that should have been commented
* remove phpinfo
* correct mistake in stock controller
* try storing app in apcu
* serialise inside the app closures
* get timings for db-changed-time
* get timings for db-changed-time
* store localisation service in apcu
* stor translations in apcu instead of localisation service (due to database connection)
* correct syntax error
* forgot to uncomment instance map
* correct indentation and variable out of scope
* more timings for app execution time
* try apc caching for views
* correct scope for Pot variable
* remove additional fopen
* correct timings for app build time
* correct timings for app object build time
* correct timings for app route build time
* get timings for routing timings
* get more in depth timings for routing loading
* fix more in depth timings for routing loading
* start investigating session auth middleware creation
* start investigating session auth middleware creation
* start investigating Login controller time
* start investigating Login controller time
* in depth look at Logincontroller timings
* comment out debug printing
* lazily obtain valus for page rendering
* correct syntax error
* correct scope of variable
* correct visibiity of methds inherited from BaseController
* missing use for Userfieldsservice
* lazy loading of open api spec
* lazy loading of users service
* lazy loading of batteries service
* lazy loading of services in controllers
* lazy loading of services in services
* correct mistake
* fix userservice
* fix userservice
* fix userfieldservice
* fix chores service
* fix calendar service
* remove Dockerfile used for development
* Remove docker compose file used for development
* Clean up app.php
* remove last diff
* Clean up base controller
* Clean up controllers
* lean up middleware
* Clean up and tuen all services into singletons
* remove debug from routes.php
* remove acpu from localisation
* Complete removal of acpu from localisation
* fixes for things broken
* More fixes following merge
* Fix for start up bug. Re factoring singleton code had brroken due to scope of clas var.
* fix bug where getUsersService is declared twice
* bug fixes following merge
* bug fixes following merge
* bug fixes following merge
* bug fixes following merge
* bug fixes following merge
* Fix all the not working things...
* Deleted off-topic files
* Deleted off-topic files
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-03-01 17:47:47 +01:00
Bernd Bestel
d56aebc9b8
Don't crash when @stack['componentScripts'] is empty and properly format the output
2020-02-10 21:20:21 +01:00
Bernd Bestel
c266b53ff1
Added an ugly hack to prevent including the same component JS file multiple times
2020-02-10 20:21:52 +01:00
Bernd Bestel
a32206834b
Make product card recipe ingredient indentation dynamic (references #556 )
2020-02-10 19:30:49 +01:00
Bernd Bestel
aa787e765e
Changelog, small changes and added missing localization strings for #556
2020-02-10 18:24:15 +01:00
kriddles
c5f38689fa
Include product_group in recipe ingredient list ( #556 )
...
* Include product_group in recipe ingredient list
* Delete 0098.sql
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-02-10 18:04:57 +01:00
Bernd Bestel
472c083bca
Little changes, changelog and added missing localization strings for #555
2020-02-09 21:16:47 +01:00
kriddles
7be2d94cf7
View base servings on recipecard ( #555 )
2020-02-09 21:08:11 +01:00
Bernd Bestel
0359003e09
Little changes for #551
2020-02-09 15:36:03 +01:00
Bernd Bestel
a5277224f5
Reworked recipe card ( fixes #543 )
2020-02-04 19:48:00 +01:00
Bernd Bestel
fcfe62f4d3
Further optimize spacing to waste less space
2020-02-03 21:45:15 +01:00
Bernd Bestel
171d6af5e1
We don't need that switch-button, a native Boostrap button is enough and less disturbing
2020-02-03 21:21:42 +01:00
Bernd Bestel
b9e32a9795
Fixed contextual time ago display was missing (references #513 )
2020-02-02 17:55:35 +01:00
Bernd Bestel
9e519e0841
Annotate variable ingredient amounts ( closes #530 )
2020-02-02 17:26:32 +01:00
Bernd Bestel
ba1272ced8
Made the navbar a little smaller
2020-02-02 17:16:02 +01:00
Bernd Bestel
3ca6982c39
Don't show and use scan mode in embedded mode (dialogs)
2020-02-02 13:13:18 +01:00
Bernd Bestel
890663bf63
Fixed the "Shopping list to stock workflow" with disabled FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING ( fixes #537 )
2020-02-02 13:01:31 +01:00
Bernd Bestel
5effa0c103
Fixed recipeposform edit when "Only check if a single unit is in stock" is set (again closes #535 )
2020-02-02 12:33:48 +01:00
Bernd Bestel
23efe0c87a
Added an option to hide the calendar on the shopping list ( closes #531 )
2020-02-01 12:55:12 +01:00
Bernd Bestel
683ea0984c
Further optimized shopping list compact view (references #453 )
2020-02-01 12:35:06 +01:00
Bernd Bestel
55c5501d96
Optimized recipeposform input ordering ( closes #533 )
2020-02-01 08:59:37 +01:00
Bernd Bestel
b8c6ac6905
Fixed location_id handling when FEATURE_FLAG_STOCK_LOCATION_TRACKING is disabled ( fixes #532 )
2020-01-31 21:27:51 +01:00
Bernd Bestel
72e18ed0a4
Show the shopping list notes field in compact view (references #453 )
2020-01-31 17:58:47 +01:00
Bernd Bestel
6d4a15d372
Improve shopping list compact view (references #453 )
2020-01-31 17:52:03 +01:00
Bernd Bestel
8d490351d0
Replaced jQuery UI by Animate.css (better, faster, lighter)
2020-01-28 19:27:18 +01:00
kriddles
6f549bdf3a
Battery fix ( #519 )
...
* bugfix variable name
* Typo: curent->current
2020-01-28 08:44:25 +01:00
Bernd Bestel
a64b35e9d4
Made the sidebar menu items a little smaller
2020-01-27 22:34:48 +01:00
Bernd Bestel
0c0604c693
Properly space/divide userentities in the newly arranged sidebar
2020-01-27 20:22:49 +01:00
Bernd Bestel
4c1c971f6d
Rename /stockedit and /stockdetail to match the "naming conventions" (references #421 )
2020-01-27 19:19:09 +01:00
Bernd Bestel
05aceb72ae
Squashed commit
...
- Only refresh contextual number/datetime info/formatting where needed (closes #513 )
- Also refresh correlated stock journal entries on undo (closes #471 )
- Prefill "New amount" with the current stock amount on the inventory page (closes #434 )
- Ensure that the location_id of the stock and stock_log tables is never empty after migration 95 (references #421 )
- Load initial values of the /stockedit form server side to improve loading performance (references #421 )
- Use more or less the same input ordering as on the purchase page for the /stockedit page (references #421 )
- Also display the "Compact view" button on the shopping list page when FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS is disabled (references #453 )
- Ensure that the currently active sidebar menu item is visible
- Optimized sidebar menu item grouping/spacing
- Properly order the API documentation route groups and put the "by-barcode" routes into a separate group
- Updated dependencies
- Pulled translations from Transifex
- Prepared changelog for next release
2020-01-27 19:00:49 +01:00
Bernd Bestel
2764bb680c
Changed some localization strings
2020-01-26 20:13:15 +01:00
Bernd Bestel
71a57c9dcb
Implement "Free products" ( closes #426 )
2020-01-26 20:01:30 +01:00
Bernd Bestel
bad19721db
Make the scan mode switch-buttons a little bigger
2020-01-26 15:44:09 +01:00
Bernd Bestel
c7bcb9984a
Implemented "Scan mode"
2020-01-26 15:35:01 +01:00
Bernd Bestel
0ef9b2fdb7
Added a new setting to be able to start the meal plan on a different weekday ( closes #429 )
2020-01-25 20:01:40 +01:00
Bernd Bestel
e111d07f4e
Added the ability to directly add products to the meal plan ( closes #450 )
2020-01-25 11:51:00 +01:00
Bernd Bestel
061f4da041
Don't try to switch twice to shopping list compact mode on mobile (references #453 )
2020-01-25 08:49:17 +01:00
Bernd Bestel
3cbeea7d95
Added an option to filter for only undone items on the shopping list ( closes #452 )
2020-01-24 22:26:36 +01:00
Bernd Bestel
ad54253d72
Added a compact view for shopping list (for mobile shopping) ( closes #453 )
2020-01-24 22:05:08 +01:00
Bernd Bestel
fd5a72264d
Meal plan recipe and notes also fit into one table (references #477 )
2020-01-23 21:57:47 +01:00
Bernd Bestel
8d7f985b59
Make it possible to add notes to meal plan (days) ( closes #477 )
2020-01-23 20:59:19 +01:00
Bernd Bestel
594dc0858b
Make sure that Grocy.CurrentUrlRelative is set without the query string ( fixes #509 )
2020-01-23 20:12:38 +01:00
Bernd Bestel
99d4b05a3c
Make purchased date on /stockedit editable / Dirty workaround for 2 datetimepickers on the same page (references #506 )
2020-01-23 18:58:05 +01:00
kriddles
ef9f28d154
421 ( #507 )
...
* refactor to be stock/entry/{entryId}
* Allow recipeform add productworkflow
* on document ready stockdetail filter based on ProductPicker
* openDate fixes for undo
* RefreshStockDetailRow refresh location-id
2020-01-22 21:08:49 +01:00
Bernd Bestel
6f035fd64d
Allow decimal numbers for the kcal field ( closes #492 )
2020-01-21 21:31:42 +01:00
Bernd Bestel
0816359867
Some refinements for #501
2020-01-21 20:45:34 +01:00
kriddles
3a36bdaf45
recipes can create products ( #501 )
2020-01-21 20:20:26 +01:00
Bernd Bestel
f543a3a472
Fixed and optimized some things related to #421 (& some more cleanup)
2020-01-21 17:30:09 +01:00
kriddles
2a608c41e9
Stock detail updates ( #493 )
...
* Fix spelling
* stockdetail refresh with location name
* Stock updates
* change stock_row_id to id
* fix stockdetail refresh rows after clicking undo
* fix stockdetail consume spoiled
2020-01-17 17:54:34 +01:00
Bernd Bestel
d4bec3bd10
Added a "keep screen on" option using NoSleep.js ( closes #427 )
2020-01-05 10:03:02 +01:00
Bernd Bestel
0be672aa48
Fixed that when FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS was set to false, the shopping list appeared empty after some actions ( fixes #428 )
2020-01-03 13:35:48 +01:00
kriddles
36e8484046
Recipe form updates ( #476 )
...
* recipePosForm - hide when embeded productcard
* recipeposform: remove prefillByName for productPicker
* recipeform add data-product-id
* recipeposform cleanup extra clicks
* recipeform: bootbox the recipe pos edit button
* recipeform: bootbox the recipe pos add button
* recipeposform postMessage back
* recipeform reload if IngredientsChanged
* Fix page reload for new recipes (URL = /recipe/new)
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2019-12-21 12:36:02 +01:00
Bernd Bestel
d617a72397
Again small localization string changes (references #421 )
2019-12-19 20:03:27 +01:00
kriddles
6c7420ea08
Stock Service Updates ( #421 )
...
* viewjs consume: implement location and update stock specific
* Transfer Products
* services StockService#GetProductStockEntriesByLocation: add method
* services StockService#AddProduct: check for stock and locations
* services StockService: include location_id
* services StockService#LocationExists: add method
* services StockService#UndoBooking: fix based on stockRow
* Reimplement StockServer->TransferProduct (one loop for the whole action to preserve stock_id)
* Ensure that the location_id is never NULL in the stock and stock_log table (checked by an INSERT trigger, sets the products default location if empty)
* Only consider stock amount at the given location on consume, if supplied
* Restore more/old display text for "specific stock entry"
* Don't allow transfering tare weight enabled products
* Various small changes (code style, missing OpenAPI endpoint, remove location_id null checking)
* Updated translations strings
* Added transaction_id and correlation_id to stock_log entries to group them together
* ProductCard - location to default location label change
* Also undo correlated bookings on undo
* Added API endpoints for listing and undoing transactions and use them on purchase/consume/inventory/stockoverview
* Initial Stock detail page
* Allow Undo for Tranfers
* Price step to .01
* Some localization string changes & fixes
2019-12-19 19:48:36 +01:00
Lewis Juggins
9ba66aeac2
Rename location to "Default location" on product page ( #416 )
...
* Rename location to default location on product page
* Move resource
2019-10-12 14:27:15 +02:00
Bernd Bestel
3328c789d4
Fixed that the meal plan menu item was not visible when the calendar was disabled (through feature flags) ( closes #415 )
2019-10-12 10:35:47 +02:00
Bernd Bestel
700db9ae00
Added a new sub feature flag FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS
2019-10-05 13:10:56 +02:00
Bernd Bestel
ba6bfa6a2c
Added a chore period type "yearly" ( closes #407 )
2019-10-04 11:24:51 +02:00
Bernd Bestel
28b23fd313
Implemented chore period intervals to have more flexible schedules ( closes #312 )
2019-10-04 11:14:11 +02:00
Bernd Bestel
420e4b933f
Don't display QU conversions for other products on the product edit page ( fixes #400 )
2019-10-02 15:53:36 +02:00
Bernd Bestel
95208f5582
Updated unmanaged dependencies (font)
2019-09-28 08:53:59 +02:00
Bernd Bestel
dea2ffeaaf
Added a "clear" button above the new notes field on the shopping list page
2019-09-28 08:48:58 +02:00
Bernd Bestel
1b9a3c7f57
Fix that the barcode scanner start button overlaps everything
2019-09-27 17:03:50 +02:00
Bernd Bestel
2636456461
Show the journal of the product/chore/battery cards in a dialog
2019-09-27 16:54:40 +02:00
Bernd Bestel
81f6b58fe4
Added a button to jump to the journal on the product/chore/battery card
2019-09-27 14:19:06 +02:00
Bernd Bestel
765f908966
Make it possible to provide the purchase price also as a total price ( closes #390 )
2019-09-27 13:50:16 +02:00
Bernd Bestel
9527305311
Userobjects list page print optimizations ( closes #396 )
2019-09-27 13:23:10 +02:00
DeeeeLAN
6522aca30e
Fixed navigation menu and full screen recipe smooth scrolling on iOS ( #397 )
...
* fixed barcode button on iOS and made nicer on the desktop
* fixed indentation
* fixed indentation
* fixed recipe ingredient layout issue in safari
* fixed navigation menu and full screen recipe smooth scrolling on iOS
2019-09-27 08:33:08 +02:00
Bernd Bestel
e59a35c6d1
Also refresh the parent product on sub product actions on the stock overview page ( closes #394 )
2019-09-27 08:30:08 +02:00
Bernd Bestel
cf2e6f1039
Added a sub feature flag to disable chore assignments when not needed
2019-09-26 17:20:25 +02:00
Bernd Bestel
21503c26d2
Use properly formatted numbers "everywhere" (partly references #389 )
2019-09-26 15:25:30 +02:00
Bernd Bestel
a2b6d9ae39
Various small UI refinements
2019-09-26 13:14:24 +02:00
Bernd Bestel
2809cc1454
Typo...
2019-09-26 12:45:35 +02:00
Bernd Bestel
828ab8eba0
Allow accumulating min. stock amounts on parent product level ( closes #384 )
2019-09-26 10:36:49 +02:00
DeeeeLAN
c0d79b1518
Fixed #378 ( #380 )
...
* fixed barcode button on iOS and made nicer on the desktop
* fixed indentation
* fixed indentation
2019-09-25 09:00:36 +02:00
Bernd Bestel
5351828e79
Reuse existing shopping list items when adding products from the stock overview page ( closes #375 )
2019-09-24 18:27:50 +02:00
Bernd Bestel
d8be254ff3
Link /barcodescannertesting page in settings menu
2019-09-24 10:43:10 +02:00
Bernd Bestel
50e829f270
Hide the recipe interaction buttons when displayed as a fullscreen card (as the dialogs would be behind the fullscreen card)
2019-09-24 10:28:42 +02:00
Bernd Bestel
099ac7e75a
Use exact matches for product barcode lookups ( closes #366 )
2019-09-24 09:52:05 +02:00
Bernd Bestel
6bb9d2c51d
Some little changes for pull request #369 (also references #367 )
2019-09-24 08:35:30 +02:00
Bernd Bestel
4c57bf8b9d
Always navigate back to the previous page after saving a product ( closes #364 )
2019-09-22 09:03:59 +02:00
Bernd Bestel
363dcf448e
Give the main page content section an id
2019-09-22 08:35:03 +02:00
Bernd Bestel
fc2a37d3fc
Typo...
2019-09-21 20:20:32 +02:00
Bernd Bestel
c32ea087df
Added a little barcode scanner testing page (references #362 )
2019-09-21 20:01:49 +02:00
Bernd Bestel
b57fd83cb8
Fixed various smaller problems after some testing
2019-09-21 13:08:42 +02:00
Bernd Bestel
ab44566890
Small style refinements
2019-09-21 08:38:28 +02:00
Bernd Bestel
d2a841143e
Don't show the sidebar on other menus on the login page
2019-09-21 08:28:08 +02:00
Bernd Bestel
d580990b25
Fixed JS errors on the login page
2019-09-21 08:25:32 +02:00
Bernd Bestel
78b658e86e
Also the product calories field is not required
2019-09-20 20:19:12 +02:00
Bernd Bestel
051cb816fe
Disabled CSS class was applied to calories product field by mistake
2019-09-20 20:17:54 +02:00
Bernd Bestel
91c275e66b
Slightly reordered the header of the shopping list page
2019-09-20 20:14:47 +02:00
Bernd Bestel
653098a81e
Improved product picture display on the productcard
2019-09-20 20:10:03 +02:00
Bernd Bestel
c228126c3a
Added a new field calories for products ( closes #268 )
2019-09-20 20:06:24 +02:00
Bernd Bestel
1ae5f552d1
Inventory is always possible, also when the produc is not in stock currently (references #327 )
2019-09-20 18:26:32 +02:00
Bernd Bestel
4754cc306a
Currently there are no multiple shopping lists output options, so no dropdown button needed (this now closes #245 )
2019-09-20 18:13:38 +02:00
Bernd Bestel
339a25d1e3
Added a notes field to shopping lists (references #245 )
2019-09-20 18:08:38 +02:00
Bernd Bestel
5a91c86b81
Added an option to print a shopping list (references #245 )
2019-09-20 17:40:45 +02:00
Bernd Bestel
a95d6be4f4
Added more product actions on the stock overview page ( closes #327 )
2019-09-20 13:37:53 +02:00
Bernd Bestel
9f8216378e
Only show the "Test plural forms"-button on the qu edit page when the current language requires more than 2 plural forms (references #261 )
2019-09-20 10:33:44 +02:00
Bernd Bestel
d4c76aaa76
Properly show qu plural forms on the product or qu conversion edit page
2019-09-20 10:30:46 +02:00
Bernd Bestel
aa670adefc
Added a say-thanks-button on the about page
2019-09-20 10:08:10 +02:00
Bernd Bestel
e720311572
Fixed hidden price_factor field in recipeposform.blade.php
2019-09-19 21:31:37 +02:00
Bernd Bestel
7c114cfec3
Implemented a price factor option for recipe ingredients ( closes #295 )
2019-09-19 21:30:24 +02:00
Bernd Bestel
412653d67d
Small Swagger UI refinements
2019-09-19 19:59:17 +02:00
Bernd Bestel
cbf1d1ca40
Implemented stock sub-feature-flags ( closes #314 )
2019-09-19 17:46:52 +02:00
Bernd Bestel
5e9a7fb7ca
Implemented browser barcode scanning ( closes #102 )
2019-09-19 12:48:02 +02:00
Bernd Bestel
9f18b75526
Auto focus the amount field on the qu plural form testing page (references #261 )
2019-09-18 20:27:35 +02:00
Bernd Bestel
346b589534
Make it possible to test quantity unit plural forms ( closes #261 )
2019-09-18 20:21:09 +02:00
Bernd Bestel
ce12202c86
Make it configurable if calendars shows week numbers or not ( closes #333 )
2019-09-18 18:30:25 +02:00
Bernd Bestel
2522b3748c
Just name it "fields" not "userfields" for custom objects (references #242 )
2019-09-18 16:25:38 +02:00
Bernd Bestel
096fb7a116
Implement custom entities / objects ( closes #242 )
2019-09-18 16:18:15 +02:00
Bernd Bestel
918f84f568
Lazy load all images to increase page load times (references #275 )
2019-09-18 13:59:37 +02:00
Bernd Bestel
d209c0bd22
Automatically downscale pictures to reduce page loading times ( closes #275 )
2019-09-18 11:04:59 +02:00
Bernd Bestel
3df44697bf
Implemented the option to automatically consume a product on tracking a chore execution ( closes #279 )
2019-09-18 10:02:52 +02:00
Bernd Bestel
9b5f3ba7b8
Render product Userfields also on the shopping list (this now closes #258 )
2019-09-17 19:39:55 +02:00
Bernd Bestel
0fa0138972
Implemented new Userfield type "Link" (references #258 )
2019-09-17 19:33:06 +02:00
Bernd Bestel
0c27157db6
Implemented new Userfield type "Select list" ( closes #325 )
2019-09-17 19:11:06 +02:00
Bernd Bestel
4dd804003b
Re-apply filter after chore execution on the chores overview page
2019-09-17 17:17:33 +02:00
Bernd Bestel
182d063886
Fixed user filter button on chores overview page (references #253 )
2019-09-17 16:58:42 +02:00
Bernd Bestel
bc487b4867
Make it possible to also filter by chore assignments on the chore overview page (references #253 )
2019-09-17 16:50:29 +02:00
Bernd Bestel
597a9e3d21
Show aggregated product amounts also on the productcard (references #196 )
2019-09-17 16:18:00 +02:00
Bernd Bestel
74f9470769
Implemented that chores can be assigned to users ( closes #253 )
2019-09-17 13:13:26 +02:00
Bernd Bestel
3dcd513094
Fixed new translation strings
2019-09-16 11:02:03 +02:00
Bernd Bestel
a799f2b43f
Finished qu unit conversion handling ( closes #177 )
2019-09-16 09:35:20 +02:00
Bernd Bestel
c532a67884
Started working on qu unit conversion handling (references #177 )
2019-09-15 17:06:52 +02:00
Bernd Bestel
6094096675
Started working on qu unit conversion handling (references #177 )
2019-09-15 16:40:54 +02:00
Bernd Bestel
a0a0e104b0
Implemented product variations ( closes #196 )
2019-09-14 17:34:36 +02:00
Bernd Bestel
f9036f0248
Use the summernote editor for product description ( closes #288 )
2019-08-15 14:35:28 +02:00
Bernd Bestel
257dd644aa
Render checkbox Userfields in tables as checkmark ( closes #326 )
2019-08-15 14:05:33 +02:00
Bernd Bestel
7004cf4400
Finished the implementation of "Location Content Sheet" ( closes #341 )
2019-08-11 09:24:47 +02:00
Bernd Bestel
28716ed96c
First draft for printable location content sheets (references #341 )
2019-08-10 16:34:29 +02:00
Bernd Bestel
e6020432c6
Add chores due date rollover ( closes #340 )
2019-08-10 12:44:09 +02:00
Oncleben31
b61d569247
Use list title when display a used filed form
...
To replace the default string `Product group`
2019-07-13 01:34:57 +02:00
Bernd Bestel
6e3407b157
Always show "Track date only" shore execution times without the time part
2019-07-07 19:38:57 +02:00
Bernd Bestel
52dd01f313
Fixed that a string was never translated
2019-07-07 09:29:04 +02:00
Bernd Bestel
b4d2e2a20a
Added the possibility to undo a task ( closes #252 )
2019-07-06 20:34:01 +02:00
Bernd Bestel
914dde4609
Added a new config.php setting CALENDAR_FIRST_DAY_OF_WEEK to be able to change the first day of a week used for calendar views ( closes #256 )
2019-07-06 20:19:21 +02:00
Bernd Bestel
1eb1aa8b11
Added a "consume this recipe"-button to the meal plan (and also a button to consume all recipes for a whole week) ( closes #283 )
2019-07-06 20:02:40 +02:00
Bernd Bestel
8c205941c7
Added that products can now also be consumed as spoiled from the stock overview page (option in the more/context menu per line) ( closes #251 )
2019-07-06 18:15:53 +02:00
Bernd Bestel
b24683f954
Added the possibility to mark a shopping list item as "done" ( closes #257 )
2019-07-06 17:56:59 +02:00
Bernd Bestel
e4d26bb8fd
Make it possible to switch shopping list items between shopping lists ( closes #284 )
2019-07-06 17:31:17 +02:00
Bernd Bestel
0c0e8c6957
Fixed the consume success message on stock overview page ( fixes #302 )
2019-07-06 13:13:38 +02:00
Bernd Bestel
8f9c3c66f7
Don't load userfieldsform.js when not needed
2019-05-16 22:14:04 +02:00
Bernd Bestel
338c6c0a9d
Added a new userfield type "preset-list" ( closes #239 )
2019-05-07 21:24:59 +02:00
Bernd Bestel
8504eb9b38
Finished first version of meal planning (for now closes #146 )
2019-05-07 19:48:14 +02:00
Bernd Bestel
57233dba1a
Added first basic version of meal planning (references #146 )
2019-05-06 19:38:47 +02:00
Bernd Bestel
dd148a8fc3
Use named arguments for all gettext strings which have more than 1 argument (again closes #161 )
2019-05-05 14:13:50 +02:00
Bernd Bestel
9ef55f1f01
Make it possible to track a chore execution without the time part, only the day
2019-05-04 16:13:05 +02:00
Bernd Bestel
98fcd767b3
Fixed chore edit form - period type hint did not work (references #151 )
2019-05-04 15:40:26 +02:00
Bernd Bestel
328d96ed60
Only show plural forms text field on quantity unit edit page when the current language has more than 2 plural forms to prevent confusion (references #161 )
2019-05-04 15:15:03 +02:00
Bernd Bestel
12ba99f649
Added "variable amount" for recipe ingredients ( closes #181 )
2019-05-04 14:50:15 +02:00
Bernd Bestel
0eb974bd92
Make it possible to customize the default amount for purchase/consume ( closes #215 )
2019-05-04 13:19:34 +02:00
Bernd Bestel
bcd6dd4b20
Forgot to save a file on the last commit...
2019-05-03 22:18:24 +02:00
Bernd Bestel
6cecb2ca7b
Make it possible to enter up to 4 decimal places for price fields (this now closes #225 )
2019-05-03 22:15:30 +02:00
Bernd Bestel
bcae9f9292
Added price field on inventory page (for added products) (references #225 )
2019-05-03 22:11:20 +02:00
Bernd Bestel
8138dd43ac
Added barcode as a column to master data / products page ( closes #234 )
2019-05-03 21:41:31 +02:00
Bernd Bestel
4c2cf4944d
Added a feature flag to also be able to hide all stock related UI elements and routes ( closes #228 )
2019-05-03 20:03:04 +02:00
Bernd Bestel
bd296f8fe1
Fixed a problem where the current stock fulfillment amount is not correctly displayed (references #161 )
2019-05-03 19:51:08 +02:00
Bernd Bestel
24680154d8
Properly display/round recipe ingredients amounts ( closes #230 )
2019-05-03 19:36:27 +02:00
Bernd Bestel
dae5bb2b34
Make it possible to filter recipes by stock availability ( closes #231 )
2019-05-03 19:22:58 +02:00
Bernd Bestel
595171afa5
Properly show and handle that the new amount during inventory cannot equal the current stock amount (this now closes #224 )
2019-05-03 19:08:54 +02:00
Bernd Bestel
3cf8ebeb89
Fixed product picker workflow URLs were wrong when running grocy in a subdirectory and with disabled URL rewriting (again fixes #219 )
2019-05-02 21:33:59 +02:00
Bernd Bestel
4912dd56d1
Finished migration to use gettext (this now closes #161 )
2019-05-02 20:20:18 +02:00
Bernd Bestel
9b2dba2397
Migrated (hopefully) all translations to PO/Gettext (references #161 )
2019-05-01 20:19:18 +02:00
Bernd Bestel
b6b8c76d3a
Fixed product picker workflows URLs were wrong when running grocy in a subdirectory ( fixes #219 )
2019-04-27 15:17:55 +02:00
Bernd Bestel
c5993ad994
Finalize user-defined-fields ( closes #176 )
2019-04-23 09:06:18 +02:00
Bernd Bestel
fc11da3c3f
Started working on user-defined-fields for all entities (references #176 )
2019-04-22 22:16:35 +02:00
Bernd Bestel
77f3b80540
Implemented daily/weekly/monthly recurrence patterns for chores ( closes #151 )
2019-04-22 14:01:31 +02:00
Bernd Bestel
d72fe69a17
Show more info in product card ( closes #173 )
2019-04-22 10:11:58 +02:00
Bernd Bestel
49d16b458d
Added missing localization strings
2019-04-20 19:25:59 +02:00
Bernd Bestel
cdd02efcc6
Implemented multiple/named shopping lists ( closes #190 )
2019-04-20 17:04:40 +02:00
Bernd Bestel
c1674d33b4
Make "next X days" configurable ( closes #175 )
2019-04-20 15:30:45 +02:00
Bernd Bestel
fa6f09679f
Made "Disable stock fulfillment checking for this ingredient" a default option per product ( closes #182 )
2019-04-06 15:42:40 +02:00
Bernd Bestel
0496ae9e00
Added an info for product-add-workflows ( closes #192 )
2019-04-06 15:15:20 +02:00
Bernd Bestel
b6e80580ed
Make it possible to provide a different location for added product during inventory ( closes #183 )
2019-04-05 21:26:44 +02:00
Bernd Bestel
886e272c03
Show product count per group on the product groups page and added a link to the products page filtered by the current product group ( closes #174 )
2019-04-05 21:08:30 +02:00
Bernd Bestel
12082b52ab
Fixed differences in highlighting for expiring/expired items in header vs table on stock overview page ( fixes #198 )
2019-04-05 18:41:21 +02:00
Bernd Bestel
2d3df2024a
Fixed "Mark as open" button is disabled on stock overview page when current stock amount == 1 ( fixes #197 )
2019-04-05 18:01:21 +02:00
Bernd Bestel
bfcd05473a
Allow best before date on purchase/inventory to be today or in the past, but display a hint when so ( closes #172 )
2019-03-10 16:02:13 +01:00
Bernd Bestel
3d485d4850
Fixed datetimepicker had no validation message displayed (references #172 )
2019-03-10 15:40:19 +01:00
Bernd Bestel
27ba2bfd55
Fixed display errors when consuming partial amounts from stock overview page ( fixes #170 )
2019-03-10 14:10:25 +01:00
Bernd Bestel
cd0ca4a67c
Prepared next release
2019-03-09 16:42:46 +01:00
Bernd Bestel
6de4b120b3
Include changelog as markdown files and show it in the about dialog
2019-03-09 15:54:16 +01:00
Bernd Bestel
bd483ec8b0
Added a context menu to all stock overview page items
2019-03-09 13:11:50 +01:00
Bernd Bestel
a3d4fd834f
Added a small right border to separate button columns in all tables better
2019-03-09 10:49:26 +01:00
Bernd Bestel
0f03420808
Removed unnecessary table column heading for button columns
2019-03-09 10:40:38 +01:00
Bernd Bestel
ba319dc6f1
Fixed equipment page edit/delete button icons were not visible
2019-03-08 22:22:05 +01:00
Bernd Bestel
c10890205c
Don't load not existing / not need localization JS files (this now closes #165 )
2019-03-08 22:18:42 +01:00
Bernd Bestel
643f6272e4
Fixed file name case sensitivity issue with tagmanager jQuery Plugin (references 165)
2019-03-08 22:13:47 +01:00
Bernd Bestel
9f36a599a4
Changed the about dialog slightly
2019-03-06 19:23:53 +01:00
Bernd Bestel
ff15e81abe
Fixed a rounding regarding stock amount comparison when a (scaled) recipe needs a decimal amount ( closes #164 )
2019-03-06 19:05:32 +01:00
Bernd Bestel
2d8ad24887
Implemented that included recipes can have a serving amount ( closes #163 and references #127 )
2019-03-05 23:45:04 +01:00
Bernd Bestel
fcdeda91d9
Show the iCal sharing link instead of directly open it (references #141 )
2019-03-05 19:36:14 +01:00
Bernd Bestel
4932b9c6d2
Improved recipe header display on small screens
2019-03-05 19:22:16 +01:00
Bernd Bestel
7f2942d414
Also filter gallery items when searching for recipes (references #147 )
2019-03-05 19:17:10 +01:00
Bernd Bestel
816eb03147
Added a "recipe gallery" view ( closes #147 )
2019-03-05 17:59:33 +01:00
Bernd Bestel
8504429f5f
Implemented tare weight handling ( closes #132 )
2019-03-05 17:51:50 +01:00
Bernd Bestel
90291fdbca
Added possibility to export the calendar in iCal format ( closes #141 )
2019-03-04 17:44:48 +01:00
Bernd Bestel
77b0bc675c
Varios small UI changes / improve UI consistency
2019-03-04 17:43:12 +01:00
Bernd Bestel
8020f92d6b
Track on consume for which recipe it was ( closes #64 and references #64 )
2019-03-03 18:20:06 +01:00
Bernd Bestel
38825c70da
Added missing translations strings & pulled translations from Transifex
2019-03-03 17:01:35 +01:00
Bernd Bestel
bb5daa5f8b
Display total cost of recipes based on last purchase prices ( closes #128 )
2019-03-03 16:33:48 +01:00
Bernd Bestel
8c11d0f15d
Add an option per recipe to not check against the shopping list when adding missing recipe ingredients, only against stock ( closes #154 )
2019-03-03 15:23:39 +01:00
Bernd Bestel
6f93da9b5f
Only list missing products in the "recipe put everything on the shopping list"-dialog (references #125 )
2019-03-03 14:57:36 +01:00
Bernd Bestel
e9ef7ea6d8
Allow recipe ingredients to be ignored when putting them on the shopping list ( closes #125 )
2019-03-03 14:49:46 +01:00
Bernd Bestel
89ad25c904
Implemented scalable recipes ( closes #127 )
2019-03-03 13:27:10 +01:00
Bernd Bestel
ee38d626aa
Added all application icon variants ( closes #159 )
2019-03-02 08:56:53 +01:00
Bernd Bestel
40b60bed85
Added apple-touch-icon tag (references #159 )
2019-03-01 22:37:15 +01:00
Bernd Bestel
b89643ddb1
Allow different locations per product in stock ( closes #124 )
...
Kind of basic for now, a different location can be set on purchase, the filters on the stock overview page handles different locations
2019-03-01 20:25:01 +01:00
Bernd Bestel
32e878afc9
Added feature flags to disable/hide parts not needed ( closes #157 )
...
grocy was initally about stock management, so this is always enabled, the rest can be disabled
2019-03-01 19:33:33 +01:00
Bernd Bestel
a3b2d03d68
Fixed datetimepicker only worked once when not selecting a date
...
References #143
Using a self-patched version of tempusdominus/bootstrap-4 for now, see 2cf725fed9tempusdominus/bootstrap-4#34
2019-02-09 14:44:37 +01:00
Bernd Bestel
01e9e3f5ce
Move about dialog into separate view and add API endpoint for system info
2019-02-09 13:41:40 +01:00
Bernd Bestel
ad09630dbe
Make it possible to add pictures to recipes ( closes #136 )
2019-01-26 20:06:01 +01:00
Bernd Bestel
dfc05e0bec
Allow optional partial units of products in stock ( closes #123 )
2019-01-26 14:17:02 +01:00
Bernd Bestel
eec3515b6d
Don't use a second hidden amount field for shopping list entries which were added by "Add missing products to shopping list" ( fixes #149 )
2019-01-26 13:09:01 +01:00
Bernd Bestel
276bc94cc6
More improvements on the REST API (references #139 )
2019-01-21 22:13:42 +01:00
Bernd Bestel
bfa59dd29c
Rework API to be more RESTful (references #139 )
2019-01-19 14:51:51 +01:00
Bernd Bestel
f6649d51bd
Finalize loading speed improvements for all data tables (this now closes #120 )
...
This is a workaround for now. The tables are still DOM sourced because of too big dependencies between server side rendering and frontend JS code. The tables are initially load while tbody is hidden, this results in a speedup by around 65 %.
2019-01-05 20:06:35 +01:00
Bernd Bestel
30e54997b2
Workaround to improve stock overview table loading time (references #120 )
2019-01-05 14:27:40 +01:00
Bernd Bestel
5c25e91984
Add possibility to skip items in "all shopping list items to stock workflow" ( closes #116 )
2018-11-26 20:02:01 +01:00
Bernd Bestel
c3731b3200
Sort recipes fulfillment column by amount of missing products ( closes #113 )
2018-11-26 19:40:29 +01:00
Bernd Bestel
5cdf2c14d3
Fix shopping list edit form - product was not prefilled ( fixes #115 )
2018-11-26 19:37:17 +01:00
Bernd Bestel
367a3e52de
Properly sort recipes fulfillment column ( closes #113 )
2018-11-24 19:59:24 +01:00
Bernd Bestel
a3617cffb8
Small different UI improvements
...
Show the cursor as pointer on stock overview page while hovering the product name cell to highlight that the productcard can be opened
Show a waiting cursor and disable all form inputs while doing background XHR calls to highlight that the user should wait
Place the search field (to search a table) on all pages to the left most place
2018-11-24 19:40:50 +01:00
Bernd Bestel
306d0f7da6
Add "one click shopping list to stock workflow" ( closes #110 )
2018-11-21 19:08:36 +01:00
Bernd Bestel
f7f90238f2
Show optionally a clock in the header ( closes #109 )
2018-11-20 19:23:48 +01:00
Bernd Bestel
5da24d2d4f
Added first version of calendar ( closes #42 )
2018-11-18 15:39:43 +01:00
Bernd Bestel
f7f2bf3fc0
Various small UI improvements for the shopping list
2018-11-18 14:19:50 +01:00
Bernd Bestel
2ff5faacc0
Prevent opening more products than are unopened in stock
2018-11-18 13:35:21 +01:00
Bernd Bestel
a403bb687a
Show amount of opened products on stock overview page and in product card
2018-11-18 13:17:36 +01:00
Bernd Bestel
5966a3d678
Improve journal UI when undoing a transaction
2018-11-18 12:58:15 +01:00
Bernd Bestel
10ea9c44fd
Make it possible to mark a product as opened ( closes #86 )
2018-11-17 19:39:37 +01:00
Bernd Bestel
816ca6460f
Make it possible to pick a specific stock item on consume ( closes #62 )
2018-11-17 17:51:35 +01:00
Bernd Bestel
6f67619784
Finish "shopping list to stock workflow" ( closes #98 )
2018-11-17 14:50:52 +01:00
Bernd Bestel
db0b48e7ae
Fix GitHub project links
2018-11-17 12:58:44 +01:00
Bernd Bestel
973f07b360
Add embedded mode (hides menu and so on), maybe need for #98
2018-11-17 12:57:35 +01:00
Bernd Bestel
0f73d849eb
Fixed equipment edit button always pointed to the first equipment item ( fixes #107 )
2018-11-17 08:26:31 +01:00
Bernd Bestel
8f31f891fd
Add a "shopping list item to stock flow" (references #98 )
2018-11-14 21:40:17 +01:00
Bernd Bestel
04e9ba8e34
Allow fraction numbers for recipe ingredients when not checked against stock and add option to not check stock for a recipe position ( closes #105 )
2018-11-02 19:53:01 +01:00
Bernd Bestel
364f6b2051
Add journal and undo UI for stock bookings, chore executions and battery charge cycles ( closes #63 , closes #97 )
2018-10-27 17:26:00 +02:00
Bernd Bestel
1f3dd58ddf
Properly display line breaks of recipe positions and shopping list item notes
2018-10-27 10:39:52 +02:00
Bernd Bestel
da98efa833
Finalize nested recipes / group recipe positions feature ( closes #77 )
2018-10-27 10:37:31 +02:00
Bernd Bestel
b84e6da0dd
Added recipe position groups (references #77 )
2018-10-25 22:45:44 +02:00
Bernd Bestel
fc3a4c6899
Finish first version of nested recipes feature (references #77 )
2018-10-25 20:36:29 +02:00
Bernd Bestel
12a2cb0bdf
Created basis edit UI for nested recipes (references #77 )
2018-10-23 19:36:39 +02:00
Bernd Bestel
57a0864465
Show productcard as a popup on stockoverview page instead of only the product picture ( closes #93 )
2018-10-22 19:28:59 +02:00
Bernd Bestel
b3da837ede
Added link to item edit page for all item cards (product/chore/battery) (references #93 )
2018-10-22 19:13:08 +02:00
Bernd Bestel
78865a9d3c
Fix product groups were empty on product presets page (references #92 )
2018-10-20 15:22:32 +02:00
Bernd Bestel
5b3230d63d
Properly name the quantity unit field on product presets page (references #92 )
2018-10-20 15:18:58 +02:00
Bernd Bestel
04c93d937e
Make presets for new products configurable ( closes #92 )
2018-10-20 14:55:49 +02:00
Bernd Bestel
7bf4421d44
Improve best before date comparison on stockoverview page ( fixes #87 )
2018-10-20 14:04:09 +02:00
Bernd Bestel
03eaa6c79f
Add possibility to filter by product group on stock overview page
2018-10-06 18:19:31 +02:00
Bernd Bestel
132999ce36
Show the little "product has an image icon" also on products page (references #58 )
2018-10-06 18:08:25 +02:00
Bernd Bestel
8cf68ade30
Fix missing translation (references #85 )
2018-10-06 18:02:13 +02:00
Bernd Bestel
9984e8f218
Small visual/space improvements/changes on recipes and equipment page
2018-10-06 11:43:46 +02:00
Bernd Bestel
7ba6fc875b
Improve responsive embeds (references #25 )
2018-10-03 19:05:00 +02:00
Bernd Bestel
3b10906e78
Optimize space around the embedded PDF a little bit (references #25 )
2018-10-03 18:04:46 +02:00
Bernd Bestel
ebd24bf30e
Use new editor also for recipes
2018-10-03 16:41:21 +02:00
Bernd Bestel
ebd9b1b851
Add possibility to show equipment notes/instruction manuals also in fullscreen mode (references #25 )
2018-10-03 16:40:40 +02:00
Bernd Bestel
b242a5de52
Finish equipment / instruction manuals feature (references #25 )
2018-10-03 16:11:39 +02:00
Bernd Bestel
edb986ce24
Added a quick mockup for equipment / instruction manuals (references #25 )
2018-10-02 20:03:08 +02:00
Bernd Bestel
f90faca62e
Accept only files for product picture file input
2018-10-02 18:33:16 +02:00
Bernd Bestel
9dd57decdf
Finish "pictures for products" features (now closes #58 )
2018-10-02 16:48:39 +02:00
Bernd Bestel
f1fc0ee549
Finished first version of "pictures for products" (references #58 )
2018-10-01 20:20:50 +02:00
Bernd Bestel
44cd26ae77
Finish first early version of "pictures for products" (references #58 )
2018-09-30 23:22:17 +02:00
Bernd Bestel
ba2d32be60
Fixes for auto night mode (references #71 )
2018-09-30 19:31:03 +02:00
Bernd Bestel
8b815fce93
Finalize auto night mode feature (references #71 )
2018-09-30 18:02:59 +02:00
Bernd Bestel
f1c78659be
Optimize user settings
2018-09-30 17:14:04 +02:00
Bernd Bestel
5c79a80f7a
Prepared auto night mode configuration option (references #71 )
2018-09-30 13:33:21 +02:00
Bernd Bestel
f451e65278
Also log missing localization found in frontend (only when MODE == dev)
2018-09-30 13:02:07 +02:00
Bernd Bestel
176333df5b
Save night mode enabled state and apply night mode class to <body> on server side (references #71 )
2018-09-30 11:25:07 +02:00
