This commit is contained in:
faiqahzaman
2022-04-14 13:28:21 +08:00
parent a1c1e2b162
commit baa4077019
2 changed files with 32 additions and 36 deletions
+30 -34
View File
@@ -473,7 +473,7 @@ class MarhunController extends Controller
->get()->toArray();
$lelongbid = LelongBid::where('id', $lelbidmarhun->lelongbid_id)->where('lelong_id', $id)->first();
dd($lelongbid);
// dd($lelongbid);
$karat = Lelkarat::where('lelong_id', $id)->get();
foreach($marhuns as $index1=>$marhun)
@@ -513,7 +513,6 @@ class MarhunController extends Controller
public function terimaperubahan(Request $request)
{
// dd($request->all());
//update mutu marhun - gadaimarhun
$user = Auth::user();
@@ -526,24 +525,10 @@ class MarhunController extends Controller
$pengesahan->id = $pengesahan['id'] ;
$pengesahan->disahkan_oleh = $user['id'];
$pengesahan->disahkan_pada = $currentdate;
// $pengesahan->save();
// $gadaimarhun = GadaiMarhun::where('norujukan', $pengesahan->norujukan)->delete();
$pengesahan->save();
// dd($pengesahan);
$lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->get();
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get();
// foreach($lelongbidmarhun as $bidmarhun)
// {
// $newmarhun = new GadaiMarhun;
// $newmarhun->norujukan = $pengesahan->norujukan;
// $newmarhun->bil = $bidmarhun->bil;
// $newmarhun->marhun = $bidmarhun->marhun;
// $newmarhun->nota = $bidmarhun->nota;
// $newmarhun->karat = $bidmarhun->karat;
// $newmarhun->berat = $bidmarhun->berat;
// $newmarhun->berat = $bidmarhun->harga;
// $newmarhun->berat = $bidmarhun->n_marhun;
// $newmarhun->save();
// }
if($request->jenis_button == "terima")
{
@@ -556,22 +541,33 @@ class MarhunController extends Controller
{
if($bidmarhuns->status_ubah == 3)
{
// $bidmarhuns->delete();
$bidmarhuns->delete();
}
else
{
$bidmarhuns->bil = $bidmarhun->bil;
$bidmarhuns->marhun = $bidmarhun->marhun;
$bidmarhuns->nota = $bidmarhun->nota;
$bidmarhuns->karat = $bidmarhun->karat;
$bidmarhuns->berat = $bidmarhun->berat;
// $bidmarhuns->update();
//
}
}
$this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id);
}
$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 " . $lelongbidmarhuns->marhun ;
$lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
$lelongbid->berat = $lelongbid->berat - $lelongbidmarhuns->berat_emastambahan;
$lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhuns->harga_asastambahan;
$lelongbid->save();
// $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id);
}
else if($request->jenis_button == "tangguhlelong")
{
//add into table tangguhlelong
@@ -584,15 +580,17 @@ class MarhunController extends Controller
$tangguhlelong->ditangguh_oleh = $user->id;
$tangguhlelong->ditangguh_pada = $currentdate;
$tangguhlelong->nota = $request->nota;
// $tangguhlelong->save();
$pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
->first();
$tangguhlelong->save();
// dd($tangguhlelong);
$marhundelete = LelongBid::where('id', $pengesahan->lelongbid_id)->delete();
}
else
{
//
}
return redirect()->route('pengesahan.senarailelongubahmutu')->with('success','Pengesahan Mutu Marhun Berjaya');
}
@@ -648,8 +646,6 @@ class MarhunController extends Controller
$lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan;
$lelongbid->save();
// return redirect()->route('pengesahan.perubahanmutumarhun')
// ->with('success','Pengesahan Padam Marhun Telah Berjaya');
}
public function senarailelong()
@@ -64,11 +64,11 @@
"orderable": false
},
{
"targets": 3,
"targets": 4,
"orderable": false
}
],
order: [[1, 'asc']],
order: [[1, 'desc']],
// "ordering": false,
"info": false,
"lengthChange": false,