Commit Graph

164 Commits

Author SHA1 Message Date
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
zebardy
91034d333b get timings for db-changed-time 2019-11-19 07:29:26 +00:00
zebardy
06e210a0b9 try storing app in apcu 2019-11-18 22:07:52 +00:00
zebardy
75a3c6c62e correct mistake in stock controller 2019-11-18 07:28:52 +00:00
zebardy
9f277f51b3 utilise Localisation service as a singleton 2019-11-17 19:25:56 +00:00
zebardy
1659e151a7 comment out debug printing to log file 2019-11-17 16:32:48 +00:00
Aaron Moses
fca0bd73ad use singletons to reduce need to recreate the same objects 2019-11-17 11:59:43 +00:00
kriddles
c6ae8cc348 Calendar descriptions (iCal export) (#417)
* controllers CalendarApiController: setDescription for events

* services CalendarService: include link to mealplan in calendar descriptions
2019-10-12 10:16:06 +02:00
Bernd Bestel
cf3217ada4
Fixed expired products count on stock overview page (fixes #392) 2019-09-26 16:42:59 +02:00
Lewis Juggins
fd14083443 Support meal plan as default page (#383)
* Support meal plan as default page

* Update SystemController.php
2019-09-25 13:08:41 +02:00
Bernd Bestel
04808eaa66
Include the server timezone in iCal calendar export (closes #379) 2019-09-25 09:52:32 +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
49b26bd375
Return a Cache-Control header for files served via the API 2019-09-24 10:38:41 +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
327c1f4fb3
Fixed meal plan did not load when a containing recipe was deleted (closes #361) 2019-09-21 09:18:40 +02:00
Bernd Bestel
c228126c3a
Added a new field calories for products (closes #268) 2019-09-20 20:06:24 +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
ca9b8d068a
Reuse existing routes for the by-barcode API routes and complete them (references #331) 2019-09-20 10:45:58 +02:00
Bernd Bestel
58a69d650f
Added an API endpoint to add/remove products to stock by its barcode (closes #331) 2019-09-19 18:36:46 +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
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
74f9470769
Implemented that chores can be assigned to users (closes #253) 2019-09-17 13:13:26 +02:00
Bernd Bestel
a799f2b43f
Finished qu unit conversion handling (closes #177) 2019-09-16 09:35:20 +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
Marc Ole Bulling
d4eb767f1b Add API call for adding products to shoppinglist 2019-08-30 09:21:11 +02:00