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

Merge branch 'ujrah_master_fix' of https://bitbucket.org/arrahn-pkb/api_arrahn into test-simulator-nisha

Browse Source
This commit is contained in:
nishaMuhd
2024-04-02 13:14:41 +08:00
parent 2ac2176f2e 3be2247cb0
commit d74f09953c
2 changed files with 65 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+16 -18
View File
@@ -61,32 +61,30 @@ class MarhunController extends Controller
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
$request_data = json_decode($request->getContent(), false); $harga = HargaEmas::on('mysql7')->where('karat',$request->karat)->first();
$harga = HargaEmas::on('mysql7')->where('karat',$request_data->karat)->first();
$hargaemas = $harga['harga']; $hargaemas = $harga['harga'];
if(isset($request_data->jenisAT)){ if(isset($request->jenisAT)){
if($request_data->jenisAT == 'hargalama'){ if($request->jenisAT == 'hargalama'){
$hargaemas = $request_data->harga; $hargaemas = $request->harga;
// $nilai_marhun = $request_data->berat_emas * $request_data->harga; // $nilai_marhun = $request->berat_emas * $request->harga;
}else $hargaemas = $harga['harga']; }else $hargaemas = $harga['harga'];
// $nilai_marhun = $request_data->berat_emas * $harga['harga']; // $nilai_marhun = $request->berat_emas * $harga['harga'];
}else $hargaemas = $harga['harga']; }else $hargaemas = $harga['harga'];
$nilai_marhun = $request_data->berat_emas * $hargaemas; $nilai_marhun = $request->berat_emas * $hargaemas;
$marhunToCreate = [ $marhunToCreate = [
'kodcaw'=> $kodcaw, 'kodcaw'=> $kodcaw,
'norujukan'=> $request_data->norujukan, 'norujukan'=> $request->norujukan,
't_gadai' => $current->toDateString(), 't_gadai' => $current->toDateString(),
'bil' => 1, 'bil' => 1,
'marhun' => $request_data->marhun, 'marhun' => $request->marhun,
'nota' => $request_data->nota, 'nota' => $request->nota,
'tag_permata' => $request_data->tag_permata, 'tag_permata' => $request->tag_permata != null ? $request->tag_permata : 0,
'berat_batu_permata' => $request_data->berat_batu_permata, 'berat_batu_permata' => $request->berat_batu_permata != null ? $request->berat_batu_permata : '',
'karat' => $request_data->karat, 'karat' => $request->karat,
'berat' => $request_data->berat_emas, 'berat' => $request->berat_emas,
'harga' => $hargaemas, 'harga' => $hargaemas,
'n_marhun' => $nilai_marhun 'n_marhun' => $nilai_marhun
]; ];
@@ -100,9 +98,9 @@ class MarhunController extends Controller
$marhun = Marhun::on($cawangan['mysql'])->create($marhunToCreate); $marhun = Marhun::on($cawangan['mysql'])->create($marhunToCreate);
$audit = new Audit(); $audit = new Audit();
$audit->users = $request_data->teller; $audit->users = $request->teller;
$audit->actions = 'Daftar Marhun'; $audit->actions = 'Daftar Marhun';
$audit->norujukan = $request_data->norujukan; $audit->norujukan = $request->norujukan;
$audit->new_data = $marhun; $audit->new_data = $marhun;
$audit->kodcaw = $kodcaw; $audit->kodcaw = $kodcaw;
$audit->created_at = $current; $audit->created_at = $current;
app/Support/v2/Penebusan.php
+49 -17
View File
@@ -649,12 +649,33 @@ class Penebusan
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
$ujrah=0;$onepercent=0;$rounded=0;
if($gadai['hargajualan'] == null){
$harga_tebus = $this->hargaTebusNotTawarruq($kodcaw,$norujukan);
$upah_tebus = $this->kiraUpahNotTawarruq($kodcaw,$norujukan);
$upah_rebet = 0;
$upah_rebet_sebenar = 0;
}else{
$harga_tebus = $this->hargaTebusTawarruq($kodcaw,$norujukan,$request->jeniskeuntungan);
$upah_tebus = $this->kiraupahTawarruq($norujukan);
$upah_rebet = $this->kiraUpahRebetSebenar($kodcaw,$norujukan);
$upah_rebet_sebenar = $harga_tebus['harga'] - $gadai['bakipjm'];
if($request->jeniskeuntungan == 'onepercent'){
$array_onepercent = $this->kiraupahUjrahOnePercent($kodcaw,$norujukan);
$array_onepercent_rebet = $this->kiraupahUjrahOnePercentRebate($kodcaw,$norujukan);
$margin_semasa = ($gadai['bakipjm']/$gadai['nilaimarhun']) * 100;
$ujrah = $array_onepercent['ujrah'];
$onepercent = $array_onepercent['onepercent'];
}
}
$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(),
)); ));
$upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan); // $upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
$create_tebus = Tebus::on($cawangan['mysql'])->create([ $create_tebus = Tebus::on($cawangan['mysql'])->create([
'kodcaw'=> $kodcaw, 'kodcaw'=> $kodcaw,
@@ -664,22 +685,24 @@ class Penebusan
'jenistebus' => $request->jenistebus, 'jenistebus' => $request->jenistebus,
'glcode' => "0", 'glcode' => "0",
't_tebus' => $current->toDateString(), 't_tebus' => $current->toDateString(),
'jbg' => $request->jbg, 'jbg' => $gadai['tempoh'],
'kadarupah' => $request->kadarupah, 'kadarupah' => $gadai['kadarupah'],
'nilaimarhun' => $request->nilai_marhun, 'nilaimarhun' => $gadai['nilaimarhun'],
'pinjaman' => $request->pinjaman, 'pinjaman' => $gadai['pinjaman'],
'ansuran' => $request->ansuran, 'ansuran' => 0.00,
'addpinjaman' => $request->addpinjaman, 'addpinjaman' => $request->addpinjaman,
'bakipjm' => $request->bakipinjaman, 'bakipjm' => $harga_tebus['harga'],
'bakiupah' => $request->bakiupah, 'bakiupah' => $upah_tebus,
'terima' => "*", 'terima' => "*",
'kodgl' => "0", 'kodgl' => "0",
'nowakil' => $request->nowakil, 'nowakil' => $request->nowakil,
'rebate' => $rebet, 'rebate' => $rebet,
'marhuntebus' => $request->marhun, 'marhuntebus' => $request->marhun,
'historygadaian' => $request->historygadaian, 'historygadaian' => $norujukan,
'tarikhbyrn' => $current->toDateString(), 'tarikhbyrn' => $current->toDateString(),
'teller' => $request->teller 'teller' => $request->teller,
'ujrah' => $ujrah,
'onepercent' => $onepercent,
]); ]);
$create_inoutmar = InOutMar::on($cawangan['mysql'])->create([ $create_inoutmar = InOutMar::on($cawangan['mysql'])->create([
@@ -700,23 +723,32 @@ class Penebusan
$transaction_upah = TransaksiKeuntungan::on('mysql7')->create([ $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
'norujukan' => $norujukan, 'norujukan' => $norujukan,
'bayaran_keuntungan' => $request->bakiupah, 'bayaran_keuntungan' => $upah_tebus,
'bayaran_pembiayaan' => $bayaran_pembiayaan, 'bayaran_pembiayaan' => $gadai['bakipjm'],
'keuntungan_rebet' => $request->bakiupah, 'keuntungan_rebet' => $upah_rebet_sebenar,
'tarikh_bayaran'=> $current, 'tarikh_bayaran'=> $current,
'kodcaw'=> $kodcaw 'kodcaw'=> $kodcaw,
'ujrah' => ($request->jeniskeuntungan == 'onepercent') ? $array_onepercent['ujrah'] : 0,
'ujrah_rebet' => ($request->jeniskeuntungan == 'onepercent') ? $array_onepercent_rebet['ujrah'] : 0,
'onepercent' => ($request->jeniskeuntungan == 'onepercent') ? $array_onepercent['onepercent'] : 0,
'onepercent_rebet' => ($request->jeniskeuntungan == 'onepercent') ? $array_onepercent_rebet['onepercent'] : 0,
'margin_semasa' => ($request->jeniskeuntungan == 'onepercent') ? $margin_semasa : 0,
'tempoh' => $gadai['tempoh'],
'beza_tempoh' => ($gadai['tempoh'] - $gadai['tempohbayar']),
]); ]);
$baki_hargajualan = $gadai['bakihargajualan'] - $request->bakipinjaman;
$transaction = Transaction::on('mysql7')->create([ $transaction = Transaction::on('mysql7')->create([
'trans_type' => $request->jenistebus, 'trans_type' => $request->jenistebus,
'norujukan' => $norujukan, 'norujukan' => $norujukan,
'nokp' => $gadai['nokp'], 'nokp' => $gadai['nokp'],
'teller' => $request->teller, 'teller' => $request->teller,
'kodcaw' => $kodcaw, 'kodcaw' => $kodcaw,
'duit_masuk' => $request->totalbayaran, 'duit_masuk' => $harga_tebus['harga'],
'created_at' => $current, 'created_at' => $current,
'bakiharga' => 0, 'bakiharga' => $baki_hargajualan,
'duitpelanggan' => $request->bayaranpelanggan, 'nowakil' => (int)$request->nowakil,
'duitpelanggan' => isset($request->duitpelanggan) ? $request->duitpelanggan : 0,
'bakipelanggan' => $request->bakipelanggan 'bakipelanggan' => $request->bakipelanggan
]); ]);