fix sag lama untuk ps

This commit is contained in:
Hafifie PKB
2024-12-16 21:58:04 +08:00
parent b5e17aaee2
commit 954568b086
4 changed files with 22 additions and 14 deletions
+7 -4
View File
@@ -890,7 +890,7 @@ class Penebusan
$bayaran_pembiayaan = $array_tebus_base['totalbayaran'] - $array_tebus_base['bakiupah'];
$upah_rebet_sebenar = $harga_tebus['harga'] - $gadai['bakipjm'];
$upah_rebet_sebenar = $harga_tebus - $gadai['bakipjm'];
try{
TransaksiKeuntungan::on('mysql7')->create([
@@ -936,9 +936,12 @@ class Penebusan
$gadaiTransaction = optional($gadaiTransaction)->toArray();
$new_sirig = ($gadaiTransaction) ? $gadaiTransaction['sirig'] + 1 : 1;
$curent_year = substr($current->year,2,2);
$curent_month = sprintf("%02d", $current->month);
$current_day = sprintf("%02d", $current->day);
$new_transaction = sprintf("%04d",$new_sirig);
$new_sag_number = strtoupper($cawangan['kodcaw']) . $current->year . $current->month . $current->day . '-' .$new_transaction;
$new_sag_number = strtoupper($cawangan['kodcaw']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
try{
Gadai::on($cawangan['mysql'])->create([
@@ -994,7 +997,7 @@ class Penebusan
$total_bil_marhun = Marhun::on($cawangan['mysql'])->where('norujukan',$new_sag_number)->sum('bil');
$total_berat_marhun = Marhun::on($cawangan['mysql'])->where('norujukan',$new_sag_number)->sum('berat');
$margin_pinjaman = ($array_trans['pinjaman'] / $total_nilai_marhun);
$margin_pinjaman = ($array_trans['pinjamanbaru'] / $total_nilai_marhun);
$t_matang = Carbon::now();
$t_matang = $t_matang->addMonths(6)->subDays(1);
@@ -1005,7 +1008,7 @@ class Penebusan
$kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->where('group_id',$cawangan['group_id'])->first();
$onepercentservices = new Calculation();
$keuntungan = $onepercentservices->kiraanKeuntunganSebenar($array_trans['pinjaman'],$total_nilai_marhun,$kadar_raw['kadarujrah'],$margin_pinjaman);
$keuntungan = $onepercentservices->kiraanKeuntunganSebenar($array_trans['pinjamanbaru'],$total_nilai_marhun,$kadar_raw['kadarujrah'],$margin_pinjaman);
$upah1 = $onepercentservices->getRoundedMethod($keuntungan['keuntungan']);
$upah6 = $onepercentservices->getRoundedMethod($upah1 * 6);