Commit Graph

194 Commits

Author SHA1 Message Date
Bernd Bestel
34ecf85a29
Fix all the not working things... 2020-03-01 17:42:00 +01:00
zebardy
a88a9953bd bug fixes following merge 2020-02-19 01:56:35 +00:00
zebardy
5402319a2c bug fixes following merge 2020-02-19 01:32:30 +00:00
zebardy
40631ff60d bug fixes following merge 2020-02-19 01:01:17 +00:00
zebardy
a3cdb85317 bug fixes following merge 2020-02-19 00:24:01 +00:00
zebardy
a3f5efdd5b bug fixes following merge 2020-02-18 23:40:58 +00:00
zebardy
6d049185cf fix bug where getUsersService is declared twice 2020-02-18 22:46:31 +00:00
zebardy
b6be442fb9 updated to original master 2020-02-18 21:56:36 +00:00
Bernd Bestel
5dd78aa19a
Remove accidentally added function 2020-02-11 19:36:15 +01:00
Bernd Bestel
d4fa1a64c2
Upgrade Slim Framework to v4 (closes #561) 2020-02-11 17:42:03 +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
6b8169a1f1
Changelog and small changes for #557) 2020-02-10 18:00:42 +01:00
kriddles
898ea26139
Recipe Overview recipePositionsResolved should only include normal recipes (#557) 2020-02-10 17:56:52 +01:00
Bernd Bestel
35eb976706
Don't show nested-resolved recipe ingredients of the selected recipe 2020-02-04 19:49:09 +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
eaacca61c2
Order product picker list by name on the recipe edit page (references #520) 2020-01-28 20:58:35 +01:00
Bernd Bestel
0e41500a63
Properly check for any boolean value query parameter 2020-01-27 22:20:20 +01:00
Bernd Bestel
e84c7063d3
Consume any subproduct when consuming a recipe ingredient which is not in stock (fixes #446) 2020-01-27 22:14:11 +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
e111d07f4e
Added the ability to directly add products to the meal plan (closes #450) 2020-01-25 11:51:00 +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
469dcefc7a
Don't show not listable entites in Swagger UI (fixes #510) 2020-01-23 20:05:44 +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
c22496ca7c
Fixed /stockedit opened checkbox (references #506) 2020-01-21 20:04:33 +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
a8cf5ae9ab
Handle demo mode via a setting instead of checking the existence of a file (closes #484) 2020-01-05 09:11:11 +01:00
Aaron Moses
8d4b8c91d7 fixes for things broken 2019-12-22 23:29:22 +00:00
Aaron Moses
146c7b6011 Merge branch 'master' of https://github.com/grocy/grocy into grocy-448 2019-12-22 23:28:50 +00:00
Aaron Moses
ce75d6bca8 Clean up and tuen all services into singletons 2019-12-22 22:51:54 +00:00
Aaron Moses
1cdef09832 Clean up controllers 2019-12-22 22:14:05 +00:00
Aaron Moses
1ec2b26d4b Clean up base controller 2019-12-22 21:34:00 +00: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
zebardy
855ea70e9b fix userservice 2019-11-23 18:45:48 +00:00
zebardy
fce767b0ad fix userservice 2019-11-23 17:48:19 +00:00
zebardy
7cf1430433 lazy loading of services in controllers 2019-11-23 15:06:57 +00:00
zebardy
ac210fe092 lazy loading of batteries service 2019-11-23 14:48:53 +00:00
zebardy
b0d602d13c lazy loading of users service 2019-11-23 14:43:00 +00:00
zebardy
8b9790417d lazy loading of open api spec 2019-11-23 14:38:37 +00:00
zebardy
577b181e1b missing use for Userfieldsservice 2019-11-23 13:45:28 +00:00
zebardy
76c5c55635 correct visibiity of methds inherited from BaseController 2019-11-23 13:24:32 +00:00
zebardy
2a30d6377f correct syntax error 2019-11-23 12:51:49 +00:00
zebardy
76beb4779e lazily obtain valus for page rendering 2019-11-23 12:15:18 +00:00
zebardy
89b959b3c9 comment out debug printing 2019-11-22 19:19:37 +00:00
zebardy
cf8e285b62 in depth look at Logincontroller timings 2019-11-22 16:37:13 +00:00
zebardy
4895417586 start investigating Login controller time 2019-11-22 15:18:56 +00:00
zebardy
11bf1ccfae start investigating Login controller time 2019-11-22 14:54:57 +00:00