diff --git a/config/search-string.php b/config/search-string.php index 56689d91d..1ab1aaf13 100644 --- a/config/search-string.php +++ b/config/search-string.php @@ -388,7 +388,14 @@ return [ 'id', 'name' => ['searchable' => true], 'enabled' => ['boolean' => true], - 'type', + 'type' => [ + 'values' => [ + 'income' => 'general.incomes', + 'expense' => 'general.expenses', + 'item' => 'general.items', + 'other' => 'general.others', + ], + ], 'created_at' => ['date' => true], 'updated_at' => ['date' => true], ], diff --git a/resources/lang/en-GB/transfers.php b/resources/lang/en-GB/transfers.php index 46b4238d6..93be947e6 100644 --- a/resources/lang/en-GB/transfers.php +++ b/resources/lang/en-GB/transfers.php @@ -26,9 +26,8 @@ return [ 'slider' => [ 'create' => ':user created this transfer on :date', - 'transactions' => 'In list here are the transactions that were created automatically.', - 'from_desc' => ':number transaction from :account', - 'to_desc' => ':number transaction to :account', + 'transactions' => 'List of transactions related to this transfer', + 'transactions_desc' => ':number transaction for :account', ], ]; diff --git a/resources/views/common/reports/edit.blade.php b/resources/views/common/reports/edit.blade.php index 6a6669f8d..9d2d9cfe0 100644 --- a/resources/views/common/reports/edit.blade.php +++ b/resources/views/common/reports/edit.blade.php @@ -39,6 +39,7 @@ label="{{ $field['title'] }}" data-field="settings" :attributes="$field['attributes']" + :dynamic-attributes="$field['attributes']" /> @break @@ -49,16 +50,18 @@ label="{{ $field['title'] }}" data-field="settings" :attributes="$field['attributes']" + :dynamic-attributes="$field['attributes']" /> @break @case('password') @case('passwordGroup') - @break @@ -69,6 +72,7 @@ label="{{ $field['title'] }}" data-field="settings" :attributes="$field['attributes']" + :dynamic-attributes="$field['attributes']" /> @break @@ -83,6 +87,7 @@ 'model' => 'form.settings'.'.'.$field['name'], 'show-date-format' => company_date_format(), ], $field['attributes'])" + :dynamic-attributes="$field['attributes']" /> @break @@ -92,9 +97,10 @@ name="{{ $field['name'] }}" label="{{ $field['title'] }}" :options="$field['values']" - :selected="$field['selected']" + :selected="isset($report->settings->{$field['name']}) ? $report->settings->{$field['name']} : $field['selected']" data-field="settings" :attributes="$field['attributes']" + :dynamic-attributes="$field['attributes']" /> @break @@ -106,6 +112,7 @@ :attributes="array_merge([ 'data-field' => 'settings' ], $field['attributes'])" + :dynamic-attributes="$field['attributes']" /> @break @@ -117,6 +124,7 @@ :attributes="array_merge([ 'data-field' => 'settings' ], $field['attributes'])" + :dynamic-attributes="$field['attributes']" /> @break @@ -127,6 +135,7 @@ :attributes="array_merge([ 'data-field' => 'settings' ], $field['attributes'])" + :dynamic-attributes="$field['attributes']" /> @endswitch @endforeach diff --git a/resources/views/components/transfers/show/transactions.blade.php b/resources/views/components/transfers/show/transactions.blade.php index 7dbab2e46..dece94ce9 100644 --- a/resources/views/components/transfers/show/transactions.blade.php +++ b/resources/views/components/transfers/show/transactions.blade.php @@ -1,3 +1,9 @@ +@php + $link_class = 'to-black-400 hover:bg-full-2 bg-no-repeat bg-0-2 bg-0-full bg-gradient-to-b from-transparent transition-backgroundSize'; + $expense_number = '' . $transfer->expense_transaction->number . ''; + $income_number = '' . $transfer->income_transaction->number . ''; +@endphp +