From a8c848922a88de4665c4bbb2e98e88a27dd233f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 3 Feb 2020 11:58:05 +0300 Subject: [PATCH] Change all url to route --- resources/views/auth/login/create.blade.php | 2 +- .../banking/reconciliations/create.blade.php | 4 ++-- .../banking/reconciliations/edit.blade.php | 10 +++++----- .../views/install/updates/index.blade.php | 4 ++-- resources/views/layouts/install.blade.php | 2 +- .../views/modals/bills/payment.blade.php | 2 +- .../views/modals/invoices/payment.blade.php | 2 +- .../views/modules/item/pre_sale.blade.php | 4 ++-- resources/views/modules/item/show.blade.php | 12 +++++------ .../partials/form/delete_button.blade.php | 13 ++++++++++-- .../views/partials/form/delete_link.blade.php | 6 ++++-- .../partials/form/save_buttons.blade.php | 9 ++++++++- .../views/partials/portal/navbar.blade.php | 6 +++--- .../views/partials/reports/filter.blade.php | 4 ++-- resources/views/portal/profile/edit.blade.php | 2 +- .../views/purchases/bills/index.blade.php | 2 +- .../views/purchases/bills/show.blade.php | 4 ++-- .../views/purchases/payments/index.blade.php | 2 +- .../views/purchases/vendors/index.blade.php | 2 +- .../views/purchases/vendors/show.blade.php | 4 ++-- .../views/sales/customers/index.blade.php | 4 ++-- .../views/sales/customers/show.blade.php | 2 +- .../views/sales/invoices/index.blade.php | 2 +- resources/views/sales/invoices/show.blade.php | 20 +++++++++---------- .../views/sales/revenues/index.blade.php | 2 +- routes/admin.php | 10 +++++----- 26 files changed, 77 insertions(+), 59 deletions(-) diff --git a/resources/views/auth/login/create.blade.php b/resources/views/auth/login/create.blade.php index 35e8a6dbd..19e07180d 100644 --- a/resources/views/auth/login/create.blade.php +++ b/resources/views/auth/login/create.blade.php @@ -46,7 +46,7 @@ @stack('forgotten-password-start')
- {{ trans('auth.forgot_password') }} + {{ trans('auth.forgot_password') }}
@stack('forgotten-password-end') {!! Form::close() !!} diff --git a/resources/views/banking/reconciliations/create.blade.php b/resources/views/banking/reconciliations/create.blade.php index b477cffa0..cc37cdab1 100644 --- a/resources/views/banking/reconciliations/create.blade.php +++ b/resources/views/banking/reconciliations/create.blade.php @@ -5,7 +5,7 @@ @section('content')
{!! Form::open([ - 'url' => 'banking/reconciliations/create', + 'route' => 'reconciliations.store', 'id' => 'reconciliation', '@submit.prevent' => 'onSubmit', '@keydown' => 'form.errors.clear($event.target.name)', @@ -40,7 +40,7 @@
{!! Form::open([ - 'url' => 'banking/reconciliations/create', + 'route' => 'reconciliations.store', 'role' => 'form', 'class' => 'form-loading-button', 'id' => 'form-reconciliations', diff --git a/resources/views/banking/reconciliations/edit.blade.php b/resources/views/banking/reconciliations/edit.blade.php index 4f895688f..3ae6a4b08 100644 --- a/resources/views/banking/reconciliations/edit.blade.php +++ b/resources/views/banking/reconciliations/edit.blade.php @@ -5,11 +5,11 @@ @section('content')
{!! Form::model($reconciliation, [ - 'method' => 'PATCH', - 'url' => ['banking/reconciliations', $reconciliation->id], - 'role' => 'form', - 'id' => 'form-reconciliations', - 'class' => 'form-loading-button mb-0' + 'method' => 'PATCH', + 'route' => ['reconciliations.update', $reconciliation->id], + 'role' => 'form', + 'id' => 'form-reconciliations', + 'class' => 'form-loading-button mb-0' ]) !!}
diff --git a/resources/views/install/updates/index.blade.php b/resources/views/install/updates/index.blade.php index e343064dd..ae645ea4f 100644 --- a/resources/views/install/updates/index.blade.php +++ b/resources/views/install/updates/index.blade.php @@ -23,7 +23,7 @@ {{ trans('updates.new_core') }}
-  {{ trans('updates.update', ['version' => $core]) }} @@ -61,7 +61,7 @@ {{ $module->installed }} {{ $module->latest }} - + {{ trans_choice('general.updates', 1) }} diff --git a/resources/views/layouts/install.blade.php b/resources/views/layouts/install.blade.php index f568064dd..e4d411734 100644 --- a/resources/views/layouts/install.blade.php +++ b/resources/views/layouts/install.blade.php @@ -38,7 +38,7 @@
@if (Request::is('install/requirements')) - {{ trans('install.refresh') }}   + {{ trans('install.refresh') }}   @else {!! Form::button( ' ' . diff --git a/resources/views/modals/bills/payment.blade.php b/resources/views/modals/bills/payment.blade.php index 1a19ba884..8a4819501 100644 --- a/resources/views/modals/bills/payment.blade.php +++ b/resources/views/modals/bills/payment.blade.php @@ -1,6 +1,6 @@
{!! Form::open([ - 'url' => 'modals/bills/' . $bill->id . '/transactions', + 'route' => 'modals.bills.bill.transactions.store', $bill->id, 'id' => 'transaction', '@submit.prevent' => 'onSubmit', '@keydown' => 'transaction_form.errors.clear($event.target.name)', diff --git a/resources/views/modals/invoices/payment.blade.php b/resources/views/modals/invoices/payment.blade.php index c7b64a19c..e87a5a9ae 100644 --- a/resources/views/modals/invoices/payment.blade.php +++ b/resources/views/modals/invoices/payment.blade.php @@ -1,6 +1,6 @@
{!! Form::open([ - 'url' => 'modals/invoices/' . $invoice->id . '/transactions', + 'route' => 'modals.invoices.invoice.transactions.store', $invoice->id, 'id' => 'transaction', '@submit.prevent' => 'onSubmit', '@keydown' => 'transaction_form.errors.clear($event.target.name)', diff --git a/resources/views/modules/item/pre_sale.blade.php b/resources/views/modules/item/pre_sale.blade.php index d316ae06a..d2076c142 100644 --- a/resources/views/modules/item/pre_sale.blade.php +++ b/resources/views/modules/item/pre_sale.blade.php @@ -102,7 +102,7 @@ @if ($module->vendor_name) {{ trans_choice('general.developers', 1) }} - {{ $module->vendor_name }} + {{ $module->vendor_name }} @endif @if ($module->version) @@ -132,7 +132,7 @@ @if ($module->category) {{ trans_choice('general.categories', 1) }} - {{ $module->category->name }} + {{ $module->category->name }} @endif diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php index ed80a73cd..9adcbbf4f 100644 --- a/resources/views/modules/item/show.blade.php +++ b/resources/views/modules/item/show.blade.php @@ -164,14 +164,14 @@
@if ($installed) @permission('delete-modules-item') - {{ trans('modules.button.uninstall') }} + {{ trans('modules.button.uninstall') }} @endpermission @permission('update-modules-item') @if ($enable) - {{ trans('modules.button.disable') }} + {{ trans('modules.button.disable') }} @else - {{ trans('modules.button.enable') }} + {{ trans('modules.button.enable') }} @endif @endpermission @else @@ -204,7 +204,7 @@ @if ($module->vendor_name) {{ trans_choice('general.developers', 1) }} - {{ $module->vendor_name }} + {{ $module->vendor_name }} @endif @if ($module->version) @@ -234,14 +234,14 @@ @if ($module->category) {{ trans_choice('general.categories', 1) }} - {{ $module->category->name }} + {{ $module->category->name }} @endif {{ trans('modules.documentation') }} @if ($module->documentation) - {{ trans('modules.view') }} + {{ trans('modules.view') }} @else {{ trans('general.na') }} diff --git a/resources/views/partials/form/delete_button.blade.php b/resources/views/partials/form/delete_button.blade.php index 0589e9536..63ad7ff49 100644 --- a/resources/views/partials/form/delete_button.blade.php +++ b/resources/views/partials/form/delete_button.blade.php @@ -1,5 +1,14 @@ @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; @endphp @@ -7,7 +16,7 @@ 'type' => 'button', 'class' => 'btn btn-danger btn-xs', 'title' => trans('general.delete'), - '@click' => 'confirmDelete("' . url($url, $item->$id) . '", "' . trans_choice('general.' . $text, 2) . '", "' . trans('general.delete_confirm', ['name' => '' . $item->$value . '', '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' => '' . $item->$value . '', 'type' => mb_strtolower(trans_choice('general.' . $text, 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")' )) !!} @push('content_content_end') diff --git a/resources/views/partials/form/delete_link.blade.php b/resources/views/partials/form/delete_link.blade.php index 7e28a4dee..4ead1ebf7 100644 --- a/resources/views/partials/form/delete_link.blade.php +++ b/resources/views/partials/form/delete_link.blade.php @@ -1,10 +1,12 @@ @php if (\Str::contains($url, ['.'])) { - $url = route($url, $item->$id); $page = explode('.', $url)[0]; + + $url = route($url, $item->$id); } else { - $url = url($url, $item->$id); $page = explode('/', $url)[1]; + + $url = url($url, $item->$id); } $text = $text ? $text : $page; diff --git a/resources/views/partials/form/save_buttons.blade.php b/resources/views/partials/form/save_buttons.blade.php index 13388beb7..b6477d23c 100644 --- a/resources/views/partials/form/save_buttons.blade.php +++ b/resources/views/partials/form/save_buttons.blade.php @@ -1,7 +1,14 @@ @stack('save_buttons_start') + @php + if (\Str::contains($cancel, ['.'])) { + $url = route($cancel); + } else { + $url = url($cancel); + } + @endphp
- + {{ trans('general.cancel') }} diff --git a/resources/views/partials/portal/navbar.blade.php b/resources/views/partials/portal/navbar.blade.php index 46e429327..9bcf5633f 100644 --- a/resources/views/partials/portal/navbar.blade.php +++ b/resources/views/partials/portal/navbar.blade.php @@ -29,7 +29,7 @@
@if (count($bills)) - +
@@ -44,7 +44,7 @@ @endif @if (count($invoices)) - +
@@ -105,7 +105,7 @@
{{ trans('general.welcome') }}
- + {{ trans('auth.profile') }} diff --git a/resources/views/partials/reports/filter.blade.php b/resources/views/partials/reports/filter.blade.php index 7e6ad2603..570737be6 100644 --- a/resources/views/partials/reports/filter.blade.php +++ b/resources/views/partials/reports/filter.blade.php @@ -1,8 +1,8 @@
{!! Form::open([ - 'url' => 'common/reports/' . $class->model->id, - 'role' => 'form', 'method' => 'GET', + 'route' => 'reports.show', $class->model->id, + 'role' => 'form', ]) !!}
diff --git a/resources/views/portal/profile/edit.blade.php b/resources/views/portal/profile/edit.blade.php index 535026885..a8219b6fe 100644 --- a/resources/views/portal/profile/edit.blade.php +++ b/resources/views/portal/profile/edit.blade.php @@ -5,7 +5,7 @@ @section('content')
{!! Form::model($user, [ - 'url' => 'portal/profile/update', + 'route' => 'portal.profile.update', 'id' => 'profile', '@submit.prevent' => 'onSubmit', '@keydown' => 'form.errors.clear($event.target.name)', diff --git a/resources/views/purchases/bills/index.blade.php b/resources/views/purchases/bills/index.blade.php index 8768657a2..0c659ecd9 100644 --- a/resources/views/purchases/bills/index.blade.php +++ b/resources/views/purchases/bills/index.blade.php @@ -5,7 +5,7 @@ @section('new_button') @permission('create-purchases-bills')  {{ trans('general.add_new') }} -  {{ trans('import.import') }} +  {{ trans('import.import') }} @endpermission  {{ trans('general.export') }} @endsection diff --git a/resources/views/purchases/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php index 79a0b2ec9..49d3d8ed1 100644 --- a/resources/views/purchases/bills/show.blade.php +++ b/resources/views/purchases/bills/show.blade.php @@ -71,7 +71,7 @@
@stack('timeline_body_create_bill_body_button_edit_start') - + {{ trans('general.edit') }} @stack('timeline_body_create_bill_body_button_edit_end') @@ -101,7 +101,7 @@
@stack('timeline_body_receive_bill_body_button_sent_start') @permission('update-purchases-bills') - {{ trans('bills.mark_received') }} + {{ trans('bills.mark_received') }} @endpermission @stack('timeline_body_receive_bill_body_button_sent_end')
diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php index 7b2808f04..b8caeb580 100644 --- a/resources/views/purchases/payments/index.blade.php +++ b/resources/views/purchases/payments/index.blade.php @@ -5,7 +5,7 @@ @section('new_button') @permission('create-purchases-payments')  {{ trans('general.add_new') }} -  {{ trans('import.import') }} +  {{ trans('import.import') }} @endpermission  {{ trans('general.export') }} @endsection diff --git a/resources/views/purchases/vendors/index.blade.php b/resources/views/purchases/vendors/index.blade.php index 05727bf6a..e7af30425 100644 --- a/resources/views/purchases/vendors/index.blade.php +++ b/resources/views/purchases/vendors/index.blade.php @@ -5,7 +5,7 @@ @section('new_button') @permission('create-purchases-vendors')  {{ trans('general.add_new') }} -  {{ trans('import.import') }} +  {{ trans('import.import') }} @endpermission  {{ trans('general.export') }} @endsection diff --git a/resources/views/purchases/vendors/show.blade.php b/resources/views/purchases/vendors/show.blade.php index 917621436..2c14208af 100644 --- a/resources/views/purchases/vendors/show.blade.php +++ b/resources/views/purchases/vendors/show.blade.php @@ -47,7 +47,7 @@
- {{ trans('general.edit') }} + {{ trans('general.edit') }}
@@ -156,7 +156,7 @@ @foreach($bills as $item) - {{ $item->bill_number }} + {{ $item->bill_number }} @money($item->amount, $item->currency_code, true) @date($item->billed_at) @date($item->due_at) diff --git a/resources/views/sales/customers/index.blade.php b/resources/views/sales/customers/index.blade.php index d6bae4903..b6fb4a91e 100644 --- a/resources/views/sales/customers/index.blade.php +++ b/resources/views/sales/customers/index.blade.php @@ -4,8 +4,8 @@ @section('new_button') @permission('create-sales-customers') -  {{ trans('general.add_new') }} -  {{ trans('import.import') }} +  {{ trans('general.add_new') }} +  {{ trans('import.import') }} @endpermission  {{ trans('general.export') }} @endsection diff --git a/resources/views/sales/customers/show.blade.php b/resources/views/sales/customers/show.blade.php index 113fa4227..e6e29ac6a 100644 --- a/resources/views/sales/customers/show.blade.php +++ b/resources/views/sales/customers/show.blade.php @@ -151,7 +151,7 @@ @foreach($invoices as $item) - {{ $item->invoice_number }} + {{ $item->invoice_number }} @money($item->amount, $item->currency_code, true) @date($item->invoiced_at) @date($item->due_at) diff --git a/resources/views/sales/invoices/index.blade.php b/resources/views/sales/invoices/index.blade.php index 374405640..11fe6c97c 100644 --- a/resources/views/sales/invoices/index.blade.php +++ b/resources/views/sales/invoices/index.blade.php @@ -5,7 +5,7 @@ @section('new_button') @permission('create-sales-invoices')  {{ trans('general.add_new') }} -  {{ trans('import.import') }} +  {{ trans('import.import') }} @endpermission  {{ trans('general.export') }} @endsection diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php index fbb8ee946..78a51bb3a 100644 --- a/resources/views/sales/invoices/show.blade.php +++ b/resources/views/sales/invoices/show.blade.php @@ -71,7 +71,7 @@
@stack('timeline_body_create_invoice_body_button_edit_start') - + {{ trans('general.edit') }} @stack('timeline_body_create_invoice_body_button_edit_end') @@ -102,7 +102,7 @@ @stack('timeline_body_send_invoice_body_button_sent_start') @permission('update-sales-invoices') @if($invoice->status == 'draft') - {{ trans('invoices.mark_sent') }} + {{ trans('invoices.mark_sent') }} @else @endif @@ -500,7 +500,7 @@ @stack('button_email_start') @if($invoice->contact_email) - {{ trans('invoices.send_mail') }} + {{ trans('invoices.send_mail') }} @else - + {{ trans('invoices.accept_payments') }} diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php index abe2db237..cfd52f4b7 100644 --- a/resources/views/sales/revenues/index.blade.php +++ b/resources/views/sales/revenues/index.blade.php @@ -5,7 +5,7 @@ @section('new_button') @permission('create-sales-revenues')  {{ trans('general.add_new') }} -  {{ trans('import.import') }} +  {{ trans('import.import') }} @endpermission  {{ trans('general.export') }} @endsection diff --git a/routes/admin.php b/routes/admin.php index 5c75ac6c9..c4f476ba1 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -177,9 +177,9 @@ Route::group(['as' => 'apps.', 'prefix' => 'apps'], function () { Route::resource('my', 'Modules\My'); - Route::get('categories/{alias}', 'Modules\Tiles@categoryModules'); - Route::get('vendors/{alias}', 'Modules\Tiles@vendorModules'); - Route::get('docs/{alias}', 'Modules\Item@documentation'); + Route::get('categories/{alias}', 'Modules\Tiles@categoryModules')->name('categories.show'); + Route::get('vendors/{alias}', 'Modules\Tiles@vendorModules')->name('vendors.show'); + Route::get('docs/{alias}', 'Modules\Item@documentation')->name('docs.show'); Route::get('paid', 'Modules\Tiles@paidModules')->name('paid'); 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('items', 'Modals\Items'); Route::patch('invoice-templates', 'Modals\InvoiceTemplates@update')->name('invoice-templates.update'); - Route::resource('invoices/{invoice}/transactions', 'Modals\InvoiceTransactions', ['middleware' => ['date.format', 'money']]); - Route::resource('bills/{bill}/transactions', 'Modals\BillTransactions', ['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', ['names' => 'bills.bill.transactions', 'middleware' => ['date.format', 'money']]); Route::resource('taxes', 'Modals\Taxes'); });