update kemaskinidata

This commit is contained in:
Nur Izzati Zulkifli
2022-07-18 12:06:09 +08:00
parent adcdf93190
commit 627b7abc74
7 changed files with 305 additions and 218 deletions
+139 -97
View File
@@ -7,7 +7,7 @@ use Illuminate\Http\Request;
use Spatie\Permission\Models\Role;
use Spatie\Permission\Models\Permission;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Http;
use PDF;
use App\Models\User;
use App\Models\Cawangan;
@@ -442,13 +442,18 @@ class LelongController extends Controller
$currentdate = $currentdate->toDateTimeString();
$lelongbid = LelongBid::where('lelong_id', $id)
->get()->toArray();
->get();
// dd($lelongbid[0]['kodcaw']);
foreach($lelongbid as $bid)
{
// $gadai = Gadai::where('norujukan', $bid['norujukan'])->first();
// $gadai->taglel = 0;
// $gadai->update();
$kodcaw = $bid['kodcaw'];
// dd($bid->norujukan);
$updategadai = Http::withOptions(['verify' => config('app.api_verify')])
->post(config('app.api_url').'taglel/revert',[
'kodcaw'=>$bid->kodcaw,
'norujukan'=>$bid->norujukan
])
->json();
//insert loguser
$loguser = new LogUser;
@@ -1353,7 +1358,7 @@ class LelongController extends Controller
$lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->where('cawangan_lelong.lelong_id','=',$lelongid)
->select('lelong_id','tarikh_lelong')
->select('lelong_id','tarikh_lelong','lelong.fasa')
->groupBy('lelong_id')
->get()->toArray();
@@ -1829,97 +1834,134 @@ class LelongController extends Controller
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$data = [];
$senaraisag = LelongBid::where('lelongbid.lelong_id', $lelong_id)
->whereNotIn('lelongbid.norujukan', function($query) {
$query->select('norujukan')
->from('gadai');
})
->get()->toArray();
// dd($senaraisag);
foreach($senaraisag as $data)
{
//insert lelong_tebus
$lelongtebus = new LelongTebus;
$lelongtebus->tarikh = $currentdate;
$lelongtebus->kodcaw = $data['kodcaw'];
$lelongtebus->teller = $user->name;
$lelongtebus->norujukan = $data['norujukan'];
$lelongtebus->batch_no = $lelong_id;
$lelongtebus->nilaimarhun = $data['nilaimarhun'];
$lelongtebus->pinjaman = $data['pinjaman'];
$lelongtebus->upah = $data['bakiupah'];
$lelongtebus->jbg = $data['jbg'];
$lelongtebus->jenis_tebus = 'T';
$lelongtebus->save();
// dd($data['norujukan']);
$updatelelong = LelongBid::where('norujukan','=',$data['norujukan'])->first();
$updatelelong->delete();
//insert loguser
$loguser = new LogUser;
$loguser->user_id = $user->id;
$loguser->date = $currentdate;
$loguser->username = $user->username;
$loguser->nama_user = $user->name;
$loguser->norujukan = $data['norujukan'];
$loguser->nota = ' Kemaskini Data Lelong '.$lelong_id;
$loguser->save();
}
$datatempoh = [];
$senaraisagtempoh = LelongBid::join('gadai','gadai.norujukan','=','lelongbid.norujukan')
->where('lelongbid.lelong_id', $lelong_id)
->whereIn('lelongbid.norujukan', function($query) {
$query->select('norujukan')
->from('gadai');
})
->select('gadai.norujukan','gadai.tempoh','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.tempoh','gadai.ansakhir','gadai.tempohbayar','gadai.kadarupah','gadai.bakiupah')
->get()->toArray();
// dd($senaraisagtempoh);
foreach($senaraisagtempoh as $index1=>$datatempoh)
{
//kemaskini keuntungan
$total_untung_rebet = TransaksiKeuntungan::on('mysql2')->where('norujukan','=',$datatempoh['norujukan'])->sum('keuntungan_rebet');
$total_untung_asal = TransaksiKeuntungan::on('mysql2')->where('norujukan','=',$datatempoh['norujukan'])->sum('bayaran_keuntungan');
$beza_keuntungan = $total_untung_asal - $total_untung_rebet;
$keuntungan = bcdiv(($datatempoh['tempoh']-$datatempoh['tempohbayar'])*$datatempoh['kadarupah']/100*$datatempoh['bakipjm'],1,1)-$beza_keuntungan;
// dd($keuntungan);
//kemaskini keuntungan baru
// $keuntungan = $datatempoh['bakipjm'] - ($datatempoh['bakihargajualan'] - ($datatempoh['upah12'] - $datatempoh['ansakhir'])-(($datatempoh['tempoh']-$datatempoh['tempohbayar'])*$datatempoh['kadarupah']/100*$datatempoh['bakipjm']) );
// $senaraisagtempoh[$index1]['keuntungan'] = $keuntungan;
// dd($data['norujukan']);
$updatetempoh = LelongBid::where('norujukan', $datatempoh['norujukan'])
->where('lelong_id', $lelong_id)
->first();
$updatetempoh->jbg = $datatempoh['tempoh'];
$updatetempoh->pinjaman = $datatempoh['bakipjm'];
$updatetempoh->bakiupah = bcdiv($keuntungan,1,1);
$updatetempoh->update();
//insert loguser
$loguser = new LogUser;
$loguser->user_id = $user->id;
$loguser->date = $currentdate;
$loguser->username = $user->username;
$loguser->nama_user = $user->name;
$loguser->norujukan = $datatempoh['norujukan'];
$loguser->nota = ' Kemaskini Tempoh '.$lelong_id.' Keuntungan:'.$datatempoh['bakiupah'].' to '.bcdiv($keuntungan,1,1);
$loguser->save();
}
$date = Carbon::now()->toDateTimeString();
$lelong = Lelong::where('id','=',$lelong_id)->first();
$lelong->masakemaskini_data = $date;
$lelong->save();
return redirect()->route('lelong.senarailelong')
->with('success','Kemaskini Berjaya');
$getcaw = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('lelongbid','cawangan_lelong.caw_id','=','lelongbid.caw_id')
->where('lelong.id', $lelong_id)
->groupBy('lelongbid.caw_id')
->select('lelongbid.caw_id')
->get();
// dd($getcaw);
foreach($getcaw as $index=>$caw)
{
$cawid = $caw['caw_id'];
$marhun = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
->where('lelong_id','=',$lelong_id)
->where('caw_id','=',$caw['caw_id']);
$arraynorujukan = $marhun->pluck('norujukan')->toArray();
$datalelong = $marhun->get();
// dd($datalelong[$index]['kodcaw']);
$senaraisag = Gadai::on($datalelong[$index]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
->get();
// dd($senaraisag);
foreach($senaraisag as $data)
{
// dd($data['norujukan']);
//insert lelong_tebus
if($data['sttebus'] == "T")
{
$lelongtebus = new LelongTebus;
$lelongtebus->tarikh = $currentdate;
$lelongtebus->kodcaw = $data['kodcaw'];
$lelongtebus->teller = $user->name;
$lelongtebus->norujukan = $data['norujukan'];
$lelongtebus->batch_no = $lelong_id;
$lelongtebus->nilaimarhun = $data['nilaimarhun'];
$lelongtebus->pinjaman = $data['pinjaman'];
$lelongtebus->upah = $data['bakiupah'];
$lelongtebus->jbg = $data['jbg'];
$lelongtebus->jenis_tebus = 'T';
$lelongtebus->save();
// dd($data['norujukan']);
$updatelelong = LelongBid::where('norujukan','=',$data['norujukan'])->first();
$updatelelong->delete();
//insert loguser
$loguser = new LogUser;
$loguser->user_id = $user->id;
$loguser->date = $currentdate;
$loguser->username = $user->username;
$loguser->nama_user = $user->name;
$loguser->norujukan = $data['norujukan'];
$loguser->nota = ' LELONG TEBUS '.$lelong_id;
$loguser->save();
}
else if($data['sttebus'] == ""){
$ktlhbyr = $data['hargajualan']-$data['bakihargajualan'];
if($ktlhbyr >= $data['bakiupah'])
{
$lelongtebus = new LelongTebus;
$lelongtebus->tarikh = $currentdate;
$lelongtebus->kodcaw = $data['kodcaw'];
$lelongtebus->teller = $user->name;
$lelongtebus->norujukan = $data['norujukan'];
$lelongtebus->batch_no = $lelong_id;
$lelongtebus->nilaimarhun = $data['nilaimarhun'];
$lelongtebus->pinjaman = $data['pinjaman'];
$lelongtebus->upah = $data['bakiupah'];
$lelongtebus->jbg = $data['jbg'];
$lelongtebus->jenis_tebus = 'A';
$lelongtebus->save();
// dd($data['norujukan']);
$updatelelong = LelongBid::where('norujukan','=',$data['norujukan'])->first();
$updatelelong->delete();
//insert loguser
$loguser = new LogUser;
$loguser->user_id = $user->id;
$loguser->date = $currentdate;
$loguser->username = $user->username;
$loguser->nama_user = $user->name;
$loguser->norujukan = $data['norujukan'];
$loguser->nota = ' KELUAR LELONG '.$lelong_id;
$loguser->save();
}
else{
//kemaskini keuntungan
$total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('keuntungan_rebet');
$total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('bayaran_keuntungan');
$beza_keuntungan = $total_untung_asal - $total_untung_rebet;
$keuntungan = bcdiv(($data['tempoh']-$data['tempohbayar'])*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan;
// dd($keuntungan);
//update dalam simulasibid
$updatetempoh = LelongBid::where('norujukan', $data['norujukan'])
->where('lelong_id', $lelong_id)
->first();
$updatetempoh->jbg = $data['tempoh'];
$updatetempoh->pinjaman = $data['bakipjm'];
$updatetempoh->bakiupah = bcdiv($keuntungan,1,1);
$updatetempoh->update();
//insert loguser
$loguser = new LogUser;
$loguser->user_id = $user->id;
$loguser->date = $currentdate;
$loguser->username = $user->username;
$loguser->nama_user = $user->name;
$loguser->norujukan = $data['norujukan'];
$loguser->nota = $lelong_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ;
$loguser->save();
}
$date = Carbon::now()->toDateTimeString();
$lelong = Lelong::where('id','=',$lelong_id)->first();
$lelong->masakemaskini_data = $date;
$lelong->save();
}
}
}
return redirect()->route('lelong.senarailelong')
->with('success','Kemaskini Berjaya');
}
public function pindahsenarailelong()
+134 -94
View File
@@ -163,8 +163,8 @@ class SimulasiController extends Controller
"hargajual" => 0.00,
"jbg" => $data->tempoh,
"kadarupah" => $data->kadarupah,
"upahsimpan" => $data->upahSim,
"ansuran" => $data->ansuran,
// "upahsimpan" => $data->upahSim,
// "ansuran" => $data->ansuran,
"nilaimarhun" => $data->nilaimarhun,
"pinjaman" => $data->bakipjm,
"bakiupah" => $data->bakiupah,
@@ -218,6 +218,7 @@ class SimulasiController extends Controller
'norujukan'=>$data->norujukan
])
->json();
// dd($cawsimulasi['cawangan']->caw_code);
}
}
}
@@ -894,12 +895,14 @@ class SimulasiController extends Controller
$tetapan = Tetapan::where('id','=',1)->first();
if($t_lelong != null)
{
if($request->fasa == '1'){
$cawangan_all = Cawangan::all();
$senarai = [];
$total_bil_lelong = 0;
foreach($cawangan_all as $cawangan){
$getsurat = Gadai::on($cawangan->caw_code)->where('t_gadai','<=',$jbgadai)
$getsurat = Gadai::on($cawangan->caw_code)
->where('t_gadai','<=',$jbgadai)
->where('sttebus','=','')
->where('tagpalsu','=',0)
->where('tagpalsu2','=',0)
@@ -995,9 +998,10 @@ class SimulasiController extends Controller
{
$jbgadai = $t_gadai1;
//$fasa = $request->fasa;
//dd($fasa);
// dd($details);
if($fasa == '1'){
$getsurat = Gadai::where('t_gadai', '<=', $jbgadai)
$getsurat = Gadai::on($details)
->where('t_gadai', '<=', $jbgadai)
->where('kodcaw', $details)
->where('sttebus', '=', '')
->where('lelong_tawarruq','=',1)
@@ -1007,7 +1011,8 @@ class SimulasiController extends Controller
->whereNotNull('upah12')
->get();
$t_gadais = Gadai::where('t_gadai', '<=', $jbgadai)
$t_gadais = Gadai::on($details)
->where('t_gadai', '<=', $jbgadai)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
@@ -1017,7 +1022,8 @@ class SimulasiController extends Controller
->select('t_gadai')
->first();
}else{
$getsurat = Gadai::where('t_gadai', '<=', $jbgadai)
$getsurat = Gadai::on($details)
->where('t_gadai', '<=', $jbgadai)
->where('kodcaw', $details)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
@@ -1026,7 +1032,8 @@ class SimulasiController extends Controller
->whereNotNull('upah12')
->get();
$t_gadais = Gadai::where('t_gadai', '<=', $jbgadai)
$t_gadais = Gadai::on($details)
->where('t_gadai', '<=', $jbgadai)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
@@ -1046,7 +1053,7 @@ class SimulasiController extends Controller
foreach($getsurat as $index1=>$surats)
{
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
$senarai = Gadai::on($details)
->where('norujukan', $surats['norujukan'])
->get();
//dd($senarai);
@@ -1072,99 +1079,132 @@ class SimulasiController extends Controller
$currentdate = $currentdate->toDateTimeString();
$data = [];
$getcaw = Simulasi::where('simulasibid.simulasi_id', $simulasi_id)->get();
dd($getcaw);
foreach($getcaw as $caw)
$getcaw = Simulasi::join('cawangan_simulasi','cawangan_simulasi.simulasi_id','=','simulasi.id')
->join('simulasibid','cawangan_simulasi.caw_id','=','simulasibid.caw_id')
->where('simulasi.id', $simulasi_id)
->groupBy('simulasibid.caw_id')
->select('simulasibid.caw_id')
->get();
// dd($getcaw);
foreach($getcaw as $index=>$caw)
{
$bycaw =
$senaraisag = SimulasiBid::where('simulasibid.simulasi_id', $simulasi_id)
->whereNotIn('simulasibid.norujukan', function($datagadai) {
$datagadai = Gadai::all();
})
->get()->toArray();
dd($senaraisag);
$cawid = $caw['caw_id'];
$marhun = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id')
->where('simulasi_id','=',$simulasi_id)
->where('caw_id','=',$caw['caw_id']);
$arraynorujukan = $marhun->pluck('norujukan')->toArray();
$datasimulasi = $marhun->get();
// dd($datasimulasi[$index]['kodcaw']);
$senaraisag = Gadai::on($datasimulasi[$index]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
->get();
foreach($senaraisag as $data)
{
//insert lelong_tebus
$lelongtebus = new LelongTebus;
$lelongtebus->tarikh = $currentdate;
$lelongtebus->kodcaw = $data['kodcaw'];
$lelongtebus->teller = $user->name;
$lelongtebus->norujukan = $data['norujukan'];
$lelongtebus->batch_no = $simulasi_id;
$lelongtebus->nilaimarhun = $data['nilaimarhun'];
$lelongtebus->pinjaman = $data['pinjaman'];
$lelongtebus->upah = $data['bakiupah'];
$lelongtebus->jbg = $data['jbg'];
$lelongtebus->jenis_tebus = 'T';
$lelongtebus->save();
// dd($data['norujukan']);
$updatesimulasi = SimulasiBid::where('norujukan','=',$data['norujukan'])->first();
$updatesimulasi->delete();
//insert loguser
$loguser = new LogUser;
$loguser->user_id = $user->id;
$loguser->date = $currentdate;
$loguser->username = $user->username;
$loguser->nama_user = $user->name;
$loguser->norujukan = $data['norujukan'];
$loguser->nota = ' Kemaskini Data Simulasi '.$simulasi_id;
$loguser->save();
//insert lelong_tebus
if($data['sttebus'] == "T")
{
$lelongtebus = new LelongTebus;
$lelongtebus->tarikh = $currentdate;
$lelongtebus->kodcaw = $data['kodcaw'];
$lelongtebus->teller = $user->name;
$lelongtebus->norujukan = $data['norujukan'];
$lelongtebus->batch_no = $simulasi_id;
$lelongtebus->nilaimarhun = $data['nilaimarhun'];
$lelongtebus->pinjaman = $data['pinjaman'];
$lelongtebus->upah = $data['bakiupah'];
$lelongtebus->jbg = $data['jbg'];
$lelongtebus->jenis_tebus = 'T';
$lelongtebus->save();
// dd($data['norujukan']);
$updatesimulasi = SimulasiBid::where('norujukan','=',$data['norujukan'])->first();
$updatesimulasi->delete();
//insert loguser
$loguser = new LogUser;
$loguser->user_id = $user->id;
$loguser->date = $currentdate;
$loguser->username = $user->username;
$loguser->nama_user = $user->name;
$loguser->norujukan = $data['norujukan'];
$loguser->nota = ' LELONG TEBUS '.$simulasi_id;
$loguser->save();
}
else if($data['sttebus'] == ""){
$ktlhbyr = $data['hargajualan']-$data['bakihargajualan'];
if($ktlhbyr >= $data['bakiupah'])
{
$lelongtebus = new LelongTebus;
$lelongtebus->tarikh = $currentdate;
$lelongtebus->kodcaw = $data['kodcaw'];
$lelongtebus->teller = $user->name;
$lelongtebus->norujukan = $data['norujukan'];
$lelongtebus->batch_no = $simulasi_id;
$lelongtebus->nilaimarhun = $data['nilaimarhun'];
$lelongtebus->pinjaman = $data['pinjaman'];
$lelongtebus->upah = $data['bakiupah'];
$lelongtebus->jbg = $data['jbg'];
$lelongtebus->jenis_tebus = 'A';
$lelongtebus->save();
// dd($data['norujukan']);
$updatesimulasi = SimulasiBid::where('norujukan','=',$data['norujukan'])->first();
$updatesimulasi->delete();
//insert loguser
$loguser = new LogUser;
$loguser->user_id = $user->id;
$loguser->date = $currentdate;
$loguser->username = $user->username;
$loguser->nama_user = $user->name;
$loguser->norujukan = $data['norujukan'];
$loguser->nota = ' KELUAR LELONG '.$simulasi_id;
$loguser->save();
}
else{
//kemaskini keuntungan
$total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('keuntungan_rebet');
$total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('bayaran_keuntungan');
$beza_keuntungan = $total_untung_asal - $total_untung_rebet;
$keuntungan = bcdiv(($data['tempoh']-$data['tempohbayar'])*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan;
// dd($keuntungan);
//update dalam simulasibid
$updatetempoh = SimulasiBid::where('norujukan', $data['norujukan'])
->where('simulasi_id', $simulasi_id)
->first();
$updatetempoh->jbg = $data['tempoh'];
$updatetempoh->pinjaman = $data['bakipjm'];
$updatetempoh->bakiupah = bcdiv($keuntungan,1,1);
$updatetempoh->update();
//insert loguser
$loguser = new LogUser;
$loguser->user_id = $user->id;
$loguser->date = $currentdate;
$loguser->username = $user->username;
$loguser->nama_user = $user->name;
$loguser->norujukan = $data['norujukan'];
$loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ;
$loguser->save();
}
$date = Carbon::now()->toDateTimeString();
$simulasi = Simulasi::where('id','=',$simulasi_id)->first();
$simulasi->masakemaskini_data = $date;
$simulasi->save();
}
}
}
$datatempoh = [];
$senaraisagtempoh = SimulasiBid::join('gadai','gadai.norujukan','=','simulasibid.norujukan')
->where('simulasibid.simulasi_id', $simulasi_id)
->whereIn('simulasibid.norujukan', function($query) {
$query->select('norujukan')
->from('gadai');
})
->select('gadai.tempoh','gadai.tempohbayar','gadai.kadarupah','gadai.norujukan','gadai.tempoh','gadai.bakipjm')
->get()->toArray();
// dd($senaraisagtempoh);
foreach($senaraisagtempoh as $datatempoh)
{
//kemaskini keuntungan
$total_untung_rebet = TransaksiKeuntungan::on('mysql2')->where('norujukan','=',$datatempoh['norujukan'])->sum('keuntungan_rebet');
$total_untung_asal = TransaksiKeuntungan::on('mysql2')->where('norujukan','=',$datatempoh['norujukan'])->sum('bayaran_keuntungan');
$beza_keuntungan = $total_untung_asal - $total_untung_rebet;
$keuntungan = bcdiv(($datatempoh['tempoh']-$datatempoh['tempohbayar'])*$datatempoh['kadarupah']/100*$datatempoh['bakipjm'],1,1)-$beza_keuntungan;
// dd($keuntungan);
//update dalam simulasibid
$updatetempoh = SimulasiBid::where('norujukan', $datatempoh['norujukan'])
->where('simulasi_id', $simulasi_id)
->first();
$updatetempoh->jbg = $datatempoh['tempoh'];
$updatetempoh->pinjaman = $datatempoh['bakipjm'];
$updatetempoh->bakiupah = bcdiv($keuntungan,1,1);
$updatetempoh->update();
//insert loguser
$loguser = new LogUser;
$loguser->user_id = $user->id;
$loguser->date = $currentdate;
$loguser->username = $user->username;
$loguser->nama_user = $user->name;
$loguser->norujukan = $datatempoh['norujukan'];
$loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ;
$loguser->save();
}
$date = Carbon::now()->toDateTimeString();
$simulasi = Simulasi::where('id','=',$simulasi_id)->first();
$simulasi->masakemaskini_data = $date;
$simulasi->save();
return redirect()->route('analisa.senaraisimulasi')
->with('success','Kemaskini Berjaya');
}
->with('success','Kemaskini Berjaya');
}
public function listsagbycust($simulasi_id, $cawid)