From 1e33975a9609082eb605f68f06f60f23bee22d3f Mon Sep 17 00:00:00 2001 From: Marc Ole Bulling Date: Sun, 4 Aug 2019 20:58:11 +0200 Subject: [PATCH] Use default best before date when adding product through API --- controllers/StockApiController.php | 2 +- services/StockService.php | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/controllers/StockApiController.php b/controllers/StockApiController.php index 4021587a..86cfdc5a 100644 --- a/controllers/StockApiController.php +++ b/controllers/StockApiController.php @@ -67,7 +67,7 @@ class StockApiController extends BaseApiController throw new \Exception('An amount is required'); } - $bestBeforeDate = date('Y-m-d'); + $bestBeforeDate = null; if (array_key_exists('best_before_date', $requestBody) && IsIsoDate($requestBody['best_before_date'])) { $bestBeforeDate = $requestBody['best_before_date']; diff --git a/services/StockService.php b/services/StockService.php index 81623b1e..d51a6df9 100644 --- a/services/StockService.php +++ b/services/StockService.php @@ -166,6 +166,16 @@ class StockService extends BaseService $amount = $amount - $productDetails->stock_amount - $productDetails->product->tare_weight; } + + //Sets the default best before date, if none is supplied + if ($bestBeforeDate == null) + { + if ($productDetails->product->default_best_before_days == -1) { + $bestBeforeDate = date('2999-12-31'); + } else { + $bestBeforeDate = date('Y-m-d', strtotime(date('Y-m-d') . ' + '.$productDetails->product->default_best_before_days.' days')); + } + } if ($transactionType === self::TRANSACTION_TYPE_PURCHASE || $transactionType === self::TRANSACTION_TYPE_INVENTORY_CORRECTION) {