From 4e2c762f36d929deb09f64f010694871515fe0c1 Mon Sep 17 00:00:00 2001 From: Michael Neuendorf Date: Tue, 24 Mar 2020 20:44:39 +0100 Subject: [PATCH] Use more precise name for number pad option --- config-dist.php | 2 +- views/components/datetimepicker.blade.php | 4 ++-- views/inventory.blade.php | 2 +- views/purchase.blade.php | 2 +- views/stockentryform.blade.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config-dist.php b/config-dist.php index e92ac1d2..a9a1f758 100644 --- a/config-dist.php +++ b/config-dist.php @@ -145,7 +145,7 @@ Setting('FEATURE_FLAG_CALENDAR', true); Setting('FEATURE_FLAG_STOCK_PRICE_TRACKING', true); Setting('FEATURE_FLAG_STOCK_LOCATION_TRACKING', true); Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING', true); -Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_AS_NUMBER', false); +Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD', true); // Activate the number pad in best-before-date fields on (supported) mobile browsers Setting('FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING', true); Setting('FEATURE_FLAG_STOCK_PRODUCT_FREEZING', true); Setting('FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS', true); diff --git a/views/components/datetimepicker.blade.php b/views/components/datetimepicker.blade.php index b1f03398..d3ca83bc 100644 --- a/views/components/datetimepicker.blade.php +++ b/views/components/datetimepicker.blade.php @@ -14,7 +14,7 @@ @php if(!isset($nextInputSelector)) { $nextInputSelector = false; } @endphp @php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp @php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp -@php if(empty($inputTypeAsNumber)) { $inputTypeAsNumber = false; } @endphp +@php if(empty($activateNumberPad)) { $activateNumberPad = false; } @endphp
- date('Y-m-d'), 'earlierThanInfoText' => $__t('The given date is earlier than today, are you sure?'), 'additionalGroupCssClasses' => $additionalGroupCssClasses, - 'inputTypeAsNumber' => GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_AS_NUMBER + 'activateNumberPad' => GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD )) @php $additionalGroupCssClasses = ''; @endphp diff --git a/views/purchase.blade.php b/views/purchase.blade.php index 26329899..b9b4619e 100644 --- a/views/purchase.blade.php +++ b/views/purchase.blade.php @@ -52,7 +52,7 @@ 'earlierThanInfoLimit' => date('Y-m-d'), 'earlierThanInfoText' => $__t('The given date is earlier than today, are you sure?'), 'additionalGroupCssClasses' => $additionalGroupCssClasses, - 'inputTypeAsNumber' => GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_AS_NUMBER + 'activateNumberPad' => GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD )) @php $additionalGroupCssClasses = ''; @endphp diff --git a/views/stockentryform.blade.php b/views/stockentryform.blade.php index 220c5485..4baae710 100644 --- a/views/stockentryform.blade.php +++ b/views/stockentryform.blade.php @@ -41,7 +41,7 @@ 'earlierThanInfoLimit' => date('Y-m-d'), 'earlierThanInfoText' => $__t('The given date is earlier than today, are you sure?'), 'additionalGroupCssClasses' => $additionalGroupCssClasses, - 'inputTypeAsNumber' => GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_AS_NUMBER + 'activateNumberPad' => GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD )) @php $additionalGroupCssClasses = ''; @endphp