461 Commits

Author SHA1 Message Date
Bernd Bestel
b267295e86
Fixed product picker workflows 2020-11-14 11:05:36 +01:00
Bernd Bestel
42f70b04e7
Also show the price hint for single unit prices when purchase QU != stock QU 2020-11-13 17:43:28 +01:00
Bernd Bestel
b0b3322266
Also relate the shopping list amount to QU stock 2020-11-13 17:30:57 +01:00
Bernd Bestel
fa3a4ed688
Fixed productamountpicker initial converted amount was undefined 2020-11-12 22:47:00 +01:00
Bernd Bestel
c360cbec4c
UI strings/tooltips/basic handling review/optimizations 2020-11-12 21:35:10 +01:00
Bernd Bestel
c121c0483a
Fixed missing error message when trying to create a duplicate product 2020-11-12 13:09:46 +01:00
Bernd Bestel
0c8b6c55c1
Added total calories as a column to stock overview (references #1058) 2020-11-11 22:38:01 +01:00
Bernd Bestel
7c8a17ce78
Add calories as a column to stock overview (references #1058) 2020-11-11 22:06:01 +01:00
Bernd Bestel
0245a925b7
Make it possible to hide columns (closes #1058)
Hide new overview page columns by default
2020-11-11 21:11:17 +01:00
Bernd Bestel
e3ab943fe7
Use the custom-file-pickers also for the new file and image userfields 2020-11-11 18:49:08 +01:00
Bernd Bestel
9c81fc890b
Simplified "checkboxUncheckedValue" handling 2020-11-11 17:34:37 +01:00
Bernd Bestel
d816be6908
Use the proper plural QU form in productamountpicker 2020-11-10 21:41:12 +01:00
Bernd Bestel
7f600bd8d9
Don't add the destination QU multiple time in productamountpicker 2020-11-10 21:19:51 +01:00
Bernd Bestel
4959e9e732
Fixed purchase page initial amount validation 2020-11-10 21:19:28 +01:00
Bernd Bestel
3831cb37b3
Fixed DateTimePicker2 contextual time 2020-11-10 20:57:49 +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
8400175f1d
Improved productamountpicker stock amount display 2020-11-09 21:55:49 +01:00
Bernd Bestel
b6f4cfa851
Also use the productamountpicker for inventory (refernces #1015) 2020-11-09 21:51:55 +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
5f920e2cc6
Start product picker workflows also by TAB 2020-11-08 22:36:55 +01:00
Bernd Bestel
ea5b3dcd51
UI test/review 2020-11-08 19:51:56 +01:00
Bernd Bestel
3e3321bf11
UI test/review 2020-11-08 19:00:12 +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
Benoit Anastay
5303952be1
Unit stock name in the mealplan (#1109)
Stock name instead of purchase name
2020-10-31 16:15:26 +01:00
Bernd Bestel
351e236353
Fixed initial state of user permission checkbox tree (fixes #1099) 2020-10-29 17:19:48 +01:00
kriddles
64a2f5b25e
dialogs for shopping list (#1103) 2020-10-29 17:09:35 +01:00
kriddles
9bbcdafab9
Add purchased date to inventory (#1102)
* Add purchased date to inventory

* Clarify stock settings label

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-29 17:04:34 +01:00
fipwmaqzufheoxq92ebc
7ef9ffe041
Fixes #1092: Repair QR-Codes for API-Keys (#1093) 2020-10-25 08:42:58 +01:00
kriddles
ff254f8db2
stock entries button on product card (#1079) 2020-10-20 20:14:25 +02:00
kriddles
57aa6499eb
display productCard when clicking item on shopping list (#1078) 2020-10-20 20:14:11 +02: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
9115645e19
Fixed consuming tare weight handling enabled products on the stock entries page (fixes #988) 2020-10-18 14:51:32 +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
kriddles
f7a1634442
typo (#1062) 2020-10-18 13:57:10 +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
Bernd Bestel
235b96d17f
Fixed recipe ingredient initial QU (fixes #1060) 2020-10-17 10:52:25 +02:00
kriddles
758a8d9708
fix for price and total price (#1057)
* fix for price and total price

* product card clarity
2020-10-15 19:55:58 +02:00
kriddles
5ae36e6ba8
Value information (#1045)
* viewjs stockoverview: add total value to stock overview

* view stockoverview.blade: add Value column

* refresh stockOverview value column

* Removed the total units info

* Properly format the total stock value number

* Added new localization strings

* Resolved merge conflict

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-15 19:46:27 +02:00
Bernd Bestel
08644f95bf
Revert "Excape HTML (where needed, for bootbox) (references #996)"
This reverts commit 0df2590de27c60c18b7db6e056347bd2aff5a887.

Revert "Excape shopping list item notes (references #996)"

This reverts commit 0624b0df594a4353ef25e6b1874565ea52ce7772.
2020-10-14 22:58:26 +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
SourceFactory.at
617b25bda8
added button to add expired products to shoppinglist (#1026)
* added button to add expired products to shoppinglist

* Localizations are managed via Transifex

Revert "added button to add expired products to shoppinglist"

This reverts commit ad1ab5d6a0f4bd1dbc88dbb0bda67713d4038014.

* Revert unnecessary change

* Reuse existing function (GetExpiringProducts) to get expired products

Co-authored-by: Mario Klug <mario.klug@sourcefactory.at>
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-04 15:20:34 +02:00
fipwmaqzufheoxq92ebc
b03e43b708
Ui fixes (#1018)
* Fixes #1005. Recipes: filter by stock-status in gallery

* Fixes #1017. Productform: Remove "Store"-Header from barcode-table if FEATURE_FLAG_STOCK_PRICE_TRACKING is not set.

* Fixed typo

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-04 15:00:34 +02:00
Bernd Bestel
4b5b7bcb19
Applied formatting rules for by #1000 changed files 2020-09-14 11:20:29 +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