Fixed transaksi keuntungan query for TransactionOnlineTrail

This commit is contained in:
Afiq Hamzah
2024-08-11 13:29:51 +08:00
parent 80908c1916
commit 40ac139fbe
2 changed files with 10 additions and 3 deletions
@@ -88,6 +88,9 @@ class TransactionOnlineTrailController extends Controller
private function getTransaksiKeuntunganQuery($date, $request)
{
$transaksiKeuntungan = TransaksiKeuntungan::whereDate('tarikh_bayaran', $date)
->whereHas('transaction', function ($query) {
return $query->where('teller', 'Online');
})
->when($request->filled('norujukan'), function ($query) use ($request) {
return $query->where('norujukan', $request->norujukan);
})
@@ -123,7 +126,7 @@ class TransactionOnlineTrailController extends Controller
$connectionCawangan = Cawangan::on('mysql7')->whereIn('kodcaw', $cawanganTransactionOnline)->get()->pluck('mysql');
$glDetail = $connectionCawangan->map(fn($x) => GlDetail::on($x)->where('teller', 'ONLINE')->whereDate('tarikh', $date)->get())
$glDetail = $connectionCawangan->map(fn($x) => GlDetail::on($x)->where('teller', 'ONLINE')->whereDate('tarikh', $date)->orderBy('recno')->get())
->flatten()
->when($isGroupByNorujukan, function ($glDetail) {
return $glDetail->groupBy('descpt')
@@ -135,7 +138,6 @@ class TransactionOnlineTrailController extends Controller
->when($request->filled('norujukan'), function ($glDetail) use ($request) {
return $glDetail->filter(fn($x) => strpos($x->descpt, $request->norujukan) !== false);
})
->sortKeysDesc()
->toArray();
return $glDetail;
+6 -1
View File
@@ -23,4 +23,9 @@ class TransaksiKeuntungan extends Model
* @var array
*/
// protected $hidden = [];
}
function transaction()
{
return $this->hasOne(Transaction::class, 'norujukan', 'norujukan');
}
}