Merge branch 'faiqahzaman'

This commit is contained in:
Azfar Arsyad
2022-03-15 12:54:20 +08:00
6 changed files with 72 additions and 19 deletions
+55 -9
View File
@@ -41,7 +41,7 @@ class MarhunController extends Controller
*
* @return \Illuminate\Contracts\Support\Renderable
*/
public function index()
public function index($lelong_id)
{
$user = Auth::user();
@@ -171,7 +171,13 @@ class MarhunController extends Controller
{
// dd($request->all());
//get request from form and create lelongbidmarhun
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$lelongbid = LelongBid::where('norujukan', $request->norujukan_marhuntambahan)->first();
$lelong = Lelong::where('id','=',$lelongbid->lelong_id)->first();
$lelongbidmarhun = new LelongBidMarhun;
$lelongbidmarhun->lelongbid_id = $lelongbid->id;
@@ -185,11 +191,19 @@ class MarhunController extends Controller
$lelongbidmarhun->hargaasas = $request->harga_asastambahan;
$lelongbidmarhun->status_semak = 0;
$lelongbidmarhun->save();
$lelongbid->marhun = $lelongbid->marhun ."1 " . $request->marhuntambahan . "," ;
$lelongbid->berat = $lelongbid->berat + $request->berat_emastambahan;
$lelongbid->hargaasas = $lelongbid->hargaasas + $request->harga_asastambahan;
$lelongbid->save();
$karat = new Pengesahan;
$karat->lelong_id = $lelong->id;
$karat->lelongbid_id = $lelongbid->id;
$karat->norujukan = $lelongbid->norujukan;
$karat->diminta_oleh = $user->id;
$karat->diminta_pada = $currentdate;
$karat->save();
return redirect()->route('marhun.show',$lelongbid->id)
->with('success','Marhun Berjaya Ditambah');
@@ -348,10 +362,45 @@ class MarhunController extends Controller
return redirect()->route('pengesahan.perubahanmutumarhun')->with('success','Pengesahan Mutu Marhun Berjaya');
}
public function delete($id){
// dd($id);
public function submitdelete($id){
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid_id','=',$id)
->get();
$pengesahan = new Pengesahan;
$pengesahan->lelong_id = $marhun->lelong_id;
$pengesahan->lelongbid = $id;
$pengesahan->norujukan = $marhun->norujukan;
$pengesahan->diminta_oleh = $user->id;
$pengesahan->diminta_pada = $currentdate;
$pengesahan->save();
return redirect()->route('pengesahan.pcdelete',$lelongbid->id)
->with('success','Permohonan Pengesahan Padam Marhun Telah Berjaya Dihantar');
}
public function pcdelete($id)
{
$lelongbidmarhun = LelongBidMarhun::where('id', $id)->first();
//save in table pengesahan first
$pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
->where('lelongbidmarhun.id', $id)
->where('lelongbid_id', $lelongbid_id)
->select('pengesahan.id as pengesahan_id')
->first();
if($pengesahan != null)
{
$lelongbidmarhun->delete();
}
$lelongbid = LelongBid::where('id', $lelongbidmarhun->lelongbid_id)->first();
// dd($lelongbid);
@@ -362,11 +411,8 @@ class MarhunController extends Controller
$lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan;
$lelongbid->save();
$lelongbidmarhun->delete();
return redirect()->route('marhun.show',$lelongbid->id)
->with('success','Marhun Berjaya Dipadam');
return redirect()->route('pengesahan.perubahanmutumarhun')
->with('success','Pengesahan Padam Marhun Telah Berjaya');
}
}