Commit Graph

884 Commits

Author SHA1 Message Date
Aaron Moses
a0e0870f1a More fixes following merge 2019-12-22 23:38:30 +00: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
f12766ca19 Complete removal of acpu from localisation 2019-12-22 23:10:03 +00:00
Aaron Moses
2666cb7a41 remove acpu from localisation 2019-12-22 23:07:27 +00:00
Aaron Moses
e8e46f253c remove debug from routes.php 2019-12-22 22:58:11 +00:00
Aaron Moses
ce75d6bca8 Clean up and tuen all services into singletons 2019-12-22 22:51:54 +00:00
Aaron Moses
58364493c9 lean up middleware 2019-12-22 22:19:56 +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
Aaron Moses
3b348a1c84 remove last diff 2019-12-22 21:29:27 +00:00
Aaron Moses
2bf4a0ee5b Clean up app.php 2019-12-22 21:28:38 +00:00
Aaron Moses
71ddb9869e Remove docker compose file used for development 2019-12-22 21:24:38 +00:00
Aaron Moses
4569b458d7 remove Dockerfile used for development 2019-12-22 21:22:31 +00:00
Bernd Bestel
8da13ab22b
Added changelog for #476 2019-12-21 12:38:15 +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
2a361a9f72
Forgot to save strings.pot... 2019-12-19 20:11:34 +01:00
Bernd Bestel
bf81d8a794
Added changelog for #469 2019-12-19 20:10:21 +01:00
kriddles
e89832c3aa Check for Price Tracking in mealplan.js (#469) 2019-12-19 20:07:13 +01:00
Bernd Bestel
d617a72397
Again small localization string changes (references #421) 2019-12-19 20:03:27 +01:00
Bernd Bestel
b02e43aea8
Added changelog for #421 2019-12-19 20:00:47 +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
Bernd Bestel
0be1994c02
Added changelog for #456 and #458 2019-12-08 20:53:28 +01:00
beetle442002
275db21740 ExternalBarcodeLookup (#458)
* Changed line 173 to /stock/barcodes/external-lookup/{barcode} fixes grocy/grocy#456

* Changed line 173 to /stock/barcodes/external-lookup/{barcode} fixes grocy/grocy#456 and I changed grocy.openapi.json to reflect the change
2019-12-08 20:46:37 +01:00
Bernd Bestel
709afac1af Proper pt-br localization/demo 2019-11-26 11:13:14 +01:00
zebardy
35e88ba5f1 fix calendar service 2019-11-23 21:15:54 +00:00
zebardy
90c00680fa fix chores service 2019-11-23 20:47:42 +00:00
zebardy
5b214dbf27 fix userfieldservice 2019-11-23 19:24:14 +00: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
a4c9239214 correct mistake 2019-11-23 17:13:03 +00:00
zebardy
f8dffbac4c lazy loading of services in services 2019-11-23 16:45:15 +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
62d3015509 correct scope of variable 2019-11-23 13:20:57 +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
zebardy
d606383b70 start investigating session auth middleware creation 2019-11-22 14:21:11 +00:00
zebardy
2b65991c51 start investigating session auth middleware creation 2019-11-22 13:13:11 +00:00
zebardy
2502bc3f0e fix more in depth timings for routing loading 2019-11-22 10:46:14 +00:00
zebardy
4c1be1ef20 get more in depth timings for routing loading 2019-11-22 10:01:47 +00:00
zebardy
135b2e776c get timings for routing timings 2019-11-22 07:53:17 +00:00