|
@@ -158,7 +158,7 @@ discard block |
|
|
block discarded – undo |
|
158
|
158
|
"login" => 'Provinces', |
|
159
|
159
|
] |
|
160
|
160
|
]; |
|
161
|
|
- } elseif ($request->user() && (!($request->user()->principal->isEmpty())) && !is_null($request->user()->principal) && ($request->user()->principal[0]->roles->code == 'PRINCIPAL')) { |
|
|
161
|
+ } elseif ($request->user() && (!($request->user()->principal->isEmpty())) && !is_null($request->user()->principal) && ($request->user()->principal[0]->roles->code == 'PRINCIPAL')) { |
|
162
|
162
|
$data = $this->checkOrg($request); |
|
163
|
163
|
if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 2))) { |
|
164
|
164
|
$request['data'] = $data; |
|
@@ -177,7 +177,7 @@ discard block |
|
|
block discarded – undo |
|
177
|
177
|
"login" => 'Schools', |
|
178
|
178
|
] |
|
179
|
179
|
]; |
|
180
|
|
- } elseif ($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && !is_null($request->user()->zonal_cordinator) && ($request->user()->zonal_cordinator[0]->roles->code == 'ZONAL_COORDINATOR')) { |
|
|
180
|
+ } elseif ($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && !is_null($request->user()->zonal_cordinator) && ($request->user()->zonal_cordinator[0]->roles->code == 'ZONAL_COORDINATOR')) { |
|
181
|
181
|
$data = $this->checkOrg($request); |
|
182
|
182
|
if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 4))) { |
|
183
|
183
|
$request['data'] = $data; |
|
@@ -196,9 +196,9 @@ discard block |
|
|
block discarded – undo |
|
196
|
196
|
"login" => 'Zones', |
|
197
|
197
|
] |
|
198
|
198
|
]; |
|
199
|
|
- } elseif ($request->user() && (!($request->user()->provincial_cordinator->isEmpty())) && !is_null($request->user()->provincial_cordinator) && ($request->user()->provincial_cordinator[0]->roles->code == 'PROVINCIAL_COORDINATOR')) { |
|
|
199
|
+ } elseif ($request->user() && (!($request->user()->provincial_cordinator->isEmpty())) && !is_null($request->user()->provincial_cordinator) && ($request->user()->provincial_cordinator[0]->roles->code == 'PROVINCIAL_COORDINATOR')) { |
|
200
|
200
|
$data = $this->checkOrg($request); |
|
201
|
|
- if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 5))) { |
|
|
201
|
+ if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 5))) { |
|
202
|
202
|
$request['data'] = $data; |
|
203
|
203
|
$data['user'] = $data; |
|
204
|
204
|
$data['orgId'] = 5; |
Please login to merge, or discard this patch.