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

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

Browse Source 
# Conflicts:
#	composer.lock
#	resources/views/banking/accounts/index.blade.php
#	resources/views/banking/reconciliations/index.blade.php
#	resources/views/banking/transactions/index.blade.php
#	resources/views/banking/transfers/index.blade.php
#	resources/views/common/items/index.blade.php
#	resources/views/common/reports/index.blade.php
#	resources/views/purchases/bills/index.blade.php
#	resources/views/purchases/payments/index.blade.php
#	resources/views/purchases/vendors/index.blade.php
#	resources/views/sales/customers/index.blade.php
#	resources/views/sales/invoices/index.blade.php
#	resources/views/sales/revenues/index.blade.php
This commit is contained in:
Cüneyt Şentürk
2020-10-22 18:03:20 +03:00
parent 77e4109b03 bf66a5988b
commit 642243790e
114 changed files with 2409 additions and 1587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/auth/permissions/index.blade.php
View File

@@ -4,7 +4,7 @@
@can('create-auth-permissions')
@section('new_button')
<a href="{{ route('permissions.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<a href="{{ route('permissions.create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a>
@endsection
@endcan

2
resources/views/auth/roles/index.blade.php
View File

@@ -4,7 +4,7 @@
@can('create-auth-roles')
@section('new_button')
<a href="{{ route('roles.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<a href="{{ route('roles.create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a>
@endsection
@endcan

2
resources/views/auth/users/index.blade.php
View File

@@ -4,7 +4,7 @@
@can('create-auth-users')
@section('new_button')
<a href="{{ route('users.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<a href="{{ route('users.create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a>
@endsection
@endcan

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

@@ -4,7 +4,7 @@
@section('new_button')
@can('create-banking-accounts')
<a href="{{ route('accounts.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<a href="{{ route('accounts.create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a>
@endcan
@endsection

12
resources/views/banking/reconciliations/create.blade.php
View File

@@ -25,7 +25,7 @@
{{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, request('account_id', setting('default.account')), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount'], 'col-xl-2') }}
<div class="col-xl-2">
{!! Form::button(trans('reconciliations.transactions'), ['type' => 'button', '@click' => 'onReconcilition', 'class' => 'btn btn-success header-button-top']) !!}
{!! Form::button('<span class="fa fa-list"></span> &nbsp;' . trans('reconciliations.transactions'), ['type' => 'button', '@click' => 'onReconcilition', 'class' => 'btn btn-success header-button-top']) !!}
</div>
</div>
</div>
@@ -140,15 +140,15 @@
<div class="col-md-12">
@if ($transactions->count())
<div class="float-right">
<a href="{{ route('reconciliations.index') }}" class="btn btn-outline-secondary header-button-top">{{ trans('general.cancel') }}</a>
<a href="{{ route('reconciliations.index') }}" class="btn btn-outline-secondary header-button-top"><span class="fa fa-times"></span> &nbsp;{{ trans('general.cancel') }}</a>
{!! Form::button(
'<span v-if="form.loading" class="btn-inner--icon"><i class="aka-loader"></i></span> <span :class="[{\'opacity-10\': reconcile}]" class="btn-inner--text">' . trans('reconciliations.reconcile') . '</span>',
[':disabled' => 'reconcile || form.loading', '@click' => 'onReconcileSubmit', 'type' => 'button', 'class' => 'btn btn-icon btn-info header-button-top']) !!}
'<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span :class="[{\'opacity-10\': reconcile}]" v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-check"></i></span>' . '<span :class="[{\'opacity-10\': reconcile}]" class="btn-inner--text"> ' . trans('reconciliations.reconcile') . '</span>',
[':disabled' => 'reconcile || form.loading', '@click' => 'onReconcileSubmit', 'type' => 'button', 'class' => 'btn btn-icon btn-info header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
{!! Form::button(
'<span v-if="form.loading" class="btn-inner--icon"><i class="aka-loader"></i></span> <span :class="[{\'ml-0\': form.loading}]" class="btn-inner--text">' . trans('general.save') . '</span>',
[':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success header-button-top']) !!}
'<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-save"></i></span>' . '<span v-if="!form.loading" class="btn-inner--text"> ' . trans('general.save') . '</span>',
[':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
</div>
@else
<div class="text-sm text-muted" id="datatable-basic_info" role="status" aria-live="polite">

8
resources/views/banking/reconciliations/edit.blade.php
View File

@@ -113,15 +113,15 @@
<div class="col-md-12">
@if ($transactions->count())
<div class="float-right">
<a href="{{ route('reconciliations.index') }}" class="btn btn-outline-secondary header-button-top">{{ trans('general.cancel') }}</a>
<a href="{{ route('reconciliations.index') }}" class="btn btn-outline-secondary header-button-top"><span class="fa fa-times"></span> &nbsp;{{ trans('general.cancel') }}</a>
{!! Form::button(
'<span v-if="form.loading" class="btn-inner--icon"><i class="aka-loader"></i></span> <span :class="[{\'opacity-10\': reconcile}]" class="btn-inner--text">' . trans('reconciliations.reconcile') . '</span>',
'<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span :class="[{\'opacity-10\': reconcile}]" v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-check"></i></span>' . '<span :class="[{\'opacity-10\': reconcile}]" class="btn-inner--text"> ' . trans('reconciliations.reconcile') . '</span>',
[':disabled' => 'reconcile || form.loading', '@click' => 'onReconcileSubmit', 'type' => 'button', 'class' => 'btn btn-icon btn-info header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
{!! Form::button(
'<span v-if="form.loading" class="btn-inner--icon"><i class="aka-loader"></i></span> <span :class="[{\'ml-0\': form.loading}]" class="btn-inner--text">' . trans('general.save') . '</span>',
[':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success header-button-top']) !!}
'<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-save"></i></span>' . '<span v-if="!form.loading" class="btn-inner--text"> ' . trans('general.save') . '</span>',
[':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
</div>
@else
<div class="text-sm text-muted" id="datatable-basic_info" role="status" aria-live="polite">

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

@@ -4,7 +4,7 @@
@section('new_button')
@can('create-banking-reconciliations')
<a href="{{ route('reconciliations.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<a href="{{ route('reconciliations.create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a>
@endcan
@endsection

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

@@ -3,14 +3,14 @@
@section('title', trans_choice('general.transactions', 2))
@section('new_button')
@can('create-sales-revenues')
<a href="{{ route('revenues.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_income') }}</a>
@endcan
@can('create-purchases-payments')
<a href="{{ route('payments.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_expense') }}</a>
@endcan
<a href="{{ route('import.create', ['banking', 'transactions']) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
<a href="{{ route('transactions.export', request()->input()) }}" class="btn btn-white btn-sm">{{ trans('general.export') }}</a>
@permission('create-sales-revenues')
<span><a href="{{ route('revenues.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_income') }}</a></span>
@endpermission
@permission('create-purchases-payments')
<span><a href="{{ route('payments.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_expense') }}</a></span>
@endpermission
<span><a href="{{ route('import.create', ['banking', 'transactions']) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload "></span> &nbsp;{{ trans('import.import') }}</a></span>
<span><a href="{{ route('transactions.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
@endsection
@section('content')

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

@@ -3,10 +3,10 @@
@section('title', trans_choice('general.transfers', 2))
@section('new_button')
@can('create-banking-transfers')
<a href="{{ route('transfers.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a>
@endcan
<span><a href="{{ route('import.create', ['banking', 'transfers']) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload "></span> &nbsp;{{ trans('import.import') }}</a></span>
@permission('create-banking-transfers')
<a href="{{ route('transfers.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a>
@endpermission
<span><a href="{{ route('import.create', ['banking', 'transfers']) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
<span><a href="{{ route('transfers.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
@endsection
@@ -59,10 +59,10 @@
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
<a class="dropdown-item" href="{{ route('transfers.edit', $item->id) }}">{{ trans('general.edit') }}</a>
@can('delete-banking-transfers')
@permission('delete-banking-transfers')
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'transfers.destroy') !!}
@endcan
@endpermission
</div>
</div>
</td>

2
resources/views/common/companies/index.blade.php
View File

@@ -4,7 +4,7 @@
@can('create-common-companies')
@section('new_button')
<a href="{{ route('companies.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<a href="{{ route('companies.create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a>
@endsection
@endcan

2
resources/views/common/dashboards/index.blade.php
View File

@@ -4,7 +4,7 @@
@can('create-common-dashboards')
@section('new_button')
<a href="{{ route('dashboards.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<a href="{{ route('dashboards.create') }}" class="btn btn-success btn-sm"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a>
@endsection
@endcan

4
resources/views/common/import/create.blade.php
View File

@@ -41,8 +41,8 @@
<div class="card-footer">
<div class="row save-buttons">
<div class="col-xs-12 col-sm-12">
<a href="{{ url($path) }}" class="btn btn-outline-secondary">{{ trans('general.cancel') }}</a>
{!! Form::button(trans('import.import'), ['type' => 'submit', 'class' => 'btn btn-success']) !!}
<a href="{{ url($path) }}" class="btn btn-outline-secondary header-button-top"><span class="fa fa-times"></span> &nbsp;{{ trans('general.cancel') }}</a>
{!! Form::button('<span class="fa fa-download"></span> &nbsp;' . trans('import.import'), ['type' => 'submit', 'class' => 'btn btn-success header-button-top']) !!}
</div>
</div>
</div>

18
resources/views/common/items/index.blade.php
View File

@@ -3,11 +3,11 @@
@section('title', trans_choice('general.items', 2))
@section('new_button')
@can('create-common-items')
<a href="{{ route('items.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<a href="{{ route('import.create', ['common', 'items']) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
@endcan
<a href="{{ route('items.export', request()->input()) }}" class="btn btn-white btn-sm">{{ trans('general.export') }}</a>
@permission('create-common-items')
<span><a href="{{ route('items.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ route('import.create', ['common', 'items']) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload "></span> &nbsp;{{ trans('import.import') }}</a></span>
@endpermission
<span><a href="{{ route('items.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
@endsection
@section('content')
@@ -82,14 +82,14 @@
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
<a class="dropdown-item" href="{{ route('items.edit', $item->id) }}">{{ trans('general.edit') }}</a>
@can('create-common-items')
@permission('create-common-items')
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{{ route('items.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
@endcan
@can('delete-common-items')
@endpermission
@permission('delete-common-items')
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'items.destroy') !!}
@endcan
@endpermission
</div>
</div>
</td>

16
resources/views/common/reports/index.blade.php
View File

@@ -3,10 +3,10 @@
@section('title', trans_choice('general.reports', 2))
@section('new_button')
@can('create-common-reports')
<a href="{{ route('reports.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
@endcan
<a href="{{ route('reports.clear') }}" class="btn btn-warning btn-sm">{{ trans('general.clear_cache') }}</a>
@permission('create-common-reports')
<a href="{{ route('reports.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a>
@endpermission
<a href="{{ route('reports.clear') }}" class="btn btn-warning btn-sm header-button-top"><span class="fa fa-history"></span> &nbsp;{{ trans('general.clear_cache') }}</a>
@endsection
@section('content')
@@ -26,14 +26,14 @@
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
<a class="dropdown-item" href="{{ route('reports.edit', $report->id) }}">{{ trans('general.edit') }}</a>
@can('create-common-reports')
@permission('create-common-reports')
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{{ route('reports.duplicate', $report->id) }}">{{ trans('general.duplicate') }}</a>
@endcan
@can('delete-common-reports')
@endpermission
@permission('delete-common-reports')
<div class="dropdown-divider"></div>
{!! Form::deleteLink($report, 'common/reports') !!}
@endcan
@endpermission
</div>
</div>
</span>

6
resources/views/errors/403.blade.php
View File

@@ -5,9 +5,7 @@
@section('content')
<div class="card">
<div class="card-header">
<h2 class="mb-0 text-danger">
<i class="fa fa-exclamation-triangle text-danger"></i> &nbsp;{{ trans('errors.header.403') }}
</h2>
<h2 class="mb-0 text-danger"><i class="fa fa-exclamation-triangle text-danger"></i>&nbsp;&nbsp;{{ trans('errors.header.403') }}</h2>
</div>
<div class="card-body">
@@ -15,7 +13,7 @@
@php $landing_page = user() ? route(user()->landing_page) : route('login'); @endphp
<a href="{{ $landing_page }}" class="btn btn-success">{{ trans('general.go_to_dashboard') }}</a>
<a href="{{ $landing_page }}" class="btn btn-success header-button-top"><span class="fa fa-tachometer-alt"></span> &nbsp;{{ trans('general.go_to_dashboard') }}</a>
</div>
</div>
@endsection

6
resources/views/errors/404.blade.php
View File

@@ -5,9 +5,7 @@
@section('content')
<div class="card">
<div class="card-header">
<h2 class="mb-0 text-warning">
<i class="fa fa-exclamation-triangle text-warning"></i> &nbsp;{{ trans('errors.header.404') }}
</h2>
<h2 class="mb-0 text-warning"><i class="fa fa-exclamation-triangle text-warning"></i>&nbsp;&nbsp;{{ trans('errors.header.404') }}</h2>
</div>
<div class="card-body">
@@ -15,7 +13,7 @@
@php $landing_page = user() ? route(user()->landing_page) : route('login'); @endphp
<a href="{{ $landing_page }}" class="btn btn-success">{{ trans('general.go_to_dashboard') }}</a>
<a href="{{ $landing_page }}" class="btn btn-success header-button-top"><span class="fa fa-tachometer-alt"></span> &nbsp;{{ trans('general.go_to_dashboard') }}</a>
</div>
</div>
@endsection

6
resources/views/errors/500.blade.php
View File

@@ -5,9 +5,7 @@
@section('content')
<div class="card">
<div class="card-header">
<h2 class="mb-0 text-danger">
<i class="fa fa-exclamation-triangle text-danger"></i> &nbsp;{{ trans('errors.header.500') }}
</h2>
<h2 class="mb-0 text-danger"><i class="fa fa-exclamation-triangle text-danger"></i>&nbsp;&nbsp;{{ trans('errors.header.500') }}</h2>
</div>
<div class="card-body">
@@ -15,7 +13,7 @@
@php $landing_page = user() ? route(user()->landing_page) : route('login'); @endphp
<a href="{{ $landing_page }}" class="btn btn-success">{{ trans('general.go_to_dashboard') }}</a>
<a href="{{ $landing_page }}" class="btn btn-success header-button-top"><span class="fa fa-tachometer-alt"></span> &nbsp;{{ trans('general.go_to_dashboard') }}</a>
</div>
</div>
@endsection

2
resources/views/install/updates/edit.blade.php
View File

@@ -3,7 +3,7 @@
@section('title', trans_choice('general.updates', 2))
@section('new_button')
<a href="{{ route('updates.check') }}" class="btn btn-warning btn-sm">{{ trans('updates.check') }}</a>
<a href="{{ route('updates.check') }}" class="btn btn-warning btn-sm header-button-top"><span class="fa fa-history"></span> &nbsp;{{ trans('updates.check') }}</a>
@endsection
@section('content')

8
resources/views/install/updates/index.blade.php
View File

@@ -3,7 +3,7 @@
@section('title', trans_choice('general.updates', 2))
@section('new_button')
<a href="{{ route('updates.check') }}" class="btn btn-white btn-sm header-button-top">{{ trans('updates.check') }}</a>
<a href="{{ route('updates.check') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-history"></span> &nbsp;{{ trans('updates.check') }}</a>
@endsection
@section('content')
@@ -25,11 +25,11 @@
<div class="col-sm-10 col-md-6 text-right">
<a href="{{ route('updates.run', ['alias' => 'core', 'version' => $core]) }}" class="btn btn-info btn-sm header-button-top long-texts">
{{ trans('updates.update', ['version' => $core]) }}
<i class="fa fa-refresh"></i> &nbsp;{{ trans('updates.update', ['version' => $core]) }}
</a>
<button type="button" @click="onChangelog" class="btn btn-white btn-sm header-button-bottom">
{{ trans('updates.changelog') }}
<i class="fa fa-exchange-alt"></i> &nbsp;{{ trans('updates.changelog') }}
</button>
</div>
@endif
@@ -62,7 +62,7 @@
<td class="col-xs-4 col-sm-3 col-md-3">{{ $module->latest }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 text-center">
<a href="{{ route('updates.run', ['alias' => $module->alias, 'version' => $module->latest]) }}" class="btn btn-warning btn-sm">
{{ trans_choice('general.updates', 1) }}
<i class="fa fa-refresh" aria-hidden="true"></i> {{ trans_choice('general.updates', 1) }}
</a>
</td>
</tr>

8
resources/views/layouts/install.blade.php
View File

@@ -40,16 +40,18 @@
<div class="card-footer">
<div class="float-right">
@if (Request::is('install/requirements'))
<a href="{{ route('install.requirements') }}" class="btn btn-success"> {{ trans('install.refresh') }}</a>
<a href="{{ route('install.requirements') }}" class="btn btn-success"> {{ trans('install.refresh') }} &nbsp;<i class="fa fa-refresh"></i></a>
@else
{!! Form::button(
'<i v-if="loading" :class="(loading) ? \'show \' : \'\'" class="fas fa-spinner fa-spin d-none"></i> ' .
trans('install.next'),
trans('install.next') .
' &nbsp;<i class="fa fa-arrow-right"></i>',
[
':disabled' => 'loading',
'type' => 'submit',
'id' => 'next-button',
'class' => 'btn btn-success'
'class' => 'btn btn-success',
'data-loading-text' => trans('general.loading')
]
) !!}
@endif

4
resources/views/modules/home/index.blade.php
View File

@@ -3,8 +3,8 @@
@section('title', trans_choice('general.modules', 2))
@section('new_button')
<a href="{{ route('apps.api-key.create') }}" class="btn btn-white btn-sm">{{ trans('modules.api_key') }}</a>
<a href="{{ route('apps.my.index') }}" class="btn btn-white btn-sm">{{ trans('modules.my_apps') }}</a>
<span><a href="{{ route('apps.api-key.create') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-key"></span> &nbsp;{{ trans('modules.api_key') }}</a></span>
<span><a href="{{ route('apps.my.index') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-user"></span> &nbsp;{{ trans('modules.my_apps') }}</a></span>
@endsection
@section('content')

6
resources/views/modules/item/documentation.blade.php
View File

@@ -3,8 +3,8 @@
@section('title', trans_choice('general.modules', 2))
@section('new_button')
<a href="{{ route('apps.api-key.create') }}" class="btn btn-white btn-sm">{{ trans('modules.api_key') }}</a>
<a href="{{ route('apps.my.index') }}" class="btn btn-white btn-sm">{{ trans('modules.my_apps') }}</a>
<span><a href="{{ route('apps.api-key.create') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-key"></span> &nbsp;{{ trans('modules.api_key') }}</a></span>
<span><a href="{{ route('apps.my.index') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-user"></span> &nbsp;{{ trans('modules.my_apps') }}</a></span>
@endsection
@section('content')
@@ -22,7 +22,7 @@
<div class="card-footer">
<div class="row">
<div class="col-md-12">
<a href="{{ url($back) }}" class="btn btn-white">{{ trans('modules.back') }}</a>
<a href="{{ url($back) }}" class="btn btn-white header-button-top"><span class="fas fa-arrow-left"></span> &nbsp;{{ trans('modules.back') }}</a>
</div>
</div>
</div>

4
resources/views/modules/item/pre_sale.blade.php
View File

@@ -3,8 +3,8 @@
@section('title', trans_choice('general.modules', 2))
@section('new_button')
<a href="{{ route('apps.api-key.create') }}" class="btn btn-white btn-sm">{{ trans('modules.api_key') }}</a>
<a href="{{ route('apps.my.index') }}" class="btn btn-white btn-sm">{{ trans('modules.my_apps') }}</a>
<span><a href="{{ route('apps.api-key.create') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-key"></span> &nbsp;{{ trans('modules.api_key') }}</a></span>
<span><a href="{{ route('apps.my.index') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-user"></span> &nbsp;{{ trans('modules.my_apps') }}</a></span>
@endsection
@section('content')

4
resources/views/modules/item/show.blade.php
View File

@@ -3,8 +3,8 @@
@section('title', trans_choice('general.modules', 2))
@section('new_button')
<a href="{{ route('apps.api-key.create') }}" class="btn btn-white btn-sm">{{ trans('modules.api_key') }}</a>
<a href="{{ route('apps.my.index') }}" class="btn btn-white btn-sm">{{ trans('modules.my_apps') }}</a>
<span><a href="{{ route('apps.api-key.create') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-key"></span> &nbsp;{{ trans('modules.api_key') }}</a></span>
<span><a href="{{ route('apps.my.index') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-user"></span> &nbsp;{{ trans('modules.my_apps') }}</a></span>
@endsection
@section('content')

4
resources/views/modules/my/index.blade.php
View File

@@ -3,8 +3,8 @@
@section('title', trans_choice('general.modules', 2))
@section('new_button')
<a href="{{ route('apps.api-key.create') }}" class="btn btn-white btn-sm">{{ trans('modules.api_key') }}</a>
<a href="{{ route('apps.my.index') }}" class="btn btn-white btn-sm">{{ trans('modules.my_apps') }}</a>
<span><a href="{{ route('apps.api-key.create') }}" class="btn btn-white btn-sm button-header-top"><span class="fa fa-key"></span> &nbsp;{{ trans('modules.api_key') }}</a></span>
<span><a href="{{ route('apps.my.index') }}" class="btn btn-white btn-sm button-header-top"><span class="fa fa-user"></span> &nbsp;{{ trans('modules.my_apps') }}</a></span>
@endsection
@section('content')

8
resources/views/modules/tiles/index.blade.php
View File

@@ -3,8 +3,8 @@
@section('title', trans_choice('general.modules', 2))
@section('new_button')
<a href="{{ route('apps.api-key.create') }}" class="btn btn-white btn-sm">{{ trans('modules.api_key') }}</a>
<a href="{{ route('apps.my.index') }}" class="btn btn-white btn-sm">{{ trans('modules.my_apps') }}</a>
<span><a href="{{ route('apps.api-key.create') }}" class="btn btn-white btn-sm button-header-top"><span class="fa fa-key"></span> &nbsp;{{ trans('modules.api_key') }}</a></span>
<span><a href="{{ route('apps.my.index') }}" class="btn btn-white btn-sm button-header-top"><span class="fa fa-user"></span> &nbsp;{{ trans('modules.my_apps') }}</a></span>
@endsection
@section('content')
@@ -24,13 +24,13 @@
<div class="col-md-6 text-left">
@if ($modules->current_page > 1)
<a href="{{ url(request()->path()) }}?page={{ $modules->current_page - 1 }}" class="btn btn-white btn-sm">{!! trans('pagination.previous') !!}</a>
<a href="{{ url(request()->path()) }}?page={{ $modules->current_page - 1 }}" class="btn btn-white btn-sm button-header-top"><span class="fas fa-arrow-left"></span> &nbsp;{!! trans('pagination.previous') !!}</a>
@endif
</div>
<div class="col-md-6 text-right">
@if ($modules->current_page < $modules->last_page)
<a href="{{ url(request()->path()) }}?page={{ $modules->current_page + 1 }}" class="btn btn-white btn-sm">{!! trans('pagination.next') !!}</a>
<a href="{{ url(request()->path()) }}?page={{ $modules->current_page + 1 }}" class="btn btn-white btn-sm button-header-top">{!! trans('pagination.next') !!}&nbsp; <span class="fas fa-arrow-right"></span> </a>
@endif
</div>
@else

5
resources/views/partials/admin/empty_page.blade.php
View File

@@ -5,11 +5,10 @@
</div>
<div class="col-xs-12 col-sm-6 text-center p-5">
<p class="text-justify description">
{!! trans('general.empty.' . $page) !!} {!! trans('general.empty.documentation', ['url' => 'https://akaunting.com/docs/user-manual/' . $docs_path]) !!}
</p>
<p class="text-justify description">{!! trans('general.empty.' . $page) !!} {!! trans('general.empty.documentation', ['url' => 'https://akaunting.com/docs/user-manual/' . $docs_path]) !!}</p>
<a href="{{ route($page . '.create') }}" class="btn btn-success header-button-top float-right mt-4">
<span class="btn-inner--icon"><i class="fas fa-plus"></i></span>
<span class="btn-inner--text">{{ trans('general.title.create', ['type' => trans_choice('general.' . $page, 1)]) }}</span>
</a>
</div>

2
resources/views/partials/form/delete_button.blade.php
View File

@@ -23,7 +23,7 @@
$message = trans('general.delete_confirm', ['name' => '<strong>' . $name . '</strong>', 'type' => $type]);
@endphp
{!! Form::button(trans('general.delete'), array(
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i> ' . trans('general.delete'), array(
'type' => 'button',
'class' => 'btn btn-danger btn-xs',
'title' => trans('general.delete'),

9
resources/views/partials/form/save_buttons.blade.php
View File

@@ -8,11 +8,14 @@
@endphp
<div class="{{ $col }}">
<a href="{{ $url }}" class="btn btn-outline-secondary">{{ trans('general.cancel') }}</a>
<a href="{{ $url }}" class="btn btn-icon btn-outline-secondary header-button-top">
<span class="btn-inner--icon"><i class="fas fa-times"></i></span>
<span class="btn-inner--text">{{ trans('general.cancel') }}</span>
</a>
{!! Form::button(
'<span v-if="form.loading" class="btn-inner--icon"><i class="aka-loader"></i></span> <span :class="[{\'ml-0\': form.loading}]" class="btn-inner--text">' . trans('general.save') . '</span>',
[':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success']) !!}
'<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-save"></i></span>' . '<span v-if="!form.loading" class="btn-inner--text">' . trans('general.save') . '</span>',
[':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
</div>
@stack('save_buttons_end')

2
resources/views/partials/reports/filter.blade.php
View File

@@ -13,7 +13,7 @@
@foreach($class->filters as $name => $values)
{!! Form::select($name . '[]', $values, request($name), ['id' => 'filter-' . $name, 'class' => 'form-control form-control-sm d-inline-block w-auto']) !!}
@endforeach
{!! Form::button(trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-secondary']) !!}
{!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-secondary']) !!}
</div>
{!! Form::close() !!}

16
resources/views/partials/reports/header.blade.php
View File

@@ -1,10 +1,14 @@
@section('title', $class->model->name)
@section('new_button')
<a href="{{ url($class->getUrl('print')) }}" target="_blank" class="btn btn-white btn-sm">
{{ trans('general.print') }}
</a>
<a href="{{ url($class->getUrl('export')) }}" class="btn btn-white btn-sm header-button-top">
{{ trans('general.export') }}
</a>
<span>
<a href="{{ url($class->getUrl('print')) }}" target="_blank" class="btn btn-white btn-sm header-button-top">
<span class="fa fa-print"></span> &nbsp;{{ trans('general.print') }}
</a>
</span>
<span>
<a href="{{ url($class->getUrl('export')) }}" class="btn btn-white btn-sm header-button-top">
<span class="fa fa-upload"></span> &nbsp;{{ trans('general.export') }}
</a>
</span>
@endsection

2
resources/views/partials/reports/table/rows.blade.php
View File

@@ -1,6 +1,6 @@
@if ($row_total = array_sum($rows))
<tr class="row rp-border-top-1 font-size-unset">
<td class="{{ $class->column_name_width }} long-texts pr-0" title="{{ $class->row_names[$table][$id] }}">{{ $class->row_names[$table][$id] }}</td>
<td class="{{ $class->column_name_width }} long-texts pr-0">{{ $class->row_names[$table][$id] }}</td>
@foreach($rows as $row)
<td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
@endforeach

4
resources/views/portal/invoices/show.blade.php
View File

@@ -291,13 +291,13 @@
<div class="col-xs-12 col-sm-6 text-right">
@stack('button_print_start')
<a href="{{ route('portal.invoices.print', $invoice->id) }}" target="_blank" class="btn btn-success header-button-top">
{{ trans('general.print') }}
<i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }}
</a>
@stack('button_print_end')
@stack('button_pdf_start')
<a href="{{ route('portal.invoices.pdf', $invoice->id) }}" class="btn btn-white header-button-top">
{{ trans('general.download') }}
<i class="fa fa-file-pdf"></i>&nbsp; {{ trans('general.download') }}
</a>
@stack('button_pdf_end')
</div>

6
resources/views/portal/invoices/signed.blade.php
View File

@@ -3,7 +3,7 @@
@section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number)
@section('new_button')
<a href="{{ route('portal.dashboard') }}" class="btn btn-success btn-sm">{{ trans('invoices.all_invoices') }}</a>
<a href="{{ route('portal.dashboard') }}" class="btn btn-success btn-sm"><span class="fa fa-user"></span> &nbsp;{{ trans('invoices.all_invoices') }}</a>
@endsection
@section('content')
@@ -235,11 +235,11 @@
<div class="col-md-8 text-right">
<a href="{{ $print_action }}" target="_blank" class="btn btn-success">
{{ trans('general.print') }}
<i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }}
</a>
<a href="{{ $pdf_action }}" class="btn btn-white" data-toggle="tooltip" title="{{ trans('invoices.download_pdf') }}">
{{ trans('general.download') }}
<i class="fa fa-file-pdf"></i>&nbsp; {{ trans('general.download') }}
</a>
</div>

22
resources/views/purchases/bills/index.blade.php
View File

@@ -3,11 +3,11 @@
@section('title', trans_choice('general.bills', 2))
@section('new_button')
@can('create-purchases-bills')
<a href="{{ route('bills.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<a href="{{ route('import.create', ['group' => 'purchases', 'type' => 'bills']) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
@endcan
<a href="{{ route('bills.export', request()->input()) }}" class="btn btn-white btn-sm">{{ trans('general.export') }}</a>
@permission('create-purchases-bills')
<span><a href="{{ route('bills.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ route('import.create', ['group' => 'purchases', 'type' => 'bills']) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
@endpermission
<span><a href="{{ route('bills.export', request()->input()) }}" class="btn btn-white btn-sm header-button-bottom"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
@endsection
@section('content')
@@ -73,21 +73,21 @@
<div class="dropdown-divider"></div>
@if ($item->status != 'cancelled')
@can('create-purchases-bills')
@permission('create-purchases-bills')
<a class="dropdown-item" href="{{ route('bills.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
@endcan
@endpermission
@can('update-purchases-bills')
@permission('update-purchases-bills')
<a class="dropdown-item" href="{{ route('bills.cancelled', $item->id) }}">{{ trans('general.cancel') }}</a>
@endcan
@endpermission
@endif
@can('delete-purchases-bills')
@permission('delete-purchases-bills')
<div class="dropdown-divider"></div>
@if (!$item->reconciled)
{!! Form::deleteLink($item, 'bills.destroy') !!}
@endif
@endcan
@endpermission
</div>
</div>
</td>

6
resources/views/purchases/bills/show.blade.php
View File

@@ -448,14 +448,14 @@
@stack('button_edit_start')
@if(!$bill->reconciled)
<a href="{{ route('bills.edit', $bill->id) }}" class="btn btn-info header-button-top">
{{ trans('general.edit') }}
<i class="fas fa-edit"></i>&nbsp; {{ trans('general.edit') }}
</a>
@endif
@stack('button_edit_end')
@stack('button_print_start')
<a href="{{ route('bills.print', $bill->id) }}" target="_blank" class="btn btn-success header-button-top">
{{ trans('general.print') }}
<i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }}
</a>
@stack('button_print_end')
@@ -611,7 +611,7 @@
]);
@endphp
{!! Form::button(trans('general.delete'), array(
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i> ' . trans('general.delete'), array(
'type' => 'button',
'class' => 'btn btn-danger btn-sm',
'title' => trans('general.delete'),

18
resources/views/purchases/payments/index.blade.php
View File

@@ -3,11 +3,11 @@
@section('title', trans_choice('general.payments', 2))
@section('new_button')
@can('create-purchases-payments')
<a href="{{ route('payments.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<a href="{{ route('import.create', ['group' => 'purchases', 'type' => 'payments']) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
@endcan
<a href="{{ route('payments.export', request()->input()) }}" class="btn btn-white btn-sm">{{ trans('general.export') }}</a>
@permission('create-purchases-payments')
<span><a href="{{ route('payments.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ route('import.create', ['group' => 'purchases', 'type' => 'payments']) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
@endpermission
<span><a href="{{ route('payments.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
@endsection
@section('content')
@@ -93,15 +93,15 @@
<div class="dropdown-divider"></div>
@endif
@if (empty($item->document_id))
@can('create-purchases-payments')
@permission('create-purchases-payments')
<a class="dropdown-item" href="{{ route('payments.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
<div class="dropdown-divider"></div>
@endcan
@endpermission
@endif
@if (!$item->reconciled)
@can('delete-purchases-payments')
@permission('delete-purchases-payments')
{!! Form::deleteLink($item, 'payments.destroy') !!}
@endcan
@endpermission
@endif
</div>
</div>

18
resources/views/purchases/vendors/index.blade.php vendored
View File

@@ -3,11 +3,11 @@
@section('title', trans_choice('general.vendors', 2))
@section('new_button')
@can('create-purchases-vendors')
<a href="{{ route('vendors.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<a href="{{ route('import.create', ['group' => 'purchases', 'type' => 'vendors']) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
@endcan
<a href="{{ route('vendors.export', request()->input()) }}" class="btn btn-white btn-sm">{{ trans('general.export') }}</a>
@permission('create-purchases-vendors')
<span><a href="{{ route('vendors.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ route('import.create', ['group' => 'purchases', 'type' => 'vendors']) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
@endpermission
<span><a href="{{ route('vendors.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
@endsection
@section('content')
@@ -82,14 +82,14 @@
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
<a class="dropdown-item" href="{{ route('vendors.show', $item->id) }}">{{ trans('general.show') }}</a>
<a class="dropdown-item" href="{{ route('vendors.edit', $item->id) }}">{{ trans('general.edit') }}</a>
@can('create-purchases-vendors')
@permission('create-purchases-vendors')
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{{ route('vendors.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
@endcan
@can('delete-purchases-vendors')
@endpermission
@permission('delete-purchases-vendors')
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'vendors.destroy') !!}
@endcan
@endpermission
</div>
</div>
</td>

2
resources/views/purchases/vendors/show.blade.php vendored
View File

@@ -68,7 +68,7 @@
</ul>
@stack('vendor_edit_button_start')
<a href="{{ route('vendors.edit', $vendor->id) }}" class="btn btn-info btn-block"><b>{{ trans('general.edit') }}</b></a>
<a href="{{ route('vendors.edit', $vendor->id) }}" class="btn btn-info btn-block edit-sv"><i class="fas fa-edit"></i><b>{{ trans('general.edit') }}</b></a>
@stack('vendor_edit_button_end')
</div>

18
resources/views/sales/customers/index.blade.php
View File

@@ -3,11 +3,11 @@
@section('title', trans_choice('general.customers', 2))
@section('new_button')
@can('create-sales-customers')
<a href="{{ route('customers.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<a href="{{ route('import.create', ['group' => 'sales', 'type' => 'customers']) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
@endcan
<a href="{{ route('customers.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top">{{ trans('general.export') }}</a>
@permission('create-sales-customers')
<span><a href="{{ route('customers.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ route('import.create', ['group' => 'sales', 'type' => 'customers']) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
@endpermission
<span><a href="{{ route('customers.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
@endsection
@section('content')
@@ -84,14 +84,14 @@
<a class="dropdown-item" href="{{ route('customers.edit', $item->id) }}">{{ trans('general.edit') }}</a>
<div class="dropdown-divider"></div>
@can('create-sales-customers')
@permission('create-sales-customers')
<a class="dropdown-item" href="{{ route('customers.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
<div class="dropdown-divider"></div>
@endcan
@can('delete-sales-customers')
@endpermission
@permission('delete-sales-customers')
{!! Form::deleteLink($item, 'customers.destroy') !!}
@endcan
@endpermission
</div>
</div>
</td>

2
resources/views/sales/customers/show.blade.php
View File

@@ -68,7 +68,7 @@
</ul>
@stack('customer_edit_button_start')
<a href="{{ route('customers.edit', $customer->id) }}" class="btn btn-info btn-block edit-sv"><b>{{ trans('general.edit') }}</b></a>
<a href="{{ route('customers.edit', $customer->id) }}" class="btn btn-info btn-block edit-sv"><i class="fas fa-edit"></i><b>{{ trans('general.edit') }}</b></a>
@stack('customer_edit_button_end')
</div>

22
resources/views/sales/invoices/index.blade.php
View File

@@ -3,11 +3,11 @@
@section('title', trans_choice('general.invoices', 2))
@section('new_button')
@can('create-sales-invoices')
<a href="{{ route('invoices.create') }}" class="btn btn-primary btn-sm btn-success header-button-top">{{ trans('general.add_new') }}</a>
<a href="{{ route('import.create', ['group' => 'sales', 'type' => 'invoices']) }}" class="btn btn-white btn-sm header-button-top">{{ trans('import.import') }}</a>
@endcan
<a href="{{ route('invoices.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top">{{ trans('general.export') }}</a>
@permission('create-sales-invoices')
<span><a href="{{ route('invoices.create') }}" class="btn btn-primary btn-sm btn-success header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ route('import.create', ['group' => 'sales', 'type' => 'invoices']) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
@endpermission
<span><a href="{{ route('invoices.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
@endsection
@section('content')
@@ -72,21 +72,21 @@
<div class="dropdown-divider"></div>
@if ($item->status != 'cancelled')
@can('create-sales-invoices')
@permission('create-sales-invoices')
<a class="dropdown-item" href="{{ route('invoices.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
<div class="dropdown-divider"></div>
@endcan
@endpermission
@can('update-sales-invoices')
@permission('update-sales-invoices')
<a class="dropdown-item" href="{{ route('invoices.cancelled', $item->id) }}">{{ trans('general.cancel') }}</a>
@endcan
@endpermission
@endif
@can('delete-sales-invoices')
@permission('delete-sales-invoices')
@if (!$item->reconciled)
{!! Form::deleteLink($item, 'invoices.destroy') !!}
@endif
@endcan
@endpermission
</div>
</div>
</td>

8
resources/views/sales/invoices/show.blade.php
View File

@@ -463,21 +463,21 @@
@stack('button_edit_start')
@if(!$invoice->reconciled)
<a href="{{ route('invoices.edit', $invoice->id) }}" class="btn btn-info header-button-top">
{{ trans('general.edit') }}
<i class="fas fa-edit"></i>&nbsp; {{ trans('general.edit') }}
</a>
@endif
@stack('button_edit_end')
@stack('button_print_start')
<a href="{{ route('invoices.print', $invoice->id) }}" target="_blank" class="btn btn-success header-button-top">
{{ trans('general.print') }}
<i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }}
</a>
@stack('button_print_end')
@if ($invoice->status != 'cancelled')
@stack('button_share_start')
<a href="{{ $signed_url }}" target="_blank" class="btn btn-white header-button-top">
{{ trans('general.share') }}
<i class="fa fa-share"></i>&nbsp; {{ trans('general.share') }}
</a>
@stack('button_share_end')
@endif
@@ -643,7 +643,7 @@
]);
@endphp
{!! Form::button(trans('general.delete'), array(
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i> ' . trans('general.delete'), array(
'type' => 'button',
'class' => 'btn btn-danger btn-sm',
'title' => trans('general.delete'),

6
resources/views/sales/revenues/index.blade.php
View File

@@ -4,10 +4,10 @@
@section('new_button')
@can('create-sales-revenues')
<a href="{{ route('revenues.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<a href="{{ route('import.create', ['group' => 'sales', 'type' => 'revenues']) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
<span><a href="{{ route('revenues.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
<span><a href="{{ route('import.create', ['group' => 'sales', 'type' => 'revenues']) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span>
@endcan
<a href="{{ route('revenues.export', request()->input()) }}" class="btn btn-white btn-sm">{{ trans('general.export') }}</a>
<span><a href="{{ route('revenues.export', request()->input()) }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-download"></span> &nbsp;{{ trans('general.export') }}</a></span>
@endsection
@section('content')

2
resources/views/settings/categories/index.blade.php
View File

@@ -4,7 +4,7 @@
@can('create-settings-categories')
@section('new_button')
<a href="{{ route('categories.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<span><a href="{{ route('categories.create') }}" class="btn btn-success btn-sm btn-alone"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
@endsection
@endcan

2
resources/views/settings/currencies/index.blade.php
View File

@@ -4,7 +4,7 @@
@can('create-settings-currencies')
@section('new_button')
<a href="{{ route('currencies.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<span><a href="{{ route('currencies.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
@endsection
@endcan

2
resources/views/settings/invoice/edit.blade.php
View File

@@ -45,7 +45,7 @@
<div class="input-group">
<a href="#" class="btn btn-block btn-outline-primary" @click="onTemplate">
{{ trans('settings.invoice.choose_template') }}
<i class="fas fa-palette"></i>&nbsp; {{ trans('settings.invoice.choose_template') }}
</a>
</div>
</div>

2
resources/views/settings/taxes/index.blade.php
View File

@@ -4,7 +4,7 @@
@can('create-settings-taxes')
@section('new_button')
<a href="{{ route('taxes.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
<span><a href="{{ route('taxes.create') }}" class="btn btn-success btn-sm btn-alone"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a></span>
@endsection
@endcan