diff --git a/app/Http/Controllers/PackController.php b/app/Http/Controllers/PackController.php index 2c8c593b..8635e85e 100644 --- a/app/Http/Controllers/PackController.php +++ b/app/Http/Controllers/PackController.php @@ -10,7 +10,7 @@ class PackController extends Controller { public function index(Request $request) { - $Packes = Pack::when($request->has('name') && $request->name != '', function($query) use($request){ + $Packs = Pack::when($request->has('name') && $request->name != '', function($query) use($request){ $query->where('name', 'LIKE', '%'.$request->name.'%'); }) ->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){ @@ -29,7 +29,7 @@ class PackController extends Controller $query->where('department', 'LIKE', '%'.$request->department.'%'); }) ->with('user')->paginate(10); - return \MessageResponse::data($Packes); + return \MessageResponse::data($Packs); } public function create() { @@ -87,10 +87,10 @@ class PackController extends Controller $Pack->delete(); return \MessageResponse::success(trans('messages.success')); } - public function getPackes() + public function getPacks() { - $Packes = Pack::with('user')->get(); - return \MessageResponse::data($Packes); + $Packs = Pack::with('user')->get(); + return \MessageResponse::data($Packs); } } diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php index d2de0371..8b855f4e 100644 --- a/app/Http/Controllers/PackageController.php +++ b/app/Http/Controllers/PackageController.php @@ -62,9 +62,9 @@ class PackageController extends Controller { $Package->items()->detach(); } - if(count($Package->packes)) + if(count($Package->packs)) { - $Package->packes()->detach(); + $Package->packs()->detach(); } $Package->delete(); return \MessageResponse::success(trans('messages.success')); diff --git a/app/Package.php b/app/Package.php index 43a0f411..4057dd76 100644 --- a/app/Package.php +++ b/app/Package.php @@ -15,7 +15,7 @@ class Package extends Model { return $this->belongsToMany('App\Item', 'item_package'); } - public function packes() + public function packs() { return $this->belongsToMany('App\Pack', 'pack_package'); } diff --git a/routes/api.php b/routes/api.php index a0e5efab..e043d08c 100644 --- a/routes/api.php +++ b/routes/api.php @@ -48,14 +48,14 @@ Route::middleware('auth:api')->group(function () { Route::resource('Items', 'ItemController'); Route::resource('Packages', 'PackageController'); - Route::resource('Packes', 'PackController'); + Route::resource('Packs', 'PackController'); Route::resource('Messages', 'MessageController'); Route::delete('Messages/User/{User}', 'MessageController@destroyUserMessages'); Route::post('/Package/Verify/{Package}', 'PackageController@verifyPackage'); Route::get('/GetItems', 'ItemController@getItems'); Route::get('/GetPackages', 'PackageController@getPackages'); - Route::get('/GetPackes', 'PackController@getPackes'); + Route::get('/GetPacks', 'PackController@getPacks'); Route::resource('Cycles', 'CycleController'); });