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

Added new Userfield type "Number (currency)" (closes #2276)

Browse Source
This commit is contained in:
Bernd Bestel
2023-09-01 17:48:46 +02:00
parent 82d899d609
commit f6bdb6e836
6 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
views/components/userfields_tbody.blade.php
View File

@@ -48,6 +48,10 @@ $excludeFieldTypes = [];
alt="{{ base64_decode(explode('_', $userfieldObject->value)[1]) }}"
loading="lazy">
</a>
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_NUMBER_DECIMAL)
<span class="locale-number locale-number-generic">{{ $userfieldObject->value }}</span>
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_NUMBER_CURRENCY)
<span class="locale-number locale-number-currency">{{ $userfieldObject->value }}</span>
@else
{{ $userfieldObject->value }}
@endif

16
views/components/userfieldsform.blade.php
View File

@@ -34,7 +34,7 @@
@if($userfield->input_required == 1) required @endif></textarea>
<div class="invalid-feedback">{{ $__t('Mandatory Userfield') }}</div>
</div>
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_INTEGRAL_NUMBER)
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_NUMBER_INT)
@include('components.numberpicker', array(
'id' => $userfield->name,
'label' => $userfield->caption,
@@ -45,7 +45,7 @@
'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"',
'value' => ''
))
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_DECIMAL_NUMBER)
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_NUMBER_DECIMAL)
@include('components.numberpicker', array(
'id' => '',
'label' => $userfield->caption,
@@ -57,6 +57,18 @@
'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"',
'value' => ''
))
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_NUMBER_CURRENCY)
@include('components.numberpicker', array(
'id' => '',
'label' => $userfield->caption,
'noNameAttribute' => true,
'min' => 0,
'decimals' => 4,
'isRequired' => $userfield->input_required == 1,
'additionalCssClasses' => 'userfield-input locale-number-input locale-number-currency',
'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"',
'value' => ''
))
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_DATE)
@include('components.datetimepicker2', array(
'id' => $userfield->name,