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

fix delete panjar

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-07-07 16:38:29 +08:00
parent 750232c915
commit 547f36d9a1
6 changed files with 84 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LaporanController.php
+14 -4
View File
@@ -47,10 +47,12 @@ class LaporanController extends Controller
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->whereDate('trans.created_at','=',$request->tarikh)
->where('trans.kodcaw','=',$request->kodcaw)
->where('trans.trans_type','=','A')
->groupBy('trans.id')
// ->groupBy('trans.id')
->sum('bayaran_keuntungan');
// $total_ansuran = number_format($total_ansuran,2);
$total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus);
@@ -181,7 +183,10 @@ class LaporanController extends Controller
}
//g
$bayar_baki_lelong = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('jumlah');
$tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh);
$bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
//h
$gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('pinjaman');
@@ -205,6 +210,7 @@ class LaporanController extends Controller
'bilangan_ansuran'=>$bilangan_ansuran,
'bilangan_customer_baru'=>$bilangan_customer_baru,
'bayar_baki_lelong'=>$bayar_baki_lelong,
'bayar_rugi_lelong'=>$bayar_rugi_lelong,
'gadai_70'=>$gadai_70,
'gadai_75'=>$gadai_75,
'gadai_80'=>$gadai_80,
@@ -265,7 +271,7 @@ class LaporanController extends Controller
->whereDate('trans.created_at','<=',$request->akhir)
->where('trans.trans_type','=','A')
->where('trans.kodcaw','=',$request->kodcaw)
->groupBy('trans.id')
// ->groupBy('trans.id')
->sum('bayaran_keuntungan');
// $total_ansuran = number_format($total_ansuran,2);
@@ -301,7 +307,10 @@ class LaporanController extends Controller
}
//g
$bayar_baki_lelong = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->sum('jumlah');
$tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]]);
$bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
$bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
//h
$gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('pinjaman');
@@ -325,6 +334,7 @@ class LaporanController extends Controller
'bilangan_ansuran'=>$bilangan_ansuran,
'bilangan_customer_baru'=>$bilangan_customer_baru,
'bayar_baki_lelong'=>$bayar_baki_lelong,
'bayar_rugi_lelong'=>$bayar_rugi_lelong,
'gadai_70'=>$gadai_70,
'gadai_75'=>$gadai_75,
'gadai_80'=>$gadai_80,