diff --git a/app/Http/Controllers/Report/LaporanStiker.php b/app/Http/Controllers/Report/LaporanStiker.php index 0e4bc81..90ec830 100644 --- a/app/Http/Controllers/Report/LaporanStiker.php +++ b/app/Http/Controllers/Report/LaporanStiker.php @@ -34,7 +34,8 @@ public function dataStiker(Request $request) $query = DB::table('mergetransaksistikerdetail as a') ->leftJoin('stasiunkerja as b', 'a.unit_kerja', '=', 'b.kode') ->leftJoin('jenis_langganan as c', 'a.jenis_langganan', '=', 'c.id') - ->select('a.*', 'c.nama as jenis_langganan','b.nama as stasiunkerja') + ->leftJoin('pegawai as p', 'a.operator', '=', 'p.nomer') + ->select('a.*', 'c.nama as jenis_langganan','b.nama as stasiunkerja','p.nama as petugas') ->whereBetween('a.tgl_edited', [ $validated['tanggalAwal'] . ' 00:00:00', $validated['tanggalAkhir'] . ' 23:59:59' diff --git a/resources/views/report/stiker/stiker-harian.blade.php b/resources/views/report/stiker/stiker-harian.blade.php index c19c737..9ddc34f 100644 --- a/resources/views/report/stiker/stiker-harian.blade.php +++ b/resources/views/report/stiker/stiker-harian.blade.php @@ -250,7 +250,7 @@ ${row.jenis_member ?? '-'} ${row.harga ?? ''} ${row.tgl_edited ?? ''} - ${row.operator ?? ''} + ${row.petugas ?? ''} `); // ${row.jenis_langganan ?? '-'}