diff --git a/app/Abstracts/View/Components/Form.php b/app/Abstracts/View/Components/Form.php index 5c67264a2..ea04803f8 100644 --- a/app/Abstracts/View/Components/Form.php +++ b/app/Abstracts/View/Components/Form.php @@ -93,6 +93,12 @@ abstract class Form extends Component /** @var string */ public $inputGroupClass = ''; + /** @var string */ + public $icon = ''; + + /** @var string */ + public $trailing = ''; + /** @var array */ public $custom_attributes = []; @@ -112,7 +118,7 @@ abstract class Form extends Component $options = [], $option = [], string $optionKey = 'id', string $optionValue = 'name', $fullOptions = [], $checked = null, $checkedKey = null, $selected = null, $selectedKey = null, $rows = '3', $remote = false, $multiple = false, $addNew = false, $group = false, bool $searchable = false, bool $disabled = false, bool $readonly = false, bool $required = true, bool $notRequired = false, - string $formGroupClass = '', string $inputGroupClass = '', + string $formGroupClass = '', string $inputGroupClass = '', $icon = '', $trailing = '', $dynamicAttributes = '', bool $hideCurrency = false ) { @@ -146,6 +152,9 @@ abstract class Form extends Component $this->formGroupClass = $this->getFromGroupClass($formGroupClass); $this->inputGroupClass = $this->getInputGroupClass($inputGroupClass); + $this->icon = $icon; + $this->trailing = $trailing; + $this->custom_attributes = $this->getCustomAttributes(); $this->setDynamicAttributes($dynamicAttributes); diff --git a/resources/lang/en-GB/settings.php b/resources/lang/en-GB/settings.php index b9d3ff0a7..298733783 100644 --- a/resources/lang/en-GB/settings.php +++ b/resources/lang/en-GB/settings.php @@ -85,6 +85,8 @@ return [ 'default' => 'Default', 'classic' => 'Classic', 'modern' => 'Modern', + 'logo_size_width' => 'Logo Width', + 'logo_size_height' => 'Logo Height', 'hide' => [ 'item_name' => 'Hide Item Name', 'item_description' => 'Hide Item Description', diff --git a/resources/views/components/form/group/text.blade.php b/resources/views/components/form/group/text.blade.php index a8bac0dfb..bafef3a3c 100644 --- a/resources/views/components/form/group/text.blade.php +++ b/resources/views/components/form/group/text.blade.php @@ -48,6 +48,12 @@ v-model="{{ !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.' . $name : 'form.' . $name) }}" {{ $attributes->merge($custom_attributes) }} /> + + @if (! $attributes->has('trailing') && ! empty($trailing->contents)) + {!! $trailing ?? '' !!} + @elseif (! empty($trailing)) + + @endif @if (! $attributes->has('error') && ! empty($error->contents)) diff --git a/resources/views/settings/invoice/edit.blade.php b/resources/views/settings/invoice/edit.blade.php index 2bff0a363..56bea0fa0 100644 --- a/resources/views/settings/invoice/edit.blade.php +++ b/resources/views/settings/invoice/edit.blade.php @@ -81,6 +81,10 @@ + + + +