cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-13 19:01:06 +03:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/Saeid74/cssd

Browse Source
This commit is contained in:
Saeid
2019-09-08 19:15:25 +04:30
parent a665911d15 5cb3eb800d
commit dd24b7c6ac
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PackController.php
+5 -5
View File
@@ -10,7 +10,7 @@ class PackController extends Controller
{ {
public function index(Request $request) 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.'%'); $query->where('name', 'LIKE', '%'.$request->name.'%');
}) })
->when($request->has('sterilizer_id') && $request->sterilizer_id != '', function($query) use($request){ ->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.'%'); $query->where('department', 'LIKE', '%'.$request->department.'%');
}) })
->with('user')->paginate(10); ->with('user')->paginate(10);
return \MessageResponse::data($Packes); return \MessageResponse::data($Packs);
} }
public function create() public function create()
{ {
@@ -87,10 +87,10 @@ class PackController extends Controller
$Pack->delete(); $Pack->delete();
return \MessageResponse::success(trans('messages.success')); return \MessageResponse::success(trans('messages.success'));
} }
public function getPackes() public function getPacks()
{ {
$Packes = Pack::with('user')->get(); $Packs = Pack::with('user')->get();
return \MessageResponse::data($Packes); return \MessageResponse::data($Packs);
} }
} }
app/Http/Controllers/PackageController.php
+2 -2
View File
@@ -62,9 +62,9 @@ class PackageController extends Controller
{ {
$Package->items()->detach(); $Package->items()->detach();
} }
if(count($Package->packes)) if(count($Package->packs))
{ {
$Package->packes()->detach(); $Package->packs()->detach();
} }
$Package->delete(); $Package->delete();
return \MessageResponse::success(trans('messages.success')); return \MessageResponse::success(trans('messages.success'));
app/Package.php
+1 -1
View File
@@ -15,7 +15,7 @@ class Package extends Model
{ {
return $this->belongsToMany('App\Item', 'item_package'); return $this->belongsToMany('App\Item', 'item_package');
} }
public function packes() public function packs()
{ {
return $this->belongsToMany('App\Pack', 'pack_package'); return $this->belongsToMany('App\Pack', 'pack_package');
} }
routes/api.php
+2 -2
View File
@@ -48,14 +48,14 @@ Route::middleware('auth:api')->group(function () {
Route::resource('Items', 'ItemController'); Route::resource('Items', 'ItemController');
Route::resource('Packages', 'PackageController'); Route::resource('Packages', 'PackageController');
Route::resource('Packes', 'PackController'); Route::resource('Packs', 'PackController');
Route::resource('Messages', 'MessageController'); Route::resource('Messages', 'MessageController');
Route::delete('Messages/User/{User}', 'MessageController@destroyUserMessages'); Route::delete('Messages/User/{User}', 'MessageController@destroyUserMessages');
Route::post('/Package/Verify/{Package}', 'PackageController@verifyPackage'); Route::post('/Package/Verify/{Package}', 'PackageController@verifyPackage');
Route::get('/GetItems', 'ItemController@getItems'); Route::get('/GetItems', 'ItemController@getItems');
Route::get('/GetPackages', 'PackageController@getPackages'); Route::get('/GetPackages', 'PackageController@getPackages');
Route::get('/GetPackes', 'PackController@getPackes'); Route::get('/GetPacks', 'PackController@getPacks');
Route::resource('Cycles', 'CycleController'); Route::resource('Cycles', 'CycleController');
}); });