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

fix add api

Browse Source
This commit is contained in:
Hafifie PKB
2024-12-15 12:14:22 +08:00
parent f986e0a515
commit e33af1a75e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Support/v2/Penebusan.php
+9 -9
View File
@@ -994,9 +994,9 @@ class Penebusan
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
$array_tebus = $request->only(['jeniskeuntungan', 'nopelanggan','jenistebus','addpinjaman','nowakil','marhun','teller']); $array_tebus = $request->only(['jeniskeuntungan', 'nopelanggan','jenistebus','addpinjaman','nowakil','marhun','teller']);
$array_trans = $request->only(['nopelanggan', 'noic','pinjaman','marhun','teller','jenistebus']); $array_trans = $request->only(['nopelanggan', 'noic','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{
//check duplicate //check duplicate
@@ -1226,7 +1226,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
]; ];
@@ -1242,7 +1242,7 @@ class Penebusan
$total_bil_marhun = Marhun::on($cawangan['mysql'])->where('norujukan',$new_sag_number)->sum('bil'); $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'); $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 = Carbon::now();
$t_matang = $t_matang->addMonths(6)->subDays(1); $t_matang = $t_matang->addMonths(6)->subDays(1);
@@ -1253,7 +1253,7 @@ class Penebusan
$kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->where('group_id',$cawangan['group_id'])->first(); $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->where('group_id',$cawangan['group_id'])->first();
$onepercentservices = new Calculation(); $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']); $upah1 = $onepercentservices->getRoundedMethod($keuntungan['keuntungan']);
$upah6 = $onepercentservices->getRoundedMethod($upah1 * 6); $upah6 = $onepercentservices->getRoundedMethod($upah1 * 6);
@@ -1263,19 +1263,19 @@ class Penebusan
$akrual_ujrah = $onepercentservices->getRoundedMethod($keuntungan['ujrah'] * 0.5); $akrual_ujrah = $onepercentservices->getRoundedMethod($keuntungan['ujrah'] * 0.5);
$akrual_onepercent = $onepercentservices->getRoundedMethod($keuntungan['onepercent'] * 0.5); $akrual_onepercent = $onepercentservices->getRoundedMethod($keuntungan['onepercent'] * 0.5);
$hargajualan = $array_trans['pinjaman'] + $upah12; $hargajualan = $array_trans['pinjamanbaru'] + $upah12;
Gadai::on($cawangan['mysql']) Gadai::on($cawangan['mysql'])
->where('norujukan','=',$new_sag_number) ->where('norujukan','=',$new_sag_number)
->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(),
@@ -1322,7 +1322,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