KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix date query

Browse Source
This commit is contained in:
Afiq Hamzah
2024-10-06 11:56:58 +08:00
parent 217febba99
commit c1d016b667
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TransactionOnlineTrailController.php
+8 -8
View File
@@ -34,8 +34,8 @@ class TransactionOnlineTrailController extends Controller
private function getTransactionOnlineQuery($request) private function getTransactionOnlineQuery($request)
{ {
$startDate = $request->startDate ? $request->startDate : Carbon::now()->toDateString(); $startDate = $request->startDate ? Carbon::parse($request->startDate)->startOfDay() : Carbon::now()->startOfDay();
$endDate = $request->endDate ? $request->endDate : Carbon::now()->toDateString(); $endDate = $request->endDate ? Carbon::parse($request->endDate)->endOfDay() : Carbon::now()->endOfDay();
$transactionOnline = TransactionOnline::whereBetween('tarikh', [$startDate, $endDate]) $transactionOnline = TransactionOnline::whereBetween('tarikh', [$startDate, $endDate])
->when($request->filled('branch'), function ($query) use ($request) { ->when($request->filled('branch'), function ($query) use ($request) {
@@ -77,8 +77,8 @@ class TransactionOnlineTrailController extends Controller
private function getTransactionQuery($list_norujukan, $request) private function getTransactionQuery($list_norujukan, $request)
{ {
$extract_norujukan = array_column($list_norujukan, 'norujukan'); $extract_norujukan = array_column($list_norujukan, 'norujukan');
$startDate = $request->startDate ? $request->startDate : Carbon::now()->toDateString(); $startDate = $request->startDate ? Carbon::parse($request->startDate)->startOfDay() : Carbon::now()->startOfDay();
$endDate = $request->endDate ? $request->endDate : Carbon::now()->toDateString(); $endDate = $request->endDate ? Carbon::parse($request->endDate)->endOfDay() : Carbon::now()->endOfDay();
$transaction = Transaction::whereIn('norujukan', $extract_norujukan) $transaction = Transaction::whereIn('norujukan', $extract_norujukan)
->whereBetween('created_at', [$startDate, $endDate]) ->whereBetween('created_at', [$startDate, $endDate])
@@ -95,8 +95,8 @@ class TransactionOnlineTrailController extends Controller
private function getTransaksiKeuntunganQuery($list_norujukan, $request) private function getTransaksiKeuntunganQuery($list_norujukan, $request)
{ {
$extract_norujukan = array_column($list_norujukan, 'norujukan'); $extract_norujukan = array_column($list_norujukan, 'norujukan');
$startDate = $request->startDate ? $request->startDate : Carbon::now()->toDateString(); $startDate = $request->startDate ? Carbon::parse($request->startDate)->startOfDay() : Carbon::now()->startOfDay();
$endDate = $request->endDate ? $request->endDate : Carbon::now()->toDateString(); $endDate = $request->endDate ? Carbon::parse($request->endDate)->endOfDay() : Carbon::now()->endOfDay();
$transaksiKeuntungan = TransaksiKeuntungan::whereIn('norujukan', $extract_norujukan) $transaksiKeuntungan = TransaksiKeuntungan::whereIn('norujukan', $extract_norujukan)
->whereBetween('tarikh_bayaran', [$startDate, $endDate]) ->whereBetween('tarikh_bayaran', [$startDate, $endDate])
@@ -112,8 +112,8 @@ class TransactionOnlineTrailController extends Controller
public function getGlDetailQuery($list_norujukan, $request) public function getGlDetailQuery($list_norujukan, $request)
{ {
$startDate = $request->startDate ? $request->startDate : Carbon::now()->toDateString(); $startDate = $request->startDate ? Carbon::parse($request->startDate)->startOfDay() : Carbon::now()->startOfDay();
$endDate = $request->endDate ? $request->endDate : Carbon::now()->toDateString(); $endDate = $request->endDate ? Carbon::parse($request->endDate)->endOfDay() : Carbon::now()->endOfDay();
$extract_norujukan = array_unique(array_column($list_norujukan, 'norujukan')); $extract_norujukan = array_unique(array_column($list_norujukan, 'norujukan'));
$extract_kodcaw = array_unique(array_column($list_norujukan, 'kodcaw')); $extract_kodcaw = array_unique(array_column($list_norujukan, 'kodcaw'));