From dc74a064bad30f8a1a9d8b322fd6d038c83cffcf Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 5 May 2023 16:29:08 +1000 Subject: [PATCH] Normalise usage of Model into Model::class strings --- app/Http/Controllers/ProductController.php | 12 ++++++------ app/Mail/CancelRequest.php | 4 ++-- app/Mail/ChangeRequest.php | 4 ++-- app/Mail/OrderRequest.php | 4 ++-- config/jwt.php | 2 +- database/factories/GroupFactory.php | 2 +- database/factories/ProductFactory.php | 4 ++-- database/factories/ServiceFactory.php | 2 +- .../service/widget/broadband/change.blade.php | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php index b7e02d7..c8e4a9d 100644 --- a/app/Http/Controllers/ProductController.php +++ b/app/Http/Controllers/ProductController.php @@ -20,7 +20,7 @@ class ProductController extends Controller public function api_supplier_products(Request $request): Collection { switch ($request->type) { - case 'App\Models\Product\Broadband': + case Product\Broadband::class: return Product\Broadband::select(['id','supplier_item_id']) ->with(['supplied.supplier_detail.supplier']) ->get() @@ -28,7 +28,7 @@ class ProductController extends Controller ->sortBy('name') ->values(); - case 'App\Models\Product\Domain': + case Product\Domain::class: return Product\Domain::select(['id','supplier_item_id']) ->with(['supplied.supplier_detail.supplier']) ->get() @@ -36,7 +36,7 @@ class ProductController extends Controller ->sortBy('name') ->values(); - case 'App\Models\Product\Email': + case Product\Email::class: return Product\Email::select(['id','supplier_item_id']) ->with(['supplied.supplier_detail.supplier']) ->get() @@ -44,7 +44,7 @@ class ProductController extends Controller ->sortBy('name') ->values(); - case 'App\Models\Product\Generic': + case Product\Generic::class: return Product\Generic::select(['id','supplier_item_id']) ->with(['supplied.supplier_detail.supplier']) ->get() @@ -52,7 +52,7 @@ class ProductController extends Controller ->sortBy('name') ->values(); - case 'App\Models\Product\Host': + case Product\Host::class: return Product\Host::select(['id','supplier_item_id']) ->with(['supplied.supplier_detail.supplier']) ->get() @@ -60,7 +60,7 @@ class ProductController extends Controller ->sortBy('name') ->values(); - case 'App\Models\Product\Phone': + case Product\Phone::class: return Product\Phone::select(['id','supplier_item_id']) ->with(['supplied.supplier_detail.supplier']) ->get() diff --git a/app/Mail/CancelRequest.php b/app/Mail/CancelRequest.php index f2619e3..ec88251 100644 --- a/app/Mail/CancelRequest.php +++ b/app/Mail/CancelRequest.php @@ -39,11 +39,11 @@ class CancelRequest extends Mailable Config::set('site',$this->service->site); switch (get_class($this->service->type)) { - case 'App\Models\Service\Broadband': + case Service\Broadband::class: $subject = sprintf('Cancel BROADBAND: %s',$this->service->type->service_address); break; - case 'App\Models\Service\Phone': + case Service\Phone::class: $subject = sprintf('Cancel PHONE: %s',$this->service->type->service_number); break; diff --git a/app/Mail/ChangeRequest.php b/app/Mail/ChangeRequest.php index afbee33..f5ef620 100644 --- a/app/Mail/ChangeRequest.php +++ b/app/Mail/ChangeRequest.php @@ -39,11 +39,11 @@ class ChangeRequest extends Mailable Config::set('site',$this->service->site); switch (get_class($this->service->type)) { - case 'App\Models\Service\Broadband': + case Service\Broadband::class: $subject = sprintf('Change BROADBAND: %s',$this->service->type->service_address); break; - case 'App\Models\Service\Phone': + case Service\Phone::class: $subject = sprintf('Change PHONE: %s',$this->service->type->service_number); break; diff --git a/app/Mail/OrderRequest.php b/app/Mail/OrderRequest.php index 4e1c57b..f175ed2 100644 --- a/app/Mail/OrderRequest.php +++ b/app/Mail/OrderRequest.php @@ -39,11 +39,11 @@ class OrderRequest extends Mailable Config::set('site',$this->service->site); switch (get_class($this->service->type)) { - case 'App\Models\Service\Broadband': + case Service\Broadband::class: $subject = sprintf('Order BROADBAND: %s',$this->service->type->service_address); break; - case 'App\Models\Service\Phone': + case Service\Phone::class: $subject = sprintf('Order PHONE: %s',$this->service->type->service_number); break; diff --git a/config/jwt.php b/config/jwt.php index 5f27a78..5468cb7 100644 --- a/config/jwt.php +++ b/config/jwt.php @@ -77,7 +77,7 @@ return [ | */ - 'user' => 'App\Models\User', + 'user' => \App\Models\User::class, /* |-------------------------------------------------------------------------- diff --git a/database/factories/GroupFactory.php b/database/factories/GroupFactory.php index 69bdb68..e12e9f0 100644 --- a/database/factories/GroupFactory.php +++ b/database/factories/GroupFactory.php @@ -29,7 +29,7 @@ class GroupFactory extends Factory // 'date_expire', // 'parent_id', 'active' => TRUE, - // 'pricing', + 'pricing' => TRUE, // 'name', ]; } diff --git a/database/factories/ProductFactory.php b/database/factories/ProductFactory.php index fb356a1..846c372 100644 --- a/database/factories/ProductFactory.php +++ b/database/factories/ProductFactory.php @@ -44,9 +44,9 @@ class ProductFactory extends Factory ]), // 'price_recur_default' // 'price_recur_strict' - // 'model_id' => 1, + 'model_id' => 1, // 'accounting' - // 'model' => 'App\Models\Product\Adsl', + 'model' => Product\Broadband::class, ]; } diff --git a/database/factories/ServiceFactory.php b/database/factories/ServiceFactory.php index 66b0543..a133bec 100644 --- a/database/factories/ServiceFactory.php +++ b/database/factories/ServiceFactory.php @@ -64,7 +64,7 @@ class ServiceFactory extends Factory // 'ordered_by', // 'order_status', // 'order_info', - 'model' => 'App\Models\Service\Broadband', + 'model' => Service\Broadband::class, ]; } } diff --git a/resources/views/theme/backend/adminlte/service/widget/broadband/change.blade.php b/resources/views/theme/backend/adminlte/service/widget/broadband/change.blade.php index 6421da1..51f3b24 100644 --- a/resources/views/theme/backend/adminlte/service/widget/broadband/change.blade.php +++ b/resources/views/theme/backend/adminlte/service/widget/broadband/change.blade.php @@ -7,7 +7,7 @@ @php $po = $selected = NULL; @endphp - @foreach (\App\Models\Product::active()->get()->filter(function($item) { return get_class($item->type) === 'App\Models\Product\Broadband'; })->sortBy('name') as $o) + @foreach (\App\Models\Product::active()->get()->filter(function($item) { return get_class($item->type) === \App\Models\Product\Broadband::class; })->sortBy('name') as $o) @php if ($o->id == old('product_id')) { $selected = 'selected';