Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender

This commit is contained in:
2025-03-26 09:01:24 +07:00
3 changed files with 4 additions and 7 deletions

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

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="">

View File

@@ -101,10 +101,7 @@
@endsection @endsection
@push('scripts') @push('scripts')
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
<script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
<script> <script>
function approveReschedule(penilaianId, permohonanId, noReg, debitur, reschedule_date, reschedule_note) { function approveReschedule(penilaianId, permohonanId, noReg, debitur, reschedule_date, reschedule_note) {
Swal.fire({ Swal.fire({
title: 'Konfirmasi', title: 'Konfirmasi',