diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index 5d75ee0c..f46ec447 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -1,194 +1,194 @@
 <?php
 
-    namespace App\Http\Controllers;
+namespace App\Http\Controllers;
 
-    use App\Media;
-    use Illuminate\Http\Request;
-    use App\Http\Requests\StoreItemRequest;
-    use App\Item;
-    use Illuminate\Support\Facades\Storage;
+use App\Http\Requests\StoreItemRequest;
+use App\Item;
+use App\Media;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
 
-    class ItemController extends Controller
+class ItemController extends Controller
+{
+    public function index( Request $request )
     {
-        public function index( Request $request )
-        {
-            $user = auth( 'api' )->user();
+        $user = auth( 'api' )->user();
 
-            if ( $user->hasRole( 'User' ) ) {
-                return \MessageResponse::error( 'You dont have access to this section!' );
+        if ( $user->hasRole( 'User' ) ) {
+            return \MessageResponse::error( 'You dont have access to this section!' );
+        }
+
+        $Items = Item::when( $user->cant( 'showAll' , Item::class ) , function ( $query ) use ( $user ) {
+            if ( $user->hasRole( 'Supervisor' ) ) {
+                $query->whereHas( 'user' , function ( $query ) use ( $user ) {
+                    $query->where( 'medical_center_id' , $user->medical_center_id );
+                } );
             }
-
-            $Items = Item::when( $user->cant( 'showAll' , Item::class ) , function ( $query ) use ( $user ) {
-                if ( $user->hasRole( 'Supervisor' ) ) {
-                    $query->whereHas( 'user' , function ( $query ) use ( $user ) {
-                        $query->where( 'medical_center_id' , $user->medical_center_id );
-                    } );
-                }
+        } )
+            ->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
+                $query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
             } )
-                ->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
-                    $query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
-                } )
-                ->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
-                    $query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
-                } )
-                ->when( $request->has( 'size' ) && $request->size != '' , function ( $query ) use ( $request ) {
-                    $query->where( 'size' , $request->size );
-                } )
-                ->when( $request->has( 'item_id' ) && $request->item_id != '' , function ( $query ) use ( $request ) {
-                    $query->where( 'id' , $request->item_id );
-                } )
-                ->when( $request->has( 'specific' ) && $request->specific != '' , function ( $query ) use ( $request ) {
-                    $query->where( 'specific' , $request->specific );
-                } )
-                ->when( $request->has( 'medical_center_id' ) && $request->medical_center_id != '' && $request->medical_center_id != 'undefined' , function ( $query ) use ( $request ) {
-                    $query->whereHas( 'user' , function ( $query ) use ( $request ) {
-                        $query->where( 'medical_center_id' , $request->medical_center_id );
-                    } );
-                } )
-                ->with( [ 'user' => function ( $query ) {
-                    $query->select( 'id' , 'name' , 'medical_center_id' );
-                } ,
-                    'user.medical_center' => function ( $query ) {
-                        $query->select( 'id' , 'name' );
-                    } ] )
-                ->paginate( 10 );
-            return \MessageResponse::data( $Items );
-        }
-
-        public function create()
-        {
-
-        }
-
-        public function show( Item $Item )
-        {
-            $Item->load( [ 'user' => function ( $query ) {
+            ->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
+                $query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
+            } )
+            ->when( $request->has( 'size' ) && $request->size != '' , function ( $query ) use ( $request ) {
+                $query->where( 'size' , $request->size );
+            } )
+            ->when( $request->has( 'item_id' ) && $request->item_id != '' , function ( $query ) use ( $request ) {
+                $query->where( 'id' , $request->item_id );
+            } )
+            ->when( $request->has( 'specific' ) && $request->specific != '' , function ( $query ) use ( $request ) {
+                $query->where( 'specific' , $request->specific );
+            } )
+            ->when( $request->has( 'medical_center_id' ) && $request->medical_center_id != '' && $request->medical_center_id != 'undefined' , function ( $query ) use ( $request ) {
+                $query->whereHas( 'user' , function ( $query ) use ( $request ) {
+                    $query->where( 'medical_center_id' , $request->medical_center_id );
+                } );
+            } )
+            ->with( [ 'user' => function ( $query ) {
                 $query->select( 'id' , 'name' , 'medical_center_id' );
             } ,
                 'user.medical_center' => function ( $query ) {
                     $query->select( 'id' , 'name' );
-                } ] );
-
-            $FilesPath = [];
-            if ( count( $Item->files ) ) {
-                foreach ( $Item->files as $Key => $File ) {
-                    $FilesPath[] = $File->path;
-                }
-                $Item[ 'filesPath' ] = $FilesPath;
-            }
-
-            return \MessageResponse::data( $Item );
-        }
-
-        public function store( StoreItemRequest $request )
-        {
-            $ItemData = [
-                'name' => $request->name ,
-                'size' => $request->size ,
-                'unique_id' => $request->unique_id ,
-                'specific' => $request->specific ,
-                'note' => $request->note ,
-                'udi' => $request->udi ,
-                'user_id' => auth( 'api' )->user()->id ,
-            ];
-            $ItemObj = Item::create( $ItemData );
-
-            ///////////////////////////////////////////////////////////////////////////Images
-            $Images = Media::whereNull( 'model_id' )->where( 'batch_id' , $request->file_batch_id )->get();
-            if ( $Images ) {
-                foreach ( $Images as $Image ) {
-                    $NewPath = 'media' . '/Items' . '/' . $ItemObj->id . '/' . $Image->file_name;
-                    Storage::disk( 'public' )->makeDirectory( 'Items' . '/' . $ItemObj->id );
-                    if ( \File::exists( public_path( $Image->path ) ) ) {
-                        \File::move( public_path( $Image->path ) , public_path( $NewPath ) );
-                    }
-                    $Image->model_id = $ItemObj->id;
-                    $Image->path = $NewPath;
-                    $Image->save();
-                }
-            }
-            ///////////////////////////////////////////////////////////////////////////Images
-
-            return \MessageResponse::success( trans( 'messages.success' ) );
-        }
-
-        public function edit( Item $Item )
-        {
-            $FilesPath = [];
-            if ( count( $Item->files ) ) {
-                foreach ( $Item->files as $Key => $file ) {
-                    $FilesPath[] = $file;
-                }
-                $Item[ 'filesPath' ] = $FilesPath;
-            } else {
-                $Item[ 'filesPath' ] = [];
-            }
-            return \MessageResponse::data( $Item );
-        }
-
-        public function update( StoreItemRequest $request , Item $Item )
-        {
-            $Item->update( $request->all() );
-            return \MessageResponse::success( trans( 'messages.success' ) );
-        }
-
-        public function destroy( Item $Item )
-        {
-            if ( ! auth( 'api' )->user()->can( 'delete' , $Item ) ) {
-                return \MessageResponse::error( trans( 'messages.access_denied' ) );
-            }
-            if ( count( $Item->packages ) ) {
-                $Item->packages()->detach();
-            }
-            $Item->delete();
-            return \MessageResponse::success( trans( 'messages.success' ) );
-        }
-
-        public function getItems()
-        {
-
-            $user = auth( 'api' )->user();
-
-            if ( $user->hasRole( 'User' ) ) {
-                return \MessageResponse::data( [] );
-            }
-
-            $Items = Item::when( $user->cant( 'showAll' , Item::class ) , function ( $query ) use ( $user ) {
-                if ( $user->hasRole( 'Supervisor' ) ) {
-                    $query->whereHas( 'user' , function ( $query ) use ( $user ) {
-                        $query->where( 'medical_center_id' , $user->medical_center_id );
-                    } );
-                }
-            } )
-                ->with( [ 'user' => function ( $query ) {
-                    $query->select( 'id' , 'name' , 'medical_center_id' );
-                } ,
-                    'user.medical_center' => function ( $query ) {
-                        $query->select( 'id' , 'name' );
-                    } ] )
-                ->get();
-
-            return \MessageResponse::data( $Items );
-        }
-
-        public function showItem( Item $Item )
-        {
-            $Item->load( [ 'user' => function ( $query ) {
-                $query->select( 'id' , 'name' , 'medical_center_id' );
-            } ,
-                'user.medical_center' => function ( $query ) {
-                    $query->select( 'id' , 'name' );
-                } ] );
-            return \MessageResponse::data( $Item );
-        }
-
-        public function changeStatus( Item $Item )
-        {
-            if ( auth( 'api' )->user()->cant( 'changeStatus' , Item::class ) ) {
-                return \MessageResponse::error( trans( 'messages.access_denied' ) );
-            }
-            $Item->status = ! $Item->status;
-            $Item->save();
-            return \MessageResponse::data( $Item );
-        }
+                } ] )
+            ->paginate( 10 );
+        return \MessageResponse::data( $Items );
     }
+
+    public function create()
+    {
+
+    }
+
+    public function show( Item $Item )
+    {
+        $Item->load( [ 'user' => function ( $query ) {
+            $query->select( 'id' , 'name' , 'medical_center_id' );
+        } ,
+            'user.medical_center' => function ( $query ) {
+                $query->select( 'id' , 'name' );
+            } ] );
+
+        $FilesPath = [];
+        if ( count( $Item->files ) ) {
+            foreach ( $Item->files as $Key => $File ) {
+                $FilesPath[] = $File->path;
+            }
+            $Item[ 'filesPath' ] = $FilesPath;
+        }
+
+        return \MessageResponse::data( $Item );
+    }
+
+    public function store( StoreItemRequest $request )
+    {
+        $ItemData = [
+            'name' => $request->name ,
+            'size' => $request->size ,
+            'unique_id' => $request->unique_id ,
+            'specific' => $request->specific ,
+            'note' => $request->note ,
+            'udi' => $request->udi ,
+            'user_id' => auth( 'api' )->user()->id ,
+        ];
+        $ItemObj = Item::create( $ItemData );
+
+        ///////////////////////////////////////////////////////////////////////////Images
+        $Images = Media::whereNull( 'model_id' )->where( 'batch_id' , $request->file_batch_id )->get();
+        if ( $Images ) {
+            foreach ( $Images as $Image ) {
+                $NewPath = 'media' . '/Items' . '/' . $ItemObj->id . '/' . $Image->file_name;
+                Storage::disk( 'public' )->makeDirectory( 'Items' . '/' . $ItemObj->id );
+                if ( \File::exists( public_path( $Image->path ) ) ) {
+                    \File::move( public_path( $Image->path ) , public_path( $NewPath ) );
+                }
+                $Image->model_id = $ItemObj->id;
+                $Image->path = $NewPath;
+                $Image->save();
+            }
+        }
+        ///////////////////////////////////////////////////////////////////////////Images
+
+        return \MessageResponse::success( trans( 'messages.success' ) );
+    }
+
+    public function edit( Item $Item )
+    {
+        $FilesPath = [];
+        if ( count( $Item->files ) ) {
+            foreach ( $Item->files as $Key => $file ) {
+                $FilesPath[] = $file;
+            }
+            $Item[ 'filesPath' ] = $FilesPath;
+        } else {
+            $Item[ 'filesPath' ] = [];
+        }
+        return \MessageResponse::data( $Item );
+    }
+
+    public function update( StoreItemRequest $request , Item $Item )
+    {
+        $Item->update( $request->all() );
+        return \MessageResponse::success( trans( 'messages.success' ) );
+    }
+
+    public function destroy( Item $Item )
+    {
+        if ( ! auth( 'api' )->user()->can( 'delete' , $Item ) ) {
+            return \MessageResponse::error( trans( 'messages.access_denied' ) );
+        }
+        if ( count( $Item->packages ) ) {
+            $Item->packages()->detach();
+        }
+        $Item->delete();
+        return \MessageResponse::success( trans( 'messages.success' ) );
+    }
+
+    public function getItems()
+    {
+
+        $user = auth( 'api' )->user();
+
+        if ( $user->hasRole( 'User' ) ) {
+            return \MessageResponse::data( [] );
+        }
+
+        $Items = Item::when( $user->cant( 'showAll' , Item::class ) , function ( $query ) use ( $user ) {
+            if ( $user->hasRole( 'Supervisor' ) ) {
+                $query->whereHas( 'user' , function ( $query ) use ( $user ) {
+                    $query->where( 'medical_center_id' , $user->medical_center_id );
+                } );
+            }
+        } )
+            ->with( [ 'user' => function ( $query ) {
+                $query->select( 'id' , 'name' , 'medical_center_id' );
+            } ,
+                'user.medical_center' => function ( $query ) {
+                    $query->select( 'id' , 'name' );
+                } ] )
+            ->get();
+
+        return \MessageResponse::data( $Items );
+    }
+
+    public function showItem( Item $Item )
+    {
+        $Item->load( [ 'user' => function ( $query ) {
+            $query->select( 'id' , 'name' , 'medical_center_id' );
+        } ,
+            'user.medical_center' => function ( $query ) {
+                $query->select( 'id' , 'name' );
+            } ] );
+        return \MessageResponse::data( $Item );
+    }
+
+    public function changeStatus( Item $Item )
+    {
+        if ( auth( 'api' )->user()->cant( 'changeStatus' , Item::class ) ) {
+            return \MessageResponse::error( trans( 'messages.access_denied' ) );
+        }
+        $Item->status = ! $Item->status;
+        $Item->save();
+        return \MessageResponse::data( $Item );
+    }
+}
diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php
index 99318a52..d7b73c0a 100644
--- a/app/Http/Controllers/PackageController.php
+++ b/app/Http/Controllers/PackageController.php
@@ -1,199 +1,196 @@
 <?php
 
-    namespace App\Http\Controllers;
+namespace App\Http\Controllers;
 
-    use Illuminate\Http\Request;
-    use App\Http\Requests\StorePackageRequest;
-    use App\Package;
-    use App\User;
+use App\Http\Requests\StorePackageRequest;
+use App\Package;
+use Illuminate\Http\Request;
 
-    class PackageController extends Controller
+class PackageController extends Controller
+{
+    public function index( Request $request )
     {
-        public function index( Request $request )
-        {
-            $user = auth( 'api' )->user();
+        $user = auth( 'api' )->user();
 
-            if ( $user->hasRole( 'User' ) ) {
-                return \MessageResponse::error( 'You dont have access to this section!' );
+        if ( $user->hasRole( 'User' ) ) {
+            return \MessageResponse::error( 'You dont have access to this section!' );
+        }
+
+        $Packages = Package::when( $user->cant( 'showAll' , Package::class ) , function ( $query ) use ( $user ) {
+            if ( $user->hasRole( 'Supervisor' ) ) {
+                $query->whereHas( 'user' , function ( $query ) use ( $user ) {
+                    $query->where( 'medical_center_id' , $user->medical_center_id );
+                } );
             }
-
-            $Packages = Package::
-            when( $user->cant( 'showAll' , Package::class ) , function ( $query ) use ( $user ) {
-                if ( $user->hasRole( 'Supervisor' ) ) {
-                    $query->whereHas( 'user' , function ( $query ) use ( $user ) {
-                        $query->where( 'medical_center_id' , $user->medical_center_id );
-                    } );
-                }
+        } )
+            ->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
+                $query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
             } )
-                ->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
-                    $query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
-                } )
-                ->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
-                    $query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
-                } )
-                ->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) {
-                    $query->where( 'id' , $request->package_id );
-                } )
-                ->when( $request->has( 'medical_center_id' ) && $request->medical_center_id != '' && $request->medical_center_id != 'undefined' , function ( $query ) use ( $request ) {
-                    $query->whereHas( 'user' , function ( $query ) use ( $request ) {
-                        $query->where( 'medical_center_id' , $request->medical_center_id );
-                    } );
-                } )
-                ->with( [ 'user' => function ( $query ) {
-                    $query->select( 'id' , 'name' , 'medical_center_id' );
-                } ,
-                    'user.medical_center' => function ( $query ) {
-                        $query->select( 'id' , 'name' );
-                    } ] )->orderByDesc( 'id' )->paginate( 10 );
-
-            return \MessageResponse::data( $Packages );
-        }
-
-        public function create()
-        {
-
-        }
-
-        public function show( Package $Package )
-        {
-            $Package->load( [ 'user' => function ( $query ) {
+            ->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
+                $query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
+            } )
+            ->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) {
+                $query->where( 'id' , $request->package_id );
+            } )
+            ->when( $request->has( 'medical_center_id' ) && $request->medical_center_id != '' && $request->medical_center_id != 'undefined' , function ( $query ) use ( $request ) {
+                $query->whereHas( 'user' , function ( $query ) use ( $request ) {
+                    $query->where( 'medical_center_id' , $request->medical_center_id );
+                } );
+            } )
+            ->with( [ 'user' => function ( $query ) {
                 $query->select( 'id' , 'name' , 'medical_center_id' );
             } ,
                 'user.medical_center' => function ( $query ) {
                     $query->select( 'id' , 'name' );
-                } ,
-                'items' ] );
-            return \MessageResponse::data( $Package );
-        }
+                } ] )->orderByDesc( 'id' )->paginate( 10 );
 
-        public function store( StorePackageRequest $request )
-        {
-            // $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
-            $PackageData = [
-                'name' => $request->name ,
-                'unique_id' => $request->unique_id ,
-                'note' => $request->note ,
-                'udi' => $request->udi ,
-                'user_id' => auth( 'api' )->user()->id ,
-                'verified' => 'NotVerified' ,
-            ];
-            $PackageObj = Package::create( $PackageData );
-            $Items = [];
-            $count = 1;
-            foreach ( $request->items as $key => $item ) {
-                if ( array_key_exists( $item[ 'id' ] , $Items ) ) {
-                    $preCount = $Items[ $item[ 'id' ] ];
-                    $Items[ $item[ 'id' ] ] = $preCount + 1;
-                } else {
-                    $Items[ $item[ 'id' ] ] = $count;
-                }
-            }
-
-            foreach ( $Items as $Item => $Count ) {
-                $PackageObj->items()->attach( array( $Item ) , [ 'count' => $Count ] );
-            }
-            return \MessageResponse::success( trans( 'messages.success' ) );
-        }
-
-        public function edit( Package $Package )
-        {
-            $Items = [];
-            $Package->load( 'items' );
-            foreach ( $Package->items as $item ) {
-                for ( $i = 0 ; $i < $item->pivot->count ; $i++ ) {
-                    $Items[] = (object) array( 'id' => $item->id , 'name' => $item->name );
-                }
-            }
-            unset( $Package->items );
-            $Package->items = $Items;
-            return \MessageResponse::data( $Package );
-        }
-
-        public function update( StorePackageRequest $request , Package $Package )
-        {
-            $Package->update( $request->except( [ 'items' ] ) );
-            $Items = [];
-            $count = 1;
-            foreach ( $request->items as $key => $item ) {
-                if ( array_key_exists( $item[ 'id' ] , $Items ) ) {
-                    $preCount = $Items[ $item[ 'id' ] ];
-                    $Items[ $item[ 'id' ] ] = $preCount + 1;
-                } else {
-                    $Items[ $item[ 'id' ] ] = $count;
-                }
-            }
-
-            $Package->items()->detach();
-
-            foreach ( $Items as $Item => $Count ) {
-                $Package->items()->attach( array( $Item ) , [ 'count' => $Count ] );
-            }
-
-            return \MessageResponse::success( trans( 'messages.success' ) );
-        }
-
-        public function destroy( Package $Package )
-        {
-            if ( auth( 'api' )->user()->cant( 'delete' , $Package ) ) {
-                return \MessageResponse::error( trans( 'messages.access_denied' ) );
-            }
-            if ( count( $Package->items ) ) {
-                $Package->items()->detach();
-            }
-            if ( count( $Package->labels ) ) {
-                $Package->labels()->delete();
-            }
-            $Package->delete();
-            return \MessageResponse::success( trans( 'messages.success' ) );
-        }
-
-        public function verifyPackage( Package $Package )
-        {
-            if ( auth( 'api' )->user()->cant( 'verifyPackage' , $Package ) ) {
-                return \MessageResponse::error( trans( 'You dont have permission' ) );
-            }
-            if ( $Package->verified == 'Verified' ) {
-                $Package->verified = 'NotVerified';
-            } else {
-                $Package->verified = 'Verified';
-            }
-            $Package->save();
-            $Package = $Package->load( 'user' );
-            return \MessageResponse::success( trans( 'messages.success' ) , null , $Package );
-        }
-
-        public function getPackages()
-        {
-            $user = auth( 'api' )->user();
-
-            $Packages = Package::
-            when( $user->cant( 'showAll' , Package::class ) , function ( $query ) use ( $user ) {
-                if ( $user->hasRole( 'Supervisor|User' ) ) {
-                    $query->whereHas( 'user' , function ( $query ) use ( $user ) {
-                        $query->where( 'medical_center_id' , $user->medical_center_id );
-                    } );
-                }
-            } )
-                ->with( [ 'user' => function ( $query ) {
-                    $query->select( 'id' , 'name' , 'medical_center_id' );
-                } ,
-                    'user.medical_center' => function ( $query ) {
-                        $query->select( 'id' , 'name' );
-                    } ] )->get();
-
-            return \MessageResponse::data( $Packages );
-
-        }
-
-        public function showPackage( Package $Package )
-        {
-            $Package->load( [ 'user' => function ( $query ) {
-                $query->select( 'id' , 'name' , 'medical_center_id' );
-            } ,
-                'user.medical_center' => function ( $query ) {
-                    $query->select( 'id' , 'name' );
-                } ,
-                'items' ] );
-            return \MessageResponse::data( $Package );
-        }
+        return \MessageResponse::data( $Packages );
     }
+
+    public function create()
+    {
+
+    }
+
+    public function show( Package $Package )
+    {
+        $Package->load( [ 'user' => function ( $query ) {
+            $query->select( 'id' , 'name' , 'medical_center_id' );
+        } ,
+            'user.medical_center' => function ( $query ) {
+                $query->select( 'id' , 'name' );
+            } ,
+            'items' ] );
+        return \MessageResponse::data( $Package );
+    }
+
+    public function store( StorePackageRequest $request )
+    {
+        $PackageData = [
+            'name' => $request->name ,
+            'unique_id' => $request->unique_id ,
+            'note' => $request->note ,
+            'udi' => $request->udi ,
+            'user_id' => auth( 'api' )->user()->id ,
+            'verified' => 'NotVerified' ,
+        ];
+        $PackageObj = Package::create( $PackageData );
+        $Items = [];
+        $count = 1;
+        foreach ( $request->items as $key => $item ) {
+            if ( array_key_exists( $item[ 'id' ] , $Items ) ) {
+                $preCount = $Items[ $item[ 'id' ] ];
+                $Items[ $item[ 'id' ] ] = $preCount + 1;
+            } else {
+                $Items[ $item[ 'id' ] ] = $count;
+            }
+        }
+
+        foreach ( $Items as $Item => $Count ) {
+            $PackageObj->items()->attach( array( $Item ) , [ 'count' => $Count ] );
+        }
+        return \MessageResponse::success( trans( 'messages.success' ) );
+    }
+
+    public function edit( Package $Package )
+    {
+        $Items = [];
+        $Package->load( 'items' );
+        foreach ( $Package->items as $item ) {
+            for ( $i = 0 ; $i < $item->pivot->count ; $i++ ) {
+                $Items[] = (object) array( 'id' => $item->id , 'name' => $item->name );
+            }
+        }
+        unset( $Package->items );
+        $Package->items = $Items;
+        return \MessageResponse::data( $Package );
+    }
+
+    public function update( StorePackageRequest $request , Package $Package )
+    {
+        $Package->update( $request->except( [ 'items' ] ) );
+        $Items = [];
+        $count = 1;
+        foreach ( $request->items as $key => $item ) {
+            if ( array_key_exists( $item[ 'id' ] , $Items ) ) {
+                $preCount = $Items[ $item[ 'id' ] ];
+                $Items[ $item[ 'id' ] ] = $preCount + 1;
+            } else {
+                $Items[ $item[ 'id' ] ] = $count;
+            }
+        }
+
+        $Package->items()->detach();
+
+        foreach ( $Items as $Item => $Count ) {
+            $Package->items()->attach( array( $Item ) , [ 'count' => $Count ] );
+        }
+
+        return \MessageResponse::success( trans( 'messages.success' ) );
+    }
+
+    public function destroy( Package $Package )
+    {
+        if ( auth( 'api' )->user()->cant( 'delete' , $Package ) ) {
+            return \MessageResponse::error( trans( 'messages.access_denied' ) );
+        }
+        if ( count( $Package->items ) ) {
+            $Package->items()->detach();
+        }
+        if ( count( $Package->labels ) ) {
+            $Package->labels()->delete();
+        }
+        $Package->delete();
+        return \MessageResponse::success( trans( 'messages.success' ) );
+    }
+
+    public function verifyPackage( Package $Package )
+    {
+        if ( auth( 'api' )->user()->cant( 'verifyPackage' , $Package ) ) {
+            return \MessageResponse::error( trans( 'You dont have permission' ) );
+        }
+        if ( $Package->verified == 'Verified' ) {
+            $Package->verified = 'NotVerified';
+        } else {
+            $Package->verified = 'Verified';
+        }
+        $Package->save();
+        $Package = $Package->load( 'user' );
+        return \MessageResponse::success( trans( 'messages.success' ) , null , $Package );
+    }
+
+    public function getPackages()
+    {
+        $user = auth( 'api' )->user();
+
+        $Packages = Package::
+        when( $user->cant( 'showAll' , Package::class ) , function ( $query ) use ( $user ) {
+            if ( $user->hasRole( 'Supervisor|User' ) ) {
+                $query->whereHas( 'user' , function ( $query ) use ( $user ) {
+                    $query->where( 'medical_center_id' , $user->medical_center_id );
+                } );
+            }
+        } )
+            ->with( [ 'user' => function ( $query ) {
+                $query->select( 'id' , 'name' , 'medical_center_id' );
+            } ,
+                'user.medical_center' => function ( $query ) {
+                    $query->select( 'id' , 'name' );
+                } ] )->get();
+
+        return \MessageResponse::data( $Packages );
+
+    }
+
+    public function showPackage( Package $Package )
+    {
+        $Package->load( [ 'user' => function ( $query ) {
+            $query->select( 'id' , 'name' , 'medical_center_id' );
+        } ,
+            'user.medical_center' => function ( $query ) {
+                $query->select( 'id' , 'name' );
+            } ,
+            'items' ] );
+        return \MessageResponse::data( $Package );
+    }
+}
diff --git a/app/Http/Requests/StoreItemRequest.php b/app/Http/Requests/StoreItemRequest.php
index 12762bfb..70039e73 100644
--- a/app/Http/Requests/StoreItemRequest.php
+++ b/app/Http/Requests/StoreItemRequest.php
@@ -3,10 +3,7 @@
 namespace App\Http\Requests;
 
 use App\Item;
-use Illuminate\Validation\Rule;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Contracts\Validation\Validator;
-
 
 class StoreItemRequest extends FormRequest
 {
diff --git a/app/Http/Requests/StorePackageRequest.php b/app/Http/Requests/StorePackageRequest.php
index 5c586884..5caacd6d 100644
--- a/app/Http/Requests/StorePackageRequest.php
+++ b/app/Http/Requests/StorePackageRequest.php
@@ -3,10 +3,7 @@
 namespace App\Http\Requests;
 
 use App\Package;
-use Illuminate\Validation\Rule;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Contracts\Validation\Validator;
-
 
 class StorePackageRequest extends FormRequest
 {
@@ -41,7 +38,7 @@ class StorePackageRequest extends FormRequest
                     'unique_id' => 'nullable|max:250|unique:packages,unique_id,'.$Package->id,
                     'note' => 'nullable',
                     'items' => 'required',
-                    'udi' => 'required|max:100|unique:packages',
+                    'udi' => 'required|max:100|unique:packages,udi,'.$Package->id,
                 ];
                 break;