550 Commits

Author SHA1 Message Date
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
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
40283609b5
Product / QU form refinements 2020-11-08 22:13:36 +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
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
Bernd Bestel
7d175563ca
Fixed stock overview status filter (fixes #1080) 2020-10-29 17:32:21 +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
Bernd Bestel
be18d59735
Fixed minimum for two number inputs (fixes 1083#) 2020-10-21 18:14:24 +02:00
Bernd Bestel
def61eee6e
Typo 2020-10-20 20:38:19 +02: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
80beff2cae
Fixed price input decimals, started reviewing all number inputs (fixes #1076, references #998) 2020-10-19 20:03:26 +02:00
Bernd Bestel
f93261404b
Fixed by PHP-CS-Fixer broken formattings 2020-10-18 15:08:09 +02:00
Bernd Bestel
196d304de6
Disable opening of tare weight handling enabled products also on the stock entries page (same as for the stock overview page, references #988) 2020-10-18 14:48:21 +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
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
kriddles
96c6faf208
fix expiring filter (#1051) 2020-10-14 22:59:58 +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
Bernd Bestel
931e4b7e9a
Applied formatting rules for by #1018 changed files 2020-10-04 15:02:08 +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
Bernd Bestel
0624b0df59
Excape shopping list item notes (references #996) 2020-09-08 18:25:42 +02:00
Maximilian Bosch
34ffdb2b4b
Adds a few small frontend fixes (#995)
* Add a few instructions to the readme on how to get `grocy` running locally

* Fix toggle for header-clock

I'm not 100% sure why, but with this change, the listener which calls
`CheckHeaderClockEnabled` will be invoked *before* the listener which
persists the setting.

If the setting is persisted before that, the clock doesn't show up when
enabling it in the settings-menu and appears/disappears in the exact
opposite way the setting is true/false.

* Allow replacing a product picture when removing it at first

Right now, a preview image of a product doesn't get updated when
pressing the delete-button at first and adding a new image the
upload-form which can be quite confusing for an end-user.

This patch allows to delete an image and add a new one in one go.

* Add `Save & return` button to product form

Same concept as for recipes: when pressing this button, the user will
stay at the form's site after saving.

* Removed unneeded class

* Revert "Add a few instructions to the readme on how to get `grocy` running locally"

This reverts commit 6ffad1d3c729de9ce4bdd19aa87d7577dd2fcd36.

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-08 17:46:37 +02:00
Bernd Bestel
6adac0588a
Applied formatting rules for by #989 changed files 2020-09-06 13:31:54 +02:00
fipwmaqzufheoxq92ebc
0454c128f0
Stock-Journal: API, Summary, Done By (#989)
* Stockjournal: Add "Done by"

* Add API for Stock-Journal

* Add "Journal-Summary"

* Use ALTER TABLE

* Moved the "Jounral summary" button to the stock journal page

* Changed icon & context menu position for new stock journal summary page

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-06 13:18:51 +02:00
fipwmaqzufheoxq92ebc
85a95f1973
Apikeys (#986)
* Add QR-Code for API-Url/Key

* Show only API-Keys for current user

* Allow only admin users to create custom API-Keys

* Use a managed package of qrcode-generator instead of a copy of the JS file

* Reuse existing localization string (API key)

* Center QR-Code in popups

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-06 10:00:49 +02:00
fipwmaqzufheoxq92ebc
32a4f81f62
Filtering of API-Results (#985)
* Add FilteredApiResponse

* Use FilteredApiResponse for Generic-Entity-Search

* Use FilteredApiResponse for Recipe-Fullfillment

* Use FilteredApiResponse for GetUsers

* Use FilteredApiResponse for current Tasks

* Use FilteredApiResponse for ProductStockEntries & ProductStockLocations

* Use FilteredApiResponse for current chores

* Use FilteredApiResponse for batteries-current

* Fix missing highlighting of "< X days"

* Keep to use existing views

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-01 19:59:40 +02:00
Bernd Bestel
ad4f8a19af
Removed the barcodes column from the products list as we don't have that field there anymore 2020-08-31 22:13:02 +02:00
Bernd Bestel
33325d5560
Applied .blade.php formatting rules 2020-08-31 20:32:50 +02:00
fipwmaqzufheoxq92ebc
07beee93a9
Add user-field-type "file" (#977)
* Add user-field-type "file"

* Add userfield-type "picture"

* Also limit image height on userfieldsform

* Prevent empty userfields (cause warnings in tables after deleting a file)

* Show files in dialogs

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-31 20:07:46 +02:00
fipwmaqzufheoxq92ebc
6f8ad9b76e
Locales: use http-accept-language or cookie (#976)
* Locales: use http-accept-language or "language"-cookie

* Add user-setting "locale"

Rename CULTURE to DEFAULT_LOCALE

* Use LocaleMiddleware also in dev mode

* CORS: don't require authentication on OPTIONS

* Use a standard user-settings-control and start a new generic user settings page, not a separate page for the locale setting

* Fixed (broken by myself) link-return handling

* Clarify language settings

* Removed unneeded files

* Better user settings icon

* Added localization hints

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-31 19:11:51 +02:00
Bernd Bestel
86300b7025
Refined permissions by existing feature structure (closes #971, references #960) 2020-08-29 18:31:28 +02:00
Bernd Bestel
22384aaa2e
Error page style improvements 2020-08-29 16:58:06 +02:00
Bernd Bestel
3b0d29bed0
Applied EditorConfig settings to all files 2020-08-29 16:41:27 +02:00
fipwmaqzufheoxq92ebc
b7d1b21f1d
[WIP] Implemented basic permissions (#960)
* Add permissions to Database & add "User"-classes

* Add UI & API for Permissions, protect "User"-(Api)-Controller with new permissions.

* Add some permissions.

* Add permission localization

* Add error handling.

* Error pages: only redirect on 404

* ExceptionController: return JSON-Response on api-routes

* Rename PRODUCT_ADD to PRODUCT_PURCHASE

* Move translation to new file

* Fix checkboxes stay selected on reload.

* Remove configurable User-implementation

* Remove MASTER_DATA_READ

* Disable buttons the user isn't allowed to use.

* Add default permissions for new users

* When migration to permissions, everyone starts as ADMIN

* Permission-Localization: add to transifex & LocalizationService

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-29 12:05:32 +02:00