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

openDate fixes for undo

Browse Source
This commit is contained in:
Kurt Riddlesperger 2020-01-22 10:19:25 -06:00
parent 6a77d36bc1
commit 2ee9b2286e
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
services/StockService.php
View File

@ -591,11 +591,19 @@ class StockService extends BaseService
));
$logOldRowForStockUpdate->save();
$openDate = $stockRow->opened_date;
if ($open && $openDate == null) {
$openDate = date('Y-m-d');
} else if (!$open) {
$openDate = null;
}
$stockRow->update(array(
'amount' => $amount,
'price' => $price,
'best_before_date' => $bestBeforeDate,
'location_id' => $locationId,
'opened_date' => $openDate,
'open' => $open
));
@ -1071,12 +1079,20 @@ class StockService extends BaseService
throw new \Exception('Booking does not exist or was already undone');
}
$openDate = $logRow->opened_date;
$open = true;
if ($openDate == null) {
$open = false;
}
$stockRow->update(array(
'amount' => $logRow->amount,
'best_before_date' => $logRow->best_before_date,
'purchased_date' => $logRow->purchased_date,
'price' => $logRow->price,
'location_id' => $logRow->location_id
'location_id' => $logRow->location_id,
'open' => $open,
'opened_date' => $openDate
));
// Update log entry