From 97f5c84f231dd0ac6e8606ae4b44011ce6585689 Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 29 Jul 2022 17:45:17 +1000 Subject: [PATCH] Consolidate service resources into a top level services/ directory --- app/Http/Controllers/HomeController.php | 22 +++------------ app/Http/Controllers/ServiceController.php | 27 ++++++++++++++----- app/Models/Account.php | 10 +++++++ public/css/fixes.css | 2 +- .../common/service/widget/error.blade.php | 12 --------- .../backend/adminlte/{u => }/home.blade.php | 2 +- .../adminlte/r/home/widgets/home.blade.php | 2 +- .../{u => }/service/cancel_request.blade.php | 13 ++++----- .../{a => }/service/change_pending.blade.php | 7 +++-- .../{u => }/service/change_request.blade.php | 13 ++++----- .../{r => }/service/domain/list.blade.php | 0 .../{r => }/service/email/list.blade.php | 0 .../adminlte/{u => }/service/home.blade.php | 12 ++++----- .../{r => }/service/host/list.blade.php | 0 .../service/order/provision_plan.blade.php | 2 +- .../{r => }/service/order/sent.blade.php | 2 +- .../widget}/active.blade.php | 0 .../widget}/broadband/change.blade.php | 0 .../widget}/broadband/details.blade.php | 0 .../widget}/broadband/update.blade.php | 0 .../widget}/broadband/usagegraph.blade.php | 0 .../widget}/domain/details.blade.php | 0 .../widget}/domain/update.blade.php | 0 .../widget}/email/details.blade.php | 0 .../widget}/email/update.blade.php | 0 .../widget}/host/details.blade.php | 0 .../widget}/host/update.blade.php | 0 .../widget}/information.blade.php | 0 .../widget}/internal.blade.php | 0 .../service/widget/invoice.blade.php | 0 .../widget}/movement.blade.php | 0 .../widget}/phone/details.blade.php | 0 .../widget}/phone/update.blade.php | 0 .../widget}/ssl/details.blade.php | 0 .../widget}/update.blade.php | 2 +- routes/web.php | 2 +- 36 files changed, 66 insertions(+), 64 deletions(-) delete mode 100644 resources/views/theme/backend/adminlte/common/service/widget/error.blade.php rename resources/views/theme/backend/adminlte/{u => }/home.blade.php (98%) rename resources/views/theme/backend/adminlte/{u => }/service/cancel_request.blade.php (92%) rename resources/views/theme/backend/adminlte/{a => }/service/change_pending.blade.php (97%) rename resources/views/theme/backend/adminlte/{u => }/service/change_request.blade.php (92%) rename resources/views/theme/backend/adminlte/{r => }/service/domain/list.blade.php (100%) rename resources/views/theme/backend/adminlte/{r => }/service/email/list.blade.php (100%) rename resources/views/theme/backend/adminlte/{u => }/service/home.blade.php (90%) rename resources/views/theme/backend/adminlte/{r => }/service/host/list.blade.php (100%) rename resources/views/theme/backend/adminlte/{r => }/service/order/provision_plan.blade.php (96%) rename resources/views/theme/backend/adminlte/{r => }/service/order/sent.blade.php (96%) rename resources/views/theme/backend/adminlte/{u/service/widgets => service/widget}/active.blade.php (100%) rename resources/views/theme/backend/adminlte/{u/service/widgets => service/widget}/broadband/change.blade.php (100%) rename resources/views/theme/backend/adminlte/{u/service/widgets => service/widget}/broadband/details.blade.php (100%) rename resources/views/theme/backend/adminlte/{a/service/widgets => service/widget}/broadband/update.blade.php (100%) rename resources/views/theme/backend/adminlte/{u/service/widgets => service/widget}/broadband/usagegraph.blade.php (100%) rename resources/views/theme/backend/adminlte/{u/service/widgets => service/widget}/domain/details.blade.php (100%) rename resources/views/theme/backend/adminlte/{a/service/widgets => service/widget}/domain/update.blade.php (100%) rename resources/views/theme/backend/adminlte/{u/service/widgets => service/widget}/email/details.blade.php (100%) rename resources/views/theme/backend/adminlte/{a/service/widgets => service/widget}/email/update.blade.php (100%) rename resources/views/theme/backend/adminlte/{u/service/widgets => service/widget}/host/details.blade.php (100%) rename resources/views/theme/backend/adminlte/{a/service/widgets => service/widget}/host/update.blade.php (100%) rename resources/views/theme/backend/adminlte/{u/service/widgets => service/widget}/information.blade.php (100%) rename resources/views/theme/backend/adminlte/{a/service/widgets => service/widget}/internal.blade.php (100%) rename resources/views/theme/backend/adminlte/{common => }/service/widget/invoice.blade.php (100%) rename resources/views/theme/backend/adminlte/{r/service/widgets => service/widget}/movement.blade.php (100%) rename resources/views/theme/backend/adminlte/{u/service/widgets => service/widget}/phone/details.blade.php (100%) rename resources/views/theme/backend/adminlte/{a/service/widgets => service/widget}/phone/update.blade.php (100%) rename resources/views/theme/backend/adminlte/{u/service/widgets => service/widget}/ssl/details.blade.php (100%) rename resources/views/theme/backend/adminlte/{a/service/widgets => service/widget}/update.blade.php (84%) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index f1d05ab..b753937 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers; use Clarkeash\Doorman\Exceptions\{DoormanException,ExpiredInviteCode}; use Clarkeash\Doorman\Facades\Doorman; -use Illuminate\Contracts\View\Factory; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Log; use Illuminate\View\View; @@ -24,7 +23,8 @@ class HomeController extends Controller /** * Logged in users home page * - * @return Factory|View + * @param User $o + * @return View */ public function home(User $o): View { @@ -33,7 +33,7 @@ class HomeController extends Controller $o->load(['services.invoice_items','services.type']); - return View('u.home',['o'=>$o]); + return View('home',['o'=>$o]); } /** @@ -62,22 +62,6 @@ class HomeController extends Controller return $this->invoice($o); } - /** - * Return details on the users service - * - * @param Service $o - * @return View - */ - public function service(Service $o): View - { - $breadcrumb = collect(); - $breadcrumb->put($o->account->user->full_name,url('u/home',$o->account->user_id)); - - return View('u.service.home') - ->with('breadcrumb',$breadcrumb) - ->with('o',$o); - } - /** * Progress the order to the next stage * diff --git a/app/Http/Controllers/ServiceController.php b/app/Http/Controllers/ServiceController.php index 467c051..dda90a7 100644 --- a/app/Http/Controllers/ServiceController.php +++ b/app/Http/Controllers/ServiceController.php @@ -84,7 +84,8 @@ class ServiceController extends Controller return redirect()->to(url('u/service',[$o->id])); } - return view('a.service.change_pending') + return view('service.change_pending') + ->with('breadcrumb',collect()->merge($o->account->breadcrumb)) ->with('o',$o); } @@ -117,7 +118,7 @@ class ServiceController extends Controller return redirect('u/service/'.$o->id)->with('success','Cancellation lodged'); } - return view('u.service.cancel_request') + return view('service.cancel_request') ->with('o',$o); } @@ -220,7 +221,8 @@ class ServiceController extends Controller switch (get_class($o->type)) { default: - return view('u.service.change_request') + return view('service.change_request') + ->with('breadcrumb',collect()->merge($o->account->breadcrumb)) ->with('o',$o); } } @@ -275,7 +277,7 @@ class ServiceController extends Controller ->with(['service.account','registrar']) ->get(); - return view('r.service.domain.list') + return view('service.domain.list') ->with('o',$o); } @@ -289,7 +291,20 @@ class ServiceController extends Controller ->with(['service.account','service.product.type.supplied.supplier_detail.supplier','tld']) ->get(); - return view('r.service.email.list') + return view('service.email.list') + ->with('o',$o); + } + + /** + * Return details on the users service + * + * @param Service $o + * @return View + */ + public function home(Service $o): View + { + return View('service.home') + ->with('breadcrumb',collect()->merge($o->account->breadcrumb)) ->with('o',$o); } @@ -303,7 +318,7 @@ class ServiceController extends Controller ->with(['service.account','service.product.type.supplied.supplier_detail.supplier','tld']) ->get(); - return view('r.service.host.list') + return view('service.host.list') ->with('o',$o); } diff --git a/app/Models/Account.php b/app/Models/Account.php index 92e17c0..9e531f1 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -139,6 +139,16 @@ class Account extends Model implements IDs ]; } + /** + * Account breadcrumb to render on pages + * + * @return array + */ + public function getBreadcrumbAttribute(): array + { + return [$this->name => url('u/home',$this->user_id)]; + } + /** * Return the account name * diff --git a/public/css/fixes.css b/public/css/fixes.css index cbc5d4b..344a045 100644 --- a/public/css/fixes.css +++ b/public/css/fixes.css @@ -1,5 +1,5 @@ body { - font-size: 0.85em; + font-size: 0.75em; } /* Fixes for data tables */ diff --git a/resources/views/theme/backend/adminlte/common/service/widget/error.blade.php b/resources/views/theme/backend/adminlte/common/service/widget/error.blade.php deleted file mode 100644 index ce3990d..0000000 --- a/resources/views/theme/backend/adminlte/common/service/widget/error.blade.php +++ /dev/null @@ -1,12 +0,0 @@ - -
-
- -
Whoops!
-
    - @foreach ($errors->all() as $error) -
  • {!! $error !!}
    • - @endforeach -
-
-
\ No newline at end of file diff --git a/resources/views/theme/backend/adminlte/u/home.blade.php b/resources/views/theme/backend/adminlte/home.blade.php similarity index 98% rename from resources/views/theme/backend/adminlte/u/home.blade.php rename to resources/views/theme/backend/adminlte/home.blade.php index 8649e13..94ddb05 100644 --- a/resources/views/theme/backend/adminlte/u/home.blade.php +++ b/resources/views/theme/backend/adminlte/home.blade.php @@ -44,7 +44,7 @@
- @include('u.service.widgets.active') + @include('service.widget.active')
diff --git a/resources/views/theme/backend/adminlte/r/home/widgets/home.blade.php b/resources/views/theme/backend/adminlte/r/home/widgets/home.blade.php index 1d380ff..fa4985e 100644 --- a/resources/views/theme/backend/adminlte/r/home/widgets/home.blade.php +++ b/resources/views/theme/backend/adminlte/r/home/widgets/home.blade.php @@ -3,7 +3,7 @@ @include('r.account.widgets.list')
- @include('r.service.widgets.movement') + @include('service.widget.movement') @include('r.invoice.widgets.due')
diff --git a/resources/views/theme/backend/adminlte/u/service/cancel_request.blade.php b/resources/views/theme/backend/adminlte/service/cancel_request.blade.php similarity index 92% rename from resources/views/theme/backend/adminlte/u/service/cancel_request.blade.php rename to resources/views/theme/backend/adminlte/service/cancel_request.blade.php index f4875c8..3cc5b70 100644 --- a/resources/views/theme/backend/adminlte/u/service/cancel_request.blade.php +++ b/resources/views/theme/backend/adminlte/service/cancel_request.blade.php @@ -15,6 +15,12 @@ @endsection @section('main-content') +
+
+ @include('adminlte::widget.status') +
+
+
@@ -22,11 +28,6 @@
Cancelling Service
- - @if ($errors->any()) - @include('common.service.widget.error') - @endif -
{{ csrf_field() }} @@ -44,7 +45,7 @@
{{-- - @includeIf('u.service.widgets.'.$o->product->category.'.order',['o'=>$o->type]) + @includeIf('service.widget.'.$o->product->category.'.order',['o'=>$o->type]) --}}
diff --git a/resources/views/theme/backend/adminlte/a/service/change_pending.blade.php b/resources/views/theme/backend/adminlte/service/change_pending.blade.php similarity index 97% rename from resources/views/theme/backend/adminlte/a/service/change_pending.blade.php rename to resources/views/theme/backend/adminlte/service/change_pending.blade.php index c49b208..9a5fab0 100644 --- a/resources/views/theme/backend/adminlte/a/service/change_pending.blade.php +++ b/resources/views/theme/backend/adminlte/service/change_pending.blade.php @@ -3,6 +3,9 @@ @section('htmlheader_title') Change Service #{{ $o->id }} @endsection +@section('page_title') + {{ $o->sid }} +@endsection @section('contentheader_title') Change Service #{{ $o->id }} - WARNING - this is only for Broadband for now @@ -113,7 +116,7 @@
- Cancel + Cancel @can('wholesaler') @endcan @@ -124,7 +127,7 @@
- @include('a.service.widgets.internal') + @include('service.widget.internal')
diff --git a/resources/views/theme/backend/adminlte/u/service/change_request.blade.php b/resources/views/theme/backend/adminlte/service/change_request.blade.php similarity index 92% rename from resources/views/theme/backend/adminlte/u/service/change_request.blade.php rename to resources/views/theme/backend/adminlte/service/change_request.blade.php index a063fbb..01ec8ca 100644 --- a/resources/views/theme/backend/adminlte/u/service/change_request.blade.php +++ b/resources/views/theme/backend/adminlte/service/change_request.blade.php @@ -15,6 +15,12 @@ @endsection @section('main-content') +
+
+ @include('adminlte::widget.status') +
+
+
@@ -22,11 +28,6 @@
Change Service
- - @if ($errors->any()) - @include('common.service.widget.error') - @endif -
{{ csrf_field() }} @@ -43,7 +44,7 @@
- @includeIf('u.service.widgets.'.$o->product->category.'.change',['o'=>$o->type]) + @includeIf('service.widget.'.$o->product->category.'.change',['o'=>$o->type])
diff --git a/resources/views/theme/backend/adminlte/r/service/domain/list.blade.php b/resources/views/theme/backend/adminlte/service/domain/list.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/r/service/domain/list.blade.php rename to resources/views/theme/backend/adminlte/service/domain/list.blade.php diff --git a/resources/views/theme/backend/adminlte/r/service/email/list.blade.php b/resources/views/theme/backend/adminlte/service/email/list.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/r/service/email/list.blade.php rename to resources/views/theme/backend/adminlte/service/email/list.blade.php diff --git a/resources/views/theme/backend/adminlte/u/service/home.blade.php b/resources/views/theme/backend/adminlte/service/home.blade.php similarity index 90% rename from resources/views/theme/backend/adminlte/u/service/home.blade.php rename to resources/views/theme/backend/adminlte/service/home.blade.php index adf4df1..d0d8f40 100644 --- a/resources/views/theme/backend/adminlte/u/service/home.blade.php +++ b/resources/views/theme/backend/adminlte/service/home.blade.php @@ -19,8 +19,8 @@
- @includeIf('u.service.widgets.'.$o->product->category.'.details',['o'=>$o->type]) - @include('u.service.widgets.information') + @includeIf('service.widget.'.$o->product->category.'.details',['o'=>$o->type]) + @include('service.widget.information')
@@ -72,13 +72,13 @@
@if (! $o->suspend_billing AND ! $o->external_billing)
- @include('common.service.widget.invoice') + @include('service.widget.invoice')
@endif @if ($o->hasUsage())
@if ($o->type->usage(30)->count()) - @include('u.service.widgets.'.$o->product->category.'.usagegraph',['o'=>$o->type]) + @include('service.widget.'.$o->product->category.'.usagegraph',['o'=>$o->type]) @endif
@endif @@ -90,11 +90,11 @@
@can('wholesaler')
- @include('a.service.widgets.internal') + @include('service.widget.internal')
- @include('a.service.widgets.update') + @include('service.widget.update')
@endcan
diff --git a/resources/views/theme/backend/adminlte/r/service/host/list.blade.php b/resources/views/theme/backend/adminlte/service/host/list.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/r/service/host/list.blade.php rename to resources/views/theme/backend/adminlte/service/host/list.blade.php diff --git a/resources/views/theme/backend/adminlte/r/service/order/provision_plan.blade.php b/resources/views/theme/backend/adminlte/service/order/provision_plan.blade.php similarity index 96% rename from resources/views/theme/backend/adminlte/r/service/order/provision_plan.blade.php rename to resources/views/theme/backend/adminlte/service/order/provision_plan.blade.php index a99c38c..a6116bb 100644 --- a/resources/views/theme/backend/adminlte/r/service/order/provision_plan.blade.php +++ b/resources/views/theme/backend/adminlte/service/order/provision_plan.blade.php @@ -38,7 +38,7 @@
- @includeIf('u.service.widgets.'.$o->product->category.'.order',['o'=>$o->type]) + @includeIf('service.widget.'.$o->product->category.'.order',['o'=>$o->type])
diff --git a/resources/views/theme/backend/adminlte/r/service/order/sent.blade.php b/resources/views/theme/backend/adminlte/service/order/sent.blade.php similarity index 96% rename from resources/views/theme/backend/adminlte/r/service/order/sent.blade.php rename to resources/views/theme/backend/adminlte/service/order/sent.blade.php index 99d8799..194a4e8 100644 --- a/resources/views/theme/backend/adminlte/r/service/order/sent.blade.php +++ b/resources/views/theme/backend/adminlte/service/order/sent.blade.php @@ -38,7 +38,7 @@
- @includeIf('u.service.widgets.'.$o->product->category.'.order',['o'=>$o->type]) + @includeIf('service.widget.'.$o->product->category.'.order',['o'=>$o->type])
diff --git a/resources/views/theme/backend/adminlte/u/service/widgets/active.blade.php b/resources/views/theme/backend/adminlte/service/widget/active.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/u/service/widgets/active.blade.php rename to resources/views/theme/backend/adminlte/service/widget/active.blade.php diff --git a/resources/views/theme/backend/adminlte/u/service/widgets/broadband/change.blade.php b/resources/views/theme/backend/adminlte/service/widget/broadband/change.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/u/service/widgets/broadband/change.blade.php rename to resources/views/theme/backend/adminlte/service/widget/broadband/change.blade.php diff --git a/resources/views/theme/backend/adminlte/u/service/widgets/broadband/details.blade.php b/resources/views/theme/backend/adminlte/service/widget/broadband/details.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/u/service/widgets/broadband/details.blade.php rename to resources/views/theme/backend/adminlte/service/widget/broadband/details.blade.php diff --git a/resources/views/theme/backend/adminlte/a/service/widgets/broadband/update.blade.php b/resources/views/theme/backend/adminlte/service/widget/broadband/update.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/a/service/widgets/broadband/update.blade.php rename to resources/views/theme/backend/adminlte/service/widget/broadband/update.blade.php diff --git a/resources/views/theme/backend/adminlte/u/service/widgets/broadband/usagegraph.blade.php b/resources/views/theme/backend/adminlte/service/widget/broadband/usagegraph.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/u/service/widgets/broadband/usagegraph.blade.php rename to resources/views/theme/backend/adminlte/service/widget/broadband/usagegraph.blade.php diff --git a/resources/views/theme/backend/adminlte/u/service/widgets/domain/details.blade.php b/resources/views/theme/backend/adminlte/service/widget/domain/details.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/u/service/widgets/domain/details.blade.php rename to resources/views/theme/backend/adminlte/service/widget/domain/details.blade.php diff --git a/resources/views/theme/backend/adminlte/a/service/widgets/domain/update.blade.php b/resources/views/theme/backend/adminlte/service/widget/domain/update.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/a/service/widgets/domain/update.blade.php rename to resources/views/theme/backend/adminlte/service/widget/domain/update.blade.php diff --git a/resources/views/theme/backend/adminlte/u/service/widgets/email/details.blade.php b/resources/views/theme/backend/adminlte/service/widget/email/details.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/u/service/widgets/email/details.blade.php rename to resources/views/theme/backend/adminlte/service/widget/email/details.blade.php diff --git a/resources/views/theme/backend/adminlte/a/service/widgets/email/update.blade.php b/resources/views/theme/backend/adminlte/service/widget/email/update.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/a/service/widgets/email/update.blade.php rename to resources/views/theme/backend/adminlte/service/widget/email/update.blade.php diff --git a/resources/views/theme/backend/adminlte/u/service/widgets/host/details.blade.php b/resources/views/theme/backend/adminlte/service/widget/host/details.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/u/service/widgets/host/details.blade.php rename to resources/views/theme/backend/adminlte/service/widget/host/details.blade.php diff --git a/resources/views/theme/backend/adminlte/a/service/widgets/host/update.blade.php b/resources/views/theme/backend/adminlte/service/widget/host/update.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/a/service/widgets/host/update.blade.php rename to resources/views/theme/backend/adminlte/service/widget/host/update.blade.php diff --git a/resources/views/theme/backend/adminlte/u/service/widgets/information.blade.php b/resources/views/theme/backend/adminlte/service/widget/information.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/u/service/widgets/information.blade.php rename to resources/views/theme/backend/adminlte/service/widget/information.blade.php diff --git a/resources/views/theme/backend/adminlte/a/service/widgets/internal.blade.php b/resources/views/theme/backend/adminlte/service/widget/internal.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/a/service/widgets/internal.blade.php rename to resources/views/theme/backend/adminlte/service/widget/internal.blade.php diff --git a/resources/views/theme/backend/adminlte/common/service/widget/invoice.blade.php b/resources/views/theme/backend/adminlte/service/widget/invoice.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/common/service/widget/invoice.blade.php rename to resources/views/theme/backend/adminlte/service/widget/invoice.blade.php diff --git a/resources/views/theme/backend/adminlte/r/service/widgets/movement.blade.php b/resources/views/theme/backend/adminlte/service/widget/movement.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/r/service/widgets/movement.blade.php rename to resources/views/theme/backend/adminlte/service/widget/movement.blade.php diff --git a/resources/views/theme/backend/adminlte/u/service/widgets/phone/details.blade.php b/resources/views/theme/backend/adminlte/service/widget/phone/details.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/u/service/widgets/phone/details.blade.php rename to resources/views/theme/backend/adminlte/service/widget/phone/details.blade.php diff --git a/resources/views/theme/backend/adminlte/a/service/widgets/phone/update.blade.php b/resources/views/theme/backend/adminlte/service/widget/phone/update.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/a/service/widgets/phone/update.blade.php rename to resources/views/theme/backend/adminlte/service/widget/phone/update.blade.php diff --git a/resources/views/theme/backend/adminlte/u/service/widgets/ssl/details.blade.php b/resources/views/theme/backend/adminlte/service/widget/ssl/details.blade.php similarity index 100% rename from resources/views/theme/backend/adminlte/u/service/widgets/ssl/details.blade.php rename to resources/views/theme/backend/adminlte/service/widget/ssl/details.blade.php diff --git a/resources/views/theme/backend/adminlte/a/service/widgets/update.blade.php b/resources/views/theme/backend/adminlte/service/widget/update.blade.php similarity index 84% rename from resources/views/theme/backend/adminlte/a/service/widgets/update.blade.php rename to resources/views/theme/backend/adminlte/service/widget/update.blade.php index 5f45beb..5e39532 100644 --- a/resources/views/theme/backend/adminlte/a/service/widgets/update.blade.php +++ b/resources/views/theme/backend/adminlte/service/widget/update.blade.php @@ -5,7 +5,7 @@ @csrf - @includeIf('a.service.widgets.'.$o->product->category.'.update',['o'=>$o->type]) + @includeIf('service.widget.'.$o->product->category.'.update',['o'=>$o->type])
diff --git a/routes/web.php b/routes/web.php index 75cd606..b8e9d1e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -158,7 +158,7 @@ Route::group(['middleware'=>['theme:adminlte-be','auth'],'prefix'=>'u'],function Route::get('invoice/cart/{o}',[CheckoutController::class,'cart_invoice']) ->where('o','[0-9]+') ->middleware('can:view,o'); - Route::get('service/{o}',[HomeController::class,'service']) + Route::get('service/{o}',[ServiceController::class,'home']) ->where('o','[0-9]+') ->middleware('can:view,o'); Route::match(['get','post'],'service/{o}/cancel-request',[ServiceController::class,'cancel_request'])