diff --git a/app/Http/Controllers/TransactionOnlineTrailController.php b/app/Http/Controllers/TransactionOnlineTrailController.php index 79bb590..99fff12 100644 --- a/app/Http/Controllers/TransactionOnlineTrailController.php +++ b/app/Http/Controllers/TransactionOnlineTrailController.php @@ -34,8 +34,8 @@ class TransactionOnlineTrailController extends Controller private function getTransactionOnlineQuery($request) { - $startDate = $request->startDate ? $request->startDate : Carbon::now()->toDateString(); - $endDate = $request->endDate ? $request->endDate : Carbon::now()->toDateString(); + $startDate = $request->startDate ? Carbon::parse($request->startDate)->startOfDay() : Carbon::now()->startOfDay(); + $endDate = $request->endDate ? Carbon::parse($request->endDate)->endOfDay() : Carbon::now()->endOfDay(); $transactionOnline = TransactionOnline::whereBetween('tarikh', [$startDate, $endDate]) ->when($request->filled('branch'), function ($query) use ($request) { @@ -77,8 +77,8 @@ class TransactionOnlineTrailController extends Controller private function getTransactionQuery($list_norujukan, $request) { $extract_norujukan = array_column($list_norujukan, 'norujukan'); - $startDate = $request->startDate ? $request->startDate : Carbon::now()->toDateString(); - $endDate = $request->endDate ? $request->endDate : Carbon::now()->toDateString(); + $startDate = $request->startDate ? Carbon::parse($request->startDate)->startOfDay() : Carbon::now()->startOfDay(); + $endDate = $request->endDate ? Carbon::parse($request->endDate)->endOfDay() : Carbon::now()->endOfDay(); $transaction = Transaction::whereIn('norujukan', $extract_norujukan) ->whereBetween('created_at', [$startDate, $endDate]) @@ -95,8 +95,8 @@ class TransactionOnlineTrailController extends Controller private function getTransaksiKeuntunganQuery($list_norujukan, $request) { $extract_norujukan = array_column($list_norujukan, 'norujukan'); - $startDate = $request->startDate ? $request->startDate : Carbon::now()->toDateString(); - $endDate = $request->endDate ? $request->endDate : Carbon::now()->toDateString(); + $startDate = $request->startDate ? Carbon::parse($request->startDate)->startOfDay() : Carbon::now()->startOfDay(); + $endDate = $request->endDate ? Carbon::parse($request->endDate)->endOfDay() : Carbon::now()->endOfDay(); $transaksiKeuntungan = TransaksiKeuntungan::whereIn('norujukan', $extract_norujukan) ->whereBetween('tarikh_bayaran', [$startDate, $endDate]) @@ -112,8 +112,8 @@ class TransactionOnlineTrailController extends Controller public function getGlDetailQuery($list_norujukan, $request) { - $startDate = $request->startDate ? $request->startDate : Carbon::now()->toDateString(); - $endDate = $request->endDate ? $request->endDate : Carbon::now()->toDateString(); + $startDate = $request->startDate ? Carbon::parse($request->startDate)->startOfDay() : Carbon::now()->startOfDay(); + $endDate = $request->endDate ? Carbon::parse($request->endDate)->endOfDay() : Carbon::now()->endOfDay(); $extract_norujukan = array_unique(array_column($list_norujukan, 'norujukan')); $extract_kodcaw = array_unique(array_column($list_norujukan, 'kodcaw'));