|
@@ -73,7 +73,7 @@ discard block |
|
|
block discarded – undo |
|
73
|
73
|
'json' => [ |
|
74
|
74
|
'name' => $request->user()->last_name, |
|
75
|
75
|
'login' => $request->user()->username, |
|
76
|
|
- 'email' => $request->user()->email ? $request->user()->email : $request->user()->username.'@'.'sis.moe.gov.lk' , |
|
|
76
|
+ 'email' => $request->user()->email ? $request->user()->email : $request->user()->username.'@'.'sis.moe.gov.lk', |
|
77
|
77
|
'password' => Str::random(8), |
|
78
|
78
|
] |
|
79
|
79
|
])->getBody(); |
|
@@ -105,7 +105,7 @@ discard block |
|
|
block discarded – undo |
|
105
|
105
|
public function getUserOrg(Request $request) |
|
106
|
106
|
{ |
|
107
|
107
|
$data = []; |
|
108
|
|
- if($request->user()->super_admin){ |
|
|
108
|
+ if ($request->user()->super_admin) { |
|
109
|
109
|
$data = [ |
|
110
|
110
|
[ |
|
111
|
111
|
"orgId" => 2, |
|
@@ -132,9 +132,9 @@ discard block |
|
|
block discarded – undo |
|
132
|
132
|
"login" => 'Provinces', |
|
133
|
133
|
] |
|
134
|
134
|
]; |
|
135
|
|
- }elseif ($request->user() && (!($request->user()->principal->isEmpty())) && !is_null($request->user()->principal) && ($request->user()->principal[0]->roles->code == 'PRINCIPAL')) { |
|
|
135
|
+ }elseif ($request->user() && (!($request->user()->principal->isEmpty())) && !is_null($request->user()->principal) && ($request->user()->principal[0]->roles->code == 'PRINCIPAL')) { |
|
136
|
136
|
$data = $this->checkOrg($request); |
|
137
|
|
- if (empty($data) || ( (!empty($data['orgId']) && $data['orgId'] !== 2))) { |
|
|
137
|
+ if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 2))) { |
|
138
|
138
|
$request['data'] = $data; |
|
139
|
139
|
$data['user'] = $data; |
|
140
|
140
|
$data['orgId'] = 2; |
|
@@ -151,7 +151,7 @@ discard block |
|
|
block discarded – undo |
|
151
|
151
|
"login" => 'Schools', |
|
152
|
152
|
] |
|
153
|
153
|
]; |
|
154
|
|
- } elseif ($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && !is_null($request->user()->zonal_cordinator) && ($request->user()->zonal_cordinator[0]->roles->code == 'ZONAL_COORDINATOR')) { |
|
|
154
|
+ } elseif ($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && !is_null($request->user()->zonal_cordinator) && ($request->user()->zonal_cordinator[0]->roles->code == 'ZONAL_COORDINATOR')) { |
|
155
|
155
|
$data = $this->checkOrg($request); |
|
156
|
156
|
if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 4))) { |
|
157
|
157
|
$request['data'] = $data; |
|
@@ -170,9 +170,9 @@ discard block |
|
|
block discarded – undo |
|
170
|
170
|
"login" => 'Zones', |
|
171
|
171
|
] |
|
172
|
172
|
]; |
|
173
|
|
- } elseif ($request->user() && (!($request->user()->provincial_cordinator->isEmpty())) && !is_null($request->user()->provincial_cordinator) && ($request->user()->provincial_cordinator[0]->roles->code == 'PROVINCIAL_COORDINATOR')) { |
|
|
173
|
+ } elseif ($request->user() && (!($request->user()->provincial_cordinator->isEmpty())) && !is_null($request->user()->provincial_cordinator) && ($request->user()->provincial_cordinator[0]->roles->code == 'PROVINCIAL_COORDINATOR')) { |
|
174
|
174
|
$data = $this->checkOrg($request); |
|
175
|
|
- if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 5))) { |
|
|
175
|
+ if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 5))) { |
|
176
|
176
|
$request['data'] = $data; |
|
177
|
177
|
$data['user'] = $data; |
|
178
|
178
|
$data['orgId'] = 5; |