kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-19 11:48:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix blank/missing items in spending report (#2432)

Browse Source 
* Fixes blank/missing items in spending report

Use left (outer) join when connecting product to optional product group

* Properly display ungrouped items in table and chart

---------

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
This commit is contained in:
Torqu3Wr3nch
2024-01-09 12:36:09 -05:00
committed by GitHub
parent 99f448dd64
commit 151bd7f025
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
controllers/StockReportsController.php
View File

@@ -29,9 +29,16 @@ class StockReportsController extends BaseController
if ($groupBy == 'product')
{
if (isset($request->getQueryParams()['product-group']) and $request->getQueryParams()['product-group'] != 'all')
if (isset($request->getQueryParams()['product-group']))
{
$where .= ' AND pg.id = ' . $request->getQueryParams()['product-group'];
if ($request->getQueryParams()['product-group'] == 'ungrouped')
{
$where .= ' AND pg.id IS NULL';
}
elseif ($request->getQueryParams()['product-group'] != 'all')
{
$where .= ' AND pg.id = ' . $request->getQueryParams()['product-group'];
}
}
$sql = "
@@ -44,7 +51,7 @@ class StockReportsController extends BaseController
FROM products_price_history pph
JOIN products p
ON pph.product_id = p.id
JOIN product_groups pg
LEFT JOIN product_groups pg
ON p.product_group_id = pg.id
WHERE $where
GROUP BY p.id, p.name, pg.id, pg.name
@@ -61,7 +68,7 @@ class StockReportsController extends BaseController
FROM products_price_history pph
JOIN products p
ON pph.product_id = p.id
JOIN product_groups pg
LEFT JOIN product_groups pg
ON p.product_group_id = pg.id
WHERE $where
GROUP BY pg.id, pg.name