From 2adbe06e908518ab6a400e710e7a9e5230311e20 Mon Sep 17 00:00:00 2001
From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com>
Date: Wed, 2 Mar 2022 15:20:38 +0800
Subject: [PATCH] update error

---
 app/Http/Controllers/NotisController.php   |  8 +-------
 app/Http/Controllers/SerahanController.php | 12 ++++--------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php
index ba5d6709..ad27d9ee 100644
--- a/app/Http/Controllers/NotisController.php
+++ b/app/Http/Controllers/NotisController.php
@@ -42,20 +42,14 @@ class NotisController extends Controller
     {
         $user =  Auth::user();
 
-        $caw = Cawangan::where('caw_code','=',$user->kodcaw)
-        ->first();
 
-        $lelongbid = LelongBid::where('caw_id','=',$caw->id)
-        ->get();
         
         $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
         ->where('cawangan.caw_code','=',$user->kodcaw)
         ->get();
-  
-        $lelong = Lelong::where('id', $lelongid)->get();
 
-        return view('jananotis.notislelong',compact('lelongbid','lelongid'));
+        return view('jananotis.notislelong',compact('lelongid'));
     }
      
     public function senarainotis($lelong_id){
diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php
index 14306cb8..6c45fa69 100644
--- a/app/Http/Controllers/SerahanController.php
+++ b/app/Http/Controllers/SerahanController.php
@@ -39,21 +39,17 @@ class SerahanController extends Controller
     public function laporanserahan()
     {
         $user =  Auth::user();
-
-        $caw = Cawangan::where('caw_code','=',$user->kodcaw)
-        ->first();
-
-        $lelongbid = LelongBid::where('caw_id','=',$caw->id)
-       ->get();
+            
+ 
         
         $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
         ->where('cawangan.caw_code','=',$user->kodcaw)
         ->get();
   
-        $lelong = Lelong::where('id', $lelongid)->get();
 
-        return view('serahan.laporanserahan',compact('lelongbid','lelongid'));
+
+        return view('serahan.laporanserahan',compact('lelongid'));
     }
      
     public function pembayaran($id){