diff --git a/app/Http/Controllers/KJPPController.php b/app/Http/Controllers/KJPPController.php index 3a1b1c7..c005ff3 100644 --- a/app/Http/Controllers/KJPPController.php +++ b/app/Http/Controllers/KJPPController.php @@ -217,32 +217,35 @@ class KJPPController extends Controller $detailNamaPicMarketing = json_decode($kjpp->detail_nama_pic_marketing); $detailNomorHpPicMarketing = json_decode($kjpp->detail_nomor_hp_pic_marketing); - $detailJoinPimpinan = json_encode(array_map(function ($nama, $nomor) { - return [ - 'nama_pimpinan' => $nama->nama_pimpinan, - 'nomor_hp_pimpinan' => $nomor->nomor_hp_pimpinan - ]; - }, $detailNamaPimpinan, $detailNomorHpPimpinan)); + $detailJoinPimpinan = []; + if ($detailNamaPimpinan) { + $detailJoinPimpinan = json_encode(array_map(function ($nama, $nomor) { + return [ + 'nama_pimpinan' => $nama, + 'nomor_hp_pimpinan' => $nomor + ]; + }, $detailNamaPimpinan, $detailNomorHpPimpinan)); + } $detailJoinPicReviewer = json_encode(array_map(function ($nama, $nomor) { return [ - 'nama_pic_reviewer' => $nama->nama_pic_reviewer, - 'nomor_hp_pic_reviewer' => $nomor->nomor_hp_pic_reviewer + 'nama_pic_reviewer' => $nama, + 'nomor_hp_pic_reviewer' => $nomor ]; }, $detailNamaPicReviewer, $detailNomorHpPicReviewer)); $detailJoinPicAdmin = json_encode(array_map(function ($nama, $nomor) { return [ - 'nama_pic_admin' => $nama->nama_pic_admin, - 'nomor_hp_pic_admin' => $nomor->nomor_hp_pic_admin + 'nama_pic_admin' => $nama, + 'nomor_hp_pic_admin' => $nomor ]; }, $detailNamaPicAdmin, $detailNomorHpPicAdmin)); $detailJoinPicMarketing = json_encode(array_map(function ($nama, $nomor) { return [ - 'nama_pic_marketing' => $nama->nama_pic_marketing, - 'nomor_hp_pic_marketing' => $nomor->nomor_hp_pic_marketing + 'nama_pic_marketing' => $nama, + 'nomor_hp_pic_marketing' => $nomor ]; }, $detailNamaPicMarketing, $detailNomorHpPicMarketing)); @@ -271,35 +274,38 @@ class KJPPController extends Controller $detailNamaPicMarketing = json_decode($kjpp->detail_nama_pic_marketing); $detailNomorHpPicMarketing = json_decode($kjpp->detail_nomor_hp_pic_marketing); - // dd($detailNamaPimpinan); + //dd($detailNamaPimpinan); - $detailJoinPimpinan = json_encode(array_map(function ($nama, $nomor) { - return [ - 'nama_pimpinan' => $nama->nama_pimpinan, - 'nomor_hp_pimpinan' => $nomor->nomor_hp_pimpinan - ]; - }, $detailNamaPimpinan, $detailNomorHpPimpinan)); + $detailJoinPimpinan = []; + if ($detailNamaPimpinan) { + $detailJoinPimpinan = json_encode(array_map(function ($nama, $nomor) { + return [ + 'nama_pimpinan' => $nama, + 'nomor_hp_pimpinan' => $nomor + ]; + }, $detailNamaPimpinan, $detailNomorHpPimpinan)); + } - // dd($detailJoinPimpinan); + //dd($detailNamaPicReviewer ); $detailJoinPicReviewer = json_encode(array_map(function ($nama, $nomor) { return [ - 'nama_pic_reviewer' => $nama->nama_pic_reviewer, - 'nomor_hp_pic_reviewer' => $nomor->nomor_hp_pic_reviewer + 'nama_pic_reviewer' => $nama, + 'nomor_hp_pic_reviewer' => $nomor ]; }, $detailNamaPicReviewer, $detailNomorHpPicReviewer)); $detailJoinPicAdmin = json_encode(array_map(function ($nama, $nomor) { return [ - 'nama_pic_admin' => $nama->nama_pic_admin, - 'nomor_hp_pic_admin' => $nomor->nomor_hp_pic_admin + 'nama_pic_admin' => $nama, + 'nomor_hp_pic_admin' => $nomor ]; }, $detailNamaPicAdmin, $detailNomorHpPicAdmin)); $detailJoinPicMarketing = json_encode(array_map(function ($nama, $nomor) { return [ - 'nama_pic_marketing' => $nama->nama_pic_marketing, - 'nomor_hp_pic_marketing' => $nomor->nomor_hp_pic_marketing + 'nama_pic_marketing' => $nama, + 'nomor_hp_pic_marketing' => $nomor ]; }, $detailNamaPicMarketing, $detailNomorHpPicMarketing)); diff --git a/resources/views/kjpp/show.blade.php b/resources/views/kjpp/show.blade.php index b0bb344..af147cb 100644 --- a/resources/views/kjpp/show.blade.php +++ b/resources/views/kjpp/show.blade.php @@ -99,7 +99,7 @@ @if (isset($kjpp->detail_email_kantor)) @foreach (json_decode($kjpp->detail_email_kantor) as $detail_email_kantor)
- {{ $detail_email_kantor->email_kantor }} + {{ $detail_email_kantor }}
@endforeach @endif