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

Merge branch 'staging' into feature/senior-officer

Browse Source
This commit is contained in:
majid
2024-12-09 15:57:03 +07:00
parent 4ed2afda72 96f99306dc
commit 055f8a67ae
47 changed files with 1416 additions and 1403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/views/penawaran/kirimEmail.blade.php
View File

@@ -132,20 +132,20 @@
@if (is_object($details))
@if (
$detail->jenisLegalitasJaminan->custom_field === 'Luas Tanah' &&
isset($details->{'Luas Tanah'}) &&
is_numeric($details->{'Luas Tanah'}))
$detail->jenisLegalitasJaminan->custom_field === 'luas_tanah' &&
isset($details->{'luas_tanah'}) &&
is_numeric($details->{'luas_tanah'}))
@php
$luas_tanah = $details->{'Luas Tanah'};
$luas_tanah = $details->{'luas_tanah'};
@endphp
@endif
@if (
$detail->jenisLegalitasJaminan->custom_field === 'Luas Bangunan' &&
isset($details->{'Luas Bangunan'}) &&
is_numeric($details->{'Luas Bangunan'}))
$detail->jenisLegalitasJaminan->custom_field === 'luas_bangunan' &&
isset($details->{'luas_bangunan'}) &&
is_numeric($details->{'luas_bangunan'}))
@php
$luas_bangunan = $details->{'Luas Bangunan'};
$luas_bangunan = $details->{'luas_bangunan'};
@endphp
@endif
@endif

16
resources/views/penawaran/kirimEmailKJPP.blade.php
View File

@@ -134,20 +134,20 @@
@if (is_object($details))
@if (
$detail->jenisLegalitasJaminan->custom_field === 'Luas Tanah' &&
isset($details->{'Luas Tanah'}) &&
is_numeric($details->{'Luas Tanah'}))
$detail->jenisLegalitasJaminan->custom_field === 'luas_tanah' &&
isset($details->{'luas_tanah'}) &&
is_numeric($details->{'luas_tanah'}))
@php
$luas_tanah = $details->{'Luas Tanah'};
$luas_tanah = $details->{'luas_tanah'};
@endphp
@endif
@if (
$detail->jenisLegalitasJaminan->custom_field === 'Luas Bangunan' &&
isset($details->{'Luas Bangunan'}) &&
is_numeric($details->{'Luas Bangunan'}))
$detail->jenisLegalitasJaminan->custom_field === 'luas_bangunan' &&
isset($details->{'luas_bangunan'}) &&
is_numeric($details->{'luas_bangunan'}))
@php
$luas_bangunan = $details->{'Luas Bangunan'};
$luas_bangunan = $details->{'luas_bangunan'};
@endphp
@endif
@endif

16
resources/views/penawaran/surat_tender.blade.php
View File

@@ -117,20 +117,20 @@
@if (is_object($details))
@if (
$detail->jenisLegalitasJaminan->custom_field === 'Luas Tanah' &&
isset($details->{'Luas Tanah'}) &&
is_numeric($details->{'Luas Tanah'}))
$detail->jenisLegalitasJaminan->custom_field === 'luas_tanah' &&
isset($details->{'luas_tanah'}) &&
is_numeric($details->{'luas_tanah'}))
@php
$luas_tanah = $details->{'Luas Tanah'};
$luas_tanah = $details->{'luas_tanah'};
@endphp
@endif
@if (
$detail->jenisLegalitasJaminan->custom_field === 'Luas Bangunan' &&
isset($details->{'Luas Bangunan'}) &&
is_numeric($details->{'Luas Bangunan'}))
$detail->jenisLegalitasJaminan->custom_field === 'luas_bangunan' &&
isset($details->{'luas_bangunan'}) &&
is_numeric($details->{'luas_bangunan'}))
@php
$luas_bangunan = $details->{'Luas Bangunan'};
$luas_bangunan = $details->{'luas_bangunan'};
@endphp
@endif
@endif

16
resources/views/penawaran/surat_tender_download.blade.php
View File

@@ -132,20 +132,20 @@
@if (is_object($details))
@if (
$detail->jenisLegalitasJaminan->custom_field === 'Luas Tanah' &&
isset($details->{'Luas Tanah'}) &&
is_numeric($details->{'Luas Tanah'}))
$detail->jenisLegalitasJaminan->custom_field === 'luas_tanah' &&
isset($details->{'luas_tanah'}) &&
is_numeric($details->{'luas_tanah'}))
@php
$luas_tanah = $details->{'Luas Tanah'};
$luas_tanah = $details->{'luas_tanah'};
@endphp
@endif
@if (
$detail->jenisLegalitasJaminan->custom_field === 'Luas Bangunan' &&
isset($details->{'Luas Bangunan'}) &&
is_numeric($details->{'Luas Bangunan'}))
$detail->jenisLegalitasJaminan->custom_field === 'luas_bangunan' &&
isset($details->{'luas_bangunan'}) &&
is_numeric($details->{'luas_bangunan'}))
@php
$luas_bangunan = $details->{'Luas Bangunan'};
$luas_bangunan = $details->{'luas_bangunan'};
@endphp
@endif
@endif

16
resources/views/penawaran/surat_tender_kjpp.blade.php
View File

@@ -115,20 +115,20 @@
@if (is_object($details))
@if (
$detail->jenisLegalitasJaminan->custom_field === 'Luas Tanah' &&
isset($details->{'Luas Tanah'}) &&
is_numeric($details->{'Luas Tanah'}))
$detail->jenisLegalitasJaminan->custom_field === 'luas_tanah' &&
isset($details->{'luas_tanah'}) &&
is_numeric($details->{'luas_tanah'}))
@php
$luas_tanah = $details->{'Luas Tanah'};
$luas_tanah = $details->{'luas_tanah'};
@endphp
@endif
@if (
$detail->jenisLegalitasJaminan->custom_field === 'Luas Bangunan' &&
isset($details->{'Luas Bangunan'}) &&
is_numeric($details->{'Luas Bangunan'}))
$detail->jenisLegalitasJaminan->custom_field === 'luas_bangunan' &&
isset($details->{'luas_bangunan'}) &&
is_numeric($details->{'luas_bangunan'}))
@php
$luas_bangunan = $details->{'Luas Bangunan'};
$luas_bangunan = $details->{'luas_bangunan'};
@endphp
@endif
@endif

16
resources/views/penawaran/surat_tender_kjpp_download.blade.php
View File

@@ -134,20 +134,20 @@
@if (is_object($details))
@if (
$detail->jenisLegalitasJaminan->custom_field === 'Luas Tanah' &&
isset($details->{'Luas Tanah'}) &&
is_numeric($details->{'Luas Tanah'}))
$detail->jenisLegalitasJaminan->custom_field === 'luas_tanah' &&
isset($details->{'luas_tanah'}) &&
is_numeric($details->{'luas_tanah'}))
@php
$luas_tanah = $details->{'Luas Tanah'};
$luas_tanah = $details->{'luas_tanah'};
@endphp
@endif
@if (
$detail->jenisLegalitasJaminan->custom_field === 'Luas Bangunan' &&
isset($details->{'Luas Bangunan'}) &&
is_numeric($details->{'Luas Bangunan'}))
$detail->jenisLegalitasJaminan->custom_field === 'luas_bangunan' &&
isset($details->{'luas_bangunan'}) &&
is_numeric($details->{'luas_bangunan'}))
@php
$luas_bangunan = $details->{'Luas Bangunan'};
$luas_bangunan = $details->{'luas_bangunan'};
@endphp
@endif
@endif

2
resources/views/registrasifinal/edit.blade.php
View File

@@ -70,7 +70,7 @@
</label>
<div class="flex flex-wrap items-baseline w-full">
<em id="" class="alert text-danger text-sm"></em>
<div class="flex items-center justify-between flex-wrap my-2.5 gap-2"><a download id="pdfSPK" class="badge badge-sm badge-outline" target="_blank">Dokumen SPK.pdf &nbsp;&nbsp;<i class="ki-filled ki-cloud-download"></i></a></div>
<div class="flex items-center justify-between flex-wrap my-2.5 gap-2">{!! $doc_pdf !!}</div>
</div>
</div>
<div id="{{ $route[0] }}_div_region" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">

2
resources/views/registrasifinal/index.blade.php
View File

@@ -139,7 +139,7 @@
<a onclick="showRegistrasiFinal(${data.permohonan.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
<i class="ki-outline ki-eye"></i>
</a>
<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" href="registrasifinal/${data.permohonan.id}/edit">
<a class="btn btn-sm btn-icon btn-clear btn-info" title="Registrasi Final" href="registrasifinal/${data.permohonan.id}/edit">
<i class="ki-outline ki-notepad-edit"></i>
</a>
</div>`;

2
resources/views/registrasifinal/show.blade.php
View File

@@ -45,7 +45,7 @@
Tujan Permohonan:
</h3>
<span class="text-2sm text-gray-700">
{{ $permohonan->tujuanPenilaian->name }} {!! $permohonan->dokumen !!}
{{ $permohonan->tujuanPenilaian->name }} {!! $permohonan->pdfSPK_path !!}
</span>
</div>

4
resources/views/spk/index.blade.php
View File

@@ -199,9 +199,9 @@
render: (item, data) => {
var spkShow ='';
var spkCreate='';
if(!data.dokumen)
if(!data.penawaran.spk_dokumen_path)
{
spkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" onclick="spkCreate(${data.penawaran.id})" >
spkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Buat SPK" onclick="spkCreate(${data.penawaran.id})" >
<i class="ki-outline ki-notepad-edit"></i>
</a>`;
}