Merge remote-tracking branch 'composer/andydev' into staging

# Conflicts:
#	app/Http/Controllers/RegistrasiFinalController.php
#	resources/views/prosespenawaran/index.blade.php
#	resources/views/spk/documentSPK.blade.php
#	resources/views/spk/edit.blade.php

resources/views/registrasi/show.blade.php

@@ -147,6 +147,38 @@
 
         @include('lpj::component.detail-jaminan')
 
+		<div class="card min-w-full">
+			<div class="card-header">
+				<h3 class="card-title">
+					Data Biaya
+				</h3>
+			</div>
+			<div class="card-table scrollable-x-auto pb-3">
+				<div class="grid grid-cols-1 xl:grid-cols-1 gap-5 lg:gap-7.5">
+					<div class="col-span-1">
+						<table class="table align-middle text-sm text-gray-500">
+							<tr>
+								<td width="10%" class="py-2 text-gray-600 font-normal">
+									Status Bayar
+								</td>
+								<td class="py-2 text-gray-800 font-normaltext-sm">
+									{{ strtoupper(str_replace('_',' ',$permohonan->status_bayar)) }}
+								</td>
+							</tr>
+							<tr>
+								<td class="py-3">
+									Nilai NJOP
+								</td>
+								<td class="py-3 text-gray-700 text-2sm font-normal">
+									{{ $permohonan->nilai_njop }}
+								</td>
+							</tr>
+							
+						</table>
+					</div>
+				</div>
+			</div>
+		</div>
 
 		<div class="card pb-2.5">
 			<div class="card-header" id="basic_settings">