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

fix diskaun promosi on tebus

Browse Source
This commit is contained in:
nurafrinaalimi16
2026-09-02 16:41:49 +08:00
parent 280f8cefa4
commit 2363c2947d
2 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+2 -2
View File
@@ -605,9 +605,9 @@ class LelongController extends Controller
if($cawangan['tagarrahnbid'] == 1){ if($cawangan['tagarrahnbid'] == 1){
if(env('APP_ENV') != 'production'){ if(env('APP_ENV') != 'production'){
$link = 'https://adminbid-kopkb.erahn.com.my/api/portalApi'; $link = 'https://adminbid-annur.erahn.com.my/api/portalApi';
}else{ }else{
$link = 'https://adminbid-kopkb.erahn.com.my/api/portalApi'; $link = 'https://adminbid-annur.erahn.com.my/api/portalApi';
} }
$lelong = Http::withOptions(['verify' => true])->get($link,[ $lelong = Http::withOptions(['verify' => true])->get($link,[
app/Support/v2/Penebusan.php
+30 -13
View File
@@ -496,7 +496,7 @@ class Penebusan
return response()->json('duplicate'); return response()->json('duplicate');
} }
$ujrah=0;$onepercent=0;$rounded=0; $ujrah=0;$onepercent=0;$rounded=0;$upah_rebet_sebenar=0;
if($gadai['hargajualan'] == null){ if($gadai['hargajualan'] == null){
$harga_tebus = $this->hargaTebusNotTawarruq($kodcaw,$norujukan); $harga_tebus = $this->hargaTebusNotTawarruq($kodcaw,$norujukan);
$upah_tebus = $this->kiraUpahNotTawarruq($kodcaw,$norujukan); $upah_tebus = $this->kiraUpahNotTawarruq($kodcaw,$norujukan);
@@ -506,7 +506,6 @@ class Penebusan
$harga_tebus = $this->hargaTebusTawarruq($kodcaw,$norujukan,$request->jeniskeuntungan); $harga_tebus = $this->hargaTebusTawarruq($kodcaw,$norujukan,$request->jeniskeuntungan);
$upah_tebus = $this->kiraupahTawarruq($norujukan); $upah_tebus = $this->kiraupahTawarruq($norujukan);
$upah_rebet = $this->kiraUpahRebetSebenar($kodcaw,$norujukan); $upah_rebet = $this->kiraUpahRebetSebenar($kodcaw,$norujukan);
$upah_rebet_sebenar = $harga_tebus['harga'] - $gadai['bakipjm'];
if($request->jeniskeuntungan == 'onepercent'){ if($request->jeniskeuntungan == 'onepercent'){
$array_onepercent = $this->kiraupahUjrahOnePercent($kodcaw,$norujukan); $array_onepercent = $this->kiraupahUjrahOnePercent($kodcaw,$norujukan);
@@ -518,10 +517,14 @@ class Penebusan
$ujrah = $array_onepercent['ujrah']; $ujrah = $array_onepercent['ujrah'];
$onepercent = $array_onepercent['onepercent']; $onepercent = $array_onepercent['onepercent'];
} }
// FIX: tolak diskaun DAHULU sebelum kira upah_rebet_sebenar
$harga_tebus['harga'] -= $diskaun;
$upah_rebet_sebenar = $harga_tebus['harga'] - $gadai['bakipjm'];
} }
// Tolak diskaun dari harga tebus $bayaran_keuntungan_bersih = max(0, $upah_rebet_sebenar);
$harga_tebus['harga'] -= $diskaun;
$create_tebus = Tebus::on($cawangan['mysql'])->create([ $create_tebus = Tebus::on($cawangan['mysql'])->create([
'kodcaw'=> $kodcaw, 'kodcaw'=> $kodcaw,
@@ -568,18 +571,28 @@ class Penebusan
$transaction_upah = TransaksiKeuntungan::on('mysql7')->create([ $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
'norujukan' => $norujukan, 'norujukan' => $norujukan,
'bayaran_keuntungan' => $upah_tebus, 'bayaran_keuntungan' => $bayaran_keuntungan_bersih,
'bayaran_pembiayaan' => $gadai['bakipjm'], 'bayaran_pembiayaan' => $gadai['bakipjm'],
'keuntungan_rebet' => $upah_rebet_sebenar, 'keuntungan_rebet' => $upah_rebet_sebenar,
'tarikh_bayaran' => $current, 'tarikh_bayaran' => $current,
'kodcaw' => $kodcaw, 'kodcaw' => $kodcaw,
'ujrah' => ($request->jeniskeuntungan == 'onepercent') ? $array_onepercent['ujrah'] : 0, 'ujrah' => ($request->jeniskeuntungan == 'onepercent')
'ujrah_rebet' => ($request->jeniskeuntungan == 'onepercent') ? $ujrah_rebet : 0, ? $array_onepercent['ujrah']
'onepercent' => ($request->jeniskeuntungan == 'onepercent') ? $array_onepercent['onepercent'] : 0, : 0,
'onepercent_rebet' => ($request->jeniskeuntungan == 'onepercent') ? $onepercent_rebet : 0, 'ujrah_rebet' => ($request->jeniskeuntungan == 'onepercent')
'margin_semasa' => ($request->jeniskeuntungan == 'onepercent') ? $margin_semasa : 0, ? $ujrah_rebet
: 0,
'onepercent' => ($request->jeniskeuntungan == 'onepercent')
? $array_onepercent['onepercent']
: 0,
'onepercent_rebet' => ($request->jeniskeuntungan == 'onepercent')
? $onepercent_rebet
: 0,
'margin_semasa' => ($request->jeniskeuntungan == 'onepercent')
? $margin_semasa
: 0,
'tempoh' => $gadai['tempoh'], 'tempoh' => $gadai['tempoh'],
'beza_tempoh' => ($gadai['tempoh'] - $gadai['tempohbayar']), 'beza_tempoh' => $gadai['tempoh'] - $gadai['tempohbayar'],
]); ]);
if($request->jenistebus == 'P'){ if($request->jenistebus == 'P'){
@@ -690,6 +703,8 @@ class Penebusan
} }
} }
$bayaran_keuntungan_bersih = max(0, $upah_rebet_sebenar);
$update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
'sttebus' => "T", 'sttebus' => "T",
't_update' => $current->toDateString(), 't_update' => $current->toDateString(),
@@ -743,7 +758,7 @@ class Penebusan
$transaction_upah = TransaksiKeuntungan::on('mysql7')->create([ $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
'norujukan' => $norujukan, 'norujukan' => $norujukan,
'bayaran_keuntungan' => $upah_tebus, 'bayaran_keuntungan' => $bayaran_keuntungan_bersih,
'bayaran_pembiayaan' => $bayaran_pembiayaan, 'bayaran_pembiayaan' => $bayaran_pembiayaan,
'keuntungan_rebet' => $upah_rebet_sebenar, 'keuntungan_rebet' => $upah_rebet_sebenar,
'tarikh_bayaran'=> $current, 'tarikh_bayaran'=> $current,
@@ -1140,10 +1155,12 @@ class Penebusan
$upah_rebet_sebenar = $harga_tebus['harga'] - $gadai['bakipjm']; $upah_rebet_sebenar = $harga_tebus['harga'] - $gadai['bakipjm'];
$bayaran_keuntungan_bersih = max(0, $upah_rebet_sebenar);
try{ try{
TransaksiKeuntungan::on('mysql7')->create([ TransaksiKeuntungan::on('mysql7')->create([
'norujukan' => $norujukan, 'norujukan' => $norujukan,
'bayaran_keuntungan' => $upah_tebus, 'bayaran_keuntungan' => $bayaran_keuntungan_bersih,
'bayaran_pembiayaan' => $bayaran_pembiayaan, 'bayaran_pembiayaan' => $bayaran_pembiayaan,
'keuntungan_rebet' => $upah_rebet_sebenar, 'keuntungan_rebet' => $upah_rebet_sebenar,
'tarikh_bayaran'=> $current, 'tarikh_bayaran'=> $current,