kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 09:39:57 +00:00
Code Issues Projects Releases Wiki Activity

Don't display QU conversions for other products on the product edit page (fixes #400)

Browse Source
This commit is contained in:
Bernd Bestel 2019-10-02 15:53:36 +02:00
parent 901b345714
commit 420e4b933f
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelog/54_UNRELEASED_2019-xx-xx.md Normal file
View File

@ -0,0 +1,5 @@
### Stock fixes
- Fixed that product specific quantity unit conversions (product overrides) were also displayed on the product edit page of other products with the same stock quantity unit
### Recipe fixes
- Fixed that recipes were displayed without ingredients if the total recipe count was > 100

2
changelog/54_x.x.x_2019-xx-xx.md
View File

@ -1,2 +0,0 @@
### Recipe fixes
- Fixed that recipes were displayed without ingredients if the total recipe count was > 100

54
views/productform.blade.php
View File

@ -268,32 +268,34 @@
<tbody class="d-none"> <tbody class="d-none">
@if($mode == "edit") @if($mode == "edit")
@foreach($quConversions as $quConversion) @foreach($quConversions as $quConversion)
<tr> @if($quConversion->product_id == $product->id || $quConversion->product_id == null)
<td class="fit-content border-right"> <tr>
<a class="btn btn-sm btn-info qu-conversion-edit-button @if($quConversion->product_id == null) disabled @endif" href="#" data-qu-conversion-id="{{ $quConversion->id }}"> <td class="fit-content border-right">
<i class="fas fa-edit"></i> <a class="btn btn-sm btn-info qu-conversion-edit-button @if($quConversion->product_id == null) disabled @endif" href="#" data-qu-conversion-id="{{ $quConversion->id }}">
</a> <i class="fas fa-edit"></i>
<a class="btn btn-sm btn-danger qu-conversion-delete-button @if($quConversion->product_id == null) disabled @endif" href="#" data-qu-conversion-id="{{ $quConversion->id }}"> </a>
<i class="fas fa-trash"></i> <a class="btn btn-sm btn-danger qu-conversion-delete-button @if($quConversion->product_id == null) disabled @endif" href="#" data-qu-conversion-id="{{ $quConversion->id }}">
</a> <i class="fas fa-trash"></i>
</td> </a>
<td> </td>
<span class="locale-number locale-number-quantity-amount">{{ $quConversion->factor }}</span> <td>
</td> <span class="locale-number locale-number-quantity-amount">{{ $quConversion->factor }}</span>
<td> </td>
{{ FindObjectInArrayByPropertyValue($quantityunits, 'id', $quConversion->to_qu_id)->name }} <td>
</td> {{ FindObjectInArrayByPropertyValue($quantityunits, 'id', $quConversion->to_qu_id)->name }}
<td class="d-none"> </td>
@if($quConversion->product_id != null) <td class="d-none">
{{ $__t('Product overrides') }} @if($quConversion->product_id != null)
@else {{ $__t('Product overrides') }}
{{ $__t('Default conversions') }} @else
@endif {{ $__t('Default conversions') }}
</td> @endif
<td class="d-none"> </td>
from_qu_id xx{{ $quConversion->from_qu_id }}xx <td class="d-none">
</td> from_qu_id xx{{ $quConversion->from_qu_id }}xx
</tr> </td>
</tr>
@endif
@endforeach @endforeach
@endif @endif
</tbody> </tbody>