github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-05 12:26:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: make stockentry grocycodes consume the actual stock entry not the product in general

Browse Source 
if the stock_entry_id is in the request body use this instead of the stockentry grocycode
this may not be the correct way to interpret this but one of them has to win
This commit is contained in:
David Mott 2021-08-16 16:05:59 +10:00
parent 8e552f1146
commit aaa2131253
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
controllers/StockApiController.php
View File

@ -282,6 +282,10 @@ class StockApiController extends BaseApiController
{
$specificStockEntryId = $requestBody['stock_entry_id'];
}
else if (array_key_exists('stock_id', $args) && !empty($args['stock_id']))
{
$specificStockEntryId = $args['stock_id'];
}
$locationId = null;
if (array_key_exists('location_id', $requestBody) && !empty($requestBody['location_id']) && is_numeric($requestBody['location_id']))
@ -322,7 +326,23 @@ class StockApiController extends BaseApiController
{
try
{
$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
if (Grocycode::Validate($barcode))
{
$gc = new Grocycode($barcode);
if ($gc->GetType() != Grocycode::PRODUCT)
{
throw new \Exception("Invalid grocycode type");
}
$args['productId'] = $gc->GetId();
if ($gc->GetExtraData())
{
$args['stock_id'] = $gc->GetExtraData()[0];
}
}
else
{
$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
}
return $this->ConsumeProduct($request, $response, $args);
}
catch (\Exception $ex)