From f7a1634442d1734cea71de57f34a3e1ad8525832 Mon Sep 17 00:00:00 2001
From: kriddles <54413450+kriddles@users.noreply.github.com>
Date: Sun, 18 Oct 2020 06:57:10 -0500
Subject: [PATCH] typo (#1062)

---
 config-dist.php                 | 2 +-
 controllers/StockController.php | 4 ++--
 migrations/0116.sql             | 1 +
 public/viewjs/stockentries.js   | 2 +-
 public/viewjs/stocksettings.js  | 2 +-
 views/stocksettings.blade.php   | 4 ++--
 6 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 migrations/0116.sql

diff --git a/config-dist.php b/config-dist.php
index 972558c4..d52b155e 100644
--- a/config-dist.php
+++ b/config-dist.php
@@ -106,7 +106,7 @@ DefaultUserSetting('keep_screen_on_when_fullscreen_card', false); // Keep the sc
 DefaultUserSetting('product_presets_location_id', -1); // Default location id for new products (-1 means no location is preset)
 DefaultUserSetting('product_presets_product_group_id', -1); // Default product group id for new products (-1 means no product group is preset)
 DefaultUserSetting('product_presets_qu_id', -1); // Default quantity unit id for new products (-1 means no quantity unit is preset)
-DefaultUserSetting('stock_expring_soon_days', 5);
+DefaultUserSetting('stock_expiring_soon_days', 5);
 DefaultUserSetting('stock_default_purchase_amount', 0);
 DefaultUserSetting('stock_default_consume_amount', 1);
 DefaultUserSetting('scan_mode_consume_enabled', false);
diff --git a/controllers/StockController.php b/controllers/StockController.php
index 1de5e420..07909e65 100644
--- a/controllers/StockController.php
+++ b/controllers/StockController.php
@@ -79,7 +79,7 @@ class StockController extends BaseController
 	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$usersService = $this->getUsersService();
-		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expring_soon_days'];
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expiring_soon_days'];
 
 		return $this->renderPage($response, 'stockoverview', [
 			'currentStock' => $this->getStockService()->GetCurrentStockOverview(),
@@ -408,7 +408,7 @@ class StockController extends BaseController
 	public function Stockentries(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$usersService = $this->getUsersService();
-		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expring_soon_days'];
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expiring_soon_days'];
 
 		return $this->renderPage($response, 'stockentries', [
 			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name'),
diff --git a/migrations/0116.sql b/migrations/0116.sql
new file mode 100644
index 00000000..b92a2f52
--- /dev/null
+++ b/migrations/0116.sql
@@ -0,0 +1 @@
+update user_settings set key = "stock_expiring_soon_days" where key = "stock_expring_soon_days";
diff --git a/public/viewjs/stockentries.js b/public/viewjs/stockentries.js
index ed7e8b6c..b902515d 100644
--- a/public/viewjs/stockentries.js
+++ b/public/viewjs/stockentries.js
@@ -135,7 +135,7 @@ function RefreshStockEntryRow(stockRowId)
 			}
 			else
 			{
-				var expiringThreshold = moment().add(Grocy.UserSettings.stock_expring_soon_days, "days");
+				var expiringThreshold = moment().add(Grocy.UserSettings.stock_expiring_soon_days, "days");
 				var now = moment();
 				var bestBeforeDate = moment(result.best_before_date);
 
diff --git a/public/viewjs/stocksettings.js b/public/viewjs/stocksettings.js
index dc069a59..003ed189 100644
--- a/public/viewjs/stocksettings.js
+++ b/public/viewjs/stocksettings.js
@@ -1,7 +1,7 @@
 $("#product_presets_location_id").val(Grocy.UserSettings.product_presets_location_id);
 $("#product_presets_product_group_id").val(Grocy.UserSettings.product_presets_product_group_id);
 $("#product_presets_qu_id").val(Grocy.UserSettings.product_presets_qu_id);
-$("#stock_expring_soon_days").val(Grocy.UserSettings.stock_expring_soon_days);
+$("#stock_expiring_soon_days").val(Grocy.UserSettings.stock_expiring_soon_days);
 $("#stock_default_purchase_amount").val(Grocy.UserSettings.stock_default_purchase_amount);
 $("#stock_default_consume_amount").val(Grocy.UserSettings.stock_default_consume_amount);
 
diff --git a/views/stocksettings.blade.php b/views/stocksettings.blade.php
index 0d07e734..f6c1dcd2 100644
--- a/views/stocksettings.blade.php
+++ b/views/stocksettings.blade.php
@@ -57,8 +57,8 @@
 
 		<h4 class="mt-2">{{ $__t('Stock overview') }}</h4>
 		@include('components.numberpicker', array(
-		'id' => 'stock_expring_soon_days',
-		'additionalAttributes' => 'data-setting-key="stock_expring_soon_days"',
+		'id' => 'stock_expiring_soon_days',
+		'additionalAttributes' => 'data-setting-key="stock_expiring_soon_days"',
 		'label' => 'Expiring soon days',
 		'min' => 1,
 		'invalidFeedback' => $__t('This cannot be lower than %s', '1'),