Perbaikan shift api
This commit is contained in:
@@ -23,6 +23,7 @@ public function harian(Request $request)
|
|||||||
|
|
||||||
$tanggal = $request->input('tanggal');
|
$tanggal = $request->input('tanggal');
|
||||||
$shift = $request->input('shift');
|
$shift = $request->input('shift');
|
||||||
|
Log::info($shift);
|
||||||
// $cashless = $request->input('cashless');
|
// $cashless = $request->input('cashless');
|
||||||
|
|
||||||
$cash = [];
|
$cash = [];
|
||||||
@@ -39,14 +40,19 @@ public function harian(Request $request)
|
|||||||
// Terapkan filter tanggal berdasarkan input
|
// Terapkan filter tanggal berdasarkan input
|
||||||
$totalTrans = 0;
|
$totalTrans = 0;
|
||||||
$totalIncome = 0;
|
$totalIncome = 0;
|
||||||
$dateField = ($shift == null) ? 'waktu_keluar' : 'pklogin';
|
if ($shift === null || $shift === 0 || $shift === '0') {
|
||||||
|
$dateField = 'waktu_keluar' ;
|
||||||
|
} else {
|
||||||
|
$dateField = 'pklogin';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Log::info('Memproses permintaan dengan perhitungan : ' . $dateField);
|
||||||
// Cash payment initialize
|
// Cash payment initialize
|
||||||
$queryCash = $this->getTrans();
|
$queryCash = $this->getTrans();
|
||||||
if ($tanggal) {
|
if ($tanggal) {
|
||||||
$queryCash->whereDate($dateField, '=', $tanggal);
|
$queryCash->whereDate($dateField, '=', $tanggal);
|
||||||
}
|
}
|
||||||
Log::info('Cari data cash dengan tanggal : ' . $tanggal);
|
Log::info('Find cash transaksi with params date : ' . $tanggal . ', and : ' . $dateField);
|
||||||
$resultCash = $queryCash
|
$resultCash = $queryCash
|
||||||
->where(function ($q) {
|
->where(function ($q) {
|
||||||
$q->whereRaw('cara_bayar <> 3')
|
$q->whereRaw('cara_bayar <> 3')
|
||||||
|
|||||||
Reference in New Issue
Block a user