fix untuk surat lama

This commit is contained in:
Hafifie PKB
2024-12-16 10:44:56 +08:00
parent f13dd32146
commit b5e17aaee2
+7 -7
View File
@@ -793,9 +793,9 @@ class Penebusan
} }
$array_tebus = $request->only(['jeniskeuntungan', 'nopelanggan','jenistebus','addpinjaman','nowakil','marhun','teller','bakipinjaman','bakiupah']); $array_tebus = $request->only(['jeniskeuntungan', 'nopelanggan','jenistebus','addpinjaman','nowakil','marhun','teller','bakipinjaman','bakiupah']);
$array_trans = $request->only(['nopelanggan', 'noic','jenisAT','pinjaman','marhun','teller','jenistebus']); $array_trans = $request->only(['nopelanggan', 'noic','jenisAT','pinjaman','pinjamanbaru','marhun','teller','jenistebus']);
$array_tebus_base = $request->only(['totalbayaran', 'bakiupah','jeniskeuntungan','bakipinjaman','jenistebus','teller','nowakil','duitpelanggan']); $array_tebus_base = $request->only(['totalbayaran', 'bakiupah','jeniskeuntungan','bakipinjaman','jenistebus','teller','nowakil','duitpelanggan']);
$array_trans_base = $request->only(['pinjaman','teller']); $array_trans_base = $request->only(['pinjaman','teller','pinjamanbaru']);
try{ try{
DB::connection($cawangan['mysql'])->beginTransaction(); DB::connection($cawangan['mysql'])->beginTransaction();
@@ -978,7 +978,7 @@ class Penebusan
'tag_permata' => $marhunloop['tag_permata'] != null ? $marhunloop['tag_permata'] : 0, 'tag_permata' => $marhunloop['tag_permata'] != null ? $marhunloop['tag_permata'] : 0,
'berat_batu_permata' => $marhunloop['berat_batu_permata'] != null ? $marhunloop['berat_batu_permata'] : '', 'berat_batu_permata' => $marhunloop['berat_batu_permata'] != null ? $marhunloop['berat_batu_permata'] : '',
'karat' => $marhunloop['karat'], 'karat' => $marhunloop['karat'],
'berat' => $marhunloop['berat_emas'], 'berat' => $marhunloop['berat'],
'harga' => $harga, 'harga' => $harga,
'n_marhun' => $nilai_marhun 'n_marhun' => $nilai_marhun
]; ];
@@ -1022,12 +1022,12 @@ class Penebusan
->update(array( ->update(array(
'nilaimarhun' => $total_nilai_marhun, 'nilaimarhun' => $total_nilai_marhun,
'berat'=> $total_berat_marhun, 'berat'=> $total_berat_marhun,
'pinjaman' => $array_trans['pinjaman'], 'pinjaman' => $array_trans['pinjamanbaru'],
'kadarupah' => $kadar_raw['kadarujrah'], 'kadarupah' => $kadar_raw['kadarujrah'],
'marhun' => $array_trans['marhun'], 'marhun' => $array_trans['marhun'],
'percentpinj' => $margin_pinjaman, 'percentpinj' => $margin_pinjaman,
'teller' => $array_trans['teller'], 'teller' => $array_trans['teller'],
'bakipjm' => $array_trans['pinjaman'], 'bakipjm' => $array_trans['pinjamanbaru'],
'bakiupah' => $upah6, 'bakiupah' => $upah6,
'jbg' => 0.5, 'jbg' => 0.5,
't_update' => $current->toDateString(), 't_update' => $current->toDateString(),
@@ -1051,12 +1051,12 @@ class Penebusan
'tagbaru' => 1, 'tagbaru' => 1,
'tunggakanujrah' => $akrual_ujrah, 'tunggakanujrah' => $akrual_ujrah,
'tunggakanonepercent' => $akrual_onepercent, 'tunggakanonepercent' => $akrual_onepercent,
'historygadaian' => $norujukan,
)); ));
Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
'sttebus' => "T", 'sttebus' => "T",
't_update' => $current->toDateString(), 't_update' => $current->toDateString(),
'historygadaian' => $new_sag_number,
'tag_tebus' => $array_trans['jenistebus'], 'tag_tebus' => $array_trans['jenistebus'],
)); ));
@@ -1074,7 +1074,7 @@ class Penebusan
$unit_current = isset($komuditi_current['unit_komuditi']) ? $komuditi_current['unit_komuditi']: 0; $unit_current = isset($komuditi_current['unit_komuditi']) ? $komuditi_current['unit_komuditi']: 0;
try{ try{
$update_unit = $unit_current - $array_trans_base['pinjaman']; $update_unit = $unit_current - $array_trans_base['pinjamanbaru'];
KomuditiPurchase::on('mysql7')->where('id','=',$komuditi_current['id'])->update([ KomuditiPurchase::on('mysql7')->where('id','=',$komuditi_current['id'])->update([
'unit_komuditi' => $update_unit 'unit_komuditi' => $update_unit