kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-19 03:40:10 +00:00
Code Issues Projects Releases Wiki Activity

Make it possible to provide a different location for added product during inventory (closes #183)

Browse Source
This commit is contained in:
Bernd Bestel
2019-04-05 21:26:44 +02:00
parent 886e272c03
commit b6e80580ed
6 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/StockApiController.php
View File

@@ -171,7 +171,13 @@ class StockApiController extends BaseApiController
$bestBeforeDate = $requestBody['best_before_date'];
}
$bookingId = $this->StockService->InventoryProduct($args['productId'], $requestBody['new_amount'], $bestBeforeDate);
$locationId = null;
if (array_key_exists('location_id', $requestBody) && is_numeric($requestBody['location_id']))
{
$locationId = $requestBody['location_id'];
}
$bookingId = $this->StockService->InventoryProduct($args['productId'], $requestBody['new_amount'], $bestBeforeDate, $locationId);
return $this->ApiResponse($this->Database->stock_log($bookingId));
}
catch (\Exception $ex)

3
controllers/StockController.php
View File

@@ -48,7 +48,8 @@ class StockController extends BaseController
public function Inventory(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
{
return $this->AppContainer->view->render($response, 'inventory', [
'products' => $this->Database->products()->orderBy('name')
'products' => $this->Database->products()->orderBy('name'),
'locations' => $this->Database->locations()->orderBy('name')
]);
}