diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 53ad1b72..28290951 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -566,11 +566,8 @@ class LelongController extends Controller public function senarailelongtaklaku(Request $request){ - $user = Auth::user(); - $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') - ->where('cawangan.caw_code', $user->kodcaw) ->get(); return view('lelong.senarailelongtaklaku',compact('senarai')); @@ -583,6 +580,7 @@ class LelongController extends Controller ->where('lelongbid.lelong_id', $lelong_id) ->whereNull('t_jual') ->select( + 'lelongbid.norujukan', 'lelongbid.t_lelong', 'lelongbid.kodcaw', 'cawangan.caw_name', @@ -601,6 +599,7 @@ class LelongController extends Controller $suratlelongtaklaku = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id') ->where('lelongbid.lelong_id', $lelong_id) + ->where('status_jual', '=', 1) ->whereNull('t_jual') ->get(); diff --git a/resources/views/jananotis/notislelong.blade.php b/resources/views/jananotis/notislelong.blade.php index 77fddc7b..192be8f6 100644 --- a/resources/views/jananotis/notislelong.blade.php +++ b/resources/views/jananotis/notislelong.blade.php @@ -29,8 +29,8 @@ {{ $bid->lelong_id}} {{ $bid->tarikh_lelong }} - - + + @endforeach @@ -43,4 +43,10 @@ + @endsection diff --git a/resources/views/jananotis/senarainotis.blade.php b/resources/views/jananotis/senarainotis.blade.php index 80aff8a2..8edaeb09 100644 --- a/resources/views/jananotis/senarainotis.blade.php +++ b/resources/views/jananotis/senarainotis.blade.php @@ -35,6 +35,9 @@ @endforeach + diff --git a/resources/views/lelong/lelongtaklaku.blade.php b/resources/views/lelong/lelongtaklaku.blade.php index 82d12758..d3780795 100644 --- a/resources/views/lelong/lelongtaklaku.blade.php +++ b/resources/views/lelong/lelongtaklaku.blade.php @@ -17,7 +17,7 @@ No Tarikh Lelong - Kod Cawangan + No Rujukan Nama Cawangan Bilangan Pinjaman (RM) @@ -38,7 +38,7 @@ {{ $loop->iteration }} {{ $leltaklaku->t_lelong }} - {{ $leltaklaku->kodcaw }} + {{ $leltaklaku->norujukan }} {{ $leltaklaku->caw_name }} {{ $leltaklaku['suratlelongtaklaku'] }} {{ $leltaklaku->pinjaman }} @@ -64,7 +64,7 @@ TIDAK LAKU @endif - + @@ -76,12 +76,20 @@ + + @endsection diff --git a/resources/views/serahan/pembayaran.blade.php b/resources/views/serahan/pembayaran.blade.php index e3666b03..594ec942 100644 --- a/resources/views/serahan/pembayaran.blade.php +++ b/resources/views/serahan/pembayaran.blade.php @@ -32,8 +32,8 @@ {{ $pay['totalBid']}} {{-- --}} - - + + @@ -42,10 +42,17 @@ @endforeach +