shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'akaunting:master' into master

Browse Source
This commit is contained in:
Burak Civan 2022-07-21 18:02:45 +03:00 committed by GitHub
commit 0825fd761f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/search-string.php
View File

@ -388,7 +388,14 @@ return [
'id', 'id',
'name' => ['searchable' => true], 'name' => ['searchable' => true],
'enabled' => ['boolean' => true], 'enabled' => ['boolean' => true],
'type', 'type' => [
'values' => [
'income' => 'general.incomes',
'expense' => 'general.expenses',
'item' => 'general.items',
'other' => 'general.others',
],
],
'created_at' => ['date' => true], 'created_at' => ['date' => true],
'updated_at' => ['date' => true], 'updated_at' => ['date' => true],
], ],

5
resources/lang/en-GB/transfers.php
View File

@ -26,9 +26,8 @@ return [
'slider' => [ 'slider' => [
'create' => ':user created this transfer on :date', 'create' => ':user created this transfer on :date',
'transactions' => 'In list here are the transactions that were created automatically.', 'transactions' => 'List of transactions related to this transfer',
'from_desc' => ':number transaction from :account', 'transactions_desc' => ':number transaction for :account',
'to_desc' => ':number transaction to :account',
], ],
]; ];

13
resources/views/common/reports/edit.blade.php
View File

@ -39,6 +39,7 @@
label="{{ $field['title'] }}" label="{{ $field['title'] }}"
data-field="settings" data-field="settings"
:attributes="$field['attributes']" :attributes="$field['attributes']"
:dynamic-attributes="$field['attributes']"
/> />
@break @break
@ -49,16 +50,18 @@
label="{{ $field['title'] }}" label="{{ $field['title'] }}"
data-field="settings" data-field="settings"
:attributes="$field['attributes']" :attributes="$field['attributes']"
:dynamic-attributes="$field['attributes']"
/> />
@break @break
@case('password') @case('password')
@case('passwordGroup') @case('passwordGroup')
<x-form.group.email <x-form.group.password
name="{{ $field['name'] }}" name="{{ $field['name'] }}"
label="{{ $field['title'] }}" label="{{ $field['title'] }}"
data-field="settings" data-field="settings"
:attributes="$field['attributes']" :attributes="$field['attributes']"
:dynamic-attributes="$field['attributes']"
/> />
@break @break
@ -69,6 +72,7 @@
label="{{ $field['title'] }}" label="{{ $field['title'] }}"
data-field="settings" data-field="settings"
:attributes="$field['attributes']" :attributes="$field['attributes']"
:dynamic-attributes="$field['attributes']"
/> />
@break @break
@ -83,6 +87,7 @@
'model' => 'form.settings'.'.'.$field['name'], 'model' => 'form.settings'.'.'.$field['name'],
'show-date-format' => company_date_format(), 'show-date-format' => company_date_format(),
], $field['attributes'])" ], $field['attributes'])"
:dynamic-attributes="$field['attributes']"
/> />
@break @break
@ -92,9 +97,10 @@
name="{{ $field['name'] }}" name="{{ $field['name'] }}"
label="{{ $field['title'] }}" label="{{ $field['title'] }}"
:options="$field['values']" :options="$field['values']"
:selected="$field['selected']" :selected="isset($report->settings->{$field['name']}) ? $report->settings->{$field['name']} : $field['selected']"
data-field="settings" data-field="settings"
:attributes="$field['attributes']" :attributes="$field['attributes']"
:dynamic-attributes="$field['attributes']"
/> />
@break @break
@ -106,6 +112,7 @@
:attributes="array_merge([ :attributes="array_merge([
'data-field' => 'settings' 'data-field' => 'settings'
], $field['attributes'])" ], $field['attributes'])"
:dynamic-attributes="$field['attributes']"
/> />
@break @break
@ -117,6 +124,7 @@
:attributes="array_merge([ :attributes="array_merge([
'data-field' => 'settings' 'data-field' => 'settings'
], $field['attributes'])" ], $field['attributes'])"
:dynamic-attributes="$field['attributes']"
/> />
@break @break
@ -127,6 +135,7 @@
:attributes="array_merge([ :attributes="array_merge([
'data-field' => 'settings' 'data-field' => 'settings'
], $field['attributes'])" ], $field['attributes'])"
:dynamic-attributes="$field['attributes']"
/> />
@endswitch @endswitch
@endforeach @endforeach

16
resources/views/components/transfers/show/transactions.blade.php
View File

@ -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 = '<a href="' . route('transactions.show', $transfer->expense_transaction->id) . '" class="' . $link_class . '">' . $transfer->expense_transaction->number . '</a>';
$income_number = '<a href="' . route('transactions.show', $transfer->income_transaction->id) . '" class="' . $link_class . '">' . $transfer->income_transaction->number . '</a>';
@endphp
<div class="border-b pb-4" x-data="{ transactions : null }"> <div class="border-b pb-4" x-data="{ transactions : null }">
<button class="relative w-full text-left group" x-on:click="transactions !== 1 ? transactions = 1 : transactions = null"> <button class="relative w-full text-left group" x-on:click="transactions !== 1 ? transactions = 1 : transactions = null">
<span class="font-medium border-b border-transparent transition-all group-hover:border-black"> <span class="font-medium border-b border-transparent transition-all group-hover:border-black">
@ -17,17 +23,11 @@
x-bind:class="transactions === 1 ? 'h-auto' : 'scale-y-0 h-0'" x-bind:class="transactions === 1 ? 'h-auto' : 'scale-y-0 h-0'"
> >
<div class="my-2"> <div class="my-2">
@php {!! trans('transfers.slider.transactions_desc', ['number' => $expense_number, 'account' => $transfer->expense_account->title]) !!}
$number = '<a href="' . route('transactions.show', $transfer->expense_transaction->id) . '" class="text-purple">' . $transfer->expense_transaction->number . '</a>';
@endphp
{!! trans('transfers.slider.from_desc', ['number' => $number, 'account' => $transfer->expense_account->title]) !!}
</div> </div>
<div class="my-2"> <div class="my-2">
@php {!! trans('transfers.slider.transactions_desc', ['number' => $income_number, 'account' => $transfer->income_account->title]) !!}
$number = '<a href="' . route('transactions.show', $transfer->income_transaction->id) . '" class="text-purple">' . $transfer->income_transaction->number . '</a>';
@endphp
{!! trans('transfers.slider.from_desc', ['number' => $number, 'account' => $transfer->income_account->title]) !!}
</div> </div>
</div> </div>
</div> </div>