diff --git a/app/Http/Controllers/TransaksiController.php b/app/Http/Controllers/TransaksiController.php index 5f80bdb..fffc7f9 100644 --- a/app/Http/Controllers/TransaksiController.php +++ b/app/Http/Controllers/TransaksiController.php @@ -78,7 +78,7 @@ class TransaksiController extends Controller ->join('tr_registrasi', 'tr_transaksi.IdRegistrasi', '=', 'tr_registrasi.IdRegistrasi') ->join('ms_tindakan', 'tr_transaksi.IdTindakan', '=', 'ms_tindakan.IdTindakan') ->join('ms_pegawai', 'tr_transaksi.IdPegawai', '=', 'ms_pegawai.IdPegawai') - ->select('tr_transaksi.*', 'tr_registrasi.NoRegistrasi', 'ms_tindakan.NamaTindakan', 'ms_pegawai.NamaPegawai') + ->select('tr_transaksi.*', 'tr_registrasi.NomorKartuAsuransi', 'ms_tindakan.NamaTindakan', 'ms_pegawai.NamaPegawai') ->where('tr_transaksi.IdTransaksi', $id) ->first(); diff --git a/resources/views/admin/transaksi/TrTransaksi/edit-form.blade.php b/resources/views/admin/transaksi/TrTransaksi/edit-form.blade.php index f4693c3..c2673e5 100644 --- a/resources/views/admin/transaksi/TrTransaksi/edit-form.blade.php +++ b/resources/views/admin/transaksi/TrTransaksi/edit-form.blade.php @@ -19,9 +19,9 @@ required> --Pilih Tanggal Registrasi-- @foreach ($registrasi as $regist) - IdRegistrasi == $registrasi->IdRegistrasi ? 'selected' : '' }}> - {{ $registrasi->TanggalRegistrasi }} + IdRegistrasi == $transaksi->IdRegistrasi ? 'selected' : '' }}> + {{ $regist->TanggalRegistrasi }} @endforeach @@ -38,7 +38,7 @@ --Pilih Tindakan-- @foreach ($tindakan as $tindak) IdTindakan == $tindak->IdTindakan ? 'selected' : '' }}> + {{ $tindak->IdTindakan == $transaksi->IdTindakan ? 'selected' : '' }}> {{ $tindak->TarifTindakan }} @endforeach @@ -51,7 +51,7 @@ Jumlah Tindakan - @error('JmlTindakan') @@ -67,7 +67,7 @@ --Pilih Master Pegawai-- @foreach ($pegawai as $pgwi) IdPegawai == $tindak->IdPegawai ? 'selected' : '' }}> + {{ $pgwi->IdPegawai == $transaksi->IdPegawai ? 'selected' : '' }}> {{ $pgwi->NamaPegawai }} @endforeach diff --git a/resources/views/admin/transaksi/TrTransaksi/show-form.blade.php b/resources/views/admin/transaksi/TrTransaksi/show-form.blade.php index e9eee26..decb372 100644 --- a/resources/views/admin/transaksi/TrTransaksi/show-form.blade.php +++ b/resources/views/admin/transaksi/TrTransaksi/show-form.blade.php @@ -77,14 +77,14 @@ Dibuat pada - {{ $transaksi->created_at ? date('d-m-Y H:i', strtotime($registrasi->created_at)) : '-' }} + {{ $transaksi->created_at ? date('d-m-Y H:i', strtotime($transaksi->created_at)) : '-' }} Terakhir diperbarui - {{ $transaksi->updated_at ? date('d-m-Y H:i', strtotime($registrasi->updated_at)) : '-' }} + {{ $transaksi->updated_at ? date('d-m-Y H:i', strtotime($transaksi->updated_at)) : '-' }}