Merge branch 'main' into amirah
This commit is contained in:
@@ -521,72 +521,83 @@ class MarhunController extends Controller
|
||||
$currentdate = Carbon::now();
|
||||
$currentdate = $currentdate->toDateTimeString();
|
||||
|
||||
$pengesahan = Pengesahan::where('norujukan', $request->norujukan)
|
||||
->first();
|
||||
|
||||
$pengesahan->id = $pengesahan['id'] ;
|
||||
$pengesahan->disahkan_oleh = $user['id'];
|
||||
$pengesahan->disahkan_pada = $currentdate;
|
||||
$pengesahan->save();
|
||||
// dd($pengesahan);
|
||||
$lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->get();
|
||||
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get();
|
||||
|
||||
$pengesahan = Pengesahan::where('norujukan', $request->norujukan)->where('lelong_id', $request->lelong_id)->get();
|
||||
|
||||
if($request->jenis_button == "terima")
|
||||
{
|
||||
$lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id')
|
||||
->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
|
||||
->where('pengesahan.id', $pengesahan->id)
|
||||
->get();
|
||||
dd($lelongbidmarhuns['marhun']);
|
||||
|
||||
foreach($lelongbidmarhuns as $bidmarhuns)
|
||||
foreach($pengesahan as $index1=>$sah)
|
||||
{
|
||||
if($bidmarhuns->status_ubah == 3)
|
||||
$savepengesahan = Pengesahan::where('id', $sah['id'])
|
||||
->first();
|
||||
$savepengesahan->disahkan_oleh = $user['id'];
|
||||
$savepengesahan->disahkan_pada = $currentdate;
|
||||
$savepengesahan->status = 1;
|
||||
$savepengesahan->save();
|
||||
|
||||
$lelongbid = LelongBid::where('id', $sah->lelongbid_id)->get();
|
||||
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $sah->lelongbid_id)->get();
|
||||
|
||||
$lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id')
|
||||
->where('pengesahan.lelongbid_id', $sah->lelongbid_id)
|
||||
->where('pengesahan.id', $sah->id)
|
||||
->get();
|
||||
|
||||
$total_berat = 0;
|
||||
$total_hargaasas = 0;
|
||||
foreach($lelongbidmarhuns as $index2=>$bidmarhuns)
|
||||
{
|
||||
$bidmarhuns->delete();
|
||||
}
|
||||
else
|
||||
{
|
||||
//
|
||||
if($bidmarhuns->status_ubah == 3)
|
||||
{
|
||||
$bidmarhuns->delete();
|
||||
}
|
||||
else
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
$lelongbids = LelongBid::where('id', $sah->lelongbid_id)->first();
|
||||
$txtmarhun = ",1 " . $bidmarhuns->marhun ;
|
||||
$lelongbids->marhun = str_replace( $txtmarhun,"", $lelongbid[0]['marhun']);
|
||||
$lelongbids->berat = $total_berat += $bidmarhuns->berat ;
|
||||
$lelongbids->hargaasas = $total_hargaasas += $bidmarhuns->hargaasas;
|
||||
$lelongbids->save();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
$pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
|
||||
->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
|
||||
->select('pengesahan.id as pengesahan_id')
|
||||
->first();
|
||||
|
||||
$marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
|
||||
->where('lelongbid_id','=',$pengesahan->lelongbid_id)
|
||||
->get();
|
||||
|
||||
$lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first();
|
||||
$txtmarhun = ",1 " . $lelongbidmarhuns->marhun ;
|
||||
$lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
|
||||
$lelongbid->berat = $lelongbid->berat - $lelongbidmarhuns->berat;
|
||||
$lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhuns->hargaasas;
|
||||
$lelongbid->save();
|
||||
|
||||
// $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id);
|
||||
}
|
||||
|
||||
else if($request->jenis_button == "tangguhlelong")
|
||||
{
|
||||
//add into table tangguhlelong
|
||||
$tangguhlelong = new TangguhLelong;
|
||||
$tangguhlelong->lelong_id = $pengesahan->lelong_id;
|
||||
$tangguhlelong->lelongbid_id = $pengesahan->lelongbid_id;
|
||||
$tangguhlelong->norujukan = $pengesahan->norujukan;
|
||||
$tangguhlelong->pinjaman = $lelongbid[0]['pinjaman'];
|
||||
$tangguhlelong->tarikhtangguh = $currentdate;
|
||||
$tangguhlelong->ditangguh_oleh = $user->id;
|
||||
$tangguhlelong->ditangguh_pada = $currentdate;
|
||||
$tangguhlelong->nota = $request->nota;
|
||||
$tangguhlelong->save();
|
||||
// dd($tangguhlelong);
|
||||
foreach($pengesahan as $index1=>$sah)
|
||||
{
|
||||
$savepengesahan = Pengesahan::where('id', $sah['id'])
|
||||
->first();
|
||||
$savepengesahan->disahkan_oleh = $user['id'];
|
||||
$savepengesahan->disahkan_pada = $currentdate;
|
||||
$savepengesahan->status = 1;
|
||||
$savepengesahan->save();
|
||||
|
||||
$lelongbidasal = LelongBid::where('id', $sah['lelongbid_id'])->first();
|
||||
|
||||
//add into table tangguhlelong
|
||||
$tangguhlelong = new TangguhLelong;
|
||||
$tangguhlelong->lelong_id = $sah->lelong_id;
|
||||
$tangguhlelong->lelongbid_id = $sah->lelongbid_id;
|
||||
$tangguhlelong->norujukan = $sah->norujukan;
|
||||
$tangguhlelong->pinjaman = $lelongbidasal['pinjaman'];
|
||||
$tangguhlelong->tarikhtangguh = $currentdate;
|
||||
$tangguhlelong->ditangguh_oleh = $user->id;
|
||||
$tangguhlelong->ditangguh_pada = $currentdate;
|
||||
$tangguhlelong->nota = $request->nota;
|
||||
$tangguhlelong->save();
|
||||
|
||||
$marhundelete = LelongBid::where('id', $sah->lelongbid_id)->delete();
|
||||
}
|
||||
|
||||
|
||||
$marhundelete = LelongBid::where('id', $pengesahan->lelongbid_id)->delete();
|
||||
|
||||
}
|
||||
|
||||
@@ -630,48 +641,48 @@ class MarhunController extends Controller
|
||||
|
||||
}
|
||||
|
||||
public function pcdelete($id, $lelongbid_id)
|
||||
{
|
||||
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelongbid_id)->first();
|
||||
$pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
|
||||
->where('pengesahan.lelongbid_id', $lelongbid_id)
|
||||
->select('pengesahan.id as pengesahan_id')
|
||||
->first();
|
||||
|
||||
$marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
|
||||
->where('lelongbid_id','=',$lelongbid_id)
|
||||
->get();
|
||||
|
||||
$lelongbid = LelongBid::where('id', $lelongbid_id)->first();
|
||||
$txtmarhun = ",1 " . $lelongbidmarhun->marhun ;
|
||||
$lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
|
||||
$lelongbid->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan;
|
||||
$lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan;
|
||||
$lelongbid->save();
|
||||
|
||||
}
|
||||
|
||||
public function senarailelong()
|
||||
{
|
||||
$lelong = Lelong::where('sts_lelong', 0)
|
||||
->get();
|
||||
$arrayinfo = [];
|
||||
|
||||
return view('pengesahan.senarailelong',compact('lelong'));
|
||||
$lelong = Lelong::where('sts_lelong', 0)
|
||||
->get()->toArray();
|
||||
|
||||
foreach($lelong as $details)
|
||||
{
|
||||
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
|
||||
->where('lelong_id', $details['id'])
|
||||
->get()
|
||||
->toArray();
|
||||
|
||||
array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
|
||||
}
|
||||
|
||||
return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo'));
|
||||
}
|
||||
|
||||
public function senaraitangguhlelong($id)
|
||||
{
|
||||
$tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
|
||||
$tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', 'lelong.id')
|
||||
->where('tangguhlelong.lelong_id', $id)
|
||||
->get();
|
||||
|
||||
foreach($tangguhlelong as $index1=>$tanguhlel)
|
||||
{
|
||||
$getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
|
||||
->where('lelong_id', $id)
|
||||
->first();
|
||||
|
||||
$tangguhlelong[$index1]['nama_caw'] = $getkodcaw->caw_name;
|
||||
}
|
||||
|
||||
return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
|
||||
}
|
||||
|
||||
public function lelbidmarhun($id, $norujukan)
|
||||
{
|
||||
$marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id')
|
||||
->where('tangguhlelong.lelong_id', $id)
|
||||
$marhuns = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
|
||||
->join('gadai', 'tangguhlelong.norujukan', '=', 'gadai.norujukan')
|
||||
->where('tangguhlelong.norujukan', $norujukan)
|
||||
->get();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user