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

Include duesoon/overdue/expired products for the belowminstockamount filter on the stock overview page (closes #1666)

Browse Source
This commit is contained in:
Bernd Bestel 2021-11-08 17:06:20 +01:00
parent 8105dea17f
commit edddfe234c
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/65_UNRELEASED_xxxx-xx-xx.md
View File

@ -1 +1,2 @@
- The "Below min. stock amount" filter on the stock overview page now also includes due-soon, overdue or already expired products
- Fixed that the "Stay logged in permanently" checkbox on the login page had no effect (thanks @0)

5
views/stockoverview.blade.php
View File

@ -320,7 +320,7 @@
<td>
@if($currentStockEntry->product_group_name !== null){{ $currentStockEntry->product_group_name }}@endif
</td>
<td data-order={{ $currentStockEntry->amount }}>
<td data-order="{{ $currentStockEntry->amount }}">
<span id="product-{{ $currentStockEntry->product_id }}-amount"
class="locale-number locale-number-quantity-amount">{{ $currentStockEntry->amount }}</span> <span id="product-{{ $currentStockEntry->product_id }}-qu-name">{{ $__n($currentStockEntry->amount, $currentStockEntry->qu_unit_name, $currentStockEntry->qu_unit_name_plural) }}</span>
<span id="product-{{ $currentStockEntry->product_id }}-opened-amount"
@ -374,8 +374,9 @@
. ' days'
))
&&
$currentStockEntry->amount > 0) duesoon @elseif ($currentStockEntry->product_missing) belowminstockamount @endif
$currentStockEntry->amount > 0) duesoon @endif
@if($currentStockEntry->amount_aggregated > 0) instockX @endif
@if ($currentStockEntry->product_missing) belowminstockamount @endif
</td>
<td class="d-none">
xx{{ $currentStockEntry->product_group_name }}xx