diff --git a/changelog/60_3.0.0_2020-12-22.md b/changelog/60_3.0.0_2020-12-22.md index 3d869f89..c2848dad 100644 --- a/changelog/60_3.0.0_2020-12-22.md +++ b/changelog/60_3.0.0_2020-12-22.md @@ -92,6 +92,7 @@ - Added a button to add all currently in-stock but overdue and expired products to the shopping list (thanks @m-byte) - Improved that when `FEATURE_FLAG_STOCK` is disabled, all product/stock related inputs and buttons are now hidden on the shopping list page (thanks @fipwmaqzufheoxq92ebc) - Shopping list items can now have their own Userfields (entity `shopping_list`), on the shopping list table those fields are rendered additionally to the product Userfields +- Made the print view configurable (new dialog before printing - option to hide header, group products by their product group, alternative list layout) - Fixed that "Add products that are below defined min. stock amount" always rounded up the missing amount to an integral number, this now allows decimal numbers ### Recipe improvements/fixes diff --git a/localization/strings.pot b/localization/strings.pot index 63a04920..0edf78dc 100644 --- a/localization/strings.pot +++ b/localization/strings.pot @@ -1537,9 +1537,6 @@ msgstr "" msgid "per day" msgstr "" -msgid "Normal view" -msgstr "" - msgid "Only undone items" msgstr "" @@ -2035,3 +2032,15 @@ msgstr "" msgid "Last price (Total)" msgstr "" + +msgid "Show header" +msgstr "" + +msgid "Group by product group" +msgstr "" + +msgid "Table" +msgstr "" + +msgid "Layout type" +msgstr "" diff --git a/public/js/grocy.js b/public/js/grocy.js index fdb5ffc9..71e76528 100644 --- a/public/js/grocy.js +++ b/public/js/grocy.js @@ -813,7 +813,7 @@ $.extend(true, $.fn.dataTable.defaults, { }); return $("
{{ $__t('Product') }} / {{ $__t('Note') }} | {{ $__t('Amount') }} | +{{ $__t('Product group') }} | @include('components.userfields_thead', array( 'userfields' => $userfields @@ -350,6 +350,9 @@{{ $listItem->amount }} @if(!empty($listItem->product_id)){{ $__n($listItem->amount, FindObjectInArrayByPropertyValue($quantityunits, 'id', $listItem->qu_id)->name, FindObjectInArrayByPropertyValue($quantityunits, 'id', $listItem->qu_id)->name_plural) }}@endif | ++ @if(!empty(FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->product_group_id)) {{ FindObjectInArrayByPropertyValue($productGroups, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->product_group_id)->name }} @else {{ $__t('Ungrouped') }} @endif + | @include('components.userfields_tbody', array( 'userfields' => $userfields, @@ -362,8 +365,16 @@
---|