mirror of
https://git.meshkee.com/cssd/cssd-back.git
synced 2026-10-11 20:51:06 +03:30
fix some problems in pdf
This commit is contained in:
@@ -52,6 +52,7 @@ class ItemController extends Controller
|
||||
$query->select( 'id' , 'name' );
|
||||
}
|
||||
] )
|
||||
->orderByDesc( 'id' )
|
||||
->paginate( 10 );
|
||||
return \MessageResponse::data( $Items );
|
||||
}
|
||||
@@ -141,7 +142,7 @@ class ItemController extends Controller
|
||||
|
||||
public function destroy( Item $Item )
|
||||
{
|
||||
if ( ! auth( 'api' )->user()->can( 'delete' , Item::class ) ) {
|
||||
if ( ! auth( 'api' )->user()->can( 'delete' , $Item ) ) {
|
||||
return \MessageResponse::error( trans( 'messages.access_denied' ) );
|
||||
}
|
||||
if ( count( $Item->packages ) ) {
|
||||
@@ -179,6 +180,7 @@ class ItemController extends Controller
|
||||
} ] );
|
||||
}
|
||||
] )
|
||||
->orderByDesc( 'id' )
|
||||
->get();
|
||||
return \MessageResponse::data( $Items );
|
||||
}
|
||||
|
||||
@@ -39,7 +39,9 @@ class PackageController extends Controller
|
||||
} ,
|
||||
'user.medical_center' => function ( $query ) {
|
||||
$query->select( 'id' , 'name' );
|
||||
} ] )->orderByDesc( 'id' )->paginate( 10 );
|
||||
} ] )
|
||||
->orderByDesc( 'id' )
|
||||
->paginate( 10 );
|
||||
|
||||
return \MessageResponse::data( $Packages );
|
||||
}
|
||||
@@ -169,7 +171,9 @@ class PackageController extends Controller
|
||||
} ,
|
||||
'user.medical_center' => function ( $query ) {
|
||||
$query->select( 'id' , 'name' );
|
||||
} ] )->get();
|
||||
} ] )
|
||||
->orderByDesc( 'id' )
|
||||
->get();
|
||||
|
||||
return \MessageResponse::data( $Packages );
|
||||
|
||||
|
||||
@@ -99,7 +99,9 @@ class TransferItemController extends Controller
|
||||
$query->select( 'id' , 'name' , 'medical_center_id' );
|
||||
} ] );
|
||||
}
|
||||
] )->get();
|
||||
] )
|
||||
->orderByDesc( 'id' )
|
||||
->paginate( 10 );
|
||||
return \MessageResponse::data( $data );
|
||||
}
|
||||
|
||||
@@ -133,7 +135,8 @@ class TransferItemController extends Controller
|
||||
} ] );
|
||||
}
|
||||
] )
|
||||
->get();
|
||||
->orderByDesc( 'id' )
|
||||
->paginate( 10 );
|
||||
return \MessageResponse::data( $data );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ class StoreItemRequest extends FormRequest
|
||||
switch ($this->method()) {
|
||||
case 'POST': {
|
||||
return [
|
||||
'name' => 'required|max:100|unique:items',
|
||||
'name' => 'required|max:100',
|
||||
'unique_id' => 'nullable|max:100|unique:items',
|
||||
'size' => 'required',
|
||||
'specific' => 'required',
|
||||
@@ -35,7 +35,7 @@ class StoreItemRequest extends FormRequest
|
||||
case 'PATCH': {
|
||||
$Item = $this->route('Item');
|
||||
return [
|
||||
'name' => 'required|max:100|unique:items,name,'.$Item->id,
|
||||
'name' => 'required|max:100',
|
||||
'unique_id' => 'nullable|max:100|unique:items,unique_id,'.$Item->id,
|
||||
'size' => 'required',
|
||||
'specific' => 'required',
|
||||
|
||||
@@ -25,8 +25,8 @@ class StoreLabelRequest extends FormRequest
|
||||
switch ($this->method()) {
|
||||
case 'POST': {
|
||||
return [
|
||||
'sterile_date' => 'required',
|
||||
'expire_date' => 'required',
|
||||
'sterile_date' => 'required|date',
|
||||
'expire_date' => 'required|date',
|
||||
'sterilizer_id' => 'required',
|
||||
'cycle_number' => 'required',
|
||||
'lot_number' => 'required',
|
||||
|
||||
Reference in New Issue
Block a user