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

Hotfix (will be include in v1.18.1 release): Price input on purchase page was not optional

Browse Source
This commit is contained in:
Bernd Bestel
2018-09-08 14:31:42 +02:00
parent 9cd0e4ab2d
commit 905fc0f357
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
views/components/numberpicker.blade.php
View File

@@ -12,11 +12,12 @@
@php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp @php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp
@php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp @php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp
@php if(empty($additionalHtmlElements)) { $additionalHtmlElements = ''; } @endphp @php if(empty($additionalHtmlElements)) { $additionalHtmlElements = ''; } @endphp
@php if(!isset($isRequired)) { $isRequired = true; } @endphp
<div class="form-group {{ $additionalGroupCssClasses }}"> <div class="form-group {{ $additionalGroupCssClasses }}">
<label for="{{ $id }}">{{ $L($label) }}&nbsp;&nbsp;<span id="{{ $hintId }}" class="small text-muted">{{ $hint }}</span></label> <label for="{{ $id }}">{{ $L($label) }}&nbsp;&nbsp;<span id="{{ $hintId }}" class="small text-muted">{{ $hint }}</span></label>
<div class="input-group"> <div class="input-group">
<input {!! $additionalAttributes !!} type="number" class="form-control numberpicker {{ $additionalCssClasses }}" id="{{ $id }}" name="{{ $id }}" value="{{ $value }}" min="{{ $min }}" max="{{ $max }}" step="{{ $step }}" required> <input {!! $additionalAttributes !!} type="number" class="form-control numberpicker {{ $additionalCssClasses }}" id="{{ $id }}" name="{{ $id }}" value="{{ $value }}" min="{{ $min }}" max="{{ $max }}" step="{{ $step }}" @if($isRequired) required @endif>
<div class="input-group-append"> <div class="input-group-append">
<div class="input-group-text numberpicker-up-button"><i class="fas fa-arrow-up"></i></div> <div class="input-group-text numberpicker-up-button"><i class="fas fa-arrow-up"></i></div>
</div> </div>

3
views/purchase.blade.php
View File

@@ -45,7 +45,8 @@
'step' => 0.01, 'step' => 0.01,
'value' => '', 'value' => '',
'hint' => $L('in #1 per purchase quantity unit', GROCY_CURRENCY), 'hint' => $L('in #1 per purchase quantity unit', GROCY_CURRENCY),
'invalidFeedback' => $L('The price cannot be lower than #1', '0') 'invalidFeedback' => $L('The price cannot be lower than #1', '0'),
'isRequired' => false
)) ))
<button id="save-purchase-button" type="submit" class="btn btn-success">{{ $L('OK') }}</button> <button id="save-purchase-button" type="submit" class="btn btn-success">{{ $L('OK') }}</button>