Commit Graph

544 Commits

Author SHA1 Message Date
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