diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 6daff170..a9bd5f22 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -29,8 +29,8 @@ ->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( 'uid' ) && $request->uid != '' , function ( $query ) use ( $request ) { + $query->where( 'uid' , 'LIKE' , '%' . $request->uid . '%' ); } ) ->when( $request->has( 'size' ) && $request->size != '' , function ( $query ) use ( $request ) { $query->where( 'size' , $request->size ); @@ -89,7 +89,7 @@ 'unique_id' => $request->unique_id , 'specific' => $request->specific , 'note' => $request->note , - 'udi' => $request->udi , + 'uid' => $request->uid , 'user_id' => auth( 'api' )->user()->id , ]; $ItemObj = Item::create( $ItemData ); diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php index 99318a52..38afbe00 100644 --- a/app/Http/Controllers/PackageController.php +++ b/app/Http/Controllers/PackageController.php @@ -28,8 +28,8 @@ ->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( 'uid' ) && $request->uid != '' , function ( $query ) use ( $request ) { + $query->where( 'uid' , 'LIKE' , '%' . $request->uid . '%' ); } ) ->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) { $query->where( 'id' , $request->package_id ); @@ -73,7 +73,7 @@ 'name' => $request->name , 'unique_id' => $request->unique_id , 'note' => $request->note , - 'udi' => $request->udi , + 'uid' => $request->uid , 'user_id' => auth( 'api' )->user()->id , 'verified' => 'NotVerified' , ]; diff --git a/app/Http/Requests/StoreItemRequest.php b/app/Http/Requests/StoreItemRequest.php index 12762bfb..5d18352b 100644 --- a/app/Http/Requests/StoreItemRequest.php +++ b/app/Http/Requests/StoreItemRequest.php @@ -30,7 +30,7 @@ class StoreItemRequest extends FormRequest 'size' => 'required', 'specific' => 'required', 'note' => 'nullable', - 'udi' => 'required|max:100|unique:items', + 'uid' => 'required|max:100|unique:items', ]; break; } @@ -43,7 +43,7 @@ class StoreItemRequest extends FormRequest 'size' => 'required', 'specific' => 'required', 'note' => 'nullable', - 'udi' => 'required|max:100|unique:items,udi,'.$Item->id, + 'uid' => 'required|max:100|unique:items,uid,'.$Item->id, ]; break; } diff --git a/app/Http/Requests/StorePackageRequest.php b/app/Http/Requests/StorePackageRequest.php index 5c586884..01583094 100644 --- a/app/Http/Requests/StorePackageRequest.php +++ b/app/Http/Requests/StorePackageRequest.php @@ -29,7 +29,7 @@ class StorePackageRequest extends FormRequest 'unique_id' => 'nullable|max:250|unique:packages', 'note' => 'nullable', 'items' => 'required', - 'udi' => 'required|max:100|unique:packages', + 'uid' => 'required|max:100|unique:packages', ]; break; } @@ -41,7 +41,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', + 'uid' => 'required|max:100|unique:packages', ]; break; diff --git a/app/Item.php b/app/Item.php index f56cf7fa..6fd9f5b9 100644 --- a/app/Item.php +++ b/app/Item.php @@ -6,7 +6,7 @@ class Item extends Model { - public $fillable = [ 'name' , 'size' , 'unique_id' , 'specific' , 'note' , 'user_id' , 'udi' , 'status' ]; + public $fillable = [ 'name' , 'size' , 'unique_id' , 'specific' , 'note' , 'user_id' , 'uid' , 'status' ]; public function packages() { diff --git a/app/Package.php b/app/Package.php index 66688ce4..38538704 100644 --- a/app/Package.php +++ b/app/Package.php @@ -6,7 +6,7 @@ class Package extends Model { - public $fillable = [ 'name' , 'unique_id' , 'user_id' , 'note' , 'verified' , 'udi' ]; + public $fillable = [ 'name' , 'unique_id' , 'user_id' , 'note' , 'verified' , 'uid' ]; public function user() { diff --git a/database/migrations/2023_08_27_124700_update_items_table.php b/database/migrations/2023_08_27_124700_update_items_table.php deleted file mode 100644 index 9c16c4a8..00000000 --- a/database/migrations/2023_08_27_124700_update_items_table.php +++ /dev/null @@ -1,34 +0,0 @@ -string('udi')->nullable(); - $table->tinyInteger('status')->default(0); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('items', function (Blueprint $table) { - $table->dropColumn('udi'); - $table->dropColumn('status'); - }); - } -} diff --git a/database/migrations/2023_08_27_124945_update_packages_table.php b/database/migrations/2023_08_27_124945_update_packages_table.php deleted file mode 100644 index 69bffc4e..00000000 --- a/database/migrations/2023_08_27_124945_update_packages_table.php +++ /dev/null @@ -1,32 +0,0 @@ -string('uid')->nullable(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('packages', function (Blueprint $table) { - $table->dropColumn('uid'); - }); - } -}