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

fix ansuran tak masuk dalam keuntungan sebenar dan fix untuk ansuran yang tak update directly

Browse Source
This commit is contained in:
Hafifie PKB
2024-04-29 09:46:00 +08:00
parent 5d2f5c53a5
commit 363ac52949
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+17 -1
View File
@@ -3141,7 +3141,23 @@ class AdminPageController extends Controller
$sum_keuntungan = ($sum_keun) ? $sum_keun[0]['sum_keun'] : 0; $sum_keuntungan = ($sum_keun) ? $sum_keun[0]['sum_keun'] : 0;
$sum_bayaran = ($sum_keun) ? $sum_keun[0]['sum_bayaran'] : 0; $sum_bayaran = ($sum_keun) ? $sum_keun[0]['sum_bayaran'] : 0;
$total = $sum_keuntungan + $sum_bayaran; /* Ansuran masuk dalam ni */
$get_norujukan_ansuran = Gadai::on($cawangan['mysql'])
->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result")
->whereNotNull('hargajualan')
->having('result','=',1)
->whereYear('t_gadai','=',$year)
->whereMonth('t_gadai','<=',$month)
->where('sttebus','=','')
->pluck('norujukan');
$summation_ansuran = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$get_norujukan_ansuran)->sum('bayaran_keuntungan');
$total = $sum_keuntungan + $sum_bayaran + $summation_ansuran;
return response()->json($total); return response()->json($total);
} }
app/Support/v2/GadaiV2.php
+8 -3
View File
@@ -312,8 +312,7 @@ class GadaiV2
$margin_updated = ($baki_pinjaman / $gadai['nilaimarhun']) * 100; $margin_updated = ($baki_pinjaman / $gadai['nilaimarhun']) * 100;
$tempoh_gadai = $this->tempohTransactionGadai($gadai); $tempoh_gadai = $this->tempohTransactionGadai($gadai);
$akrual = $this->kiraupahTawarruqStokAuditUjrahOnePercent($tempoh_gadai,$gadai['tempohbayar'],$gadai['kadarujrah'],$gadai['bakipjm'],$gadai['nilaimarhun'],$margin_semasa); $akrual = $this->kiraupahTawarruqStokAuditUjrahOnePercent($tempoh_gadai,$gadai['tempoh'],$gadai['kadarujrah'],$gadai['bakipjm'],$gadai['nilaimarhun'],$margin_semasa);
$update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
'bakipjm' => $baki_pinjaman, 'bakipjm' => $baki_pinjaman,
'jbg' => 0, 'jbg' => 0,
@@ -449,7 +448,13 @@ public function kiraupahTawarruqStokAuditUjrahOnePercent($tempoh,$tempohbayar,$k
return $arraypendapatan; return $arraypendapatan;
} }
private function tempohTransactionGadai($gadai){ public function tempohTransactionGadai($gadai) : Float{
if($gadai['t_update'] == null){
Carbon::parse($gadai['t_gadai'].' '. $gadai['masa']);
}else{
Carbon::parse($gadai['t_update'].' 00:00:00' );
}
$tarikh_gadai = Carbon::parse($gadai['t_gadai']. ' 00:00:00'); $tarikh_gadai = Carbon::parse($gadai['t_gadai']. ' 00:00:00');
$current = Carbon::now(); $current = Carbon::now();
$tahun_gadai = $tarikh_gadai->year; $tahun_gadai = $tarikh_gadai->year;