62 Commits

Author SHA1 Message Date
Bernd Bestel
887526c727
Squashed commit
Fixed number input min/max amount handling
Only (auto) save valid user inputs
More filters on the stock journal pages
Save the last price per used barcode and preselect that as a total price on purchase if not empty (closes #1131)
Don't apply conversions for only_check_single_unit_in_stock ingredients (fixes #1120)
Render shopping list userfields (closes #1052)
Fixed Focus when adding included recipes (closes #1019)
Order all base objects with NOCASE (closes #1086)
2020-11-17 19:11:02 +01:00
Bernd Bestel
e85b21384f
Remove "Allow partial units in stock" product option / unify number input validation messages 2020-11-16 17:10:41 +01:00
Bernd Bestel
1bbd7787d8
More proper number formatting 2020-11-15 22:29:47 +01:00
Bernd Bestel
b393998601
Distinguish expiry/best before dates (closes #851) 2020-11-15 19:53:44 +01:00
Bernd Bestel
4b342dbd43
Improved number input initial value decimal handling 2020-11-15 14:15:09 +01:00
Bernd Bestel
28276191cc
Don't allow tare weight handling enabled products to be opened (closes #770) 2020-11-14 22:51:06 +01:00
Bernd Bestel
b267295e86
Fixed product picker workflows 2020-11-14 11:05:36 +01:00
Bernd Bestel
fa3a4ed688
Fixed productamountpicker initial converted amount was undefined 2020-11-12 22:47:00 +01:00
Bernd Bestel
0c17666cef
Fixed default consume/purchase amount behaviour 2020-11-10 20:53:16 +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
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
d82fd09fba
UI test/review 2020-11-08 15:09:10 +01: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
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
Bernd Bestel
9cea0c77cd
Applied VSCode JS formatting settings 2020-08-30 12:18:16 +02:00
Bernd Bestel
3b0d29bed0
Applied EditorConfig settings to all files 2020-08-29 16:41:27 +02:00
Bernd Bestel
9d04d81744
Use correct amount for the success popup on the consume page (fixes #766) 2020-08-24 19:06:33 +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
Bernd Bestel
855b24c515
Fix consume page form validation limits for the amount input when tare weight handling is enabled (fixes #727) 2020-04-12 21:41:04 +02:00
Bernd Bestel
81e6530ddc
Always set number inputs in browser locale format (fixes #610) 2020-04-12 15:33:36 +02: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
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
c7bcb9984a
Implemented "Scan mode" 2020-01-26 15:35:01 +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
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
a95d6be4f4
Added more product actions on the stock overview page (closes #327) 2019-09-20 13:37:53 +02:00
Bernd Bestel
35a409f462
Fixed/refined some things regarding purchase/consume/inventory of products with enabled tare weight handling 2019-09-19 21:10:36 +02:00
Bernd Bestel
a0a0e104b0
Implemented product variations (closes #196) 2019-09-14 17:34:36 +02:00
Bernd Bestel
de89fee5bb
Fixed wrong amount was displayed in popup after consume 2019-05-10 20:43:57 +02:00
Bernd Bestel
e240260f9f
Unify translations strings which include an amount + quantity unit (references #161) 2019-05-05 14:31:27 +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
0eb974bd92
Make it possible to customize the default amount for purchase/consume (closes #215) 2019-05-04 13:19:34 +02:00
Bernd Bestel
94c6e634b8
Fixed the "Add as barcode to existing product" productpicker workflow failed to add the barcode to the given product (fixes #222) 2019-05-03 18:29:09 +02:00
Bernd Bestel
9b2dba2397
Migrated (hopefully) all translations to PO/Gettext (references #161) 2019-05-01 20:19:18 +02:00
Bernd Bestel
4d215edbd0
Clear displayed quantity unit after purchase/consume/inventory bookings 2019-03-09 12:31:45 +01:00
Bernd Bestel
8504429f5f Implemented tare weight handling (closes #132) 2019-03-05 17:51:50 +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
dfc05e0bec
Allow optional partial units of products in stock (closes #123) 2019-01-26 14:17:02 +01:00
Bernd Bestel
bfa59dd29c
Rework API to be more RESTful (references #139) 2019-01-19 14:51:51 +01:00
Chris Forkner
0ce8d706a6 API - A bit more RESTful (#140)
* Restful routes

* Change public/viewjs to match API routes

* Move the GET and POST together. Fixed Typos. PUT for object/user edits.

* Verb-less Generic Entity Interactions

* Create Grocy.Api.Put

* Create Grocy.Api.Delete

* Fix Volatile Slim Error order in routes and adjust to english noun
2019-01-19 08:37:21 +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
e021c93d22
Make clear than picking a specific stock item on consume always means an amount of 1 2018-11-18 13:46:23 +01:00
Bernd Bestel
2ff5faacc0
Prevent opening more products than are unopened in stock 2018-11-18 13:35:21 +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