Commit Graph

67 Commits

Author SHA1 Message Date
Bernd Bestel
9498dd9c67 Improve /purchase tab order handling (closes #1915) 2022-06-11 12:48:20 +02:00
Bernd Bestel
27582611c1 Split user setting stock_decimal_places_prices into separate settings for input/display (closes #1893) 2022-06-04 14:09:35 +02:00
Bernd Bestel
e336f24225 Upgraded Font Awesome to v6 2022-04-04 20:27:51 +02:00
Bernd Bestel
d3a39270de Implemented notes and Userfields for stock entries (closes #443) 2022-03-30 17:32:53 +02:00
Bernd Bestel
6070507b04 Fixed per unit stock grocycodes weren't unique per unit (fixes #1676) 2021-11-14 15:26:38 +01:00
Bernd Bestel
fc413a05d1 Simplified stock entry label printing options (on purchase) (references #1647) 2021-11-13 18:26:01 +01:00
Bernd Bestel
91d8eaeb74 Squashed commit
Improve journal pages loading time (new date range filter)
Various small style adjustments (meal plan page and others)
Pulled German translations from Transifex
Show the shopping list total value (closes #1309)
Make it possible to copy recipes (closes #714)
Implemented optional "auto decimal separator for price inputs" (closes #1345)
Removed table grouped column fixed order restriction (closes #1402)
Don't filter out style, class, id attributes of html text (closes #1298)
Added product picture as column on the stock overview page (closes #1283)
Added grocycodes also for chores and batteries (+ camera barcode scanning for /choretracking and /batterytracking, this now closes #221)
2021-07-13 19:29:23 +02:00
Katharina Bogad
f5da53a761 Migrated bootstrap3 col-xs-* to bootstrap4 col-* classes (#1521) 2021-06-24 22:46:47 +02:00
Katharina Bogad
2471e78188 Grocycode, label printing (#1500)
* Grocycode: Productpicker, StockService

* Grocycode: Datamatrix generation

* Grocycode: Display in UI, make Images downloadable

* Grocycode: Do not show on product card

* Grocycode: Stockentry Label view

* Grocycode: Webhooks & Labelprinter Feature

* Grocycode: Manual Label printing

* Grocycode: Print Label from product form

* Quagga2: use zxing for DataMatrix recognition

* Grocycode: Default settings for label printing

* Prepare merge of master

* Grocycode: docs

* Docs: label printing webhook

* Review

- "grocy" is currently written lower-case everywhere, so let's do this also for "grocycode"
- Unified phrases / capitalization
- Minor UI adjustments (mainly context menu item ordering / ordering/spacing on product edit page)
- Documented API changes for Swagger UI (grocy.openapi.json)
- Reverted German localizations (those are managed via Transifex; would cause conflicts when manually edited - will import them later there)
- Reverted a somehow messed up localization string (productform/help text for `cumulate_min_stock_amount_of_sub_products`)
- Suppress deprecation warnings when generating Datamatrix PNG (otherwise the PNG is invalid, https://github.com/jucksearm/php-barcode/issues/3)
- Default `FEATURE_FLAG_LABELPRINTER` to disabled

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-06-12 17:21:12 +02:00
Bernd Bestel
d78e156609 Use barcode defaults also for scan mode (fixes #1253) 2021-01-04 21:15:22 +01:00
Bernd Bestel
2e3c237648 Fixed zero decimals handling (fixes #1213) 2020-12-23 19:56:37 +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
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
17ae7e3d0c Added a tooltip what scan mode is 2020-11-15 09:27:07 +01:00
Bernd Bestel
68eeb07e5f Test/review/rework (and hopefully finalized) new price handling 2020-11-10 18:11:33 +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
4lloyd
76cbf796b6 [WIP] Simplified overviews on mobile (#1115)
* Simplified stock overview on mobile.

* Stock table horizontally scrollable

* Use the new mobile views for all pages (except the shopping list page, use the existing special handling there for now)
And add a clear filter button to all pages

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-11-07 14:53:45 +01:00
Bernd Bestel
7b32d1d8a4 More compact page headers / streamlined new page design for all pages 2020-10-31 18:37:10 +01:00
Bernd Bestel
18617dc9fb Fixed undefined variable warning 2020-10-31 16:29:12 +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
Bernd Bestel
80beff2cae Fixed price input decimals, started reviewing all number inputs (fixes #1076, references #998) 2020-10-19 20:03:26 +02:00
Bernd Bestel
80cf68aeaa Allow no product for shopping list items & always in-/decrement by 1 when using the number input arrow buttons (fixes #964) 2020-10-18 14:27:23 +02:00
Bernd Bestel
e24f3143b5 Changelog/little naming changes/fixes/new translations strings for #1056 2020-10-17 11:03:47 +02:00
kriddles
cd65195532 add purchased date to purchase (#1056) 2020-10-17 10:54:10 +02:00
fipwmaqzufheoxq92ebc
5056ca9397 Some bug fixes. (#1000)
* Fix #997. Remove datetimepicker if FEATURE_FLAG_STOCK_BEST_BEFORE_DATE is not set.

* datetimepicker: Fix that SetValue did not set the value if "shortcut-checkbox" (e.g. "never expires") was checked.

* Use parent div as clickable area for checkboxes in dropdowns

* Fix nightmode-enable

* Fix possibly undefined variables in CalendarService.php

* Fix undefined variable in GenericEntityApiController.php

* Fix "Trying to access property barcodes on non-object" in productpicker

* Fix undefined "hintId" in shoppinglocationpicker

* Fix undefined variables in locationpicker.blade.php
2020-09-14 11:15:11 +02:00
Bernd Bestel
33325d5560 Applied .blade.php formatting rules 2020-08-31 20:32:50 +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
kriddles
9a921cfc86 Purchase Price Hints (#767)
* productcard update last price with per qu purchase name

* Purchase price hints

* purchase set default to 2999-12-31 if not best before date tracking

* purchase- move amount above best buy date and focus amount after product selection
2020-04-22 17:38:24 +02:00
Zack Arnett
4629df17b4 Cosmetic Update (#753)
* UI changes

* New (header) style was missing on some pages

* Added/changed new localization strings

* Unify page titles / apply .title class everywhere

* Reduce spacing below page title

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-04-19 14:51:02 +02:00
kriddles
2fee4b45ff set default store for product, purchase set last store purchased if available or use product default (#672) 2020-03-27 19:27:40 +01:00
Mik-
f3b504b7de Optionally use number pad input in best-before-date fields on mobile Chrome (#657)
* Add missing translation for de

* Add option to set best-before-date field input-type to number
This allows faster input in mobile devices

* Fix datetimepicker with inputmode

* Fix datatimepicker with numeric input

* Add missing translation for de

* Add option to set best-before-date field input-type to number
This allows faster input in mobile devices

* Fix datetimepicker with inputmode

* Fix datatimepicker with numeric input

* Use more precise name for number pad option

* Update localization/de/strings.po

Co-Authored-By: Bernd Bestel <bernd@berrnd.de>

* Fix merge conflict

* Fix merge conflict try 2

Co-authored-by: Michael Neuendorf <neuendorf@gonicus.de>
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-03-25 20:26:54 +01:00
Immae
a45317aea1 Add shopping location for price tracking (#658) 2020-03-25 19:34:56 +01: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
3ca6982c39 Don't show and use scan mode in embedded mode (dialogs) 2020-02-02 13:13:18 +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
bad19721db Make the scan mode switch-buttons a little bigger 2020-01-26 15:44:09 +01:00
Bernd Bestel
c7bcb9984a Implemented "Scan mode" 2020-01-26 15:35:01 +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
765f908966 Make it possible to provide the purchase price also as a total price (closes #390) 2019-09-27 13:50:16 +02:00
Bernd Bestel
cbf1d1ca40 Implemented stock sub-feature-flags (closes #314) 2019-09-19 17:46:52 +02:00
Bernd Bestel
bcd6dd4b20 Forgot to save a file on the last commit... 2019-05-03 22:18:24 +02:00
Bernd Bestel
9b2dba2397 Migrated (hopefully) all translations to PO/Gettext (references #161) 2019-05-01 20:19:18 +02:00
Bernd Bestel
bfcd05473a Allow best before date on purchase/inventory to be today or in the past, but display a hint when so (closes #172) 2019-03-10 16:02:13 +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
b89643ddb1 Allow different locations per product in stock (closes #124)
Kind of basic for now, a different location can be set on purchase, the filters on the stock overview page handles different locations
2019-03-01 20:25:01 +01:00
Bernd Bestel
973f07b360 Add embedded mode (hides menu and so on), maybe need for #98 2018-11-17 12:57:35 +01:00