Merge branch 'ujrah_master_fix' of https://bitbucket.org/arrahn-pkb/api_arrahn into test-simulator-nisha
This commit is contained in:
nishaMuhd
@@ -61,32 +61,30 @@ class MarhunController extends Controller
|
||||
$current = Carbon::now();
|
||||
$current = new Carbon();
|
||||
|
||||
$request_data = json_decode($request->getContent(), false);
|
||||
|
||||
$harga = HargaEmas::on('mysql7')->where('karat',$request_data->karat)->first();
|
||||
$harga = HargaEmas::on('mysql7')->where('karat',$request->karat)->first();
|
||||
|
||||
$hargaemas = $harga['harga'];
|
||||
if(isset($request_data->jenisAT)){
|
||||
if($request_data->jenisAT == 'hargalama'){
|
||||
$hargaemas = $request_data->harga;
|
||||
// $nilai_marhun = $request_data->berat_emas * $request_data->harga;
|
||||
if(isset($request->jenisAT)){
|
||||
if($request->jenisAT == 'hargalama'){
|
||||
$hargaemas = $request->harga;
|
||||
// $nilai_marhun = $request->berat_emas * $request->harga;
|
||||
}else $hargaemas = $harga['harga'];
|
||||
// $nilai_marhun = $request_data->berat_emas * $harga['harga'];
|
||||
// $nilai_marhun = $request->berat_emas * $harga['harga'];
|
||||
}else $hargaemas = $harga['harga'];
|
||||
|
||||
$nilai_marhun = $request_data->berat_emas * $hargaemas;
|
||||
$nilai_marhun = $request->berat_emas * $hargaemas;
|
||||
|
||||
$marhunToCreate = [
|
||||
'kodcaw'=> $kodcaw,
|
||||
'norujukan'=> $request_data->norujukan,
|
||||
'norujukan'=> $request->norujukan,
|
||||
't_gadai' => $current->toDateString(),
|
||||
'bil' => 1,
|
||||
'marhun' => $request_data->marhun,
|
||||
'nota' => $request_data->nota,
|
||||
'tag_permata' => $request_data->tag_permata,
|
||||
'berat_batu_permata' => $request_data->berat_batu_permata,
|
||||
'karat' => $request_data->karat,
|
||||
'berat' => $request_data->berat_emas,
|
||||
'marhun' => $request->marhun,
|
||||
'nota' => $request->nota,
|
||||
'tag_permata' => $request->tag_permata != null ? $request->tag_permata : 0,
|
||||
'berat_batu_permata' => $request->berat_batu_permata != null ? $request->berat_batu_permata : '',
|
||||
'karat' => $request->karat,
|
||||
'berat' => $request->berat_emas,
|
||||
'harga' => $hargaemas,
|
||||
'n_marhun' => $nilai_marhun
|
||||
];
|
||||
@@ -100,9 +98,9 @@ class MarhunController extends Controller
|
||||
$marhun = Marhun::on($cawangan['mysql'])->create($marhunToCreate);
|
||||
|
||||
$audit = new Audit();
|
||||
$audit->users = $request_data->teller;
|
||||
$audit->users = $request->teller;
|
||||
$audit->actions = 'Daftar Marhun';
|
||||
$audit->norujukan = $request_data->norujukan;
|
||||
$audit->norujukan = $request->norujukan;
|
||||
$audit->new_data = $marhun;
|
||||
$audit->kodcaw = $kodcaw;
|
||||
$audit->created_at = $current;
|
||||
|
||||
@@ -649,12 +649,33 @@ class Penebusan
|
||||
|
||||
$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(
|
||||
'sttebus' => "T",
|
||||
't_update' => $current->toDateString(),
|
||||
));
|
||||
|
||||
$upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
|
||||
// $upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
|
||||
|
||||
$create_tebus = Tebus::on($cawangan['mysql'])->create([
|
||||
'kodcaw'=> $kodcaw,
|
||||
@@ -664,22 +685,24 @@ class Penebusan
|
||||
'jenistebus' => $request->jenistebus,
|
||||
'glcode' => "0",
|
||||
't_tebus' => $current->toDateString(),
|
||||
'jbg' => $request->jbg,
|
||||
'kadarupah' => $request->kadarupah,
|
||||
'nilaimarhun' => $request->nilai_marhun,
|
||||
'pinjaman' => $request->pinjaman,
|
||||
'ansuran' => $request->ansuran,
|
||||
'jbg' => $gadai['tempoh'],
|
||||
'kadarupah' => $gadai['kadarupah'],
|
||||
'nilaimarhun' => $gadai['nilaimarhun'],
|
||||
'pinjaman' => $gadai['pinjaman'],
|
||||
'ansuran' => 0.00,
|
||||
'addpinjaman' => $request->addpinjaman,
|
||||
'bakipjm' => $request->bakipinjaman,
|
||||
'bakiupah' => $request->bakiupah,
|
||||
'bakipjm' => $harga_tebus['harga'],
|
||||
'bakiupah' => $upah_tebus,
|
||||
'terima' => "*",
|
||||
'kodgl' => "0",
|
||||
'nowakil' => $request->nowakil,
|
||||
'rebate' => $rebet,
|
||||
'marhuntebus' => $request->marhun,
|
||||
'historygadaian' => $request->historygadaian,
|
||||
'historygadaian' => $norujukan,
|
||||
'tarikhbyrn' => $current->toDateString(),
|
||||
'teller' => $request->teller
|
||||
'teller' => $request->teller,
|
||||
'ujrah' => $ujrah,
|
||||
'onepercent' => $onepercent,
|
||||
]);
|
||||
|
||||
$create_inoutmar = InOutMar::on($cawangan['mysql'])->create([
|
||||
@@ -700,23 +723,32 @@ class Penebusan
|
||||
|
||||
$transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
|
||||
'norujukan' => $norujukan,
|
||||
'bayaran_keuntungan' => $request->bakiupah,
|
||||
'bayaran_pembiayaan' => $bayaran_pembiayaan,
|
||||
'keuntungan_rebet' => $request->bakiupah,
|
||||
'bayaran_keuntungan' => $upah_tebus,
|
||||
'bayaran_pembiayaan' => $gadai['bakipjm'],
|
||||
'keuntungan_rebet' => $upah_rebet_sebenar,
|
||||
'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([
|
||||
'trans_type' => $request->jenistebus,
|
||||
'norujukan' => $norujukan,
|
||||
'nokp' => $gadai['nokp'],
|
||||
'teller' => $request->teller,
|
||||
'kodcaw' => $kodcaw,
|
||||
'duit_masuk' => $request->totalbayaran,
|
||||
'duit_masuk' => $harga_tebus['harga'],
|
||||
'created_at' => $current,
|
||||
'bakiharga' => 0,
|
||||
'duitpelanggan' => $request->bayaranpelanggan,
|
||||
'bakiharga' => $baki_hargajualan,
|
||||
'nowakil' => (int)$request->nowakil,
|
||||
'duitpelanggan' => isset($request->duitpelanggan) ? $request->duitpelanggan : 0,
|
||||
'bakipelanggan' => $request->bakipelanggan
|
||||
]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user