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

Undo formatting changes

Browse Source
This commit is contained in:
Bernd Bestel 2021-08-16 19:47:00 +02:00
parent aaa2131253
commit 25255287a7
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
controllers/StockApiController.php
View File

@ -282,10 +282,10 @@ class StockApiController extends BaseApiController
{
$specificStockEntryId = $requestBody['stock_entry_id'];
}
else if (array_key_exists('stock_id', $args) && !empty($args['stock_id']))
{
elseif (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']))
@ -326,23 +326,23 @@ class StockApiController extends BaseApiController
{
try
{
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']);
}
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)