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

Change all url to route

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-02-03 11:58:05 +03:00
parent f86465d81d
commit a8c848922a
26 changed files with 77 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/auth/login/create.blade.php
View File

@ -46,7 +46,7 @@
@stack('forgotten-password-start') @stack('forgotten-password-start')
<div class="mt-5 mb--4"> <div class="mt-5 mb--4">
<a href="{{ url('auth/forgot') }}" class="text-white"><small class="forgot-text">{{ trans('auth.forgot_password') }}</small></a> <a href="{{ route('forgot') }}" class="text-white"><small class="forgot-text">{{ trans('auth.forgot_password') }}</small></a>
</div> </div>
@stack('forgotten-password-end') @stack('forgotten-password-end')
{!! Form::close() !!} {!! Form::close() !!}

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

@ -5,7 +5,7 @@
@section('content') @section('content')
<div class="card"> <div class="card">
{!! Form::open([ {!! Form::open([
'url' => 'banking/reconciliations/create', 'route' => 'reconciliations.store',
'id' => 'reconciliation', 'id' => 'reconciliation',
'@submit.prevent' => 'onSubmit', '@submit.prevent' => 'onSubmit',
'@keydown' => 'form.errors.clear($event.target.name)', '@keydown' => 'form.errors.clear($event.target.name)',
@ -40,7 +40,7 @@
</div> </div>
{!! Form::open([ {!! Form::open([
'url' => 'banking/reconciliations/create', 'route' => 'reconciliations.store',
'role' => 'form', 'role' => 'form',
'class' => 'form-loading-button', 'class' => 'form-loading-button',
'id' => 'form-reconciliations', 'id' => 'form-reconciliations',

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

@ -5,11 +5,11 @@
@section('content') @section('content')
<div class="card"> <div class="card">
{!! Form::model($reconciliation, [ {!! Form::model($reconciliation, [
'method' => 'PATCH', 'method' => 'PATCH',
'url' => ['banking/reconciliations', $reconciliation->id], 'route' => ['reconciliations.update', $reconciliation->id],
'role' => 'form', 'role' => 'form',
'id' => 'form-reconciliations', 'id' => 'form-reconciliations',
'class' => 'form-loading-button mb-0' 'class' => 'form-loading-button mb-0'
]) !!} ]) !!}
<div class="card-header border-0"> <div class="card-header border-0">

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

@ -23,7 +23,7 @@
{{ trans('updates.new_core') }} {{ trans('updates.new_core') }}
</div> </div>
<div class="col-sm-10 col-md-6 text-right"> <div class="col-sm-10 col-md-6 text-right">
<a href="{{ url('install/updates/update', ['alias' => 'core', 'version' => $core]) }}" <a href="{{ route('updates.update', ['alias' => 'core', 'version' => $core]) }}"
class="btn btn-info btn-sm header-button-top long-texts"> class="btn btn-info btn-sm header-button-top long-texts">
<i class="fa fa-refresh"></i> &nbsp;{{ trans('updates.update', ['version' => $core]) }} <i class="fa fa-refresh"></i> &nbsp;{{ trans('updates.update', ['version' => $core]) }}
</a> </a>
@ -61,7 +61,7 @@
<td class="col-sm-3 col-md-2 d-none d-sm-block">{{ $module->installed }}</td> <td class="col-sm-3 col-md-2 d-none d-sm-block">{{ $module->installed }}</td>
<td class="col-xs-4 col-md-2 col-sm-3">{{ $module->latest }}</td> <td class="col-xs-4 col-md-2 col-sm-3">{{ $module->latest }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 text-center"> <td class="col-xs-4 col-sm-2 col-md-2 text-center">
<a href="{{ url('install/updates/update/' . $module->alias . '/' . $module->latest) }}" class="btn btn-warning btn-sm"> <a href="{{ route('updates.update', ['alias' => $module->alias, 'version' => $module->latest]) }}" class="btn btn-warning btn-sm">
<i class="fa fa-refresh" aria-hidden="true"></i> {{ trans_choice('general.updates', 1) }} <i class="fa fa-refresh" aria-hidden="true"></i> {{ trans_choice('general.updates', 1) }}
</a> </a>
</td> </td>

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

@ -38,7 +38,7 @@
<div class="card-footer"> <div class="card-footer">
<div class="float-right"> <div class="float-right">
@if (Request::is('install/requirements')) @if (Request::is('install/requirements'))
<a href="{{ url('install/requirements') }}" class="btn btn-success"> {{ trans('install.refresh') }} &nbsp;<i class="fa fa-refresh"></i></a> <a href="{{ route('install.requirements') }}" class="btn btn-success"> {{ trans('install.refresh') }} &nbsp;<i class="fa fa-refresh"></i></a>
@else @else
{!! Form::button( {!! Form::button(
'<i v-if="loading" :class="(loading) ? \'show \' : \'\'" class="fas fa-spinner fa-spin d-none"></i> ' . '<i v-if="loading" :class="(loading) ? \'show \' : \'\'" class="fas fa-spinner fa-spin d-none"></i> ' .

2
resources/views/modals/bills/payment.blade.php
View File

@ -1,6 +1,6 @@
<div class="modal-body"> <div class="modal-body">
{!! Form::open([ {!! Form::open([
'url' => 'modals/bills/' . $bill->id . '/transactions', 'route' => 'modals.bills.bill.transactions.store', $bill->id,
'id' => 'transaction', 'id' => 'transaction',
'@submit.prevent' => 'onSubmit', '@submit.prevent' => 'onSubmit',
'@keydown' => 'transaction_form.errors.clear($event.target.name)', '@keydown' => 'transaction_form.errors.clear($event.target.name)',

2
resources/views/modals/invoices/payment.blade.php
View File

@ -1,6 +1,6 @@
<div class="modal-body pb-0"> <div class="modal-body pb-0">
{!! Form::open([ {!! Form::open([
'url' => 'modals/invoices/' . $invoice->id . '/transactions', 'route' => 'modals.invoices.invoice.transactions.store', $invoice->id,
'id' => 'transaction', 'id' => 'transaction',
'@submit.prevent' => 'onSubmit', '@submit.prevent' => 'onSubmit',
'@keydown' => 'transaction_form.errors.clear($event.target.name)', '@keydown' => 'transaction_form.errors.clear($event.target.name)',

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

@ -102,7 +102,7 @@
@if ($module->vendor_name) @if ($module->vendor_name)
<tr> <tr>
<th>{{ trans_choice('general.developers', 1) }}</th> <th>{{ trans_choice('general.developers', 1) }}</th>
<td class="text-right"><a href="{{ url('apps/vendors/' . $module->vendor->slug) }}">{{ $module->vendor_name }}</a></td> <td class="text-right"><a href="{{ route('apps.vendors.show', $module->vendor->slug) }}">{{ $module->vendor_name }}</a></td>
</tr> </tr>
@endif @endif
@if ($module->version) @if ($module->version)
@ -132,7 +132,7 @@
@if ($module->category) @if ($module->category)
<tr> <tr>
<th>{{ trans_choice('general.categories', 1) }}</th> <th>{{ trans_choice('general.categories', 1) }}</th>
<td class="text-right"><a href="{{ url('apps/categories/' . $module->category->slug) }}">{{ $module->category->name }}</a></td> <td class="text-right"><a href="{{ route('apps.categories.show', $module->category->slug) }}">{{ $module->category->name }}</a></td>
</tr> </tr>
@endif @endif
</tbody> </tbody>

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

@ -164,14 +164,14 @@
<div class="card-footer"> <div class="card-footer">
@if ($installed) @if ($installed)
@permission('delete-modules-item') @permission('delete-modules-item')
<a href="{{ url('apps/' . $module->slug . '/uninstall') }}" class="btn btn-block btn-danger">{{ trans('modules.button.uninstall') }}</a> <a href="{{ route('apps.app.uninstall', $module->slug) }}" class="btn btn-block btn-danger">{{ trans('modules.button.uninstall') }}</a>
@endpermission @endpermission
@permission('update-modules-item') @permission('update-modules-item')
@if ($enable) @if ($enable)
<a href="{{ url('apps/' . $module->slug . '/disable') }}" class="btn btn-block btn-warning">{{ trans('modules.button.disable') }}</a> <a href="{{ route('apps.app.disable', $module->slug) }}" class="btn btn-block btn-warning">{{ trans('modules.button.disable') }}</a>
@else @else
<a href="{{ url('apps/' . $module->slug . '/enable') }}" class="btn btn-block btn-success">{{ trans('modules.button.enable') }}</a> <a href="{{ route('app.app.enable', $module->slug) }}" class="btn btn-block btn-success">{{ trans('modules.button.enable') }}</a>
@endif @endif
@endpermission @endpermission
@else @else
@ -204,7 +204,7 @@
@if ($module->vendor_name) @if ($module->vendor_name)
<tr class="row"> <tr class="row">
<th class="col-5">{{ trans_choice('general.developers', 1) }}</th> <th class="col-5">{{ trans_choice('general.developers', 1) }}</th>
<td class="col-7 text-right"><a href="{{ url('apps/vendors/' . $module->vendor->slug) }}">{{ $module->vendor_name }}</a></td> <td class="col-7 text-right"><a href="{{ route('apps.vendors.show', $module->vendor->slug) }}">{{ $module->vendor_name }}</a></td>
</tr> </tr>
@endif @endif
@if ($module->version) @if ($module->version)
@ -234,14 +234,14 @@
@if ($module->category) @if ($module->category)
<tr class="row"> <tr class="row">
<th class="col-5">{{ trans_choice('general.categories', 1) }}</th> <th class="col-5">{{ trans_choice('general.categories', 1) }}</th>
<td class="col-7 text-right"><a href="{{ url('apps/categories/' . $module->category->slug) }}">{{ $module->category->name }}</a></td> <td class="col-7 text-right"><a href="{{ route('apps.categories.show', $module->category->slug) }}">{{ $module->category->name }}</a></td>
</tr> </tr>
@endif @endif
<tr class="row"> <tr class="row">
<th class="col-5">{{ trans('modules.documentation') }}</th> <th class="col-5">{{ trans('modules.documentation') }}</th>
@if ($module->documentation) @if ($module->documentation)
<td class="col-7 text-right"> <td class="col-7 text-right">
<a href="{{ url('apps/docs/' . $module->slug) }}">{{ trans('modules.view') }}</a> <a href="{{ rotue('apps.docs.show', $module->slug) }}">{{ trans('modules.view') }}</a>
</td> </td>
@else @else
<th class="col-7 text-right">{{ trans('general.na') }}</th> <th class="col-7 text-right">{{ trans('general.na') }}</th>

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

@ -1,5 +1,14 @@
@php @php
$page = explode('/', $url)[1]; if (\Str::contains($url, ['.'])) {
$page = explode('.', $url)[0];
$url = route($url, $item->$id);
} else {
$page = explode('/', $url)[1];
$url = url($url, $item->$id);
}
$text = $text ? $text : $page; $text = $text ? $text : $page;
@endphp @endphp
@ -7,7 +16,7 @@
'type' => 'button', 'type' => 'button',
'class' => 'btn btn-danger btn-xs', 'class' => 'btn btn-danger btn-xs',
'title' => trans('general.delete'), 'title' => trans('general.delete'),
'@click' => 'confirmDelete("' . url($url, $item->$id) . '", "' . trans_choice('general.' . $text, 2) . '", "' . trans('general.delete_confirm', ['name' => '<strong>' . $item->$value . '</strong>', 'type' => mb_strtolower(trans_choice('general.' . $text, 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")' '@click' => 'confirmDelete("' . $url . '", "' . trans_choice('general.' . $text, 2) . '", "' . trans('general.delete_confirm', ['name' => '<strong>' . $item->$value . '</strong>', 'type' => mb_strtolower(trans_choice('general.' . $text, 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")'
)) !!} )) !!}
@push('content_content_end') @push('content_content_end')

6
resources/views/partials/form/delete_link.blade.php
View File

@ -1,10 +1,12 @@
@php @php
if (\Str::contains($url, ['.'])) { if (\Str::contains($url, ['.'])) {
$url = route($url, $item->$id);
$page = explode('.', $url)[0]; $page = explode('.', $url)[0];
$url = route($url, $item->$id);
} else { } else {
$url = url($url, $item->$id);
$page = explode('/', $url)[1]; $page = explode('/', $url)[1];
$url = url($url, $item->$id);
} }
$text = $text ? $text : $page; $text = $text ? $text : $page;

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

@ -1,7 +1,14 @@
@stack('save_buttons_start') @stack('save_buttons_start')
@php
if (\Str::contains($cancel, ['.'])) {
$url = route($cancel);
} else {
$url = url($cancel);
}
@endphp
<div class="{{ $col }}"> <div class="{{ $col }}">
<a href="{{ url($cancel) }}" class="btn btn-icon btn-outline-secondary header-button-top"> <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--icon"><i class="fas fa-times"></i></span>
<span class="btn-inner--text">{{ trans('general.cancel') }}</span> <span class="btn-inner--text">{{ trans('general.cancel') }}</span>
</a> </a>

6
resources/views/partials/portal/navbar.blade.php
View File

@ -29,7 +29,7 @@
<div class="list-group list-group-flush"> <div class="list-group list-group-flush">
@if (count($bills)) @if (count($bills))
<a href="{{ url('auth/users/' . $user->id . '/read-bills') }}" class="list-group-item list-group-item-action"> <a href="{{ route('users.read.bills', $user->id) }}" class="list-group-item list-group-item-action">
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col-auto"> <div class="col-auto">
<i class="fa fa-shopping-cart"></i> <i class="fa fa-shopping-cart"></i>
@ -44,7 +44,7 @@
@endif @endif
@if (count($invoices)) @if (count($invoices))
<a href="{{ url('auth/users/' . $user->id . '/read-invoices') }}" class="list-group-item list-group-item-action"> <a href="{{ rotue('users.read.invoices', $user->id) }}" class="list-group-item list-group-item-action">
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col-auto"> <div class="col-auto">
<i class="fa fa-money-bill"></i> <i class="fa fa-money-bill"></i>
@ -105,7 +105,7 @@
<div class="dropdown-header noti-title"> <div class="dropdown-header noti-title">
<h6 class="text-overflow m-0">{{ trans('general.welcome') }}</h6> <h6 class="text-overflow m-0">{{ trans('general.welcome') }}</h6>
</div> </div>
<a href="{{ url('portal/profile/edit') }}" class="dropdown-item"> <a href="{{ route('portal.profile.edit') }}" class="dropdown-item">
<i class="fas fa-user"></i> <i class="fas fa-user"></i>
<span>{{ trans('auth.profile') }}</span> <span>{{ trans('auth.profile') }}</span>
</a> </a>

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

@ -1,8 +1,8 @@
<div class="card-header"> <div class="card-header">
{!! Form::open([ {!! Form::open([
'url' => 'common/reports/' . $class->model->id,
'role' => 'form',
'method' => 'GET', 'method' => 'GET',
'route' => 'reports.show', $class->model->id,
'role' => 'form',
]) !!} ]) !!}
<div id="items" class="float-left"> <div id="items" class="float-left">

2
resources/views/portal/profile/edit.blade.php
View File

@ -5,7 +5,7 @@
@section('content') @section('content')
<div class="card"> <div class="card">
{!! Form::model($user, [ {!! Form::model($user, [
'url' => 'portal/profile/update', 'route' => 'portal.profile.update',
'id' => 'profile', 'id' => 'profile',
'@submit.prevent' => 'onSubmit', '@submit.prevent' => 'onSubmit',
'@keydown' => 'form.errors.clear($event.target.name)', '@keydown' => 'form.errors.clear($event.target.name)',

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

@ -5,7 +5,7 @@
@section('new_button') @section('new_button')
@permission('create-purchases-bills') @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('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="{{ url('common/import/purchases/bills') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span> <span><a href="{{ rotue('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 @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> <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 @endsection

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

@ -71,7 +71,7 @@
<div class="mt-3"> <div class="mt-3">
@stack('timeline_body_create_bill_body_button_edit_start') @stack('timeline_body_create_bill_body_button_edit_start')
<a href="{{ url('purchases/bills/' . $bill->id . '/edit') }}" class="btn btn-primary btn-sm btn-alone"> <a href="{{ route('bills.edit', $bill->id) }}" class="btn btn-primary btn-sm btn-alone">
{{ trans('general.edit') }} {{ trans('general.edit') }}
</a> </a>
@stack('timeline_body_create_bill_body_button_edit_end') @stack('timeline_body_create_bill_body_button_edit_end')
@ -101,7 +101,7 @@
<div class="mt-3"> <div class="mt-3">
@stack('timeline_body_receive_bill_body_button_sent_start') @stack('timeline_body_receive_bill_body_button_sent_start')
@permission('update-purchases-bills') @permission('update-purchases-bills')
<a href="{{ url('purchases/bills/' . $bill->id . '/received') }}" class="btn btn-danger btn-sm btn-alone">{{ trans('bills.mark_received') }}</a> <a href="{{ url('bills.received', $bill->id) }}" class="btn btn-danger btn-sm btn-alone">{{ trans('bills.mark_received') }}</a>
@endpermission @endpermission
@stack('timeline_body_receive_bill_body_button_sent_end') @stack('timeline_body_receive_bill_body_button_sent_end')
</div> </div>

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

@ -5,7 +5,7 @@
@section('new_button') @section('new_button')
@permission('create-purchases-payments') @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('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="{{ url('common/import/purchases/payments') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span> <span><a href="{{ rotue('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 @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> <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 @endsection

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

@ -5,7 +5,7 @@
@section('new_button') @section('new_button')
@permission('create-purchases-vendors') @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('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="{{ url('common/import/purchases/vendors') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span> <span><a href="{{ rotue('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 @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> <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 @endsection

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

@ -47,7 +47,7 @@
</div> </div>
</div> </div>
<a href="{{ url('purchases/vendors/' . $vendor->id . '/edit') }}" class="btn btn-default btn-block edit-sv"><i class="fas fa-edit"></i><b>{{ trans('general.edit') }}</b></a> <a href="{{ route('vendors.edit', $vendor->id) }}" class="btn btn-default btn-block edit-sv"><i class="fas fa-edit"></i><b>{{ trans('general.edit') }}</b></a>
</div> </div>
<div class="col-xl-9"> <div class="col-xl-9">
@ -156,7 +156,7 @@
<tbody> <tbody>
@foreach($bills as $item) @foreach($bills as $item)
<tr class="row align-items-center border-top-1"> <tr class="row align-items-center border-top-1">
<td class="col-xs-4 col-sm-3"><a href="{{ url('purchases/bills/' . $item->id . ' ') }}">{{ $item->bill_number }}</a></td> <td class="col-xs-4 col-sm-3"><a href="{{ route('bills.show', $item->id) }}">{{ $item->bill_number }}</a></td>
<td class="col-xs-4 col-sm-3">@money($item->amount, $item->currency_code, true)</td> <td class="col-xs-4 col-sm-3">@money($item->amount, $item->currency_code, true)</td>
<td class="col-sm-2 d-none d-sm-none">@date($item->billed_at)</td> <td class="col-sm-2 d-none d-sm-none">@date($item->billed_at)</td>
<td class="col-sm-2 d-none d-sm-none">@date($item->due_at)</td> <td class="col-sm-2 d-none d-sm-none">@date($item->due_at)</td>

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

@ -4,8 +4,8 @@
@section('new_button') @section('new_button')
@permission('create-sales-customers') @permission('create-sales-customers')
<span><a href="{{ url('sales/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('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="{{ url('common/import/sales/customers') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span> <span><a href="{{ rotue('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 @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> <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 @endsection

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

@ -151,7 +151,7 @@
<tbody> <tbody>
@foreach($invoices as $item) @foreach($invoices as $item)
<tr class="row align-items-center border-top-1"> <tr class="row align-items-center border-top-1">
<td class="col-xs-4 col-sm-3"><a href="{{ url('sales/invoices/' . $item->id . ' ') }}">{{ $item->invoice_number }}</a></td> <td class="col-xs-4 col-sm-3"><a href="{{ route('invoices.show', $item->id) }}">{{ $item->invoice_number }}</a></td>
<td class="col-xs-4 col-sm-3">@money($item->amount, $item->currency_code, true)</td> <td class="col-xs-4 col-sm-3">@money($item->amount, $item->currency_code, true)</td>
<td class="col-sm-2 d-none d-sm-block">@date($item->invoiced_at)</td> <td class="col-sm-2 d-none d-sm-block">@date($item->invoiced_at)</td>
<td class="col-sm-2 d-none d-sm-block">@date($item->due_at)</td> <td class="col-sm-2 d-none d-sm-block">@date($item->due_at)</td>

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

@ -5,7 +5,7 @@
@section('new_button') @section('new_button')
@permission('create-sales-invoices') @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('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="{{ url('common/import/sales/invoices') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span> <span><a href="{{ rotue('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 @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> <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 @endsection

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

@ -71,7 +71,7 @@
<div class="mt-3"> <div class="mt-3">
@stack('timeline_body_create_invoice_body_button_edit_start') @stack('timeline_body_create_invoice_body_button_edit_start')
<a href="{{ url('sales/invoices/' . $invoice->id . '/edit') }}" class="btn btn-primary btn-sm btn-alone"> <a href="{{ route('invoices.edit', $invoice->id) }}" class="btn btn-primary btn-sm btn-alone">
{{ trans('general.edit') }} {{ trans('general.edit') }}
</a> </a>
@stack('timeline_body_create_invoice_body_button_edit_end') @stack('timeline_body_create_invoice_body_button_edit_end')
@ -102,7 +102,7 @@
@stack('timeline_body_send_invoice_body_button_sent_start') @stack('timeline_body_send_invoice_body_button_sent_start')
@permission('update-sales-invoices') @permission('update-sales-invoices')
@if($invoice->status == 'draft') @if($invoice->status == 'draft')
<a href="{{ url('sales/invoices/' . $invoice->id . '/sent') }}" class="btn btn-white btn-sm header-button-top">{{ trans('invoices.mark_sent') }}</a> <a href="{{ route('invoices.sent', $invoice->id) }}" class="btn btn-white btn-sm header-button-top">{{ trans('invoices.mark_sent') }}</a>
@else @else
<button type="button" class="btn btn-secondary btn-sm header-button-top" disabled="disabled"> <button type="button" class="btn btn-secondary btn-sm header-button-top" disabled="disabled">
<span class="text-disabled">{{ trans('invoices.mark_sent') }}</span> <span class="text-disabled">{{ trans('invoices.mark_sent') }}</span>
@ -113,7 +113,7 @@
@stack('timeline_body_send_invoice_body_button_email_start') @stack('timeline_body_send_invoice_body_button_email_start')
@if($invoice->contact_email) @if($invoice->contact_email)
<a href="{{ url('sales/invoices/' . $invoice->id . '/email') }}" class="btn btn-danger btn-sm header-button-bottom">{{ trans('invoices.send_mail') }}</a> <a href="{{ route('invoices.email', $invoice->id) }}" class="btn btn-danger btn-sm header-button-bottom">{{ trans('invoices.send_mail') }}</a>
@else @else
<button type="button" class="btn btn-white btn-sm header-button-bottom green-tooltip" disabled="disabled" data-toggle="tooltip" data-placement="right" title="{{ trans('invoices.messages.email_required') }}"> <button type="button" class="btn btn-white btn-sm header-button-bottom green-tooltip" disabled="disabled" data-toggle="tooltip" data-placement="right" title="{{ trans('invoices.messages.email_required') }}">
<span class="text-disabled">{{ trans('invoices.send_mail') }}</span> <span class="text-disabled">{{ trans('invoices.send_mail') }}</span>
@ -453,14 +453,14 @@
<div class="float-right"> <div class="float-right">
@stack('button_edit_start') @stack('button_edit_start')
@if(!$invoice->reconciled) @if(!$invoice->reconciled)
<a href="{{ url('sales/invoices/' . $invoice->id . '/edit') }}" class="btn btn-info header-button-top"> <a href="{{ route('invoices.edit', $invoice->id) }}" class="btn btn-info header-button-top">
<i class="fas fa-edit"></i>&nbsp; {{ trans('general.edit') }} <i class="fas fa-edit"></i>&nbsp; {{ trans('general.edit') }}
</a> </a>
@endif @endif
@stack('button_edit_end') @stack('button_edit_end')
@stack('button_print_start') @stack('button_print_start')
<a href="{{ url('sales/invoices/' . $invoice->id . '/print') }}" target="_blank" class="btn btn-success header-button-top"> <a href="{{ route('invoices.print', $invoice->id) }}" target="_blank" class="btn btn-success header-button-top">
<i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }} <i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }}
</a> </a>
@stack('button_print_end') @stack('button_print_end')
@ -478,7 +478,7 @@
@stack('button_pay_start') @stack('button_pay_start')
@if($invoice->status != 'paid') @if($invoice->status != 'paid')
@permission('update-sales-invoices') @permission('update-sales-invoices')
<a class="dropdown-item" href="{{ url('sales/invoices/' . $invoice->id . '/pay') }}">{{ trans('invoices.mark_paid') }}</a> <a class="dropdown-item" href="{{ route('invoices.pay', $invoice->id) }}">{{ trans('invoices.mark_paid') }}</a>
@endpermission @endpermission
@if(empty($invoice->paid) || ($invoice->paid != $invoice->amount)) @if(empty($invoice->paid) || ($invoice->paid != $invoice->amount))
@ -491,7 +491,7 @@
@stack('button_sent_start') @stack('button_sent_start')
@permission('update-sales-invoices') @permission('update-sales-invoices')
@if($invoice->status == 'draft') @if($invoice->status == 'draft')
<a class="dropdown-item" href="{{ url('sales/invoices/' . $invoice->id . '/sent') }}">{{ trans('invoices.mark_sent') }}</a> <a class="dropdown-item" href="{{ route('invoices.sent', $invoice->id) }}">{{ trans('invoices.mark_sent') }}</a>
@else @else
<button type="button" class="dropdown-item" disabled="disabled"><span class="text-disabled">{{ trans('invoices.mark_sent') }}</span></button> <button type="button" class="dropdown-item" disabled="disabled"><span class="text-disabled">{{ trans('invoices.mark_sent') }}</span></button>
@endif @endif
@ -500,7 +500,7 @@
@stack('button_email_start') @stack('button_email_start')
@if($invoice->contact_email) @if($invoice->contact_email)
<a class="dropdown-item" href="{{ url('sales/invoices/' . $invoice->id . '/email') }}">{{ trans('invoices.send_mail') }}</a> <a class="dropdown-item" href="{{ route('invoices.email', $invoice->id) }}">{{ trans('invoices.send_mail') }}</a>
@else @else
<button type="button" class="dropdown-item" disabled="disabled" data-toggle="tooltip" data-placement="right" title="{{ trans('invoices.messages.email_required') }}"> <button type="button" class="dropdown-item" disabled="disabled" data-toggle="tooltip" data-placement="right" title="{{ trans('invoices.messages.email_required') }}">
<span class="text-disabled">{{ trans('invoices.send_mail') }}</span> <span class="text-disabled">{{ trans('invoices.send_mail') }}</span>
@ -509,7 +509,7 @@
@stack('button_email_end') @stack('button_email_end')
@stack('button_pdf_start') @stack('button_pdf_start')
<a class="dropdown-item" href="{{ url('sales/invoices/' . $invoice->id . '/pdf') }}">{{ trans('invoices.download_pdf') }}</a> <a class="dropdown-item" href="{{ route('invoices.pdf'i, $invoice->id) }}">{{ trans('invoices.download_pdf') }}</a>
@stack('button_pdf_end') @stack('button_pdf_end')
@stack('button_delete_start') @stack('button_delete_start')
@ -669,7 +669,7 @@
<span class="btn-inner--text">{{ trans('general.cancel') }}</span> <span class="btn-inner--text">{{ trans('general.cancel') }}</span>
</button> </button>
<a href="{{ url('apps/categories/payment-method') }}" class="btn btn-icon btn-white header-button-top long-texts"> <a href="{{ route('apps.categories.show', 'payment-method') }}" class="btn btn-icon btn-white header-button-top long-texts">
<span class="btn-inner--icon"><i class="fas fa-credit-card"></i></span> <span class="btn-inner--icon"><i class="fas fa-credit-card"></i></span>
<span class="btn-inner--text">{{ trans('invoices.accept_payments') }}</span> <span class="btn-inner--text">{{ trans('invoices.accept_payments') }}</span>
</a> </a>

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

@ -5,7 +5,7 @@
@section('new_button') @section('new_button')
@permission('create-sales-revenues') @permission('create-sales-revenues')
<span><a href="{{ route('revenues.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('revenues.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="{{ url('common/import/sales/revenues') }}" class="btn btn-white btn-sm header-button-top"><span class="fa fa-upload"></span> &nbsp;{{ trans('import.import') }}</a></span> <span><a href="{{ rotue('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>
@endpermission @endpermission
<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> <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 @endsection

10
routes/admin.php
View File

@ -177,9 +177,9 @@ Route::group(['as' => 'apps.', 'prefix' => 'apps'], function () {
Route::resource('my', 'Modules\My'); Route::resource('my', 'Modules\My');
Route::get('categories/{alias}', 'Modules\Tiles@categoryModules'); Route::get('categories/{alias}', 'Modules\Tiles@categoryModules')->name('categories.show');
Route::get('vendors/{alias}', 'Modules\Tiles@vendorModules'); Route::get('vendors/{alias}', 'Modules\Tiles@vendorModules')->name('vendors.show');
Route::get('docs/{alias}', 'Modules\Item@documentation'); Route::get('docs/{alias}', 'Modules\Item@documentation')->name('docs.show');
Route::get('paid', 'Modules\Tiles@paidModules')->name('paid'); Route::get('paid', 'Modules\Tiles@paidModules')->name('paid');
Route::get('new', 'Modules\Tiles@newModules')->name('new'); Route::get('new', 'Modules\Tiles@newModules')->name('new');
@ -218,7 +218,7 @@ Route::group(['as' => 'modals.', 'prefix' => 'modals'], function () {
Route::resource('vendors', 'Modals\Vendors'); Route::resource('vendors', 'Modals\Vendors');
Route::resource('items', 'Modals\Items'); Route::resource('items', 'Modals\Items');
Route::patch('invoice-templates', 'Modals\InvoiceTemplates@update')->name('invoice-templates.update'); Route::patch('invoice-templates', 'Modals\InvoiceTemplates@update')->name('invoice-templates.update');
Route::resource('invoices/{invoice}/transactions', 'Modals\InvoiceTransactions', ['middleware' => ['date.format', 'money']]); Route::resource('invoices/{invoice}/transactions', 'Modals\InvoiceTransactions', ['names' => 'invoices.invoice.transactions', 'middleware' => ['date.format', 'money']]);
Route::resource('bills/{bill}/transactions', 'Modals\BillTransactions', ['middleware' => ['date.format', 'money']]); Route::resource('bills/{bill}/transactions', 'Modals\BillTransactions', ['names' => 'bills.bill.transactions', 'middleware' => ['date.format', 'money']]);
Route::resource('taxes', 'Modals\Taxes'); Route::resource('taxes', 'Modals\Taxes');
}); });