From 8c46c93bbd00356f33135ad9decefad02534cebf Mon Sep 17 00:00:00 2001 From: Michael Neuendorf Date: Sat, 21 Mar 2020 16:47:42 +0100 Subject: [PATCH 1/4] Add missing translation for de --- localization/de/strings.po | 3 +++ localization/strings.pot | 3 +++ 2 files changed, 6 insertions(+) diff --git a/localization/de/strings.po b/localization/de/strings.po index 38e96040..9c90a0a2 100644 --- a/localization/de/strings.po +++ b/localization/de/strings.po @@ -1957,3 +1957,6 @@ msgstr "Rezept-Karte" msgid "Group ingredients by their product group" msgstr "Zutaten nach Produktgruppen gruppieren" + +msgid "Transaction successfully undone" +msgstr "Vorgang wurde rückgängig gemacht" diff --git a/localization/strings.pot b/localization/strings.pot index 0cbcdba2..f790ae6d 100644 --- a/localization/strings.pot +++ b/localization/strings.pot @@ -1744,3 +1744,6 @@ msgstr "" msgid "Group ingredients by their product group" msgstr "" + +msgid "Transaction successfully undone" +msgstr "" From f3f0e7c9c8aa50b3bcd8f0a276b6c58f5f28fef3 Mon Sep 17 00:00:00 2001 From: Michael Neuendorf Date: Sun, 22 Mar 2020 10:43:05 +0100 Subject: [PATCH 2/4] Add option to set best-before-date field input-type to number This allows faster input in mobile devices --- config-dist.php | 1 + views/components/datetimepicker.blade.php | 3 ++- views/inventory.blade.php | 3 ++- views/purchase.blade.php | 3 ++- views/stockentryform.blade.php | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/config-dist.php b/config-dist.php index df69c012..e92ac1d2 100644 --- a/config-dist.php +++ b/config-dist.php @@ -145,6 +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_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 de2d227e..4ab349f6 100644 --- a/views/components/datetimepicker.blade.php +++ b/views/components/datetimepicker.blade.php @@ -14,6 +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
- 'Never expires', 'earlierThanInfoLimit' => date('Y-m-d'), 'earlierThanInfoText' => $__t('The given date is earlier than today, are you sure?'), - 'additionalGroupCssClasses' => $additionalGroupCssClasses + 'additionalGroupCssClasses' => $additionalGroupCssClasses, + 'inputTypeAsNumber' => GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_AS_NUMBER )) @php $additionalGroupCssClasses = ''; @endphp diff --git a/views/purchase.blade.php b/views/purchase.blade.php index 4611e596..26329899 100644 --- a/views/purchase.blade.php +++ b/views/purchase.blade.php @@ -51,7 +51,8 @@ 'shortcutLabel' => 'Never expires', 'earlierThanInfoLimit' => date('Y-m-d'), 'earlierThanInfoText' => $__t('The given date is earlier than today, are you sure?'), - 'additionalGroupCssClasses' => $additionalGroupCssClasses + 'additionalGroupCssClasses' => $additionalGroupCssClasses, + 'inputTypeAsNumber' => GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_AS_NUMBER )) @php $additionalGroupCssClasses = ''; @endphp diff --git a/views/stockentryform.blade.php b/views/stockentryform.blade.php index c763337b..220c5485 100644 --- a/views/stockentryform.blade.php +++ b/views/stockentryform.blade.php @@ -40,7 +40,8 @@ 'shortcutLabel' => 'Never expires', 'earlierThanInfoLimit' => date('Y-m-d'), 'earlierThanInfoText' => $__t('The given date is earlier than today, are you sure?'), - 'additionalGroupCssClasses' => $additionalGroupCssClasses + 'additionalGroupCssClasses' => $additionalGroupCssClasses, + 'inputTypeAsNumber' => GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_AS_NUMBER )) @php $additionalGroupCssClasses = ''; @endphp From 57e29b041716a1a26f4a99598846f2b1caeefc92 Mon Sep 17 00:00:00 2001 From: Michael Neuendorf Date: Sun, 22 Mar 2020 11:36:12 +0100 Subject: [PATCH 3/4] Fix datetimepicker with inputmode --- views/components/datetimepicker.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/components/datetimepicker.blade.php b/views/components/datetimepicker.blade.php index 4ab349f6..4e2d713a 100644 --- a/views/components/datetimepicker.blade.php +++ b/views/components/datetimepicker.blade.php @@ -25,7 +25,7 @@
- Date: Sun, 22 Mar 2020 11:53:26 +0100 Subject: [PATCH 4/4] Fix datatimepicker with numeric input --- views/components/datetimepicker.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/components/datetimepicker.blade.php b/views/components/datetimepicker.blade.php index 4e2d713a..b1f03398 100644 --- a/views/components/datetimepicker.blade.php +++ b/views/components/datetimepicker.blade.php @@ -25,7 +25,7 @@
-