itcn/backend_parkir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Perbaikan minor pada Laporan Member

Browse Source
This commit is contained in:
pand03
2026-04-07 12:46:07 +07:00
parent 1fea83be32
commit fbca98d18c
4 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Http/Setup/Gate/MasterGateController.php
View File

@@ -16,7 +16,7 @@ class MasterGateController extends Controller
public function index()
{
$Gate = NamaPos::all();
$Gate = NamaPos::orderBy('id')->get();
return view ('setup.gate.gate', compact('Gate'));
}

22
app/Http/Controllers/Report/LaporanStiker.php
View File

@@ -24,28 +24,30 @@ public function dataStiker(Request $request)
{
// 🔐 Validasi dasar
$validated = $request->validate([
'tanggalAwal' => 'required|date',
'tanggalAkhir' => 'required|date',
'tanggalAwal' => 'required|date',
'tanggalAkhir' => 'required|date',
'jenis_langganan' => 'array|nullable',
'jenis_stiker' => 'array|nullable',
'name' => 'string|nullable',
'no_pol' => 'string|nullable',
]);
$query = DB::table('mergetransaksistikerdetail as a')
->leftJoin('stasiunkerja as b', 'a.unit_kerja', '=', 'b.kode')
$query = DB::table('transaksi_stiker as a')
->leftJoin('detail_transaksi_stiker as b', 'a.notrans', '=', 'b.notrans')
->leftJoin('jenis_langganan as c', 'a.jenis_langganan', '=', 'c.id')
->leftJoin('stasiunkerja as d', 'a.unit_kerja', '=', 'd.kode')
->leftJoin('pegawai as p', 'a.operator', '=', 'p.nomer')
// ->leftJoin('tarif_stiker as ts','ts.id_mobil','=','a.jenis_mobil')
->leftJoin('tarif_stiker as ts', function ($join) {
$join->on('ts.id_mobil', '=', 'a.jenis_mobil')
->on('ts.jenis_langganan', '=', 'a.jenis_member');
$join->on('ts.id_mobil', '=', 'b.jenis_mobil')
->on('ts.jenis_langganan', '=', 'b.jenis_member');
})
->select('a.*', 'c.nama as jenis_langganan','b.nama as stasiunkerja','p.nama as petugas','ts.tarif')
->whereBetween('a.tgl_edited', [
->select('a.*', 'b.*', 'c.nama as jenis_langganan','d.nama as stasiunkerja','p.nama as petugas','ts.tarif')
->whereBetween('a.tanggal', [
$validated['tanggalAwal'] . ' 00:00:00',
$validated['tanggalAkhir'] . ' 23:59:59'
])
->where('b.status', 1)
// 🔹 Conditional filters
->when($request->name, fn ($q, $v) =>
@@ -64,7 +66,9 @@ public function dataStiker(Request $request)
// 🪵 Debug (aktifkan hanya saat local)
if (app()->isLocal()) {
Log::info('SQL Bindings', $query->getBindings());
// Log::info('SQL Bindings', $query->getBindings());
// Log::info('SQL Query', $query->toSql());
// dd($query->toSql(), $query->getBindings());
}
return response()->json([