Merge branch 'atie' into 'main'
update kemaskinidata See merge request online-sistem1/lelong!119
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
+7
-7
@@ -385,13 +385,13 @@ return [
|
||||
|
||||
'011235' => [
|
||||
'driver' => 'mysql',
|
||||
'url' => env('DATABASE_URL_010135'),
|
||||
'host' => env('DB_HOST_010135', '127.0.0.1'),
|
||||
'port' => env('DB_PORT_010135', '3306'),
|
||||
'database' => env('DB_DATABASE_010135', 'forge'),
|
||||
'username' => env('DB_USERNAME_010135', 'forge'),
|
||||
'password' => env('DB_PASSWORD_010135', ''),
|
||||
'unix_socket' => env('DB_SOCKET_010135', ''),
|
||||
'url' => env('DATABASE_URL_011235'),
|
||||
'host' => env('DB_HOST_011235', '127.0.0.1'),
|
||||
'port' => env('DB_PORT_011235', '3306'),
|
||||
'database' => env('DB_DATABASE_011235', 'forge'),
|
||||
'username' => env('DB_USERNAME_011235', 'forge'),
|
||||
'password' => env('DB_PASSWORD_011235', ''),
|
||||
'unix_socket' => env('DB_SOCKET_011235', ''),
|
||||
'charset' => 'utf8mb4',
|
||||
'collation' => 'utf8mb4_unicode_ci',
|
||||
'prefix' => '',
|
||||
|
||||
@@ -62,8 +62,8 @@ class CreateSimulasisTable extends Migration
|
||||
$table->integer('nopembeli')->nullable();
|
||||
$table->decimal('jbg', $precision = 7, $scale = 2);
|
||||
$table->decimal('kadarupah', $precision = 5, $scale = 2);
|
||||
$table->decimal('upahsimpan', $precision = 11, $scale = 2);
|
||||
$table->decimal('ansuran', $precision = 11, $scale = 2);
|
||||
$table->decimal('upahsimpan', $precision = 11, $scale = 2)->nullable();
|
||||
$table->decimal('ansuran', $precision = 11, $scale = 2)->nullable();
|
||||
$table->decimal('nilaimarhun', $precision = 9, $scale = 2);
|
||||
$table->decimal('pinjaman', $precision = 9, $scale = 2);
|
||||
$table->decimal('bakiupah', $precision = 7, $scale = 2);
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
</div>
|
||||
@endif
|
||||
<div class="text-left pt-4">
|
||||
<a href="{{ route('lelong.senaraimarhun',[$lelongid,$cawid]) }}" class="btn btn-success">Simulasi Lelong</a>
|
||||
<a href="{{ route('lelong.senaraimarhunsimulasi',[$lelongid,$cawid]) }}" class="btn btn-success">Simulasi Lelong</a>
|
||||
<a href="{{ route('lelong.listsagbycust',[$lelongid,$cawid]) }}" class="btn btn-success">Senarai Mengikut Nama Pelangan</a>
|
||||
</div>
|
||||
<form id="deletesag" method="POST">
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
</div>
|
||||
@endif
|
||||
<div class="text-left pt-4">
|
||||
<a href="{{ route('lelong.senaraimarhun',[$lelongid,$cawid]) }}" class="btn btn-success">Simulasi Lelong</a>
|
||||
<a href="{{ route('lelong.senaraimarhunsimulasi',[$lelongid,$cawid]) }}" class="btn btn-success">Simulasi Lelong</a>
|
||||
<a href="{{ route('lelong.listsagbycust',[$lelongid,$cawid]) }}" class="btn btn-success">Senarai Mengikut Nama Pelangan</a>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -6,24 +6,29 @@
|
||||
<div class="row ">
|
||||
<div class="col-md-11 mx-auto card p-4">
|
||||
<div class="nav nav-tabs" id="nav-tab" role="tablist">
|
||||
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
|
||||
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
|
||||
</div>
|
||||
<span class="pt-3" style="margin-left:1%; font-size:20px"><b>Senarai Simulasi Lelong</b></span>
|
||||
@foreach ($arrayinfo as $laporan)
|
||||
|
||||
<span class="pt-3" style="margin-left:1%;"><b>ID Lelong : {{ $laporan['laporan']['lelong_id']}}</b></span>
|
||||
<span class="pt-3" style="margin-left:1%;"><b>Tarikh Lelong : @php
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
|
||||
$datez = $myDateTime->format('d-m-Y');
|
||||
echo($datez);
|
||||
|
||||
@endphp</b></span>
|
||||
@foreach($laporan['details'] as $details)
|
||||
<span class="pt-3" style="margin-left:1%;"><b>Nama Cawangan : {{ $details['caw_name']}}</b></span>
|
||||
<span class="pt-3" style="margin-left:1%;"><b>Kod Cawangan : {{ $details['caw_code']}}</b></span>
|
||||
@endforeach
|
||||
|
||||
@endforeach
|
||||
<table cellspacing="" cellpadding="4" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped table-xl">
|
||||
<thead class="bg-light ">
|
||||
@foreach ($arrayinfo as $laporan)
|
||||
<tr>
|
||||
<td><b>ID Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
|
||||
<td><b>Fasa Lelong: {{ $laporan['laporan']['fasa']}} <b></td>
|
||||
<td><b>Tarikh Lelong : @php
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
|
||||
$datez = $myDateTime->format('d-m-Y');
|
||||
echo($datez);
|
||||
@endphp</b></td>
|
||||
@foreach($laporan['details'] as $details)
|
||||
<td><b>Nama Cawangan : {{ $details['caw_name']}}</b></td>
|
||||
<td><b>Kod Cawangan : {{ $details['caw_code']}}</b></td>
|
||||
@endforeach
|
||||
</tr>
|
||||
@endforeach
|
||||
|
||||
</thead>
|
||||
</table>
|
||||
|
||||
@if ($message = Session::get('success'))
|
||||
<div class="alert alert-success">
|
||||
|
||||
Reference in New Issue
Block a user