kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 17:45:39 +00:00
Code Issues Projects Releases Wiki Activity

typo (#1062)

Browse Source
This commit is contained in:
kriddles 2020-10-18 06:57:10 -05:00 committed by GitHub
parent 2958ccfc14
commit f7a1634442
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-dist.php
View File

@ -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);

4
controllers/StockController.php
View File

@ -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'),

1
migrations/0116.sql Normal file
View File

@ -0,0 +1 @@
update user_settings set key = "stock_expiring_soon_days" where key = "stock_expring_soon_days";

2
public/viewjs/stockentries.js
View File

@ -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);

2
public/viewjs/stocksettings.js
View File

@ -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);

4
views/stocksettings.blade.php
View File

@ -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'),