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

fix uid

Browse Source
This commit is contained in:
mahdi purHosseini
2023-09-19 11:20:03 +03:30
parent 95e534908a
commit d7e0e54b52
8 changed files with 12 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ItemController.php
+3 -3
View File
@@ -29,8 +29,8 @@
->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) { ->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( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) { ->when( $request->has( 'uid' ) && $request->uid != '' , function ( $query ) use ( $request ) {
$query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' ); $query->where( 'uid' , 'LIKE' , '%' . $request->uid . '%' );
} ) } )
->when( $request->has( 'size' ) && $request->size != '' , function ( $query ) use ( $request ) { ->when( $request->has( 'size' ) && $request->size != '' , function ( $query ) use ( $request ) {
$query->where( 'size' , $request->size ); $query->where( 'size' , $request->size );
@@ -89,7 +89,7 @@
'unique_id' => $request->unique_id , 'unique_id' => $request->unique_id ,
'specific' => $request->specific , 'specific' => $request->specific ,
'note' => $request->note , 'note' => $request->note ,
'udi' => $request->udi , 'uid' => $request->uid ,
'user_id' => auth( 'api' )->user()->id , 'user_id' => auth( 'api' )->user()->id ,
]; ];
$ItemObj = Item::create( $ItemData ); $ItemObj = Item::create( $ItemData );
app/Http/Controllers/PackageController.php
+3 -3
View File
@@ -28,8 +28,8 @@
->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) { ->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( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) { ->when( $request->has( 'uid' ) && $request->uid != '' , function ( $query ) use ( $request ) {
$query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' ); $query->where( 'uid' , 'LIKE' , '%' . $request->uid . '%' );
} ) } )
->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) { ->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) {
$query->where( 'id' , $request->package_id ); $query->where( 'id' , $request->package_id );
@@ -73,7 +73,7 @@
'name' => $request->name , 'name' => $request->name ,
'unique_id' => $request->unique_id , 'unique_id' => $request->unique_id ,
'note' => $request->note , 'note' => $request->note ,
'udi' => $request->udi , 'uid' => $request->uid ,
'user_id' => auth( 'api' )->user()->id , 'user_id' => auth( 'api' )->user()->id ,
'verified' => 'NotVerified' , 'verified' => 'NotVerified' ,
]; ];
app/Http/Requests/StoreItemRequest.php
+2 -2
View File
@@ -30,7 +30,7 @@ class StoreItemRequest extends FormRequest
'size' => 'required', 'size' => 'required',
'specific' => 'required', 'specific' => 'required',
'note' => 'nullable', 'note' => 'nullable',
'udi' => 'required|max:100|unique:items', 'uid' => 'required|max:100|unique:items',
]; ];
break; break;
} }
@@ -43,7 +43,7 @@ class StoreItemRequest extends FormRequest
'size' => 'required', 'size' => 'required',
'specific' => 'required', 'specific' => 'required',
'note' => 'nullable', 'note' => 'nullable',
'udi' => 'required|max:100|unique:items,udi,'.$Item->id, 'uid' => 'required|max:100|unique:items,uid,'.$Item->id,
]; ];
break; break;
} }
app/Http/Requests/StorePackageRequest.php
+2 -2
View File
@@ -29,7 +29,7 @@ class StorePackageRequest extends FormRequest
'unique_id' => 'nullable|max:250|unique:packages', 'unique_id' => 'nullable|max:250|unique:packages',
'note' => 'nullable', 'note' => 'nullable',
'items' => 'required', 'items' => 'required',
'udi' => 'required|max:100|unique:packages', 'uid' => 'required|max:100|unique:packages',
]; ];
break; break;
} }
@@ -41,7 +41,7 @@ class StorePackageRequest extends FormRequest
'unique_id' => 'nullable|max:250|unique:packages,unique_id,'.$Package->id, 'unique_id' => 'nullable|max:250|unique:packages,unique_id,'.$Package->id,
'note' => 'nullable', 'note' => 'nullable',
'items' => 'required', 'items' => 'required',
'udi' => 'required|max:100|unique:packages', 'uid' => 'required|max:100|unique:packages',
]; ];
break; break;
app/Item.php
+1 -1
View File
@@ -6,7 +6,7 @@
class Item extends Model 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() public function packages()
{ {
app/Package.php
+1 -1
View File
@@ -6,7 +6,7 @@
class Package extends Model 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() public function user()
{ {
database/migrations/2023_08_27_124700_update_items_table.php
-34
View File
@@ -1,34 +0,0 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class UpdateItemsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('items', function (Blueprint $table) {
$table->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');
});
}
}
database/migrations/2023_08_27_124945_update_packages_table.php
-32
View File
@@ -1,32 +0,0 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class UpdatePackagesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('packages', function (Blueprint $table) {
$table->string('uid')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('packages', function (Blueprint $table) {
$table->dropColumn('uid');
});
}
}