Merge branches 'feature/senior-officer' and 'staging' of https://git.putrakuningan.com/daengdeni/lpj into staging

This commit is contained in:
majid
2025-03-12 01:01:08 +07:00
5 changed files with 9 additions and 9 deletions

View File

@@ -46,8 +46,8 @@ function checkActiveDateRangePenawaran($id)
$start_date = strtotime($penawaran->start_date);
$end_date = strtotime($penawaran->end_date);
// $todays_date = strtotime(now());
$todays_date = strtotime("+1 day", strtotime(now()));
$todays_date = strtotime(now());
//$todays_date = strtotime("+1 day", strtotime(now()));
$allow = true;
if ($todays_date >= $start_date && $todays_date <= $end_date) {

View File

@@ -491,10 +491,10 @@
.then(data => {
if (data.status) {
// Jika status LPJ sudah ada, arahkan langsung ke halaman
if (data.status === 'standard') {
if (data.status === 'standar') {
showLoadingSwal('Tunggu ...');
window.location.href =
`{{ route('penilai.standard', $permohonan->id) }}?documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}`;
`{{ route('penilai.standar', $permohonan->id) }}?documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}`;
} else if (data.status === 'sederhana') {
showLoadingSwal('Tunggu ...');
window.location.href =
@@ -524,7 +524,7 @@
denyButtonColor: '#d33',
}).then((result) => {
if (result.isConfirmed) {
saveStatusLpj(permohonanId, documentId, inspeksiId, 'standard',
saveStatusLpj(permohonanId, documentId, inspeksiId, 'standar',
jaminanId);
} else if (result.isDenied) {
saveStatusLpj(permohonanId, documentId, inspeksiId, 'sederhana',
@@ -556,9 +556,9 @@
}).then(response => response.json())
.then(data => {
if (data.success) {
if (type === 'standard') {
if (type === 'standar') {
window.location.href =
`{{ route('penilai.standard', $permohonan->id) }}?documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}`;
`{{ route('penilai.standar', $permohonan->id) }}?documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}`;
} else if (type === 'sederhana') {
window.location.href =
`{{ route('penilai.sederhana', $permohonan->id) }}?documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}`;

View File

@@ -154,7 +154,7 @@
debitur_id: {
title: 'Debitur',
render: (item, data) => {
return `${data.debiture.name}`;
return `${data.debiture?.name}`;
},
},
tujuan_penilaian_id: {

View File

@@ -614,7 +614,7 @@ Breadcrumbs::for('penilai.showDataPembanding', function (BreadcrumbTrail $trail)
});
Breadcrumbs::for('penilai.standard', function (BreadcrumbTrail $trail) {
Breadcrumbs::for('penilai.standar', function (BreadcrumbTrail $trail) {
$trail->parent('penilai.show');
$trail->push('Standard');
});