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
bb985c09ba
Fixed purchase/inventory embedded mode initial input focus handling
2020-11-14 11:53:35 +01:00
Bernd Bestel
1fbda392c2
Fixed product edit page returnto handling
2020-11-14 11:49:46 +01:00
Bernd Bestel
62997d39bc
Removde the /objects/{entity}/search API endpoint, added the new filter capabilities to /objects/{entity} (references #985 )
2020-11-14 11:27:13 +01:00
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
0a600d3277
Fix hide/view columns dialog did not work on pages with more than 1 table (references #1058 )
2020-11-11 22:28:05 +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
b15740bded
Fixed dropdown menu in tables overflow
2020-11-11 20:14:16 +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
d863e33343
Made the sidebar items a little smaller
2020-11-10 21:35:01 +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
Bernd Bestel
7b32d1d8a4
More compact page headers / streamlined new page design for all pages
2020-10-31 18:37:10 +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
Bernd Bestel
7e08224c75
Fixed tooltip/model z-index ( fixes #1065 )
2020-10-18 14:13:39 +02:00
kriddles
f7a1634442
typo ( #1062 )
2020-10-18 13:57:10 +02:00
John M. Harris, Jr
2958ccfc14
Fix night mode ( #1067 )
...
This fixes a few lines of white when in night mode.
This change was done from a tablet, I can redo this commit properly on a computer when I get back home if needed. This just really annoyed me ;)
2020-10-18 13:54:33 +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 0df2590de2 .
Revert "Excape shopping list item notes (references #996 )"
This reverts commit 0624b0df59 .
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 ad1ab5d6a0 .
* 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
Bernd Bestel
0df2590de2
Excape HTML (where needed, for bootbox) (references #996 )
2020-09-08 18:10:30 +02:00
Bernd Bestel
22434c85f0
Applied formatting rules for by #995 changed files
2020-09-08 17:52:35 +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 6ffad1d3c7 .
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-08 17:46:37 +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
Bernd Bestel
7498d8f13d
Applied formatting rules for by #986 changed files
2020-09-06 10:10:30 +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
Bernd Bestel
d4c5da2173
Applied PHP formatting rules
2020-08-31 20:40:31 +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
9cea0c77cd
Applied VSCode JS formatting settings
2020-08-30 12:18:16 +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
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
Bernd Bestel
f28697e5b4
Added a "Clear filter" button on the stock overview page ( closes #879 )
2020-08-25 20:20:51 +02:00
Bernd Bestel
0b98504371
Don't hide the product row on the stock overview page if there are still child products in stock
2020-08-25 18:15:34 +02:00
Bernd Bestel
3b564294e3
Allow decimal amounts in general for the shopping list
2020-08-24 20:25:50 +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
Bernd Bestel
5c62377ba6
Don't trigger row select event on first column ( fixes #791 )
2020-08-24 18:42:32 +02:00
Bernd Bestel
a569048a3a
Validate form after changing the QU on the recipe ingredient edit page ( fixes #907 )
2020-08-24 18:32:50 +02:00
Bernd Bestel
fa32258553
Only reload "Disable stock fulfillment checking for this ingredient" by the products default when creating a recipe ingredient ( fixes #910 )
2020-08-24 18:16:32 +02:00
Bernd Bestel
4d38614671
Reload recipe page after add/edit an ingredient ( fixes #803 )
2020-08-24 18:02:46 +02:00
Bernd Bestel
2c151fb4de
Do an exact search for product group and location filters on the stock overview pages ( fixes #778 )
2020-08-24 17:57:43 +02:00
Andre Monteiro
b8cd5cd0b5
Additional configuration options for Quagga2 ( #844 )
2020-08-19 19:52:04 +02:00
Matthias B
88949dc3e4
Make product amount picker locale independent ( #876 )
...
Since the value of $('#amount') will be written to the database it should not be locale dependent. This code also limits the result to a maximum of 4 digits but always uses a dot as decimal separator.
2020-08-18 19:43:50 +02:00
Stefan Haller
623fce6c08
Run multi instances by making GROCY_DATAPATH customizable ( #939 )
...
Previously the data directory was fixed to the GROCY_DATAPATH constant.
This commit allows overriding the default GROCY_DATAPATH location by the
FastCGI parameter `GROCY_DATAPATH`. Relative paths are modified and get
rooted at the top level grocy installation directory.
The previous behaviour is preserved in case the new parameter is absent.
The following example nginx config snippet shows how to run multiple
instances.
```nginx
server {
location /instance1/ {
alias /var/www/grocy/;
set $instance instance1;
try_files $uri @grocy;
}
location /instane2/ {
alias /var/www/grocy/;
set $instance instance2;
try_files $uri @grocy;
}
location @grocy {
fastcgi_pass 127.0.0.1:9000;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME index.php;
fastcgi_param GROCY_DATAPATH data/$instance;
}
}
```
2020-08-18 18:10:26 +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
9e824e1845
Little adjustments and changelog for #788
2020-04-24 17:51:48 +02:00
Zack Arnett
f076b0d0c6
Recipe updates ( #795 )
2020-04-24 17:41:57 +02:00
kriddles
385e7287fe
Create Inverse QU Conversions ( #788 )
2020-04-24 17:41:50 +02:00
Marc Ole Bulling
49e5eda30f
Make GetUriParam work with special characters (eg. "&") ( #793 )
2020-04-23 20:48:48 +02:00
Zack Arnett
29b4672346
Link to respective page on Calendar Event Click ( #784 )
...
* Link to Page on calendar event click
* Undo my Prettier Changes.. Oops
2020-04-22 18:03:05 +02:00
Bernd Bestel
fbb8999513
Fixes and changelog for #767
2020-04-22 18:00:25 +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
7fb76df33a
Recipe Pages UI updates ( #776 )
...
* Recipe updates
* Add help text icon
2020-04-21 08:18:09 +02:00
Bernd Bestel
f4b70e9ae3
Fixed product edit page barcodes field tab handling ( fixes #764 )
2020-04-19 15:01:58 +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
Bernd Bestel
356cdf4991
Fixed pre requisite checker paths ( fixes #748 )
2020-04-17 19:57:22 +02:00
Bernd Bestel
e897570968
Only adjust the camera barcode scanning live stream picture size once ( fixes #734 )
2020-04-13 22:34:52 +02:00
Bernd Bestel
2e625f330d
Little style changes and changelog for #733
2020-04-13 22:30:35 +02:00
Michael Frikke Madsen
a6030798c7
Add camera picker button ( #733 )
...
* Add camera picker button
* Remove button and nested dialog - make it a select
- Also make Cancel button gray again
2020-04-13 22:07:38 +02:00
Bernd Bestel
6f4769a7b3
Make product groups on the shopping list collapsible ( closes #604 )
2020-04-13 19:11:13 +02:00
Bernd Bestel
1390c65864
Show optionally an icon on the stock overview page if the product is already on the shopping list ( closes #708 )
2020-04-13 18:47:41 +02:00
Bernd Bestel
840b35b30d
Add tooltips to shopping list item buttons ( closes #572 )
2020-04-13 18:26:53 +02:00
Bernd Bestel
886721e972
Fixed consuming tare weight handling enabled products from the stock overview page ( fixes #731 )
2020-04-13 17:29:00 +02:00
Bernd Bestel
f36d9c46ed
Make Quagga2 setting "numOfWorkers" adjustable ( closes #713 )
2020-04-13 16:14:43 +02:00
Bernd Bestel
10f890ef89
Added a camera-barcode-scanner-button to the barcodes field on the product edit page ( closes #723 )
2020-04-13 15:55:27 +02:00
Bernd Bestel
9a93c32d3c
Fix total price amount relation on purchase ( fixes #722 )
2020-04-13 14:52:13 +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
0327188125
Optimize datetimepicker form validation events ( fixes #726 )
2020-04-12 18:41:23 +02:00
Bernd Bestel
8cfd3e19ba
Typo...
2020-04-12 15:34:27 +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
3356b07342
Always show models / overlay everything else ( fixes #628 )
2020-04-12 14:34:50 +02:00
Bernd Bestel
4e5e191b22
Fixed the conversion factor hint on the purchase page ( fixes #625 )
2020-04-12 14:09:38 +02:00
Bernd Bestel
9dbd6a68c4
Don't change the displayed QU to the products stock QU when "Only check if a single unit is in stock" is set when editing a recipe ingredient ( fixes #606 )
2020-04-12 13:55:26 +02:00
Mik-
a6dd794ce8
Add missing form validation on presetting QU id stock ( #704 )
2020-04-07 16:37:30 +02:00
Mik-
1aa788b6c2
Preset the stock qu with the purchase qu on new products. ( #688 )
2020-04-02 08:36:20 +02:00
Mik-
7200f2c17f
Fix errors with disabled feature flag STOCK_PRICE_TRACKING ( #687 )
...
fixes #685
2020-04-02 08:34:43 +02:00
Mik-
f66a4c9631
Camera barcode scanner enhancements ( #675 )
...
* Disable torch button, if not supported
* Allow toggling torch
* Don't exceed the screen width with camera window
* Disable torch button, if not supported
* Allow toggling torch
* Don't exceed the screen width with camera window
* Allow toggling torch
* Disable torch button, if not supported
* Allow toggling torch
* Don't exceed the screen width with camera window
* Allow toggling torch
* Allow toggling torch
* Don't exceed the screen width with camera window
* Remove toggling of torch, as it's not working
and add resize of video to fit in viewport hieght
* Add feature to always turn on the torch in camera scanner.
* Fix feature flag name
Co-authored-by: Michael Neuendorf <neuendorf@gonicus.de>
2020-03-29 14:25:04 +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
Bernd Bestel
305f5b67e4
Name shopping locations "Stores" on the frontend (references #658 )
2020-03-25 20:09:28 +01:00
Bernd Bestel
2d00f6f84a
Immediately show the changed shopping location after edit on the stock entries page (references #658 )
2020-03-25 20:00:52 +01:00
Bernd Bestel
c3d4be352d
Fix product card chart rendering error when there is no shopping location (references #658 )
2020-03-25 19:49:10 +01:00
Immae
a45317aea1
Add shopping location for price tracking ( #658 )
2020-03-25 19:34:56 +01:00
Bernd Bestel
375865d80e
Changelog and some small changes for #639
2020-03-22 18:02:19 +01:00
Marc Ole Bulling
3fc14db5d5
Check if all dependencies are installed ( #639 )
...
* Added check if all dependencies are installed and config.php/config-dist.php exists
* Also check for php modules
* Uncomment code that was accidentally disabled for debug purposes
2020-03-22 17:55:23 +01:00
Bernd Bestel
03566d0644
Added changelog for #633 / #629
2020-03-21 15:56:59 +01:00
Mik-
71b62d5708
629 Make ellipsis menu in stock overview more responsive ( #633 )
...
* Make popup menues in table rows responsive
* Move "consum all" button to ellipsis menu on small devices
2020-03-21 15:52:51 +01:00
Bernd Bestel
48dc8e45ba
Fixed localization string (references #588 )
2020-03-06 20:58:01 +01:00
Bernd Bestel
5cfe7cf34d
Fixed that the recipe page was reloaded when expanding a collapsed row on mobile ( fixes #589 )
2020-03-06 20:51:09 +01:00
Bernd Bestel
fc131f5598
Little changes and changelog for #574
2020-03-01 17:58:10 +01:00
Radim Kabeláč
51cd81422e
Button to Flashlight ON in Barcodescanner ( #574 )
...
* Button to Flash lights ON in barcodereader
Only to ON, not OFF (you can Cancel)
* First documentation files for ReadThedoc
* Delete index.md
* Delete mkdocs.yml
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-03-01 17:53:28 +01:00
Bernd Bestel
3c4264c3a0
Reload the meal plan after consuming a recipe
2020-02-11 19:24:34 +01:00
Bernd Bestel
aa787e765e
Changelog, small changes and added missing localization strings for #556
2020-02-10 18:24:15 +01:00
kriddles
c5f38689fa
Include product_group in recipe ingredient list ( #556 )
...
* Include product_group in recipe ingredient list
* Delete 0098.sql
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-02-10 18:04:57 +01:00
Bernd Bestel
49edd011b4
Changelog and small fixes for #545
2020-02-09 21:50:56 +01:00
kriddles
7638254f14
Mealplan - use mealplan recipe_servings when consuming and adding missing recipe ingredients ( #545 )
2020-02-09 21:43:31 +01:00
Bernd Bestel
5a65f37f4a
Little wording change/fix
2020-02-09 21:03:11 +01:00
Bernd Bestel
540ae2627a
Changelog & small changes for #554
2020-02-09 21:01:29 +01:00
kriddles
2c0f7f0883
Default initial recipe add for mealplan to use recipe's base_servings ( #554 )
2020-02-09 20:57:25 +01:00
Bernd Bestel
62dae64a88
Make meal plan entries editable (references #545 )
2020-02-09 17:15:13 +01:00
Bernd Bestel
0359003e09
Little changes for #551
2020-02-09 15:36:03 +01:00
Marc Ole Bulling
a0ab5c5e94
Add option to disable automatic switching to compact shoppinglist view on mobile devices ( #551 )
2020-02-09 15:25:54 +01:00
Bernd Bestel
e9f55de987
Fixed FullCalendar height was not calculated dynamically ( fixes #549 )
2020-02-09 15:24:05 +01:00
Bernd Bestel
3af5bd8e29
Scoll to the recipe card after selecting a recipe on mobile devices ( closes #547 )
2020-02-09 15:11:38 +01:00
Bernd Bestel
06fe308f31
Fixed recipeposform initial product quantity unit was not set
2020-02-04 20:04:48 +01:00
Bernd Bestel
35388b798c
We don't need rounded borders on card headers
2020-02-04 19:51:39 +01:00
Bernd Bestel
fcfe62f4d3
Further optimize spacing to waste less space
2020-02-03 21:45:15 +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
58cff18b03
Improved the meal plan add-dialogs ( closes #540 )
2020-02-03 20:04:22 +01:00
Leroy Förster
b4a759c0fc
Use full width for compact shopping list ( #541 )
...
I had luck with not enforcing any width, not even 100% and removed the
padding an margin overrides from the shoppinglist.js
I also tested it on a real Android device to be really sure.
2020-02-03 08:48:37 +01:00
Bernd Bestel
b9e32a9795
Fixed contextual time ago display was missing (references #513 )
2020-02-02 17:55:35 +01:00
Bernd Bestel
ba1272ced8
Made the navbar a little smaller
2020-02-02 17:16:02 +01:00
Bernd Bestel
890663bf63
Fixed the "Shopping list to stock workflow" with disabled FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING ( fixes #537 )
2020-02-02 13:01:31 +01:00
Bernd Bestel
5effa0c103
Fixed recipeposform edit when "Only check if a single unit is in stock" is set (again closes #535 )
2020-02-02 12:33:48 +01:00
Bernd Bestel
7235d9c0c9
Next try to fix scrolling issues on shopping list compact view (again closes #453 )
2020-02-02 12:01:47 +01:00
Bernd Bestel
ad9f336035
Fix new recipe creation when reloading the /recipes/new page ( fixes #536 )
2020-02-01 18:16:44 +01:00
Bernd Bestel
23efe0c87a
Added an option to hide the calendar on the shopping list ( closes #531 )
2020-02-01 12:55:12 +01:00
Bernd Bestel
683ea0984c
Further optimized shopping list compact view (references #453 )
2020-02-01 12:35:06 +01:00
Bernd Bestel
debb29ddaa
Fixed recipeposform edit when "Only check if a single unit is in stock" is set ( fixes #535 )
2020-02-01 09:03:30 +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
170c7627fd
Only apply fullscreen-no-gutters class when a fullscreen-card is displayed (references #453 )
2020-01-31 18:17:39 +01:00
Bernd Bestel
6d4a15d372
Improve shopping list compact view (references #453 )
2020-01-31 17:52:03 +01:00
Bernd Bestel
da92ac40c4
Always save the recipe before leaving/reloading the page (this now closes #520 )
2020-01-28 21:04:59 +01:00
Bernd Bestel
8d490351d0
Replaced jQuery UI by Animate.css (better, faster, lighter)
2020-01-28 19:27:18 +01:00
Bernd Bestel
a64b35e9d4
Made the sidebar menu items a little smaller
2020-01-27 22:34:48 +01:00
Bernd Bestel
4c1c971f6d
Rename /stockedit and /stockdetail to match the "naming conventions" (references #421 )
2020-01-27 19:19:09 +01:00
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
d4bec3bd10
Added a "keep screen on" option using NoSleep.js ( closes #427 )
2020-01-05 10:03:02 +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
Bernd Bestel
95208f5582
Updated unmanaged dependencies (font)
2019-09-28 08:53:59 +02:00
Bernd Bestel
dea2ffeaaf
Added a "clear" button above the new notes field on the shopping list page
2019-09-28 08:48:58 +02:00
Bernd Bestel
e548caabb1
Formatting...
2019-09-27 17:32:52 +02:00
Bernd Bestel
2b0f5d8d84
Only do a product by barcode lookup if there is actually any input
2019-09-27 17:27:45 +02:00
Bernd Bestel
e9f2edea75
Optimize the initial state of the barcode scanner start button if the input element is disabled and make sure it does nothing, if the button is enabled however but the input element is disabled
2019-09-27 17:24:44 +02:00
Bernd Bestel
1b9a3c7f57
Fix that the barcode scanner start button overlaps everything
2019-09-27 17:03:50 +02:00
Bernd Bestel
2636456461
Show the journal of the product/chore/battery cards in a dialog
2019-09-27 16:54:40 +02:00
Bernd Bestel
81f6b58fe4
Added a button to jump to the journal on the product/chore/battery card
2019-09-27 14:19:06 +02:00
Bernd Bestel
9ba4585143
Reduce console.log spam
2019-09-27 14:08:24 +02:00
Bernd Bestel
4aa575e0e8
Display just "unlimited" on the product card for the average shelf life if it is > 200 years
2019-09-27 14:04:44 +02: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
DeeeeLAN
6522aca30e
Fixed navigation menu and full screen recipe smooth scrolling on iOS ( #397 )
...
* fixed barcode button on iOS and made nicer on the desktop
* fixed indentation
* fixed indentation
* fixed recipe ingredient layout issue in safari
* fixed navigation menu and full screen recipe smooth scrolling on iOS
2019-09-27 08:33:08 +02:00
Bernd Bestel
e59a35c6d1
Also refresh the parent product on sub product actions on the stock overview page ( closes #394 )
2019-09-27 08:30:08 +02:00
Bernd Bestel
cc2bf68f31
Fixed row highlighting after product actions on the stock overview page
2019-09-27 08:12:37 +02:00
Bernd Bestel
cf2e6f1039
Added a sub feature flag to disable chore assignments when not needed
2019-09-26 17:20:25 +02:00
Bernd Bestel
21503c26d2
Use properly formatted numbers "everywhere" (partly references #389 )
2019-09-26 15:25:30 +02:00
Bernd Bestel
41e93d2c50
Little night mode improvements
2019-09-26 14:13:30 +02:00
Bernd Bestel
b39866bda2
Immediately refresh the QU conversion hint on key presses on the product edit page
2019-09-26 13:59:41 +02:00
Bernd Bestel
b8f9d09afc
Don't remove products from stock overview on consuming all and the product has a min. stock amount & show it again on undo
2019-09-26 13:55:42 +02:00
Bernd Bestel
a2b6d9ae39
Various small UI refinements
2019-09-26 13:14:24 +02:00
DeeeeLAN
c5927a10f3
fixed recipe ingredient layout issue in safari ( #387 )
...
* fixed barcode button on iOS and made nicer on the desktop
* fixed indentation
* fixed indentation
* fixed recipe ingredient layout issue in safari
2019-09-26 11:42:30 +02:00
Bernd Bestel
53f0893f55
Fix unit conversion handling (factor of destination qu is always 1) ( fixes #382 )
2019-09-25 09:32:06 +02:00
Bernd Bestel
5351828e79
Reuse existing shopping list items when adding products from the stock overview page ( closes #375 )
2019-09-24 18:27:50 +02:00
Bernd Bestel
50e829f270
Hide the recipe interaction buttons when displayed as a fullscreen card (as the dialogs would be behind the fullscreen card)
2019-09-24 10:28:42 +02:00
Bernd Bestel
3b29110500
Never show close buttons in modal dialogs, this is not needed
2019-09-24 10:24:47 +02:00
Bernd Bestel
e727a38071
Improved the responsiveness of the "Create or assign product" dialog
2019-09-24 10:19:23 +02:00
Bernd Bestel
099ac7e75a
Use exact matches for product barcode lookups ( closes #366 )
2019-09-24 09:52:05 +02:00
Bernd Bestel
2a9f927a13
Improved responsiveness of /mealplan and /calendar ( closes #372 and closes #373 )
2019-09-24 09:21:57 +02:00
Bernd Bestel
6bb9d2c51d
Some little changes for pull request #369 (also references #367 )
2019-09-24 08:35:30 +02:00
kriddles
66f61ec1ad
public mealplan: add fullscreen recipe in popup ( #369 )
2019-09-24 08:13:42 +02:00
Bernd Bestel
eef844d42e
Optimized dropdown caret position a little bit
2019-09-23 20:19:53 +02:00
Bernd Bestel
e5aebad5d9
Small night mode fix
2019-09-22 13:32:18 +02:00
Bernd Bestel
f3a1489abf
Little night mode improvements
2019-09-22 10:26:43 +02:00
Bernd Bestel
f7c4662e2b
Prevent error message spam when navigating away before the page has completely loaded
2019-09-22 09:36:28 +02:00
Bernd Bestel
4c57bf8b9d
Always navigate back to the previous page after saving a product ( closes #364 )
2019-09-22 09:03:59 +02:00
Bernd Bestel
e5530e2058
Trigger input event after SetValue of datetimepicker ( fixes #363 )
2019-09-22 08:53:05 +02:00
Bernd Bestel
51e0154101
Try to improve QuaggaJS barcode scanning recognition accuracy (this now closes #362 )
2019-09-21 20:46:23 +02:00
Bernd Bestel
c32ea087df
Added a little barcode scanner testing page (references #362 )
2019-09-21 20:01:49 +02:00
Bernd Bestel
6e4117526b
Improved productcard "never" date display
2019-09-21 13:40:31 +02:00
Bernd Bestel
e4437f5db1
Fixed that "Spoil rate" and "Average shelf life" on the product card was wrong in most cases
2019-09-21 13:30:44 +02:00
Bernd Bestel
b57fd83cb8
Fixed various smaller problems after some testing
2019-09-21 13:08:42 +02:00
Bernd Bestel
327c1f4fb3
Fixed meal plan did not load when a containing recipe was deleted ( closes #361 )
2019-09-21 09:18:40 +02:00
Bernd Bestel
ab44566890
Small style refinements
2019-09-21 08:38:28 +02:00
Bernd Bestel
d580990b25
Fixed JS errors on the login page
2019-09-21 08:25:32 +02:00
Bernd Bestel
91c275e66b
Slightly reordered the header of the shopping list page
2019-09-20 20:14:47 +02:00
Bernd Bestel
653098a81e
Improved product picture display on the productcard
2019-09-20 20:10:03 +02:00
Bernd Bestel
c228126c3a
Added a new field calories for products ( closes #268 )
2019-09-20 20:06:24 +02:00
Bernd Bestel
339a25d1e3
Added a notes field to shopping lists (references #245 )
2019-09-20 18:08:38 +02:00
Bernd Bestel
5a91c86b81
Added an option to print a shopping list (references #245 )
2019-09-20 17:40:45 +02:00
Bernd Bestel
292b652437
Updated localizations & improved some special and demo translation string data handling
2019-09-20 16:26:50 +02: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
d4c76aaa76
Properly show qu plural forms on the product or qu conversion edit page
2019-09-20 10:30:46 +02:00
Bernd Bestel
6ce4e6cb37
An icon is not needed when not showing an userentity in the sidebar menu (references #242 )
2019-09-20 10:22:59 +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
cbf1d1ca40
Implemented stock sub-feature-flags ( closes #314 )
2019-09-19 17:46:52 +02:00
Bernd Bestel
5e9a7fb7ca
Implemented browser barcode scanning ( closes #102 )
2019-09-19 12:48:02 +02:00
Bernd Bestel
9f18b75526
Auto focus the amount field on the qu plural form testing page (references #261 )
2019-09-18 20:27:35 +02:00
Bernd Bestel
346b589534
Make it possible to test quantity unit plural forms ( closes #261 )
2019-09-18 20:21:09 +02:00
Bernd Bestel
8f798a94d1
Only allow night mode enabled manually or automatically, but not both at the same time (again fixes #71 )
2019-09-18 19:43:33 +02:00
Bernd Bestel
991706920f
Fixed that datetimepickers not considered the config.php setting CALENDAR_FIRST_DAY_OF_WEEK ( closes #334 )
2019-09-18 18:46:07 +02:00
Bernd Bestel
ce12202c86
Make it configurable if calendars shows week numbers or not ( closes #333 )
2019-09-18 18:30:25 +02:00
Bernd Bestel
2237e2f8f4
Hide userfields form border for custom objects because all fields are userfields... (references #242 )
2019-09-18 16:31:00 +02:00
Bernd Bestel
096fb7a116
Implement custom entities / objects ( closes #242 )
2019-09-18 16:18:15 +02:00
Bernd Bestel
918f84f568
Lazy load all images to increase page load times (references #275 )
2019-09-18 13:59:37 +02:00
Bernd Bestel
d209c0bd22
Automatically downscale pictures to reduce page loading times ( closes #275 )
2019-09-18 11:04:59 +02:00
Bernd Bestel
ba089a3d79
Also show the stock QU (as on all other places) after a product is selected on the chore edit page (references #279 )
2019-09-18 10:08:59 +02:00
Bernd Bestel
3df44697bf
Implemented the option to automatically consume a product on tracking a chore execution ( closes #279 )
2019-09-18 10:02:52 +02:00
Bernd Bestel
e326e69d49
Allow decimal numbers in "Factor purchase to stock quantity unit" when "Allow partial units in stock" is enabled ( closes #351 )
2019-09-17 20:02:27 +02:00
Bernd Bestel
0c27157db6
Implemented new Userfield type "Select list" ( closes #325 )
2019-09-17 19:11:06 +02:00
Bernd Bestel
4dd804003b
Re-apply filter after chore execution on the chores overview page
2019-09-17 17:17:33 +02:00
Bernd Bestel
182d063886
Fixed user filter button on chores overview page (references #253 )
2019-09-17 16:58:42 +02:00
Bernd Bestel
bc487b4867
Make it possible to also filter by chore assignments on the chore overview page (references #253 )
2019-09-17 16:50:29 +02:00
Bernd Bestel
597a9e3d21
Show aggregated product amounts also on the productcard (references #196 )
2019-09-17 16:18:00 +02:00
Bernd Bestel
1b19940aba
Only cascade changes of stock QU to recipe ingredients which uses the same QU (references #177 )
2019-09-17 16:01:30 +02:00
Bernd Bestel
74f9470769
Implemented that chores can be assigned to users ( closes #253 )
2019-09-17 13:13:26 +02:00
Bernd Bestel
a799f2b43f
Finished qu unit conversion handling ( closes #177 )
2019-09-16 09:35:20 +02:00
Bernd Bestel
6094096675
Started working on qu unit conversion handling (references #177 )
2019-09-15 16:40:54 +02:00
Bernd Bestel
a0a0e104b0
Implemented product variations ( closes #196 )
2019-09-14 17:34:36 +02:00
Bernd Bestel
26ebeec74f
Improved date display of "Track date only"-chores (never show the time part for them)
2019-09-14 13:05:36 +02:00
Bernd Bestel
f9036f0248
Use the summernote editor for product description ( closes #288 )
2019-08-15 14:35:28 +02:00
Bernd Bestel
be4b5c81b2
ixed that the delete button not always deleted the currently selected equipment item ( fixes #307 )
2019-08-15 13:53:30 +02:00
Bernd Bestel
7004cf4400
Finished the implementation of "Location Content Sheet" ( closes #341 )
2019-08-11 09:24:47 +02:00
Bernd Bestel
6e3407b157
Always show "Track date only" shore execution times without the time part
2019-07-07 19:38:57 +02:00
Bernd Bestel
4822d9a4b8
Fixed date-only-datetimepicker width
2019-07-07 10:10:20 +02:00
Bernd Bestel
84e6e253ea
Fixed date "never" display on stock overview page (again closes #296 )
2019-07-07 09:04:40 +02:00
Bernd Bestel
b4d2e2a20a
Added the possibility to undo a task ( closes #252 )
2019-07-06 20:34:01 +02:00
Bernd Bestel
914dde4609
Added a new config.php setting CALENDAR_FIRST_DAY_OF_WEEK to be able to change the first day of a week used for calendar views ( closes #256 )
2019-07-06 20:19:21 +02:00
Bernd Bestel
1eb1aa8b11
Added a "consume this recipe"-button to the meal plan (and also a button to consume all recipes for a whole week) ( closes #283 )
2019-07-06 20:02:40 +02:00
Bernd Bestel
8c205941c7
Added that products can now also be consumed as spoiled from the stock overview page (option in the more/context menu per line) ( closes #251 )
2019-07-06 18:15:53 +02:00
Bernd Bestel
b24683f954
Added the possibility to mark a shopping list item as "done" ( closes #257 )
2019-07-06 17:56:59 +02:00
Bernd Bestel
e4d26bb8fd
Make it possible to switch shopping list items between shopping lists ( closes #284 )
2019-07-06 17:31:17 +02:00
Bernd Bestel
c6c10c87e4
Improved date display for dates of today and no time
...
Instead of the hours since midnight now just "Today" will be shown
2019-07-06 17:19:28 +02:00
Bernd Bestel
df529c3c0b
Show 2999-12-31 as "Never" everywhere ( closes #296 )
2019-07-06 15:43:54 +02:00
Bernd Bestel
b76e51ba41
Fixed nested recipes costs calculation ( fixes #299 )
2019-07-06 14:48:46 +02:00
Bernd Bestel
67cfd0ba5f
Remove the internal meal plan recipe when removing a meal plan entry ( fixes #298 )
2019-07-06 13:57:49 +02:00
Bernd Bestel
3fcede0b7c
Fix that "Track date only" cannot be tracked <> today ( fixes #300 )
2019-07-06 13:32:40 +02:00
Bernd Bestel
0c0e8c6957
Fixed the consume success message on stock overview page ( fixes #302 )
2019-07-06 13:13:38 +02:00
Bernd Bestel
7c7c5db28c
Fixed that a entered barcode on the product edit page was only saved when "adding" it to the barcodes list by pressing TAB ( closes #269 )
2019-06-09 09:21:56 +02:00
Bernd Bestel
6b98fa85d3
Improved meal plan entry reference when deleting an entry (references #255 )
2019-06-09 09:10:29 +02:00
Bernd Bestel
825be63b93
Fixed single quotes problem in all pickers ( fixes #264 )
2019-06-09 09:06:44 +02:00
Bernd Bestel
a56f8be19e
Fixed page reloads with unsaved form data and "Auto reload on external changes" enabled ( fixes #265 )
2019-06-09 08:58:46 +02:00
Bernd Bestel
43710b5062
Properly show the API error when it failed to undo a stock booking ( fixes #267 )
2019-06-08 16:53:31 +02:00
Bernd Bestel
9e7d62b62d
Make sure to hide all tooltips before removing an element ( fixes #260 )
2019-06-08 16:39:35 +02:00
Bernd Bestel
2b77bc6ae6
Fixed deleting meal plan entries did not work ( fixes #255 )
2019-06-08 16:30:45 +02:00
Marius Boro
3321bcd683
Update grocy_night_mode.css
...
Fixed unreadable text
2019-05-30 14:32:27 +02:00
Bernd Bestel
0a4ea6861a
Fixed quotes were not escaped properly for contains search in dropdowns ( fixes #249 )
2019-05-16 22:20:01 +02:00
Bernd Bestel
de89fee5bb
Fixed wrong amount was displayed in popup after consume
2019-05-10 20:43:57 +02:00
Bernd Bestel
338c6c0a9d
Added a new userfield type "preset-list" ( closes #239 )
2019-05-07 21:24:59 +02:00
Bernd Bestel
8504eb9b38
Finished first version of meal planning (for now closes #146 )
2019-05-07 19:48:14 +02:00
Bernd Bestel
57233dba1a
Added first basic version of meal planning (references #146 )
2019-05-06 19:38:47 +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
153ac61867
Fix deleting user have not worked ( fixes #237 )
2019-05-04 23:10:01 +02:00
Bernd Bestel
9ef55f1f01
Make it possible to track a chore execution without the time part, only the day
2019-05-04 16:13:05 +02:00
Bernd Bestel
98fcd767b3
Fixed chore edit form - period type hint did not work (references #151 )
2019-05-04 15:40:26 +02:00
Bernd Bestel
fe8bb43996
Fixed userfields did not load (references #176 )
2019-05-04 15:21: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
bcae9f9292
Added price field on inventory page (for added products) (references #225 )
2019-05-03 22:11:20 +02:00
Bernd Bestel
78a230c5d5
Fixed again a problem with productpicker workflows and disabled URL rewriting ( closes #232 )
2019-05-03 20:22:48 +02:00
Bernd Bestel
24680154d8
Properly display/round recipe ingredients amounts ( closes #230 )
2019-05-03 19:36:27 +02:00
Bernd Bestel
dfd501c515
Don't load or save userfields if there are none (references #176 )
2019-05-03 19:29:12 +02:00
Bernd Bestel
dae5bb2b34
Make it possible to filter recipes by stock availability ( closes #231 )
2019-05-03 19:22:58 +02:00
Bernd Bestel
595171afa5
Properly show and handle that the new amount during inventory cannot equal the current stock amount (this now closes #224 )
2019-05-03 19:08:54 +02:00
Bernd Bestel
618ff5609f
Fixed success message on inventory page showed the previous amount instead of the new one (references #224 )
2019-05-03 18:32:59 +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
b310aa55c5
Prevent productpicker workflow modal from being opened twice ( fixes #229 )
2019-05-02 21:46:15 +02:00
Bernd Bestel
4912dd56d1
Finished migration to use gettext (this now closes #161 )
2019-05-02 20:20:18 +02:00
Bernd Bestel
9b2dba2397
Migrated (hopefully) all translations to PO/Gettext (references #161 )
2019-05-01 20:19:18 +02:00
Bernd Bestel
b6b8c76d3a
Fixed product picker workflows URLs were wrong when running grocy in a subdirectory ( fixes #219 )
2019-04-27 15:17:55 +02:00
Bernd Bestel
c5993ad994
Finalize user-defined-fields ( closes #176 )
2019-04-23 09:06:18 +02:00
Bernd Bestel
fc11da3c3f
Started working on user-defined-fields for all entities (references #176 )
2019-04-22 22:16:35 +02:00
Bernd Bestel
77f3b80540
Implemented daily/weekly/monthly recurrence patterns for chores ( closes #151 )
2019-04-22 14:01:31 +02:00
Bernd Bestel
d72fe69a17
Show more info in product card ( closes #173 )
2019-04-22 10:11:58 +02:00