diff --git a/resources/views/admin/inventory/stock-entries/_form.blade.php b/resources/views/admin/inventory/stock-entries/_form.blade.php index 9dccbb1..e3fefc1 100644 --- a/resources/views/admin/inventory/stock-entries/_form.blade.php +++ b/resources/views/admin/inventory/stock-entries/_form.blade.php @@ -126,7 +126,8 @@ - {{ __('Bei Rohstoff in Gramm, bei Verpackung in Stück.') }} + {{ __('Bei Rohstoff in Gramm, bei Verpackung in Stück.') }} + @error('ordered_quantity')
{{ $message }}
@enderror diff --git a/resources/views/admin/inventory/stock-entries/_scripts.blade.php b/resources/views/admin/inventory/stock-entries/_scripts.blade.php index 9e817b1..0024816 100644 --- a/resources/views/admin/inventory/stock-entries/_scripts.blade.php +++ b/resources/views/admin/inventory/stock-entries/_scripts.blade.php @@ -88,14 +88,19 @@ } var $hint = $('#ordered-quantity-hint'); + var $preview = $('#ordered-quantity-preview'); + $preview.hide().text(''); if (!isIng) { $hint.text('{{ __('Bei Verpackung in Stück.') }}'); return; } if ($('#ordered_unit').val() === 'ml' && hasDensity) { + $hint.text('{{ __('Erfassung in ml — der Bestand wird über die Dichte in Gramm gebucht.') }}'); var ml = parseNumber($('#ordered_quantity').val()); - var g = ml != null ? formatQuantity(ml * density) : '?'; - $hint.text('{{ __('Erfassung in ml — entspricht ca.') }} ' + g + ' {{ __('g (Dichte') }} ' + formatDensity(density) + ' g/ml).'); + if (ml != null && ml > 0) { + // AP-42: Live-Vorschau der ml→g-Umrechnung direkt am Mengenfeld. + $preview.text(formatQuantity(ml) + ' ml × ' + formatDensity(density) + ' g/ml = ' + formatQuantity(ml * density) + ' g').show(); + } } else if (hasDensity) { $hint.text('{{ __('In Gramm — oder Einheit auf ml stellen (Dichte hinterlegt).') }}'); } else { diff --git a/resources/views/admin/inventory/stock-entries/show.blade.php b/resources/views/admin/inventory/stock-entries/show.blade.php index ef5cc7f..da4be6a 100644 --- a/resources/views/admin/inventory/stock-entries/show.blade.php +++ b/resources/views/admin/inventory/stock-entries/show.blade.php @@ -203,7 +203,7 @@ - + @if($receiveIsMl) {{ __('Angabe in ml — Umrechnung in Gramm über die Dichte') }} ({{ \App\Services\Util::formatNumber($model->density_used) }} g/ml) @elseif($model->unit === 'gram') @@ -212,6 +212,9 @@ {{ __('Angabe in Stück') }} @endif + @if($receiveIsMl) + + @endif @error('received_quantity')
{{ $message }}
@enderror @@ -266,6 +269,28 @@ @section('scripts')