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

Formatting / feature flag checks / proper data type comparision

Browse Source
This commit is contained in:
Bernd Bestel 2021-11-13 17:22:34 +01:00
parent 9578f1696b
commit 2f071e945a
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/viewjs/purchase.js
View File

@ -288,19 +288,20 @@ if (Grocy.Components.ProductPicker !== undefined)
if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING)
{ {
var best_before; var dueDays;
if (productDetails.location.is_freezer.toString() == "1") if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRODUCT_FREEZING && BoolVal(productDetails.location.is_freezer))
{ {
best_before = productDetails.product.default_best_before_days_after_freezing; dueDays = productDetails.product.default_best_before_days_after_freezing;
} }
else else
{ {
best_before = productDetails.product.default_best_before_days; dueDays = productDetails.product.default_best_before_days;
} }
if (best_before.toString() !== '0') dueDays = parseFloat(dueDays);
if (dueDays != 0)
{ {
if (best_before == -1) if (dueDays == -1)
{ {
if (!$("#datetimepicker-shortcut").is(":checked")) if (!$("#datetimepicker-shortcut").is(":checked"))
{ {
@ -309,7 +310,7 @@ if (Grocy.Components.ProductPicker !== undefined)
} }
else else
{ {
Grocy.Components.DateTimePicker.SetValue(moment().add(best_before, 'days').format('YYYY-MM-DD')); Grocy.Components.DateTimePicker.SetValue(moment().add(dueDays, 'days').format('YYYY-MM-DD'));
} }
} }
} }

11
services/StockService.php
View File

@ -147,13 +147,15 @@ class StockService extends BaseService
if ($locationId !== null && !$this->LocationExists($locationId)) if ($locationId !== null && !$this->LocationExists($locationId))
{ {
throw new \Exception('Location does not exist'); throw new \Exception('Location does not exist');
} else { }
else
{
$location = $this->getDatabase()->locations()->where('id', $locationId)->fetch(); $location = $this->getDatabase()->locations()->where('id', $locationId)->fetch();
} }
if (GROCY_FEATURE_FLAG_STOCK_PRODUCT_FREEZING && $locationId !== null && intval($location->is_freezer) === 1 && $productDetails->product->default_best_before_days_after_freezing >= -1) if (GROCY_FEATURE_FLAG_STOCK_PRODUCT_FREEZING && $locationId !== null && intval($location->is_freezer) === 1 && intval($productDetails->product->default_best_before_days_after_freezing) >= -1)
{ {
if ($productDetails->product->default_best_before_days_after_freezing == -1) if (intval($productDetails->product->default_best_before_days_after_freezing) == -1)
{ {
$bestBeforeDate = date('2999-12-31'); $bestBeforeDate = date('2999-12-31');
} }
@ -161,7 +163,8 @@ class StockService extends BaseService
{ {
$bestBeforeDate = date('Y-m-d', strtotime('+' . $productDetails->product->default_best_before_days_after_freezing . ' days')); $bestBeforeDate = date('Y-m-d', strtotime('+' . $productDetails->product->default_best_before_days_after_freezing . ' days'));
} }
} elseif (intval($productDetails->product->default_best_before_days) == -1) }
elseif (intval($productDetails->product->default_best_before_days) == -1)
{ {
$bestBeforeDate = date('2999-12-31'); $bestBeforeDate = date('2999-12-31');
} }