Commit Graph

1332 Commits

Author SHA1 Message Date
Andre Monteiro
b8cd5cd0b5 Additional configuration options for Quagga2 (#844) 2020-08-19 19:52:04 +02:00
Bernd Bestel
2cd3779d82 Added changelog for #855 2020-08-19 19:49:32 +02:00
Michał Przybyś
f8c6e81dcb Fix grocy/grocy#834 (#855)
* Fix grocy/grocy#834

* stock_missing_products_including_opened didn't take the opened amount in HAVING clauses

* Resolved merge conflicts

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-19 19:46:25 +02:00
Bernd Bestel
31c412a28c Typo 2020-08-19 19:31:52 +02:00
Bernd Bestel
41359137dc Added changelog for #921 2020-08-19 19:29:39 +02:00
fipwmaqzufheoxq92ebc
d60d981fd1 Refactor Authentication and add proxy-authentication (#921)
* Refactor Authentication-Middlewares

* Add Proxy-Authentication

* Disable "Logout" & "Manage Users" when using ProxyAuth

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-19 19:23:13 +02:00
Bernd Bestel
5b475d9307 Added changelog for #876 2020-08-18 19:46:38 +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
Bernd Bestel
e4d0978f5d Merge branch 'master' of https://github.com/grocy/grocy 2020-08-18 19:37:10 +02:00
Bernd Bestel
f88401a44a Added changelog for #933 2020-08-18 19:36:45 +02:00
fipwmaqzufheoxq92ebc
e7af74f550 use last Chore-Log when determining the next assigned person (#933) 2020-08-18 19:34:19 +02:00
Bernd Bestel
295f360306 Added changelog for #927 2020-08-18 19:30:00 +02:00
fipwmaqzufheoxq92ebc
42dc55625a Improve Performance (#927)
* Stock-Overview: Reduce amount of database queries and FindObjectInArray()-calls

* Speed-up stock_current by improving products_resolved and creating indices.

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-18 19:23:37 +02:00
Bernd Bestel
7510c677f1 Added changelog for #880 2020-08-18 18:30:35 +02:00
duck
7e276289e0 WIP: Fix typo on "Consumed Amount" localization string (#880)
* Fix typo on localization string in strings.pot

Should be "Consumed Amount"

* Remove typo Consumed Amount string in locationcontentsheet template
2020-08-18 18:28:39 +02:00
Bernd Bestel
273811fdc1 Updated dependencies 2020-08-18 18:27:58 +02:00
Bernd Bestel
a93a3e1df1 Added changelog for #939 2020-08-18 18:15: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
Bernd Bestel
68dcd02d00 Revert "Fix base path computation when running in subdirectory (#945)" (#954)
This reverts commit 6cd874f3ba.
2020-08-18 18:01:50 +02:00
Stefan Haller
6cd874f3ba Fix base path computation when running in subdirectory (#945) 2020-08-18 17:57:35 +02:00
Bernd Bestel
b6b6f903ab Added more changelog for #801 2020-08-18 11:49:25 +02:00
Bernd Bestel
144ca094e6 Typo 2020-08-17 22:13:53 +02:00
Bernd Bestel
da05cbffc0 Added changelog for #801 2020-08-17 22:12:39 +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
d1e395b45e Added the Korean translation (closes #903) 2020-08-17 18:22:42 +02:00
Bernd Bestel
7f461bfa51 Added the Greek translation (closes #952) 2020-08-17 18:07:05 +02:00
Bernd Bestel
cadf61d641 Pulled translations from Transifex 2020-08-17 17:57:40 +02:00
Bernd Bestel
f6852e82b2 Website link has changed (references grocy/grocy-website#15) 2020-07-28 20:15:42 +02:00
Bernd Bestel
98f214e9f1 Added changelog for #826 2020-05-03 20:28:04 +02:00
Germs2004
f25902214f Change ellipsis to dash (#826)
An ellipsis in software often implies that the element is clickable to get more information.  Changing that to a simple dash symbol makes it more clear that the value is simply undefined and is not a clickable element.
2020-05-03 20:25:27 +02:00
Bernd Bestel
1e07a2dc2e Added changelog for #806 2020-04-29 19:55:56 +02:00
Marc Ole Bulling
a9dc5deaaa Added SQLite check for #805 (#806)
* Added SQLite check

* Moved check behind Extensions check

* Changed to SqlitePDO
2020-04-29 19:54:05 +02:00
Shadow
86b7cfed29 Fixed (#802)
Reordered days for better readability.
2020-04-27 18:11:32 +02:00
Bernd Bestel
fc9e2927f9 Added changelog for #796 2020-04-26 17:30:21 +02:00
kriddles
45c14723b0 Fix Product Shopping Location Prefill for Edits (#796) 2020-04-26 17:28:02 +02:00
Bernd Bestel
d72fd565ca Changelog and little adjustments for #800 2020-04-26 17:26:32 +02:00
Shadow
6c3c2d5384 #570 Added fix for weekly chores with multiple days (#800) 2020-04-26 17:14:54 +02:00
Bernd Bestel
37054475c2 Little adjustments and changelog for #795 2020-04-24 18:06:57 +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
Bernd Bestel
60f321d9c2 Added changelog for #793 2020-04-23 20:51:34 +02:00
Marc Ole Bulling
49e5eda30f Make GetUriParam work with special characters (eg. "&") (#793) 2020-04-23 20:48:48 +02:00
Bernd Bestel
5833bb1e8f Added changelog for #784 2020-04-22 18:05:05 +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
Bernd Bestel
1ea26cadcc Merge branch 'master' of https://github.com/grocy/grocy 2020-04-22 17:38:37 +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
Bernd Bestel
16b9e2c30a Return Access-Control-Allow-Origin for all API (content) requests (references #681) 2020-04-22 17:36:20 +02:00
Bernd Bestel
5e6a9dd443 Return status code 204 for CORS OPTIONS requests (references #681) 2020-04-21 21:15:45 +02:00