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

perbaikan query API harian

Browse Source
This commit is contained in:
Support ITCN
2025-09-22 15:38:02 +07:00
parent 44f8014bb9
commit 9daea2de89
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Http/Controllers/Api/V1/LaporanController.php
View File

@@ -11,7 +11,7 @@ class LaporanController extends Controller
{ {
private function getTrans() { private function getTrans() {
$query = TransaksiParkir::selectRaw('jm.id, jm.nama as vehicle, COUNT(*) as jml, SUM(bayar_keluar) as VALUE') $query = TransaksiParkir::selectRaw('jm.id, jm.nama as vehicle, COUNT(*) as jml, SUM(bayar_keluar) as total_bayar')
->leftJoin('jenis_mobil as jm','jm.id','=','transaksi_parkir.id_kendaraan'); ->leftJoin('jenis_mobil as jm','jm.id','=','transaksi_parkir.id_kendaraan');
return $query; return $query;
@@ -46,18 +46,26 @@ public function harian(Request $request)
if ($tanggal) { if ($tanggal) {
$queryCash->whereDate($dateField, '=', $tanggal); $queryCash->whereDate($dateField, '=', $tanggal);
} }
Log::info('Cari data cash dengan tanggal : ' . $tanggal);
$resultCash = $queryCash->whereRaw('cara_bayar <> 3') $resultCash = $queryCash
->where(function ($q) {
$q->whereRaw('cara_bayar <> 3')
->orWhereRaw('cara_bayar is null');
})
// ->where(function ($q) {
// $q->where('status_transaksi', '-0')
// ->orWhere('status_transaksi', '3');
// })
->groupByRaw("jm.id, jm.nama") ->groupByRaw("jm.id, jm.nama")
->orderByRaw("jm.id, jm.nama") ->orderByRaw("jm.id, jm.nama")
->get(); ->get();
Log::info($resultCash); // Log::info($resultCash->toSql());
$jmlCash = 0; $jmlCash = 0;
$incomeCash = 0; $incomeCash = 0;
foreach ($resultCash as $row) { foreach ($resultCash as $row) {
$jmlCash += $row->jml; $jmlCash += $row->jml;
$incomeCash += $row->value; $incomeCash += $row->total_bayar;
} }
// Cashless payment initialize // Cashless payment initialize
@@ -65,7 +73,14 @@ public function harian(Request $request)
if ($tanggal) { if ($tanggal) {
$queryCashless->whereDate($dateField, '=', $tanggal); $queryCashless->whereDate($dateField, '=', $tanggal);
} }
$resultCashless = $queryCashless->where('cara_bayar', 3) Log::info(' Cari data cashless dengan tanggal : ' . $tanggal);
$resultCashless = $queryCashless
// ->where(function ($q) {
// $q->where('status_transaksi', '-0')
// ->orWhere('status_transaksi','3');
// })
->where('cara_bayar', 3)
->groupByRaw("jm.id, jm.nama") ->groupByRaw("jm.id, jm.nama")
->orderByRaw("jm.id, jm.nama") ->orderByRaw("jm.id, jm.nama")
->get(); ->get();
@@ -76,7 +91,7 @@ public function harian(Request $request)
foreach ($resultCashless as $row) { foreach ($resultCashless as $row) {
$jmlCashless += $row->jml; $jmlCashless += $row->jml;
$incomeCashless += $row->value; $incomeCashless += $row->total_bayar;
} }