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

merged server

Browse Source
This commit is contained in:
hafifierahman
2024-12-31 00:16:55 +08:00
parent 6c780beb7e 909c3e3a16
commit 52cb63600c
10 changed files with 169 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Support/v1/Penebusan.php
+4 -3
View File
@@ -191,7 +191,8 @@ class Penebusan
$bilang_bln = $tempoh - $gadai_data['tempohbayar'];
$tawarruqservices = new V1Calculation();
$keuntungan = $tawarruqservices->kiraanTawarruq($gadai_data['pinjaman'],$gadai_data['kadarupah']);
//$keuntungan = $tawarruqservices->kiraanTawarruq($gadai_data['pinjaman'],$gadai_data['kadarupah']);
$keuntungan = $tawarruqservices->kiraanTawarruq(($gadai_data['pinjaman'] !== null) ? $gadai_data['pinjaman'] : 0,($gadai_data['kadarupah'] !== null) ? $gadai_data['kadarupah'] : 0);
$upahsemasa_raw = $bilang_bln * $keuntungan;
$upah_semasa_round = number_format($upahsemasa_raw,2);
@@ -461,7 +462,7 @@ class Penebusan
//check duplicate
$data = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->where('trans_type','=','T')->first();
if(!empty($data)){
return 'duplicate';
return response()->json('duplicate');
}
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
@@ -604,7 +605,7 @@ class Penebusan
//check duplicate
$data = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->where('trans_type','=','AT')->first();
if(!empty($data)){
return 'duplicate';
return response()->json('duplicate');
}
$update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
app/Support/v2/GadaiV2.php
+9 -3
View File
@@ -175,8 +175,11 @@ class GadaiV2
$bilang_bln = $tempoh - $gadai_data['tempohbayar'];
$upah = $onepercentservices->kiraanKeuntunganSebenar($gadai_data['pinjaman'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['percentpinj']);
$upahsemasa_raw = $bilang_bln * $upah['keuntungan'];
$upahsemasa_raw = $onepercentservices->getRoundedMethod($upahsemasa_raw);
//$upahsemasa_raw = $bilang_bln * $upah['keuntungan'];
$onepercent = $onepercentservices->getRoundedMethod($bilang_bln * $upah['onepercent']);
$ujrah = $onepercentservices->getRoundedMethod($bilang_bln * $upah['ujrah']);
$upahsemasa_raw = $onepercent + $ujrah;
$upahsemasa_raw = $onepercentservices->getRoundedMethod($upahsemasa_raw);
return $upahsemasa_raw;
}
@@ -201,7 +204,10 @@ class GadaiV2
$upah = $onepercentservices->kiraanKeuntunganRebet($gadai_data['bakipjm'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['margin_semasa']);
$upahrebet_raw = $bilang_bln * $upah['keuntungan'];
//$upahrebet_raw = $bilang_bln * $upah['keuntungan'];
$onepercent = $onepercentservices->getRoundedMethod($bilang_bln * $upah['onepercent']);
$ujrah = $onepercentservices->getRoundedMethod($bilang_bln * $upah['ujrah']);
$upahrebet_raw = $onepercent + $ujrah;
$upahrebet_raw = $onepercentservices->getRoundedMethod($upahrebet_raw);
return $upahrebet_raw;
app/Support/v2/Penebusan.php
+2 -2
View File
@@ -489,7 +489,7 @@ class Penebusan
$data = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->whereIn('trans_type', ['P', 'T', 'S'])->first();
if(!empty($data)){
return 'duplicate';
return response()->json('duplicate');
}
$ujrah=0;$onepercent=0;$rounded=0;
@@ -655,7 +655,7 @@ class Penebusan
$data = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->where('trans_type','=','AT')->first();
if(!empty($data)){
return 'duplicate';
return response()->json('duplicate');
}
$ujrah=0;$onepercent=0;$rounded=0;