Merged in izzati-hotfix-tarikhlelong-tarikhjual (pull request #313)
update tarikh lelong kepada tarikh jual
This commit is contained in:
@@ -64,7 +64,7 @@ class LelonganController extends Controller
|
||||
|
||||
|
||||
if ($request->filled('startDate') && $request->filled('endDate')) {
|
||||
$query->whereBetween('lelong.t_lelong', [$request->startDate, $request->endDate]);
|
||||
$query->whereBetween('lelong.t_jual', [$request->startDate, $request->endDate]);
|
||||
}
|
||||
|
||||
$summary_lelongan_data[$db_connection] = $query->first()->toArray();
|
||||
|
||||
@@ -46,8 +46,8 @@ class LelonganService
|
||||
);
|
||||
|
||||
$query_total_lelongan->when(!empty($this->startDate) and !empty($this->endDate), function ($q) {
|
||||
return $q->where('lelong.t_lelong', '>=', $this->startDate)
|
||||
->where('lelong.t_lelong', '<=', $this->endDate);
|
||||
return $q->where('lelong.t_jual', '>=', $this->startDate)
|
||||
->where('lelong.t_jual', '<=', $this->endDate);
|
||||
});
|
||||
|
||||
$total_lelongan = $this->getTotalLelongan($query_total_lelongan);
|
||||
|
||||
Reference in New Issue
Block a user