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

Fixed product barcodes table display when FEATURE_FLAG_STOCK_PRICE_TRACKING is disabled (fixes #1202)

Browse Source
This commit is contained in:
Bernd Bestel 2020-12-21 09:54:20 +01:00
parent 360f25ec44
commit 01306bc1ae
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
views/productform.blade.php
View File

@ -464,9 +464,7 @@
href="#"><i class="fas fa-eye"></i></a> href="#"><i class="fas fa-eye"></i></a>
</th> </th>
<th>{{ $__t('Barcode') }}</th> <th>{{ $__t('Barcode') }}</th>
@if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) <th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif">{{ $__t('Store') }}</th>
<th>{{ $__t('Store') }}</th>
@endif
<th>{{ $__t('Quantity unit') }}</th> <th>{{ $__t('Quantity unit') }}</th>
<th>{{ $__t('Amount') }}</th> <th>{{ $__t('Amount') }}</th>
<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif">{{ $__t('Last price') }}</th> <th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif">{{ $__t('Last price') }}</th>
@ -499,13 +497,12 @@
<td> <td>
{{ $barcode->barcode }} {{ $barcode->barcode }}
</td> </td>
@if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) <td class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif"
<td id="barcode-shopping-location"> id="barcode-shopping-location">
@if (FindObjectInArrayByPropertyValue($shoppinglocations, 'id', $barcode->shopping_location_id) !== null) @if (FindObjectInArrayByPropertyValue($shoppinglocations, 'id', $barcode->shopping_location_id) !== null)
{{ FindObjectInArrayByPropertyValue($shoppinglocations, 'id', $barcode->shopping_location_id)->name }} {{ FindObjectInArrayByPropertyValue($shoppinglocations, 'id', $barcode->shopping_location_id)->name }}
@endif @endif
</td> </td>
@endif
<td> <td>
@if(!empty($barcode->qu_id)) @if(!empty($barcode->qu_id))
{{ FindObjectInArrayByPropertyValue($quantityunits, 'id', $barcode->qu_id)->name }} {{ FindObjectInArrayByPropertyValue($quantityunits, 'id', $barcode->qu_id)->name }}