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

This commit is contained in:
2024-12-13 14:21:20 +07:00
2 changed files with 33 additions and 27 deletions

View File

@@ -217,32 +217,35 @@ class KJPPController extends Controller
$detailNamaPicMarketing = json_decode($kjpp->detail_nama_pic_marketing); $detailNamaPicMarketing = json_decode($kjpp->detail_nama_pic_marketing);
$detailNomorHpPicMarketing = json_decode($kjpp->detail_nomor_hp_pic_marketing); $detailNomorHpPicMarketing = json_decode($kjpp->detail_nomor_hp_pic_marketing);
$detailJoinPimpinan = json_encode(array_map(function ($nama, $nomor) { $detailJoinPimpinan = [];
return [ if ($detailNamaPimpinan) {
'nama_pimpinan' => $nama->nama_pimpinan, $detailJoinPimpinan = json_encode(array_map(function ($nama, $nomor) {
'nomor_hp_pimpinan' => $nomor->nomor_hp_pimpinan return [
]; 'nama_pimpinan' => $nama,
}, $detailNamaPimpinan, $detailNomorHpPimpinan)); 'nomor_hp_pimpinan' => $nomor
];
}, $detailNamaPimpinan, $detailNomorHpPimpinan));
}
$detailJoinPicReviewer = json_encode(array_map(function ($nama, $nomor) { $detailJoinPicReviewer = json_encode(array_map(function ($nama, $nomor) {
return [ return [
'nama_pic_reviewer' => $nama->nama_pic_reviewer, 'nama_pic_reviewer' => $nama,
'nomor_hp_pic_reviewer' => $nomor->nomor_hp_pic_reviewer 'nomor_hp_pic_reviewer' => $nomor
]; ];
}, $detailNamaPicReviewer, $detailNomorHpPicReviewer)); }, $detailNamaPicReviewer, $detailNomorHpPicReviewer));
$detailJoinPicAdmin = json_encode(array_map(function ($nama, $nomor) { $detailJoinPicAdmin = json_encode(array_map(function ($nama, $nomor) {
return [ return [
'nama_pic_admin' => $nama->nama_pic_admin, 'nama_pic_admin' => $nama,
'nomor_hp_pic_admin' => $nomor->nomor_hp_pic_admin 'nomor_hp_pic_admin' => $nomor
]; ];
}, $detailNamaPicAdmin, $detailNomorHpPicAdmin)); }, $detailNamaPicAdmin, $detailNomorHpPicAdmin));
$detailJoinPicMarketing = json_encode(array_map(function ($nama, $nomor) { $detailJoinPicMarketing = json_encode(array_map(function ($nama, $nomor) {
return [ return [
'nama_pic_marketing' => $nama->nama_pic_marketing, 'nama_pic_marketing' => $nama,
'nomor_hp_pic_marketing' => $nomor->nomor_hp_pic_marketing 'nomor_hp_pic_marketing' => $nomor
]; ];
}, $detailNamaPicMarketing, $detailNomorHpPicMarketing)); }, $detailNamaPicMarketing, $detailNomorHpPicMarketing));
@@ -271,35 +274,38 @@ class KJPPController extends Controller
$detailNamaPicMarketing = json_decode($kjpp->detail_nama_pic_marketing); $detailNamaPicMarketing = json_decode($kjpp->detail_nama_pic_marketing);
$detailNomorHpPicMarketing = json_decode($kjpp->detail_nomor_hp_pic_marketing); $detailNomorHpPicMarketing = json_decode($kjpp->detail_nomor_hp_pic_marketing);
// dd($detailNamaPimpinan); //dd($detailNamaPimpinan);
$detailJoinPimpinan = json_encode(array_map(function ($nama, $nomor) { $detailJoinPimpinan = [];
return [ if ($detailNamaPimpinan) {
'nama_pimpinan' => $nama->nama_pimpinan, $detailJoinPimpinan = json_encode(array_map(function ($nama, $nomor) {
'nomor_hp_pimpinan' => $nomor->nomor_hp_pimpinan return [
]; 'nama_pimpinan' => $nama,
}, $detailNamaPimpinan, $detailNomorHpPimpinan)); 'nomor_hp_pimpinan' => $nomor
];
}, $detailNamaPimpinan, $detailNomorHpPimpinan));
}
// dd($detailJoinPimpinan); //dd($detailNamaPicReviewer );
$detailJoinPicReviewer = json_encode(array_map(function ($nama, $nomor) { $detailJoinPicReviewer = json_encode(array_map(function ($nama, $nomor) {
return [ return [
'nama_pic_reviewer' => $nama->nama_pic_reviewer, 'nama_pic_reviewer' => $nama,
'nomor_hp_pic_reviewer' => $nomor->nomor_hp_pic_reviewer 'nomor_hp_pic_reviewer' => $nomor
]; ];
}, $detailNamaPicReviewer, $detailNomorHpPicReviewer)); }, $detailNamaPicReviewer, $detailNomorHpPicReviewer));
$detailJoinPicAdmin = json_encode(array_map(function ($nama, $nomor) { $detailJoinPicAdmin = json_encode(array_map(function ($nama, $nomor) {
return [ return [
'nama_pic_admin' => $nama->nama_pic_admin, 'nama_pic_admin' => $nama,
'nomor_hp_pic_admin' => $nomor->nomor_hp_pic_admin 'nomor_hp_pic_admin' => $nomor
]; ];
}, $detailNamaPicAdmin, $detailNomorHpPicAdmin)); }, $detailNamaPicAdmin, $detailNomorHpPicAdmin));
$detailJoinPicMarketing = json_encode(array_map(function ($nama, $nomor) { $detailJoinPicMarketing = json_encode(array_map(function ($nama, $nomor) {
return [ return [
'nama_pic_marketing' => $nama->nama_pic_marketing, 'nama_pic_marketing' => $nama,
'nomor_hp_pic_marketing' => $nomor->nomor_hp_pic_marketing 'nomor_hp_pic_marketing' => $nomor
]; ];
}, $detailNamaPicMarketing, $detailNomorHpPicMarketing)); }, $detailNamaPicMarketing, $detailNomorHpPicMarketing));

View File

@@ -99,7 +99,7 @@
@if (isset($kjpp->detail_email_kantor)) @if (isset($kjpp->detail_email_kantor))
@foreach (json_decode($kjpp->detail_email_kantor) as $detail_email_kantor) @foreach (json_decode($kjpp->detail_email_kantor) as $detail_email_kantor)
<p class="flex w-full text-gray-600 font-medium text-sm"> <p class="flex w-full text-gray-600 font-medium text-sm">
{{ $detail_email_kantor->email_kantor }} {{ $detail_email_kantor }}
</p> </p>
@endforeach @endforeach
@endif @endif