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

Merge branch '2.1-dev' of github.com:akaunting/akaunting into 2.1-dev

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-11-11 18:49:19 +03:00
parent 72231b10ce 6dbf2a8d5c
commit 8784dc14db
91 changed files with 1938 additions and 1814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/views/banking/accounts/index.blade.php
View File

@@ -18,10 +18,7 @@
'class' => 'mb-0'
]) !!}
<div class="align-items-center" v-if="!bulk_action.show">
<akaunting-search
:placeholder="'{{ trans('general.search_placeholder') }}'"
:options="{{ json_encode([]) }}"
></akaunting-search>
<x-search-string model="App\Models\Banking\Account" />
</div>
{{ Form::bulkActionRowGroup('general.accounts', $bulk_actions, ['group' => 'banking', 'type' => 'accounts']) }}

7
resources/views/banking/reconciliations/index.blade.php
View File

@@ -9,7 +9,7 @@
@endsection
@section('content')
@if ($reconciliations->count())
@if ($reconciliations->count() || request()->get('search', false))
<div class="card">
<div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
{!! Form::open([
@@ -19,10 +19,7 @@
'class' => 'mb-0'
]) !!}
<div class="align-items-center" v-if="!bulk_action.show">
<akaunting-search
:placeholder="'{{ trans('general.search_placeholder') }}'"
:options="{{ json_encode([]) }}"
></akaunting-search>
<x-search-string model="App\Models\Banking\Reconciliation" />
</div>
{{ Form::bulkActionRowGroup('general.reconciliations', $bulk_actions, ['group' => 'banking', 'type' => 'reconciliations']) }}

5
resources/views/banking/transactions/index.blade.php
View File

@@ -22,10 +22,7 @@
'role' => 'form',
'class' => 'mb-0'
]) !!}
<akaunting-search
:placeholder="'{{ trans('general.search_placeholder') }}'"
:options="{{ json_encode([]) }}"
></akaunting-search>
<x-search-string model="App\Models\Banking\Transaction" />
{!! Form::close() !!}
</div>

7
resources/views/banking/transfers/index.blade.php
View File

@@ -11,7 +11,7 @@
@endsection
@section('content')
@if ($transfers->count())
@if ($transfers->count() || request()->get('search', false))
<div class="card">
<div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
{!! Form::open([
@@ -21,10 +21,7 @@
'class' => 'mb-0'
]) !!}
<div class="align-items-center" v-if="!bulk_action.show">
<akaunting-search
:placeholder="'{{ trans('general.search_placeholder') }}'"
:options="{{ json_encode([]) }}"
></akaunting-search>
<x-search-string model="App\Models\Banking\Transfer" />
</div>
{{ Form::bulkActionRowGroup('general.transfers', $bulk_actions, ['group' => 'banking', 'type' => 'transfers']) }}