kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 12:20:22 +00:00
Code Issues Projects Releases Wiki Activity

Upgraded to PHP 8.1

Browse Source
This commit is contained in:
Bernd Bestel
2022-12-10 15:19:11 +01:00
parent 84e3707f4f
commit 38a4ad8ec4
9 changed files with 124 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
views/recipes.blade.php
View File

@@ -10,7 +10,6 @@
max-height: 250px !important;
object-fit: cover !important;
}
</style>
@endpush
@@ -520,7 +519,7 @@
@endif
@if(!empty($selectedRecipePosition->note))
<div class="text-muted">{!! nl2br($selectedRecipePosition->note) !!}</div>
<div class="text-muted">{!! nl2br($selectedRecipePosition->note ?? '') !!}</div>
@endif
</li>
@php $lastProductGroup = $selectedRecipePosition->product_group; @endphp

6
views/shoppinglist.blade.php
View File

@@ -235,7 +235,7 @@
</td>
<td class="product-name-cell cursor-link"
data-product-id="{{ $listItem->product_id }}">
@if(!empty($listItem->product_id)) {{ $listItem->product_name }}<br>@endif<em>{!! nl2br($listItem->note) !!}</em>
@if(!empty($listItem->product_id)) {{ $listItem->product_name }}<br>@endif<em>{!! nl2br($listItem->note ?? '') !!}</em>
</td>
@if(!empty($listItem->product_id))
@php
@@ -383,7 +383,7 @@
@foreach($listItems as $listItem)
<tr>
<td>
@if(!empty($listItem->product_id)) {{ $listItem->product_name }}<br>@endif<em>{!! nl2br($listItem->note) !!}</em>
@if(!empty($listItem->product_id)) {{ $listItem->product_name }}<br>@endif<em>{!! nl2br($listItem->note ?? '') !!}</em>
</td>
<td>
<span class="locale-number locale-number-quantity-amount">{{ $listItem->amount }}</span> @if(!empty($listItem->product_id)){{ $__n($listItem->amount, $listItem->qu_name, $listItem->qu_name_plural, true) }}@endif
@@ -411,7 +411,7 @@
@foreach($listItems as $listItem)
<div class="py-0">
<span class="locale-number locale-number-quantity-amount">{{ $listItem->amount }}</span> @if(!empty($listItem->product_id)){{ $__n($listItem->amount, $listItem->qu_name, $listItem->qu_name_plural, true) }}@endif
@if(!empty($listItem->product_id)) {{ $listItem->product_name }}<br>@endif<em>{!! nl2br($listItem->note) !!}</em>
@if(!empty($listItem->product_id)) {{ $listItem->product_name }}<br>@endif<em>{!! nl2br($listItem->note ?? '') !!}</em>
</div><br>
@endforeach
</div>