321 Commits

Author SHA1 Message Date
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
9221d787a5
How many units are in stock doesn't really mean anything... 2020-01-26 21:18:09 +01:00
Bernd Bestel
71a57c9dcb
Implement "Free products" (closes #426) 2020-01-26 20:01:30 +01:00
Bernd Bestel
f09ba08549
Typo... (references #517) 2020-01-26 18:02:12 +01:00
Bernd Bestel
430cd05278
Break long mealplan notes (fixes #517) 2020-01-26 18:00:29 +01:00
Bernd Bestel
c7bcb9984a
Implemented "Scan mode" 2020-01-26 15:35:01 +01:00
Bernd Bestel
7a048136c6
Added missing localization strings 2020-01-26 13:40:26 +01:00
kriddles
ac1be1e90f 450 updates (#518)
* prevent seeing undefinde if no recipes

* disable weekRecipeConsume if weekCosts are zero

* reword title

* Add meal plan notes and products to Calendar
2020-01-26 08:50:44 +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
d64a1a546c
Finalize products on meal plan feature (references #450) 2020-01-25 19:42:46 +01:00
Bernd Bestel
98f70d1525
Finalize products on meal plan feature (references #450) 2020-01-25 18:36:54 +01:00
Bernd Bestel
aa97a8c301
Finalize products on meal plan feature (references #450) 2020-01-25 18:34:03 +01:00
kriddles
3762c1f799 450 consume meal plan product (#514)
* typo

* mealplan product consume
2020-01-25 18:02:50 +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
b4997abf75
Reload the page if a stock row cannot be found by id (references #506) 2020-01-23 19:13:35 +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
Bernd Bestel
ec2551d263
Little refinements for #507 2020-01-22 21:17:04 +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
101355cae2
Added day summary (costs and calories) to the meal plan (closes #502) 2020-01-21 22:44:04 +01:00
Bernd Bestel
ca6c2b0af8
Also show calories per serving on the meal plan (references #502) 2020-01-21 22:02:53 +01:00
Bernd Bestel
5793f6b041
Fixed that meal plan week costs were missing for weeks 1 - 9 2020-01-21 21:54:22 +01:00
Bernd Bestel
22c978c8dc
Preselect the default serving size when adding a nested recipe (closes #500) 2020-01-21 21:42:52 +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
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
7c2320e978 refresh productcard on save (#495) 2020-01-17 18:13:43 +01:00
kriddles
cdbfc3c3db productcard.js check null location (#494) 2020-01-17 18:06:33 +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
485eb262f9
Show some more info when camera access is not possible (closes #437) 2020-01-05 09:20:58 +01:00
Bernd Bestel
e515f21d3b
Fixed DataTables earch / don't search the first column with buttons/menus (fixes #440) 2020-01-03 14:18:56 +01:00
Bernd Bestel
6345e69922
Fixed tare weight handling min. amount on purchase was not calculated based on the products qu_factor_purchase_to_stock (fixes #457) 2020-01-03 14:10:43 +01:00
Bernd Bestel
675bf25927
Allow empty date(time) inputs when the field is not required (fixes #462( 2020-01-03 13:50:10 +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
kriddles
e89832c3aa Check for Price Tracking in mealplan.js (#469) 2019-12-19 20:07:13 +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
da2c8d48ac
Changelog and code optimizations for pull request #420 2019-10-19 10:33:46 +02:00
Marc Ole Bulling
a0fc06f6ed Add GET parameter to close window after product creation (#420)
* Add GET parameter to close window after product creation

PR for issue #419

This only works when the window was opened by Javascript (eg. from a third party plugin like Barcode Buddy)

* Added flow if window closing fails

If the window could not be closed, the normal flow continues
Added comments

* Made GET parameter case insensitive
2019-10-19 10:26:18 +02:00
Bernd Bestel
e133508814
Delay DataTables search by 200ms (references #424) 2019-10-15 19:59:14 +02:00
Bernd Bestel
9e1804252e
Centralize default DataTables init settings (references #424) 2019-10-15 19:38:51 +02:00
Lewis Juggins
1b0308f39d Improve mobile performance on stock overview (#424) 2019-10-15 19:24:23 +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
554ac104f8
Added missing translation string 2019-10-04 10:31:06 +02:00
Bernd Bestel
5d98140843
Added input shorthands for date fields to increase/decrease the date by 1 month/year (closes #405) 2019-10-02 16:06:44 +02:00