kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 17:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Fixed consume stock amount check for product substitution (fixes #1240)

Browse Source
This commit is contained in:
Bernd Bestel 2021-01-01 13:27:57 +01:00
parent c57e554369
commit 8c0ff04caa
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
services/StockService.php
View File

@ -277,8 +277,10 @@ class StockService extends BaseService
$potentialStockEntries = FindAllObjectsInArrayByPropertyValue($potentialStockEntries, 'stock_id', $specificStockEntryId); $potentialStockEntries = FindAllObjectsInArrayByPropertyValue($potentialStockEntries, 'stock_id', $specificStockEntryId);
} }
$productStockAmount = SumArrayValue($potentialStockEntries, 'amount'); // TODO: This check doesn't really check against products only at the given location
// (as GetProductDetails returns the stock_amount_aggregated of all locations)
// However, $potentialStockEntries are filtered accordingly, so this currently isn't really a problem at the end
$productStockAmount = ((object)$this->GetProductDetails($productId))->stock_amount_aggregated;
if ($amount > $productStockAmount) if ($amount > $productStockAmount)
{ {
throw new \Exception('Amount to be consumed cannot be > current stock amount (if supplied, at the desired location)'); throw new \Exception('Amount to be consumed cannot be > current stock amount (if supplied, at the desired location)');
@ -604,7 +606,6 @@ class StockService extends BaseService
$consumeCount = $this->getDatabase()->stock_log()->where('product_id', $productId)->where('transaction_type', self::TRANSACTION_TYPE_CONSUME)->where('undone = 0 AND spoiled = 0')->sum('amount') * -1; $consumeCount = $this->getDatabase()->stock_log()->where('product_id', $productId)->where('transaction_type', self::TRANSACTION_TYPE_CONSUME)->where('undone = 0 AND spoiled = 0')->sum('amount') * -1;
$consumeCountSpoiled = $this->getDatabase()->stock_log()->where('product_id', $productId)->where('transaction_type', self::TRANSACTION_TYPE_CONSUME)->where('undone = 0 AND spoiled = 1')->sum('amount') * -1; $consumeCountSpoiled = $this->getDatabase()->stock_log()->where('product_id', $productId)->where('transaction_type', self::TRANSACTION_TYPE_CONSUME)->where('undone = 0 AND spoiled = 1')->sum('amount') * -1;
if ($consumeCount == 0) if ($consumeCount == 0)
{ {
$consumeCount = 1; $consumeCount = 1;
@ -727,7 +728,7 @@ class StockService extends BaseService
throw new \Exception('Product does not exist or is inactive'); throw new \Exception('Product does not exist or is inactive');
} }
$productDetails = (object) $this->GetProductDetails($productId); $productDetails = (object)$this->GetProductDetails($productId);
if ($price === null) if ($price === null)
{ {