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

fix some problems in udi

Browse Source
This commit is contained in:
mahdi purHosseini
2023-10-08 11:53:31 +03:30
parent 08d7708918
commit 1a89b77ecc
4 changed files with 364 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ItemController.php
+9 -9
View File
@@ -1,15 +1,15 @@
<?php <?php
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Media; use App\Http\Requests\StoreItemRequest;
use Illuminate\Http\Request; use App\Item;
use App\Http\Requests\StoreItemRequest; use App\Media;
use App\Item; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage; 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();
@@ -191,4 +191,4 @@
$Item->save(); $Item->save();
return \MessageResponse::data( $Item ); return \MessageResponse::data( $Item );
} }
} }
app/Http/Controllers/PackageController.php
+8 -11
View File
@@ -1,14 +1,13 @@
<?php <?php
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Http\Request; use App\Http\Requests\StorePackageRequest;
use App\Http\Requests\StorePackageRequest; use App\Package;
use App\Package; use Illuminate\Http\Request;
use App\User;
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();
@@ -17,8 +16,7 @@
return \MessageResponse::error( 'You dont have access to this section!' ); return \MessageResponse::error( 'You dont have access to this section!' );
} }
$Packages = Package:: $Packages = Package::when( $user->cant( 'showAll' , Package::class ) , function ( $query ) use ( $user ) {
when( $user->cant( 'showAll' , Package::class ) , function ( $query ) use ( $user ) {
if ( $user->hasRole( 'Supervisor' ) ) { if ( $user->hasRole( 'Supervisor' ) ) {
$query->whereHas( 'user' , function ( $query ) use ( $user ) { $query->whereHas( 'user' , function ( $query ) use ( $user ) {
$query->where( 'medical_center_id' , $user->medical_center_id ); $query->where( 'medical_center_id' , $user->medical_center_id );
@@ -68,7 +66,6 @@
public function store( StorePackageRequest $request ) public function store( StorePackageRequest $request )
{ {
// $UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
$PackageData = [ $PackageData = [
'name' => $request->name , 'name' => $request->name ,
'unique_id' => $request->unique_id , 'unique_id' => $request->unique_id ,
@@ -196,4 +193,4 @@
'items' ] ); 'items' ] );
return \MessageResponse::data( $Package ); return \MessageResponse::data( $Package );
} }
} }
app/Http/Requests/StoreItemRequest.php
-3
View File
@@ -3,10 +3,7 @@
namespace App\Http\Requests; namespace App\Http\Requests;
use App\Item; use App\Item;
use Illuminate\Validation\Rule;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Contracts\Validation\Validator;
class StoreItemRequest extends FormRequest class StoreItemRequest extends FormRequest
{ {
app/Http/Requests/StorePackageRequest.php
+1 -4
View File
@@ -3,10 +3,7 @@
namespace App\Http\Requests; namespace App\Http\Requests;
use App\Package; use App\Package;
use Illuminate\Validation\Rule;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Contracts\Validation\Validator;
class StorePackageRequest extends FormRequest class StorePackageRequest extends FormRequest
{ {
@@ -41,7 +38,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', 'udi' => 'required|max:100|unique:packages,udi,'.$Package->id,
]; ];
break; break;