diff --git a/app/Http/Controllers/Report/LaporanStiker.php b/app/Http/Controllers/Report/LaporanStiker.php index 40851f9..0e4bc81 100644 --- a/app/Http/Controllers/Report/LaporanStiker.php +++ b/app/Http/Controllers/Report/LaporanStiker.php @@ -33,7 +33,8 @@ public function dataStiker(Request $request) $query = DB::table('mergetransaksistikerdetail as a') ->leftJoin('stasiunkerja as b', 'a.unit_kerja', '=', 'b.kode') - ->select('a.*', 'b.nama as jenis_langganan') + ->leftJoin('jenis_langganan as c', 'a.jenis_langganan', '=', 'c.id') + ->select('a.*', 'c.nama as jenis_langganan','b.nama as stasiunkerja') ->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 5fcdf81..c19c737 100644 --- a/resources/views/report/stiker/stiker-harian.blade.php +++ b/resources/views/report/stiker/stiker-harian.blade.php @@ -104,12 +104,13 @@