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

fix pachage fields

Browse Source
This commit is contained in:
mahdi purHosseini
2023-11-09 13:27:03 +03:30
parent 4c3b7793c0
commit 0269f24ac4
5 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PackageController.php
-5
View File
@@ -26,9 +26,6 @@ class PackageController extends Controller
->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 );
} )
@@ -66,9 +63,7 @@ class PackageController extends Controller
{
$PackageData = [
'name' => $request->name ,
'unique_id' => $request->unique_id ,
'note' => $request->note ,
'udi' => $request->udi ,
'user_id' => auth( 'api' )->user()->id ,
'verified' => 'NotVerified' ,
];
app/Http/Controllers/TransferPackageController.php
-6
View File
@@ -80,9 +80,6 @@ class TransferPackageController extends Controller
->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 );
} )
@@ -108,9 +105,6 @@ class TransferPackageController extends Controller
->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 );
} )
app/Http/Requests/StorePackageRequest.php
-4
View File
@@ -23,10 +23,8 @@ class StorePackageRequest extends FormRequest
case 'POST': {
return [
'name' => 'required|max:250|unique:packages',
'unique_id' => 'nullable|max:250|unique:packages',
'note' => 'nullable',
'items' => 'required',
'udi' => 'required|max:100|unique:packages',
];
break;
}
@@ -35,10 +33,8 @@ class StorePackageRequest extends FormRequest
$Package = $this->route('Package');
return [
'name' => 'required|max:250|unique:packages,name,'.$Package->id,
'unique_id' => 'nullable|max:250|unique:packages,unique_id,'.$Package->id,
'note' => 'nullable',
'items' => 'required',
'udi' => 'required|max:100|unique:packages,udi,'.$Package->id,
];
break;
app/Package.php
+1 -1
View File
@@ -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' ];
public function user()
{
database/migrations/2023_10_26_124700_update_packages_table2.php
+34
View File
@@ -0,0 +1,34 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class UpdatePackagesTable2 extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('packages', function (Blueprint $table) {
$table->dropColumn('uid');
$table->dropColumn('unique_id');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('packages', function (Blueprint $table) {
$table->string('uid')->nullable();
$table->string('unique_id')->nullable();
});
}
}