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

Merged in fixbugs-wtd-process (pull request #406)

Browse Source 
fixbugs-wtd-process
This commit is contained in:
nurulnisha muhammad
2026-04-12 08:26:57 +00:00
parent 4eb86b8f27 00ee7be836
commit 441a39b80f
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+2 -2
View File
@@ -2727,7 +2727,7 @@ class AdminPageController extends Controller
'prkod' => "01", 'prkod' => "01",
'teller' => "DM", 'teller' => "DM",
'bakipjm' => ($lel['bakipjm']) ? $lel['bakipjm'] : 0, 'bakipjm' => ($lel['bakipjm']) ? $lel['bakipjm'] : 0,
'bakiupah' => $lel['bakiupah'], 'bakiupah' => ($lel['bakiupah']) ? $lel['bakiupah'] : 0,
'cajlain' => '0.00', 'cajlain' => '0.00',
'cajlelong' => $lel['cajlelong'], 'cajlelong' => $lel['cajlelong'],
'kodgl' => '', 'kodgl' => '',
@@ -2749,7 +2749,7 @@ class AdminPageController extends Controller
't_jual' => $lel['t_jual'], 't_jual' => $lel['t_jual'],
'hargajual' => $lel['hargajual'], 'hargajual' => $lel['hargajual'],
'pinjaman' => $lel['pinjaman'], 'pinjaman' => $lel['pinjaman'],
'bakiupah' => $lel['bakiupah'], 'bakiupah' => ($lel['bakiupah']) ? $lel['bakiupah'] : 0,
'cajlelong' => $lel['cajlelong'], 'cajlelong' => $lel['cajlelong'],
'gst_cl' => $lel['gst_cl'], 'gst_cl' => $lel['gst_cl'],
'baki' => $lel['baki'], 'baki' => $lel['baki'],
app/Http/Controllers/LaporanController.php
+16 -4
View File
@@ -974,11 +974,23 @@ $date = new Carbon($request->tarikh);
$gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data_kaunter)->whereNotNull('hargajualan')->pluck('norujukan'); $gadaiDataKaunter = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data_kaunter)->whereNotNull('hargajualan')->pluck('norujukan');
// $keuntunganansuran_kaunter_query = TransaksiKeuntungan::on('mysql7')
// ->whereIn('norujukan',$gadaiDataKaunter)
// ->whereDate('tarikh_bayaran','>=',$request->mula)
// ->whereDate('tarikh_bayaran','<=',$request->akhir);
// //new update
$keuntunganansuran_kaunter_query = TransaksiKeuntungan::on('mysql7') $keuntunganansuran_kaunter_query = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiDataKaunter) ->leftJoin('transaction as trans', function($join)
->whereDate('tarikh_bayaran','>=',$request->mula) {
->whereDate('tarikh_bayaran','<=',$request->akhir); $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->whereDate('trans.created_at','>=',$request->mula)
->whereDate('trans.created_at','<=',$request->akhir)
->where('trans.teller','<>','Online')
->where('trans.trans_type','=','A')
->where('trans.kodcaw',$request->kodcaw)
->pluck('transaksi_keuntungan.norujukan');
$total_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->sum('bayaran_keuntungan'); $total_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->sum('bayaran_keuntungan');