daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'composer/feature/senior-officer' into staging

Browse Source
This commit is contained in:
Daeng Deni Mardaeni
2025-03-26 08:31:56 +07:00
parent 825cc9c5f9 1b8df943d5
commit 686dec7727
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/PenilaianController.php
View File

@@ -573,7 +573,7 @@ class PenilaianController extends Controller
]); ]);
} elseif (Auth::user()->roles[0]->name === 'EO Appraisal' || Auth::user()->roles[0]->name === 'administrator' && $authorization->approve_so && $authorization->approve_eo === null) { } elseif (Auth::user()->roles[0]->name === 'EO Appraisal' || Auth::user()->roles[0]->name === 'administrator' && $authorization->approve_so && $authorization->approve_eo === null) {
$status = '2'; $status = '2';
if (!in_array($permohonan->nilai_plafond_id, [1, 2])) { if (in_array($permohonan->nilai_plafond_id, [1, 2])) {
$status = '1'; $status = '1';
$permohonan->update([ $permohonan->update([
'status' => $authorization->request 'status' => $authorization->request
@@ -617,7 +617,7 @@ class PenilaianController extends Controller
]); ]);
} elseif (Auth::user()->roles[0]->name === 'EO Appraisal') { } elseif (Auth::user()->roles[0]->name === 'EO Appraisal') {
$status = '2'; $status = '2';
if (!in_array($permohonan->nilai_plafond_id, [1,2])) { if (in_array($permohonan->nilai_plafond_id, [1,2])) {
$status = '1'; $status = '1';
$permohonan->update([ $permohonan->update([
'status' => $authorization->request 'status' => $authorization->request

4
resources/views/surveyor/components/header.blade.php
View File

@@ -316,9 +316,9 @@
@php @php
$hubCadebPemilik = $dokumen->pemilik->hubungan_pemilik->name ?? 'N/A'; $hubCadebPemilik = $dokumen->pemilik->hubungan_pemilik->name ?? 'N/A';
@endphp @endphp
<p> <label class="form-label">
{{ $hubCadebPemilik }} {{ $hubCadebPemilik }}
</p> </label>
<input type="hidden" name="hub_cadeb_sesuai" value="{{ $hubCadebPemilik }}" <input type="hidden" name="hub_cadeb_sesuai" value="{{ $hubCadebPemilik }}"
id=""> id="">