kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +00:00
Code Issues Projects Releases Wiki Activity

Fixed shopping list QU handling (fixes #1385, fixes #1384)

Browse Source
This commit is contained in:
Bernd Bestel
2021-07-02 17:37:06 +02:00
parent 187d48f93d
commit cae924eb81
6 changed files with 128 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/StockService.php
View File

@@ -214,7 +214,7 @@ class StockService extends BaseService
}
}
public function AddProductToShoppingList($productId, $amount = 1, $note = null, $listId = 1)
public function AddProductToShoppingList($productId, $amount = 1, $quId = -1, $note = null, $listId = 1)
{
if (!$this->ShoppingListExists($listId))
{
@@ -226,9 +226,15 @@ class StockService extends BaseService
throw new \Exception('Product does not exist or is inactive');
}
if ($quId == -1)
{
$quId = $this->getDatabase()->products($productId)->qu_id_purchase;
}
$alreadyExistingEntry = $this->getDatabase()->shopping_list()->where('product_id = :1 AND shopping_list_id = :2', $productId, $listId)->fetch();
if ($alreadyExistingEntry)
{ // Update
{
// Update
$alreadyExistingEntry->update([
'amount' => ($alreadyExistingEntry->amount + $amount),
'shopping_list_id' => $listId,
@@ -236,10 +242,12 @@ class StockService extends BaseService
]);
}
else
{ // Insert
{
// Insert
$shoppinglistRow = $this->getDatabase()->shopping_list()->createRow([
'product_id' => $productId,
'amount' => $amount,
'qu_id' => $quId,
'shopping_list_id' => $listId,
'note' => $note
]);