khantey/hpt_inventory
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modified assests

Browse Source
This commit is contained in:
pcalengratha
2026-06-15 11:25:16 +07:00
parent 3f115866d9
commit e96d58dcb4
1218 changed files with 1162 additions and 339502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/RoleController.php
View File

@@ -19,21 +19,21 @@ class RoleController extends Controller
protected $roleModel;
protected $roleHasPermission;
protected $baseLabId;
protected $baseOrganizationId;
protected $labs;
public function __construct(RoleHasPermission $roleHasPermission, Role $roleModel){
$this->roleModel = $roleModel;
$this->roleHasPermission = $roleHasPermission;
$this->baseLabId = Session::get('base_lab_id');
$this->base = Session::get('base_lab');
$this->baseOrganizationId = Session::get('base_organization_id');
$this->base = Session::get('base_organization');
}
public function index(Request $request){
if(!GlobalController::user_can(Auth::user()->role_id, ['view_user_role'])) return redirect(url('my-profile'));
$recordStatusCondition = Auth::id()==1 ? [RecordStatusEnum::DELETE, RecordStatusEnum::ACTIVE] : [RecordStatusEnum::ACTIVE];
$roles = $this->roleModel::with('lab')->whereIn(BaseModel::RECORD_STATUS_FIELD, $recordStatusCondition)
->where('lab_id', $this->baseLabId)
->where('organization_id', $this->baseOrganizationId)
->whereNotIn('id', [UtilEnum::ADMINISTRATOR_ROLE])
->when(!empty($request->kword), function ($roles) use($request){
$roles->whereRaw("replace(name_en, ' ','') like '%".str_replace(" ","",$request->kword)."%'");
@@ -46,7 +46,7 @@ class RoleController extends Controller
if(!GlobalController::user_can(Auth::user()->role_id, ['create_user_role'])) return false;
$validator = \Validator::make($request->all(), ['name_en' => 'required']);
if ($validator->fails()) return response()->json(['success' => false, 'message' => __('system_role.create_fail'), 'errors'=>$validator->errors()->all()]);
$new = $this->roleModel::query()->create(['name_en' => $request->name_en, 'lab_id' => $this->baseLabId]);
$new = $this->roleModel::query()->create(['name_en' => $request->name_en, 'organization_id' => $this->baseOrganizationId]);
return response()->json(['success' => true, 'message' => __('system_role.create_success')]);
} catch (\Exception $e){
return response()->json(['success' => false, 'message' => __('system_role.create_fail'), 'errors' => $e->getMessage()]);