diff --git a/public/img/empty_pages/payments.png b/public/img/empty_pages/payments.png index ea1d98a06..e5fd8c414 100644 Binary files a/public/img/empty_pages/payments.png and b/public/img/empty_pages/payments.png differ diff --git a/public/img/empty_pages/reconciliations.png b/public/img/empty_pages/reconciliations.png new file mode 100644 index 000000000..fadfecd05 Binary files /dev/null and b/public/img/empty_pages/reconciliations.png differ diff --git a/public/img/empty_pages/taxes.png b/public/img/empty_pages/taxes.png new file mode 100644 index 000000000..9a65fe1cd Binary files /dev/null and b/public/img/empty_pages/taxes.png differ diff --git a/public/img/empty_pages/transfers.png b/public/img/empty_pages/transfers.png new file mode 100644 index 000000000..8958e17a6 Binary files /dev/null and b/public/img/empty_pages/transfers.png differ diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php index 5c08087a3..d3fa2d5e1 100644 --- a/resources/lang/en-GB/general.php +++ b/resources/lang/en-GB/general.php @@ -198,6 +198,9 @@ return [ 'bills' => 'Bills can be one time or recurring. They indicate what you owe your vendors for the products or services you purchase.', 'payments' => 'Payment is a paid expense transaction. It can be an independent record (i.e. food receipt) or attached to a bill.', 'vendors' => 'Vendors are required if you want to create bills. You can see the balance you owe and filter reports by the vendor.', + 'transfers' => 'Sometimes you may want to transfer money from one account to another.', + 'taxes' => 'The following fields are displayed as blank to be filled, some are required and some not. Those marked with red star are required.', + 'reconciliations' => 'Bank reconciliation is a process performed to ensure that your company bank records are also correct.', ], ]; diff --git a/resources/views/banking/reconciliations/index.blade.php b/resources/views/banking/reconciliations/index.blade.php index a7db7a732..08cf8ec26 100644 --- a/resources/views/banking/reconciliations/index.blade.php +++ b/resources/views/banking/reconciliations/index.blade.php @@ -9,80 +9,84 @@ @endsection @section('content') -
-
- {!! Form::open([ - 'method' => 'GET', - 'route' => 'reconciliations.index', - 'role' => 'form', - 'class' => 'mb-0' - ]) !!} -
- -
+ @if ($reconciliations->count()) +
+
+ {!! Form::open([ + 'method' => 'GET', + 'route' => 'reconciliations.index', + 'role' => 'form', + 'class' => 'mb-0' + ]) !!} +
+ +
- {{ Form::bulkActionRowGroup('general.reconciliations', $bulk_actions, ['group' => 'banking', 'type' => 'reconciliations']) }} - {!! Form::close() !!} -
- -
- - - - - - - - - - - - - - - @foreach($reconciliations as $item) - - - - - - - - - - @endforeach - -
{{ Form::bulkActionAllGroup() }}@sortablelink('created_at', trans('general.created_date'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])@sortablelink('account_id', trans_choice('general.accounts', 1)){{ trans('general.period') }}@sortablelink('closing_balance', trans('reconciliations.closing_balance'))@sortablelink('status', trans_choice('general.statuses', 1)){{ trans('general.actions') }}
{{ Form::bulkActionGroup($item->id, $item->account->name) }}@date($item->created_at){{ $item->account->name }}@date($item->started_at) - @date($item->ended_at)@money($item->closing_balance, $item->account->currency_code, true) - @if ($item->reconciled) - {{ trans('reconciliations.reconciled') }} - @else - {{ trans('reconciliations.unreconciled') }} - @endif - - -
-
- - -
+ +
+ + + + + + + + + + + + + + + @foreach($reconciliations as $item) + + + + + + + + + + @endforeach + +
{{ Form::bulkActionAllGroup() }}@sortablelink('created_at', trans('general.created_date'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])@sortablelink('account_id', trans_choice('general.accounts', 1)){{ trans('general.period') }}@sortablelink('closing_balance', trans('reconciliations.closing_balance'))@sortablelink('status', trans_choice('general.statuses', 1)){{ trans('general.actions') }}
{{ Form::bulkActionGroup($item->id, $item->account->name) }}@date($item->created_at){{ $item->account->name }}@date($item->started_at) - @date($item->ended_at)@money($item->closing_balance, $item->account->currency_code, true) + @if ($item->reconciled) + {{ trans('reconciliations.reconciled') }} + @else + {{ trans('reconciliations.unreconciled') }} + @endif + + +
+
+ + +
+ @else + @include('partials.admin.empty_page', ['page' => 'reconciliations', 'docs_path' => 'banking/reconciliations']) + @endif @endsection @push('scripts_start') diff --git a/resources/views/banking/transfers/index.blade.php b/resources/views/banking/transfers/index.blade.php index dcd8338ca..cde2dc851 100644 --- a/resources/views/banking/transfers/index.blade.php +++ b/resources/views/banking/transfers/index.blade.php @@ -9,72 +9,76 @@ @endpermission @section('content') -
-
- {!! Form::open([ - 'method' => 'GET', - 'route' => 'transfers.index', - 'role' => 'form', - 'class' => 'mb-0' - ]) !!} -
- -
+ @if ($transfers->count()) +
+
+ {!! Form::open([ + 'method' => 'GET', + 'route' => 'transfers.index', + 'role' => 'form', + 'class' => 'mb-0' + ]) !!} +
+ +
- {{ Form::bulkActionRowGroup('general.transfers', $bulk_actions, ['group' => 'banking', 'type' => 'transfers']) }} - {!! Form::close() !!} -
+ {{ Form::bulkActionRowGroup('general.transfers', $bulk_actions, ['group' => 'banking', 'type' => 'transfers']) }} + {!! Form::close() !!} +
-
- - - - - - - - - - - - - - @foreach($transfers as $item) - - - - - - - +
+
{{ Form::bulkActionAllGroup() }}@sortablelink('expense_transaction.paid_at', trans('general.date'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])@sortablelink('expense_transaction.name', trans('transfers.from_account'))@sortablelink('income_transaction.name', trans('transfers.to_account'))@sortablelink('expense_transaction.amount', trans('general.amount')){{ trans('general.actions') }}
{{ Form::bulkActionGroup($item->id, $item->from_account) }}@date($item->paid_at){{ $item->from_account }}{{ $item->to_account }}@money($item->amount, $item->currency_code, true) - -
+ + + + + + + + - @endforeach - -
{{ Form::bulkActionAllGroup() }}@sortablelink('expense_transaction.paid_at', trans('general.date'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])@sortablelink('expense_transaction.name', trans('transfers.from_account'))@sortablelink('income_transaction.name', trans('transfers.to_account'))@sortablelink('expense_transaction.amount', trans('general.amount')){{ trans('general.actions') }}
-
+ - -
+ @else + @include('partials.admin.empty_page', ['page' => 'transfers', 'docs_path' => 'banking/transfers']) + @endif @endsection @push('scripts_start') diff --git a/resources/views/settings/taxes/index.blade.php b/resources/views/settings/taxes/index.blade.php index 4a3041cca..c8ab3da9c 100644 --- a/resources/views/settings/taxes/index.blade.php +++ b/resources/views/settings/taxes/index.blade.php @@ -9,82 +9,86 @@ @endpermission @section('content') -
-
- {!! Form::open([ - 'method' => 'GET', - 'route' => 'taxes.index', - 'role' => 'form', - 'class' => 'mb-0' - ]) !!} -
- -
+ @if ($taxes->count()) +
+
+ {!! Form::open([ + 'method' => 'GET', + 'route' => 'taxes.index', + 'role' => 'form', + 'class' => 'mb-0' + ]) !!} +
+ +
- {{ Form::bulkActionRowGroup('general.taxes', $bulk_actions, ['group' => 'settings', 'type' => 'taxes']) }} - {!! Form::close() !!} -
+ {{ Form::bulkActionRowGroup('general.taxes', $bulk_actions, ['group' => 'settings', 'type' => 'taxes']) }} + {!! Form::close() !!} +
-
- - - - - - - - - - - - - - @foreach($taxes as $item) - - - - - - - +
+
{{ Form::bulkActionAllGroup() }}@sortablelink('name', trans('general.name'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])@sortablelink('rate', trans('taxes.rate_percent'))@sortablelink('type', trans_choice('general.types', 1))@sortablelink('enabled', trans('general.enabled')){{ trans('general.actions') }}
{{ Form::bulkActionGroup($item->id, $item->name) }}{{ $item->name }}{{ $item->rate }}{{ $types[$item->type] }} - @if (user()->can('update-settings-taxes')) - {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }} - @else - @if ($item->enabled) - {{ trans('general.enabled') }} - @else - {{ trans('general.disabled') }} - @endif - @endif - - -
+ + + + + + + + - @endforeach - -
{{ Form::bulkActionAllGroup() }}@sortablelink('name', trans('general.name'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow'])@sortablelink('rate', trans('taxes.rate_percent'))@sortablelink('type', trans_choice('general.types', 1))@sortablelink('enabled', trans('general.enabled')){{ trans('general.actions') }}
-
+ - -
+ @else + @include('partials.admin.empty_page', ['page' => 'taxes', 'docs_path' => 'settings/taxes']) + @endif @endsection @push('scripts_start')