From 436101bd27a8804103371c710493928a774b111b Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Sun, 20 Mar 2022 10:34:31 +0800
Subject: [PATCH] update marhun blade

---
 app/Http/Controllers/MarhunController.php | 9 ++++-----
 resources/views/marhun/marhun.blade.php   | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index d0689ec7..76f9a778 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -97,6 +97,7 @@ class MarhunController extends Controller
                         $karat = new Pengesahan;
                         $karat->lelong_id = $lelong->id;
                         $karat->lelongbid_id = $lelongbid->id;
+                        $karat->lelongbidmarhun_id = $marhun->id;
                         $karat->norujukan = $lelongbid->norujukan;
                         $karat->diminta_oleh = $user->id;
                         $karat->diminta_pada = $currentdate;
@@ -132,10 +133,7 @@ class MarhunController extends Controller
     public function show($id, $lelong_id)
     {
         $lelongbid = LelongBid::where('id','=',$id)->first();
-        $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
-        ->where('lelongbid.id','=',$id)
-        ->where('lelongbid.lelong_id', $lelong_id)
-        ->get();
+        $marhun = LelongBidMarhun::where('lelongbid_id','=',$id)->get();
         $lelkarat = LelKarat::where('lelong_id','=',$lelongbid->lelong_id)->get();
         $karatall = JenisKarat::all();
         $emasall = JenisEmas::all();
@@ -376,7 +374,7 @@ class MarhunController extends Controller
         return redirect()->route('pengesahan.perubahanmutumarhun')->with('success','Pengesahan Mutu Marhun Berjaya');
     }
 
-    public function submitdelete($id, $lelong_id){
+    public function submitdeletes($id, $lelong_id){
 
         $user =  Auth::user();
         
@@ -391,6 +389,7 @@ class MarhunController extends Controller
         $pengesahan = new Pengesahan;
         $pengesahan->lelong_id = $lelong_id;
         $pengesahan->lelongbid_id = $id;
+        $pengesahan->lelongbidmarhun_id = $marhun->lelongbidmarhun_id;
         $pengesahan->norujukan = $marhun->norujukan;
         $pengesahan->diminta_oleh = $user->id;
         $pengesahan->diminta_pada = $currentdate;
diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index 557ac1e4..007898a9 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -44,7 +44,7 @@
                             <td>{{ $item->nota }}</td>
                             <td class="text-center">
                             <a  onclick="kemaskini(this)" data-idmarhun="{{ $item->id }}" data-marhun="{{ $item->marhun }}" data-karat="{{ $item->karat }}" data-berat="{{ $item->berat }}" data-harga="{{ $item->harga }}" data-nmarhun="{{ $item->n_marhun }}" data-hargaasas="{{ $item->hargaasas }}" data-nota="{{ $item->nota }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Marhun" style="margin-right:30px"><i class="far fa-edit"></i></a>
-                            <a class="confirmdel" href="{{ route('marhun.submitdelete',[$item->id, $item->lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
+                            <a class="confirmdel" href="{{ route('marhun.submitdelete',[$item->id, $lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
                             </td>
                         </tr>
                         @endforeach