kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 20:26:42 +00:00
Code Issues Projects Releases Wiki Activity

Fixed /stock/products/{productId}/entries endpoint query parameter include_sub_products did not work (however)

Browse Source
This commit is contained in:
Bernd Bestel
2020-11-19 18:28:16 +01:00
parent 631831e1e4
commit 211239a5d3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/StockService.php
View File

@@ -519,7 +519,7 @@ class StockService extends BaseService
public function GetExpiredProducts() public function GetExpiredProducts()
{ {
$currentStock = $this->GetCurrentStock(false); $currentStock = $this->GetCurrentStock(false);
$currentStock = FindAllObjectsInArrayByPropertyValue($currentStock, 'best_before_date', date('Y-m-d 23:59:59', strtotime("-1 days")), '<'); $currentStock = FindAllObjectsInArrayByPropertyValue($currentStock, 'best_before_date', date('Y-m-d 23:59:59', strtotime('-1 days')), '<');
$currentStock = FindAllObjectsInArrayByPropertyValue($currentStock, 'due_type', 2); $currentStock = FindAllObjectsInArrayByPropertyValue($currentStock, 'due_type', 2);
return $currentStock; return $currentStock;
@@ -665,11 +665,11 @@ class StockService extends BaseService
// In order of next use: // In order of next use:
// First due first, then first in first out // First due first, then first in first out
$sqlWhereProductId = 'product_id = :1'; $sqlWhereProductId = 'product_id = ' . $productId;
if ($allowSubproductSubstitution) if ($allowSubproductSubstitution)
{ {
$sqlWhereProductId = '(product_id IN (SELECT sub_product_id FROM products_resolved WHERE parent_product_id = :1) OR product_id = :1)'; $sqlWhereProductId = 'product_id IN (SELECT sub_product_id FROM products_resolved WHERE parent_product_id = ' . $productId . ')';
} }
$sqlWhereAndOpen = 'AND open IN (0, 1)'; $sqlWhereAndOpen = 'AND open IN (0, 1)';
@@ -678,7 +678,7 @@ class StockService extends BaseService
{ {
$sqlWhereAndOpen = 'AND open = 0'; $sqlWhereAndOpen = 'AND open = 0';
} }
$result = $this->getDatabase()->stock()->where($sqlWhereProductId . ' ' . $sqlWhereAndOpen, $productId); $result = $this->getDatabase()->stock()->where($sqlWhereProductId . ' ' . $sqlWhereAndOpen);
if ($ordered) if ($ordered)
{ {
return $result->orderBy('best_before_date', 'ASC')->orderBy('purchased_date', 'ASC'); return $result->orderBy('best_before_date', 'ASC')->orderBy('purchased_date', 'ASC');