fix gadaiv1 letak ansuran untuk update terus bukan tunggu udpatejbgsemasa

This commit is contained in:
Hafifie PKB
2024-04-29 10:03:24 +08:00
parent 363ac52949
commit 2e533660e5
2 changed files with 40 additions and 1 deletions
+39
View File
@@ -241,6 +241,9 @@ class GadaiV1
'kodcaw'=> $kodcaw
]);
$tempoh_gadai = $this->tempohTransactionGadai($gadai);
$upah_semasa = $this->kiraupahTawarruqStokAudit($tempoh_gadai,$gadai['tempohbayar'],$gadai['kadarupah'],$gadai['bakipjm']);
$update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
'bakipjm' => $baki_pinjaman,
'jbg' => 0,
@@ -322,6 +325,42 @@ class GadaiV1
return $upah_semasa;
}
private 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');
$current = Carbon::now();
$tahun_gadai = $tarikh_gadai->year;
$bulan_gadai = $tarikh_gadai->month;
$hari_gadai = $tarikh_gadai->day;
$tahun_semasa = $current->year;
$bulan_semasa = $current->month;
$hari_semasa = $current->day;
if($hari_semasa >= $hari_gadai){
$beza_hari = $hari_semasa - $hari_gadai + 1;
}else if($hari_semasa < $hari_gadai){
$bulan_semasa = $bulan_semasa - 1;
$beza_hari = ($hari_semasa + 30) - $hari_gadai + 1;
}
$extensivemonth_gadai = 0;
if($beza_hari >= 1 && $beza_hari <= 15){
$extensivemonth_gadai = 0.5;
}else if($beza_hari >= 16){
$extensivemonth_gadai = 1;
}else{
$extensivemonth_gadai = 0;
}
$beza_tahun = $tahun_semasa - $tahun_gadai;
$beza_bulan = ($bulan_semasa + ($beza_tahun * 12)) - $bulan_gadai;
$tempoh_gadai = $beza_bulan + $extensivemonth_gadai;
return $tempoh_gadai;
}
}
+1 -1
View File
@@ -448,7 +448,7 @@ public function kiraupahTawarruqStokAuditUjrahOnePercent($tempoh,$tempohbayar,$k
return $arraypendapatan;
}
public function tempohTransactionGadai($gadai) : Float{
private function tempohTransactionGadai($gadai) : Float{
if($gadai['t_update'] == null){
Carbon::parse($gadai['t_gadai'].' '. $gadai['masa']);
}else{