This commit is contained in:
Bernd Bestel 2020-01-27 22:17:19 +01:00
parent e84c7063d3
commit 5d83ec7967
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300

View File

@ -195,13 +195,13 @@ class StockService extends BaseService
$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 = :1) OR product_id = :1)';
} }
$sqlOpenAndWhere = 'AND open IN (0, 1)'; $sqlWhereAndOpen = 'AND open IN (0, 1)';
if ($excludeOpened) if ($excludeOpened)
{ {
$sqlOpenAndWhere = 'AND open = 0'; $sqlWhereAndOpen = 'AND open = 0';
} }
return $this->Database->stock()->where($sqlWhereProductId . ' ' . $sqlOpenAndWhere, $productId)->orderBy('best_before_date', 'ASC')->orderBy('purchased_date', 'ASC')->fetchAll(); return $this->Database->stock()->where($sqlWhereProductId . ' ' . $sqlWhereAndOpen, $productId)->orderBy('best_before_date', 'ASC')->orderBy('purchased_date', 'ASC')->fetchAll();
} }
public function GetProductStockEntriesForLocation($productId, $locationId, $excludeOpened = false, $allowSubproductSubstitution = false) public function GetProductStockEntriesForLocation($productId, $locationId, $excludeOpened = false, $allowSubproductSubstitution = false)