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

fix

Browse Source
This commit is contained in:
Afiq
2022-03-01 22:24:42 +08:00
parent b9a9d65811
commit 6881aaa2a8
6 changed files with 287 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TebusController.php
+57 -55
View File
@@ -93,7 +93,7 @@ class TebusController extends Controller
$upah_rebet_round = str_replace(',','',$upah_rebet_round);
}
$upah_rebet = substr($upah_rebet_round, 0, -1);
if(strpos($upah_rebet,',')){
if(strpos($upah_rebet,',')){
$upah_rebet = str_replace(',','',$upah_rebet);
}
@@ -118,7 +118,7 @@ class TebusController extends Controller
$upah_rebet_round = str_replace(',','',$upah_rebet_round);
}
$upah_rebet = substr($upah_rebet_round, 0, -1);
if(strpos($upah_rebet,',')){
if(strpos($upah_rebet,',')){
$upah_rebet = str_replace(',','',$upah_rebet);
}
@@ -131,14 +131,14 @@ class TebusController extends Controller
}
public function upahTawarruq($kodcaw,$norujukan){
$upah_semasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
return response()->json(number_format($upah_semasa,2));
}
public function upahRebetTawarruq($kodcaw,$norujukan){
$upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
return response()->json(number_format($upah_rebet,2));
@@ -221,7 +221,7 @@ class TebusController extends Controller
$margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
$margin_kadarupah = 80;
$rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
$bln_mora = Moratorium::first();
$upah_sebenar = $upah_asal - $rebet;
@@ -261,7 +261,7 @@ class TebusController extends Controller
$margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
$margin_kadarupah = 80;
$rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
$bln_mora = Moratorium::first();
$upah_sebenar = $upah_asal - $rebet;
@@ -276,7 +276,7 @@ class TebusController extends Controller
$upah_semasa = str_replace(',','',$upah_semasa);
}
$upah_semasa = (float)$upah_semasa - $upahtelahbayar;
if($upah_semasa <= 0){
$upah_semasa = 0;
}
@@ -330,7 +330,7 @@ class TebusController extends Controller
$gadai_data = Gadai::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->first();
$upah_asal = $gadai_data['nilaimarhun'] / 100 * $gadai_data['kadarupah'];
$margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
$margin_kadarupah = 80;
@@ -352,7 +352,7 @@ class TebusController extends Controller
$transaction_keuntungan = TransaksiKeuntungan::on('mysql7')
->where('norujukan','=',$norujukan)
->sum('keuntungan_rebet');
$upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
$rebet_raw =$gadai_data['upah12'] - $transaction_keuntungan - $upah_rebet;
@@ -364,7 +364,7 @@ class TebusController extends Controller
$rebet_round = str_replace(',','',$rebet_round);
}
$rebet = substr($rebet_round, 0, -1);
return $rebet;
}
@@ -387,13 +387,15 @@ class TebusController extends Controller
}
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
$update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
'sttebus' => "T",
't_update' => $current->toDateString(),
));
$harga_tebus = $this->tebusTawarruq($kodcaw,$norujukan);
$upah_rebet = $this->kiraUpahRebetSebenar($kodcaw,$norujukan);
$upah_tebus = $this->kiraupahTawarruq($kodcaw,$norujukan);
$upah_rebet_sebenar = $harga_tebus - $gadai['bakipjm'];
$create_tebus = Tebus::on($cawangan['mysql'])->create([
'kodcaw'=> $kodcaw,
@@ -403,20 +405,20 @@ class TebusController extends Controller
'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,
'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
]);
@@ -437,9 +439,9 @@ class TebusController extends Controller
$transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
'norujukan' => $norujukan,
'bayaran_keuntungan' => $request->bakiupah,
'bayaran_keuntungan' => $upah_tebus,
'bayaran_pembiayaan' => $gadai['bakipjm'],
'keuntungan_rebet' => $upah_rebet,
'keuntungan_rebet' => $upah_rebet_sebenar,
'tarikh_bayaran'=> $current,
'kodcaw'=> $kodcaw
]);
@@ -464,7 +466,7 @@ class TebusController extends Controller
'nokp' => $gadai['nokp'],
'teller' => $request->teller,
'kodcaw' => $kodcaw,
'duit_masuk' => $request->bakipinjaman,
'duit_masuk' => $harga_tebus,
'created_at' => $current,
'bakiharga' => $baki_hargajualan,
]);
@@ -478,14 +480,14 @@ class TebusController extends Controller
$audit->actions = "Tebus Separuh";
}else if($request->jenistebus == 'T'){
$audit->actions = "Tebus Penuh";
}
}
$audit->norujukan = $norujukan;
$audit->new_data = $create_tebus;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json($update_gadai, 201);
}
@@ -508,7 +510,7 @@ class TebusController extends Controller
}
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
$update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
'sttebus' => "T",
't_update' => $current->toDateString(),
@@ -580,14 +582,14 @@ class TebusController extends Controller
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = "Auto Tawarruq";
$audit->actions = "Auto Tawarruq";
$audit->norujukan = $norujukan;
$audit->new_data = $create_tebus;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json($update_gadai, 201);
}
@@ -637,7 +639,7 @@ class TebusController extends Controller
]);
}
}
return response()->json($tebus);
}
@@ -682,20 +684,20 @@ class TebusController extends Controller
}
public function listPenebusanBaru($kodcaw){
$current = Carbon::now();
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Tebus::on($cawangan['mysql'])
->where([['t_tebus','=',$current->toDateString()],['tagterima','=',0]])
->get();
return response()->json($gadai);
}
public function listSerahKhazanah($kodcaw){
$current = Carbon::now();
$current = new Carbon();
@@ -718,7 +720,7 @@ class TebusController extends Controller
$update_inoutmar = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
'tagterima' => 1
));
return response()->json('success');
}
}
@@ -770,7 +772,7 @@ class TebusController extends Controller
}else{
$wakil = [];
}
return response()->json($wakil,200);
}
@@ -817,7 +819,7 @@ class TebusController extends Controller
'alamat1' => $request->alamat,
'telefon' => $request->telefon,
'nota' => $request->nota
]);
return response()->json($wakil_create ,201);
@@ -842,7 +844,7 @@ class TebusController extends Controller
$listtebus = Tebus::on($cawangan['mysql'])
->where('norujukan','=',$request->norujukan)
->get();
return response()->json($listtebus);
}
@@ -1100,7 +1102,7 @@ class TebusController extends Controller
// ->sum('bayaran_keuntungan');
// ->get();
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $keuntungan_data)->whereNull('hargajualan')->pluck('norujukan');
$keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan');
@@ -1134,8 +1136,8 @@ class TebusController extends Controller
$keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
// $keuntunganselepastawarruq = $keuntunganselepastawarruqupah;
// $keuntunganselepastawarruq = $keuntunganselepastawarruqupah;
// $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
$total = $keuntungansebelumtawarruq + $keuntungan;
@@ -1189,7 +1191,7 @@ class TebusController extends Controller
->where('t_jual','>','2013-12-31')
->whereYear('t_jual','<',$current->year)
->sum('bakiupah');
//Upah Simpan Advansur
$upahsimpanansur = Advansur::on($cawangan['mysql']) //--masuk
->whereYear('tarikh','<',$current->year)
@@ -1258,7 +1260,7 @@ class TebusController extends Controller
->whereYear('tarikh_bayaran','<',$current->year)
->where('kodcaw',$kodcaw)
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntungan = TransaksiKeuntungan::on('mysql7')
@@ -1283,7 +1285,7 @@ class TebusController extends Controller
->whereDate('tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','<',$current->year)
->sum('keuntungan_rebet');
$keuntungansebenar = ($keuntungan + $keuntunganreducing);
@@ -1390,8 +1392,8 @@ class TebusController extends Controller
if($kodcaw == '011229')
$total -= 45390.37;
return response()->json($total,200);
}
@@ -1431,7 +1433,7 @@ class TebusController extends Controller
// ->whereNotNull('db2.hargajualan')
// ->sum('bayaran_keuntungan');
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntungan = TransaksiKeuntungan::on('mysql7')
@@ -1470,7 +1472,7 @@ class TebusController extends Controller
->whereDate('tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$tarikhyear->year)
->sum('keuntungan_rebet');
// $keuntunganreducing = 0;
// if($keuntunganreducing_data){
// foreach($keuntunganreducing_data as $index=>$keuntunganreducingData){
@@ -1480,7 +1482,7 @@ class TebusController extends Controller
// }
// }
// }
$total = ($keuntungan + $keuntunganreducing);
@@ -1501,7 +1503,7 @@ class TebusController extends Controller
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan');
// $keuntungan = 0;
// if($keuntungan_data){
// foreach($keuntungan_data as $index=>$keuntunganData){
@@ -1629,7 +1631,7 @@ class TebusController extends Controller
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$tarikhyear->year)
->sum('transaksi_keuntungan.bayaran_keuntungan');
// $ansuran = 0;
// if($ansuran_data){
// foreach($ansuran_data as $index=>$ansuranData){
@@ -1665,7 +1667,7 @@ class TebusController extends Controller
if($request->hingga < '2021-06-01')
{
$keuntungan_data = TransaksiKeuntungan::on('mysql7')
->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->hingga)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
@@ -1673,7 +1675,7 @@ class TebusController extends Controller
->where('kodcaw',$request->kodcaw)
->pluck('norujukan');
$gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntungan = TransaksiKeuntungan::on('mysql7')
@@ -1771,7 +1773,7 @@ class TebusController extends Controller
->where('tebus.t_tebus','<=',$request->tarikh)
->where('db2.hargajualan','>','0') // tambahan 2021-05-07
->whereNotNull('db2.hargajualan')
->sum('rebate');
->sum('rebate');
return response($rebet);
}
@@ -1786,7 +1788,7 @@ class TebusController extends Controller
->where('tebus.t_tebus','<=',$request->hingga)
->where('db2.hargajualan','>','0')
->whereNotNull('db2.hargajualan')
->sum('rebate');
->sum('rebate');
return response($rebet);
}
@@ -1821,7 +1823,7 @@ class TebusController extends Controller
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = "Hapus Upah";
$audit->actions = "Hapus Upah";
$audit->norujukan = $norujukan;
$audit->old_data = $data_ansuran;
$audit->kodcaw = $kodcaw;